diff --git a/components/__tests__/__snapshots__/index.test.ts.snap b/components/__tests__/__snapshots__/index.test.ts.snap index 5518a69fe8..6f3eff4e71 100644 --- a/components/__tests__/__snapshots__/index.test.ts.snap +++ b/components/__tests__/__snapshots__/index.test.ts.snap @@ -59,6 +59,7 @@ Array [ "TimePicker", "Timeline", "Tooltip", + "Tour", "Transfer", "Tree", "TreeSelect", diff --git a/components/dropdown/style/index.tsx b/components/dropdown/style/index.tsx index 7a19fc8a6a..839aa02b4b 100644 --- a/components/dropdown/style/index.tsx +++ b/components/dropdown/style/index.tsx @@ -67,7 +67,7 @@ const genBaseStyle: GenerateStyle = token => { // A placeholder out of dropdown visible range to avoid close when user moving '&::before': { position: 'absolute', - insetBlock: -dropdownArrowDistance + sizePopupArrow, + insetBlock: -dropdownArrowDistance + sizePopupArrow / 2, // insetInlineStart: -7, // FIXME: Seems not work for hidden element zIndex: -9999, opacity: 0.0001, @@ -449,7 +449,7 @@ export default genComponentStyleHook( const dropdownToken = mergeToken(token, { menuCls: `${componentCls}-menu`, rootPrefixCls, - dropdownArrowDistance: sizePopupArrow + marginXXS, + dropdownArrowDistance: sizePopupArrow / 2 + marginXXS, dropdownArrowOffset, dropdownPaddingVertical, dropdownEdgeChildPadding: paddingXXS, diff --git a/components/index.tsx b/components/index.tsx index 20b8a314bd..c4ecfa53a7 100644 --- a/components/index.tsx +++ b/components/index.tsx @@ -133,6 +133,8 @@ export { default as Timeline } from './timeline'; export type { TimelineItemProps, TimelineProps } from './timeline'; export { default as Tooltip } from './tooltip'; export type { TooltipProps } from './tooltip'; +export { default as Tour } from './tour'; +export type { TourProps, TourStepProps } from './tour/interface'; export { default as Transfer } from './transfer'; export type { TransferProps } from './transfer'; export { default as Tree } from './tree'; diff --git a/components/locale-provider/index.tsx b/components/locale-provider/index.tsx index 9da6efbc32..779ccdd06f 100644 --- a/components/locale-provider/index.tsx +++ b/components/locale-provider/index.tsx @@ -4,6 +4,7 @@ import warning from '../_util/warning'; import type { PickerLocale as DatePickerLocale } from '../date-picker/generatePicker'; import type { TransferLocale as TransferLocaleForEmpty } from '../empty'; import type { ModalLocale } from '../modal/locale'; +import type { TourLocale } from '../tour/interface'; import { changeConfirmLocale } from '../modal/locale'; import type { PaginationLocale } from '../pagination/Pagination'; import type { PopconfirmLocale } from '../popconfirm/PurePanel'; @@ -23,6 +24,7 @@ export interface Locale { Calendar?: Record; Table?: TableLocale; Modal?: ModalLocale; + Tour?: TourLocale; Popconfirm?: PopconfirmLocale; Transfer?: TransferLocale; Select?: Record; diff --git a/components/locale/en_US.tsx b/components/locale/en_US.tsx index 6b91199db5..e05ece5f76 100644 --- a/components/locale/en_US.tsx +++ b/components/locale/en_US.tsx @@ -35,6 +35,11 @@ const localeValues: Locale = { triggerAsc: 'Click to sort ascending', cancelSort: 'Click to cancel sorting', }, + Tour: { + Next: 'Next', + Previous: 'Previous', + Finish: 'Finish', + }, Modal: { okText: 'OK', cancelText: 'Cancel', diff --git a/components/locale/zh_CN.tsx b/components/locale/zh_CN.tsx index 4750fb6c16..6d155dde0a 100644 --- a/components/locale/zh_CN.tsx +++ b/components/locale/zh_CN.tsx @@ -40,6 +40,11 @@ const localeValues: Locale = { cancelText: '取消', justOkText: '知道了', }, + Tour: { + Next: '下一步', + Previous: '上一步', + Finish: '结束导览', + }, Popconfirm: { cancelText: '取消', okText: '确定', diff --git a/components/locale/zh_HK.tsx b/components/locale/zh_HK.tsx index d8eb4800e3..ce06aa9440 100644 --- a/components/locale/zh_HK.tsx +++ b/components/locale/zh_HK.tsx @@ -37,6 +37,11 @@ const localeValues: Locale = { cancelText: '取消', justOkText: '知道了', }, + Tour: { + Next: '下一步', + Previous: '上一步', + Finish: '結束導覽', + }, Popconfirm: { okText: '確定', cancelText: '取消', diff --git a/components/locale/zh_TW.tsx b/components/locale/zh_TW.tsx index 07ca16f0e5..d6cf310308 100644 --- a/components/locale/zh_TW.tsx +++ b/components/locale/zh_TW.tsx @@ -37,6 +37,11 @@ const localeValues: Locale = { cancelText: '取消', justOkText: '知道了', }, + Tour: { + Next: '下一步', + Previous: '上一步', + Finish: '結束導覽', + }, Popconfirm: { okText: '確定', cancelText: '取消', diff --git a/components/style/placementArrow.tsx b/components/style/placementArrow.tsx index f211cb8994..ae626eec31 100644 --- a/components/style/placementArrow.tsx +++ b/components/style/placementArrow.tsx @@ -56,7 +56,7 @@ export default function getArrowStyle + + Begin Tour + + , +