Skip to content

feat(CalendarPicker): unified provision of custom prefixCls #6968

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

Open
wants to merge 6 commits into
base: feature
Choose a base branch
from
Open

feat(CalendarPicker): unified provision of custom prefixCls #6968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c214b2
feat(CalendarPicker): unified provision of custom prefixCls
Oct 21, 2025
123cacf
test: add picker test
Oct 22, 2025
0e3bac5
Update src/components/calendar-picker/tests/calendar-picker.test.tsx
EmilyyyLiu Oct 22, 2025
611aa82
Update src/components/calendar-picker/tests/calendar-picker.test.tsx
EmilyyyLiu Oct 22, 2025
1166400
test: update snap
Oct 22, 2025
e01e1e1
feat: change calendarPickerView
Oct 23, 2025
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
47 changes: 23 additions & 24 deletions src/components/calendar-picker-view/calendar-picker-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import useSyncScroll from './useSyncScroll'
dayjs.extend(isoWeek)
dayjs.extend(isSameOrBefore)

const classPrefix = 'adm-calendar-picker-view'

export const Context = React.createContext<{
visible: boolean
}>({
Expand All @@ -54,6 +52,7 @@ export type CalendarPickerViewProps = {
max?: Date
min?: Date
shouldDisableDate?: (date: Date) => boolean
prefixCls?: string
} & (
| {
selectionMode?: undefined
Expand Down Expand Up @@ -91,8 +90,8 @@ export const CalendarPickerView = forwardRef<
const bodyRef = useRef<HTMLDivElement>(null)
const today = dayjs()
const props = mergeProps(defaultProps, p)
const { locale } = useConfig()

const { locale, getPrefixCls } = useConfig()
const prefixCls = getPrefixCls('calendar-picker-view', props.prefixCls)
const markItems = [...locale.Calendar.markItems]
if (props.weekStartsOn === 'Sunday') {
const item = markItems.pop()
Expand Down Expand Up @@ -187,8 +186,8 @@ export const CalendarPickerView = forwardRef<

// =============================== Render ===============================
const header = (
<div className={`${classPrefix}-header`}>
<div className={`${classPrefix}-title`}>
<div className={`${prefixCls}-header`}>
<div className={`${prefixCls}-title`}>
{props.title ?? locale.Calendar.title}
</div>
</div>
Expand Down Expand Up @@ -220,20 +219,20 @@ export const CalendarPickerView = forwardRef<
: Array(presetEmptyCellCount)
.fill(null)
.map((_, index) => (
<div key={index} className={`${classPrefix}-cell`}></div>
<div key={index} className={`${prefixCls}-cell`}></div>
))

cells.push(
<div key={yearMonth} data-year-month={yearMonth}>
<div className={`${classPrefix}-title`}>
<div className={`${prefixCls}-title`}>
{locale.Calendar.yearAndMonth?.replace(
/\${(.*?)}/g,
(_, variable: keyof typeof renderMap) => {
return renderMap[variable]?.toString()
}
)}
</div>
<div className={`${classPrefix}-cells`}>
<div className={`${prefixCls}-cells`}>
{/* 空格填充 */}
{presetEmptyCells}
{/* 遍历每月 */}
Expand Down Expand Up @@ -274,7 +273,7 @@ export const CalendarPickerView = forwardRef<
if (props.renderTop === false) return null

const contentWrapper = (content: ReactNode) => (
<div className={`${classPrefix}-cell-top`}>{content}</div>
<div className={`${prefixCls}-cell-top`}>{content}</div>
)

const top = props.renderTop?.(d.toDate())
Expand Down Expand Up @@ -308,7 +307,7 @@ export const CalendarPickerView = forwardRef<
if (props.renderBottom === false) return null

return (
<div className={`${classPrefix}-cell-bottom`}>
<div className={`${prefixCls}-cell-bottom`}>
{props.renderBottom?.(d.toDate())}
</div>
)
Expand All @@ -317,15 +316,15 @@ export const CalendarPickerView = forwardRef<
return (
<div
key={d.valueOf()}
className={classNames(`${classPrefix}-cell`, {
[`${classPrefix}-cell-today`]: d.isSame(today, 'day'),
[`${classPrefix}-cell-selected`]: isSelect,
[`${classPrefix}-cell-selected-begin`]: isBegin,
[`${classPrefix}-cell-selected-end`]: isEnd,
[`${classPrefix}-cell-selected-row-begin`]:
className={classNames(`${prefixCls}-cell`, {
[`${prefixCls}-cell-today`]: d.isSame(today, 'day'),
[`${prefixCls}-cell-selected`]: isSelect,
[`${prefixCls}-cell-selected-begin`]: isBegin,
[`${prefixCls}-cell-selected-end`]: isEnd,
[`${prefixCls}-cell-selected-row-begin`]:
isSelectRowBegin,
[`${classPrefix}-cell-selected-row-end`]: isSelectRowEnd,
[`${classPrefix}-cell-disabled`]: !!disabled,
[`${prefixCls}-cell-selected-row-end`]: isSelectRowEnd,
[`${prefixCls}-cell-disabled`]: !!disabled,
})}
onClick={() => {
if (!props.selectionMode) return
Expand Down Expand Up @@ -368,7 +367,7 @@ export const CalendarPickerView = forwardRef<
}}
>
{renderTop()}
<div className={`${classPrefix}-cell-date`}>
<div className={`${prefixCls}-cell-date`}>
{props.renderDate
? props.renderDate(d.toDate())
: d.date()}
Expand All @@ -387,15 +386,15 @@ export const CalendarPickerView = forwardRef<
return cells
}
const body = (
<div className={`${classPrefix}-body`} ref={bodyRef}>
<div className={`${prefixCls}-body`} ref={bodyRef}>
{renderBody()}
</div>
)

const mark = (
<div className={`${classPrefix}-mark`}>
<div className={`${prefixCls}-mark`}>
{markItems.map((item, index) => (
<div key={index} className={`${classPrefix}-mark-cell`}>
<div key={index} className={`${prefixCls}-mark-cell`}>
{item}
</div>
))}
Expand All @@ -404,7 +403,7 @@ export const CalendarPickerView = forwardRef<

return withNativeProps(
props,
<div className={classPrefix}>
<div className={prefixCls}>
{showHeader && header}
{mark}
{body}
Expand Down
Loading
Loading