Skip to content

feat(calendar): support renderBottomButton props #2645

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

Merged
merged 3 commits into from
Oct 18, 2024
Merged

feat(calendar): support renderBottomButton props #2645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f27e7e9
feat(calendar): support renderBottomButton props
Miles-hxy Oct 16, 2024
e25f459
feat(calendar): support renderBottomButton props
Miles-hxy Oct 16, 2024
bb4d51e
fix: test
Miles-hxy Oct 16, 2024
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: 3 additions & 0 deletions src/packages/calendar/calendar.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface CalendarProps {
firstDayOfWeek: number
disableDate: (date: CalendarDay) => boolean
renderHeaderButtons?: () => string | JSX.Element
renderBottomButton?: () => string | JSX.Element
renderDay?: (date: CalendarDay) => string | JSX.Element
renderDayTop?: (date: CalendarDay) => string | JSX.Element
renderDayBottom?: (date: CalendarDay) => string | JSX.Element
Expand Down Expand Up @@ -90,6 +91,7 @@ export const Calendar = React.forwardRef<
firstDayOfWeek,
disableDate,
renderHeaderButtons,
renderBottomButton,
renderDay,
renderDayTop,
renderDayBottom,
Expand Down Expand Up @@ -153,6 +155,7 @@ export const Calendar = React.forwardRef<
firstDayOfWeek={firstDayOfWeek}
disableDate={disableDate}
renderHeaderButtons={renderHeaderButtons}
renderBottomButton={renderBottomButton}
renderDay={renderDay}
renderDayTop={renderDayTop}
renderDayBottom={renderDayBottom}
Expand Down
3 changes: 3 additions & 0 deletions src/packages/calendar/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface CalendarProps {
firstDayOfWeek: number
disableDate: (date: CalendarDay) => boolean
renderHeaderButtons?: () => string | JSX.Element
renderBottomButton?: () => string | JSX.Element
renderDay?: (date: CalendarDay) => string | JSX.Element
renderDayTop?: (date: CalendarDay) => string | JSX.Element
renderDayBottom?: (date: CalendarDay) => string | JSX.Element
Expand Down Expand Up @@ -90,6 +91,7 @@ export const Calendar = React.forwardRef<
firstDayOfWeek,
disableDate,
renderHeaderButtons,
renderBottomButton,
renderDay,
renderDayTop,
renderDayBottom,
Expand Down Expand Up @@ -138,6 +140,7 @@ export const Calendar = React.forwardRef<
children={children}
type={type}
autoBackfill={autoBackfill}
renderBottomButton={renderBottomButton}
popup={popup}
title={title || locale.calendaritem.title}
defaultValue={defaultValue}
Expand Down
1 change: 1 addition & 0 deletions src/packages/calendar/doc.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ import { Calendar } from '@nutui/nutui-react'
| firstDayOfWeek | first day of week | `0-6` | `0` |
| disableDate | set disable date | `(date: CalendarDay) => boolean` | `-` |
| renderHeaderButtons | custom buttons, under the title but above the subtitle | `() => string` \| `JSX.Element` | `-` |
| renderBottomButton | Custom calendar bottom button | `() => string` \| `JSX.Element` | `-` |
| renderDay | day info | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayTop | something above day | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayBottom | something under day | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
Expand Down
1 change: 1 addition & 0 deletions src/packages/calendar/doc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ import { Calendar } from '@nutui/nutui-react'
| firstDayOfWeek | 设置周起始日 | `0-6` | `0` |
| disableDate | 设置不可选日期 | `(date: CalendarDay) => boolean` | `-` |
| renderHeaderButtons | 自定义日历标题下部，可用以添加自定义操作 | `() => string` \| `JSX.Element` | `-` |
| renderBottomButton | 自定义日历底部按钮 | `() => string` \| `JSX.Element` | `-` |
| renderDay | 日期信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayTop | 日期顶部信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayBottom | 日期底部信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
Expand Down
1 change: 1 addition & 0 deletions src/packages/calendar/doc.taro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ import { Calendar } from '@nutui/nutui-react-taro'
| firstDayOfWeek | 设置周起始日 | `0-6` | `0` |
| disableDate | 设置不可选日期 | `(date: CalendarDay) => boolean` | `-` |
| renderHeaderButtons | 自定义日历标题下部，可用以添加自定义操作 | `() => string` \| `JSX.Element` | `-` |
| renderBottomButton | 自定义日历底部按钮 | `() => string` \| `JSX.Element` | `-` |
| renderDay | 日期信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayTop | 日期顶部信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayBottom | 日期底部信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
Expand Down
1 change: 1 addition & 0 deletions src/packages/calendar/doc.zh-TW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ import { Calendar } from '@nutui/nutui-react'
| firstDayOfWeek | 設置周起始日 | `0-6` | `0` |
| disableDate | 設置不可選日期 | `(date: CalendarDay) => boolean` | `-` |
| renderHeaderButtons | 自定義日歴標題下部，可用以添加自定義操作 | `() => string` \| `JSX.Element` | `-` |
| renderBottomButton | 自定義日歴底部按鈕 | `() => string` \| `JSX.Element` | `-` |
| renderDay | 日期信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayTop | 日期頂部信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
| renderDayBottom | 日期底部信息 | `(date: CalendarDay) => string` \| `JSX.Element` | `-` |
Expand Down
12 changes: 10 additions & 2 deletions src/packages/calendaritem/calendaritem.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export interface CalendarItemProps extends PopupProps {
firstDayOfWeek: number
disableDate: (date: CalendarDay) => boolean
renderHeaderButtons: () => string | JSX.Element
renderBottomButton: () => string | JSX.Element
renderDay: (date: CalendarDay) => string | JSX.Element
renderDayTop: (date: CalendarDay) => string | JSX.Element
renderDayBottom: (date: CalendarDay) => string | JSX.Element
Expand Down Expand Up @@ -121,6 +122,7 @@ export const CalendarItem = React.forwardRef<
renderDay,
renderDayTop,
renderDayBottom,
renderBottomButton,
value,
onConfirm,
onUpdate,
Expand Down Expand Up @@ -876,8 +878,14 @@ export const CalendarItem = React.forwardRef<
return (
<div className="nut-calendar-footer">
{children}
<div className="calendar-confirm-btn" onClick={confirm}>
{confirmText || locale.confirm}
<div onClick={confirm}>
{renderBottomButton ? (
renderBottomButton()
) : (
<div className="calendar-confirm-btn">
{confirmText || locale.confirm}
</div>
)}
</div>
</div>
)
Expand Down
12 changes: 10 additions & 2 deletions src/packages/calendaritem/calendaritem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
firstDayOfWeek: number
disableDate: (date: CalendarDay) => boolean
renderHeaderButtons: () => string | JSX.Element
renderBottomButton: () => string | JSX.Element
renderDay: (date: CalendarDay) => string | JSX.Element
renderDayTop: (date: CalendarDay) => string | JSX.Element
renderDayBottom: (date: CalendarDay) => string | JSX.Element
Expand Down Expand Up @@ -116,6 +117,7 @@
firstDayOfWeek,
disableDate,
renderHeaderButtons,
renderBottomButton,
renderDay,
renderDayTop,
renderDayBottom,
Expand Down Expand Up @@ -875,8 +877,14 @@
return (
<div className="nut-calendar-footer">
{children}
<div className="calendar-confirm-btn" onClick={confirm}>
{confirmText || locale.confirm}
<div onClick={confirm}>
{renderBottomButton ? (
renderBottomButton()

Check warning on line 882 in src/packages/calendaritem/calendaritem.tsx

View check run for this annotation

Codecov / codecov/patch

src/packages/calendaritem/calendaritem.tsx#L882 

Added line #L882 was not covered by tests
) : (
<div className="calendar-confirm-btn">
{confirmText || locale.confirm}
</div>
)}
</div>
</div>
)
Expand Down
Loading