Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Rename Calendar to CalendarPicker #6402

Merged
merged 5 commits into from
Oct 19, 2023
Merged

chore: Rename Calendar to CalendarPicker #6402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99c997f
chore: mv
zombieJ Oct 19, 2023
1e06d1b
chore: rename
zombieJ Oct 19, 2023
3041d8c
chore: move it
zombieJ Oct 19, 2023
f962539
chore: clean up
zombieJ Oct 19, 2023
54570a4
test: update test
zombieJ Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ export const components = {
experimental: [
'/guide/what-is-experimental',
'/components/calendar',
'/components/calendar-view',
'/components/calendar-picker',
'/components/calendar-picker-view',
'/components/dropdown',
'/components/floating-bubble',
'/components/image-uploader',
Expand Down
0 ...nents/calendar-view/arrow-left-double.tsx → ...alendar-picker-view/arrow-left-double.tsx
View file
Open in desktop
File renamed without changes.
0 src/components/calendar-view/arrow-left.tsx → ...nents/calendar-picker-view/arrow-left.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ponents/calendar-view/calendar-view.en.md → ...ar-picker-view/calendar-picker-view.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# CalendarView <Experimental></Experimental>
# CalendarPickerView <Experimental></Experimental>

Used to select a date or date range.

CalendarView is the content area of [Calendar](/components/calendar).
CalendarPickerView is the content area of [CalendarPicker](/components/calendar-picker).

## Demos

Only the simplest content area is shown here, and other more usages can be consulted [Calendar](/zh/components/calendar)
Only the simplest content area is shown here, and other more usages can be consulted [CalendarPicker](/components/calendar-picker)

<code src="./demos/demo1.tsx"></code>

## CalendarView
## CalendarPickerView

### Props

Expand Down
18 changes: 9 additions & 9 deletions ...mponents/calendar-view/calendar-view.less → ...dar-picker-view/calendar-picker-view.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.adm-calendar,
.adm-calendar-view,
.adm-calendar-popup {
.adm-calendar-picker,
.adm-calendar-picker-view,
.adm-calendar-picker-popup {
& &-title {
flex: auto;
font-size: var(--adm-font-size-10);
Expand All @@ -10,7 +10,7 @@
padding: 12px;
border-bottom: 1px solid var(--adm-color-border);

.adm-calendar-view-title {
.adm-calendar-picker-view-title {
text-align: center;
}
}
Expand All @@ -23,7 +23,7 @@
display: none;
}

.adm-calendar-view-title {
.adm-calendar-picker-view-title {
position: sticky;
top: 0;
padding: 8px 20px;
Expand Down Expand Up @@ -71,8 +71,8 @@
&&-disabled {
color: var(--adm-color-light);

.adm-calendar-view-cell-top,
.adm-calendar-view-cell-bottom {
.adm-calendar-picker-view-cell-top,
.adm-calendar-picker-view-cell-bottom {
color: var(--adm-color-light);
}
}
Expand All @@ -83,8 +83,8 @@
color: var(--adm-color-text);
}

& .adm-calendar-view-cell-top,
& .adm-calendar-view-cell-bottom {
& .adm-calendar-picker-view-cell-top,
& .adm-calendar-picker-view-cell-bottom {
color: var(--adm-color-white);
}

Expand Down
Loading
Loading