diff --git a/components/date-picker-new/style/index.less b/components/date-picker-new/style/index.less deleted file mode 100644 index b707b9bd0..000000000 --- a/components/date-picker-new/style/index.less +++ /dev/null @@ -1,357 +0,0 @@ -@import '../../style/themes/index'; -@import '../../style/mixins/index'; -@import '../../input/style/mixin'; - -@picker-prefix-cls: ~'@{ant-prefix}-picker'; - -.picker-padding(@input-height, @font-size, @padding-horizontal) { - // font height probably 22.0001， So use floor better - @font-height: floor(@font-size * @line-height-base) + 2; - @padding-top: max(((@input-height - @font-height) / 2), 0); - @padding-bottom: max(@input-height - @font-height - @padding-top, 0); - padding: @padding-top @padding-horizontal @padding-bottom; -} - -.@{picker-prefix-cls} { - @arrow-size: 10px; - - .reset-component(); - .picker-padding(@input-height-base, @font-size-base, @input-padding-horizontal-base); - position: relative; - display: inline-flex; - align-items: center; - background: @picker-bg; - border: @border-width-base @border-style-base @select-border-color; - border-radius: @border-radius-base; - transition: border @animation-duration-slow, box-shadow @animation-duration-slow; - - &:hover, - &-focused { - .hover(); - } - - &-focused { - .active(); - } - - &&-disabled { - background: @input-disabled-bg; - border-color: @select-border-color; - cursor: not-allowed; - } - - &&-disabled &-suffix { - color: @disabled-color; - } - - &&-borderless { - background-color: transparent !important; - border-color: transparent !important; - box-shadow: none !important; - } - - // ======================== Input ========================= - &-input { - position: relative; - display: inline-flex; - align-items: center; - width: 100%; - - > input { - .input(); - flex: auto; - - // Fix Firefox flex not correct: - // https://github.com/ant-design/ant-design/pull/20023#issuecomment-564389553 - min-width: 1px; - height: auto; - padding: 0; - background: transparent; - - border: 0; - - &:focus { - box-shadow: none; - } - - &[disabled] { - background: transparent; - } - } - - &:hover { - .@{picker-prefix-cls}-clear { - opacity: 1; - } - } - - &-placeholder { - > input { - color: @input-placeholder-color; - } - } - } - - // Size - &-large { - .picker-padding(@input-height-lg, @font-size-lg, @input-padding-horizontal-lg); - - .@{picker-prefix-cls}-input > input { - font-size: @font-size-lg; - } - } - - &-small { - .picker-padding(@input-height-sm, @font-size-base, @input-padding-horizontal-sm); - } - - &-suffix { - align-self: center; - margin-left: (@padding-xs / 2); - color: @disabled-color; - line-height: 1; - pointer-events: none; - - > * { - vertical-align: top; - } - } - - &-clear { - position: absolute; - top: 50%; - right: 0; - color: @disabled-color; - line-height: 1; - background: @component-background; - transform: translateY(-50%); - cursor: pointer; - opacity: 0; - transition: opacity @animation-duration-slow, color @animation-duration-slow; - - > * { - vertical-align: top; - } - - &:hover { - color: @text-color-secondary; - } - } - - &-separator { - position: relative; - display: inline-block; - width: 1em; - height: @font-size-lg; - color: @disabled-color; - font-size: @font-size-lg; - vertical-align: top; - cursor: default; - - .@{picker-prefix-cls}-focused & { - color: @text-color-secondary; - } - - .@{picker-prefix-cls}-range-separator & { - .@{picker-prefix-cls}-disabled & { - cursor: not-allowed; - } - } - } - - // ======================== Range ========================= - &-range { - position: relative; - display: inline-flex; - - // Clear - .@{picker-prefix-cls}-clear { - right: @input-padding-horizontal-base; - } - - &:hover { - .@{picker-prefix-cls}-clear { - opacity: 1; - } - } - - // Active bar - .@{picker-prefix-cls}-active-bar { - bottom: -@border-width-base; - height: 2px; - margin-left: @input-padding-horizontal-base; - background: @primary-color; - opacity: 0; - transition: all @animation-duration-slow ease-out; - pointer-events: none; - } - - &.@{picker-prefix-cls}-focused { - .@{picker-prefix-cls}-active-bar { - opacity: 1; - } - } - - &-separator { - align-items: center; - padding: 0 @padding-xs; - line-height: 1; - } - - &.@{picker-prefix-cls}-small { - .@{picker-prefix-cls}-clear { - right: @input-padding-horizontal-sm; - } - - .@{picker-prefix-cls}-active-bar { - margin-left: @input-padding-horizontal-sm; - } - } - } - - // ======================= Dropdown ======================= - &-dropdown { - .reset-component(); - position: absolute; - z-index: @zindex-picker; - - &-hidden { - display: none; - } - - &-placement-bottomLeft { - .@{picker-prefix-cls}-range-arrow { - top: (@arrow-size / 2) - (@arrow-size / 3); - display: block; - transform: rotate(-45deg); - } - } - - &-placement-topLeft { - .@{picker-prefix-cls}-range-arrow { - bottom: (@arrow-size / 2) - (@arrow-size / 3); - display: block; - transform: rotate(135deg); - } - } - - &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-topLeft, - &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-topRight, - &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-topLeft, - &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-topRight { - animation-name: antSlideDownIn; - } - - &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-bottomLeft, - &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-bottomRight, - &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-bottomLeft, - &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-bottomRight { - animation-name: antSlideUpIn; - } - - &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-topLeft, - &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-topRight { - animation-name: antSlideDownOut; - } - - &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-bottomLeft, - &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-bottomRight { - animation-name: antSlideUpOut; - } - } - - &-dropdown-range { - padding: (@arrow-size * 2 / 3) 0; - - &-hidden { - display: none; - } - } - - // Time picker with additional style - &-dropdown &-panel > &-time-panel { - padding-top: (@padding-xs / 2); - } - - // ======================== Ranges ======================== - &-ranges { - margin-bottom: 0; - padding: (@padding-xs / 2) @padding-sm; - overflow: hidden; - line-height: @picker-text-height - 2 * @border-width-base - (@padding-xs / 2); - text-align: left; - list-style: none; - - > li { - display: inline-block; - } - - // https://github.com/ant-design/ant-design/issues/23687 - .@{picker-prefix-cls}-preset > .@{ant-prefix}-tag-blue { - color: @primary-color; - background: @primary-1; - border-color: @primary-3; - cursor: pointer; - } - - .@{picker-prefix-cls}-ok { - float: right; - margin-left: @padding-xs; - } - } - - &-range-wrapper { - display: flex; - } - - &-range-arrow { - position: absolute; - z-index: 1; - display: none; - width: @arrow-size; - height: @arrow-size; - margin-left: @input-padding-horizontal-base * 1.5; - box-shadow: 2px -2px 6px fade(@black, 6%); - transition: left @animation-duration-slow ease-out; - - &::after { - position: absolute; - top: @border-width-base; - right: @border-width-base; - width: @arrow-size; - height: @arrow-size; - border: (@arrow-size / 2) solid @border-color-split; - border-color: @calendar-bg @calendar-bg transparent transparent; - content: ''; - } - } - - &-panel-container { - overflow: hidden; - vertical-align: top; - background: @calendar-bg; - border-radius: @border-radius-base; - box-shadow: @box-shadow-base; - transition: margin @animation-duration-slow; - - .@{picker-prefix-cls}-panels { - display: inline-flex; - flex-wrap: nowrap; - direction: ltr; - } - - .@{picker-prefix-cls}-panel { - vertical-align: top; - background: transparent; - border-width: 0 0 @border-width-base 0; - border-radius: 0; - - &-focused { - border-color: @border-color-split; - } - } - } -} - -@import './panel'; -@import './rtl'; diff --git a/components/date-picker/InputIcon.tsx b/components/date-picker-old/InputIcon.tsx similarity index 100% rename from components/date-picker/InputIcon.tsx rename to components/date-picker-old/InputIcon.tsx diff --git a/components/date-picker/RangePicker.tsx b/components/date-picker-old/RangePicker.tsx similarity index 100% rename from components/date-picker/RangePicker.tsx rename to components/date-picker-old/RangePicker.tsx diff --git a/components/date-picker/WeekPicker.tsx b/components/date-picker-old/WeekPicker.tsx similarity index 100% rename from components/date-picker/WeekPicker.tsx rename to components/date-picker-old/WeekPicker.tsx diff --git a/components/date-picker/__tests__/DatePicker.test.js b/components/date-picker-old/__tests__/DatePicker.test.js similarity index 100% rename from components/date-picker/__tests__/DatePicker.test.js rename to components/date-picker-old/__tests__/DatePicker.test.js diff --git a/components/date-picker/__tests__/MonthPicker.test.js b/components/date-picker-old/__tests__/MonthPicker.test.js similarity index 100% rename from components/date-picker/__tests__/MonthPicker.test.js rename to components/date-picker-old/__tests__/MonthPicker.test.js diff --git a/components/date-picker/__tests__/RangePicker.test.js b/components/date-picker-old/__tests__/RangePicker.test.js similarity index 100% rename from components/date-picker/__tests__/RangePicker.test.js rename to components/date-picker-old/__tests__/RangePicker.test.js diff --git a/components/date-picker/__tests__/WeekPicker.test.js b/components/date-picker-old/__tests__/WeekPicker.test.js similarity index 100% rename from components/date-picker/__tests__/WeekPicker.test.js rename to components/date-picker-old/__tests__/WeekPicker.test.js diff --git a/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap b/components/date-picker-old/__tests__/__snapshots__/DatePicker.test.js.snap similarity index 100% rename from components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap rename to components/date-picker-old/__tests__/__snapshots__/DatePicker.test.js.snap diff --git a/components/date-picker/__tests__/__snapshots__/RangePicker.test.js.snap b/components/date-picker-old/__tests__/__snapshots__/RangePicker.test.js.snap similarity index 100% rename from components/date-picker/__tests__/__snapshots__/RangePicker.test.js.snap rename to components/date-picker-old/__tests__/__snapshots__/RangePicker.test.js.snap diff --git a/components/date-picker/__tests__/__snapshots__/WeekPicker.test.js.snap b/components/date-picker-old/__tests__/__snapshots__/WeekPicker.test.js.snap similarity index 100% rename from components/date-picker/__tests__/__snapshots__/WeekPicker.test.js.snap rename to components/date-picker-old/__tests__/__snapshots__/WeekPicker.test.js.snap diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker-old/__tests__/__snapshots__/demo.test.js.snap similarity index 100% rename from components/date-picker/__tests__/__snapshots__/demo.test.js.snap rename to components/date-picker-old/__tests__/__snapshots__/demo.test.js.snap diff --git a/components/date-picker/__tests__/__snapshots__/other.test.js.snap b/components/date-picker-old/__tests__/__snapshots__/other.test.js.snap similarity index 100% rename from components/date-picker/__tests__/__snapshots__/other.test.js.snap rename to components/date-picker-old/__tests__/__snapshots__/other.test.js.snap diff --git a/components/date-picker/__tests__/demo.test.js b/components/date-picker-old/__tests__/demo.test.js similarity index 100% rename from components/date-picker/__tests__/demo.test.js rename to components/date-picker-old/__tests__/demo.test.js diff --git a/components/date-picker/__tests__/mount.test.js b/components/date-picker-old/__tests__/mount.test.js similarity index 100% rename from components/date-picker/__tests__/mount.test.js rename to components/date-picker-old/__tests__/mount.test.js diff --git a/components/date-picker/__tests__/other.test.js b/components/date-picker-old/__tests__/other.test.js similarity index 100% rename from components/date-picker/__tests__/other.test.js rename to components/date-picker-old/__tests__/other.test.js diff --git a/components/date-picker/__tests__/showTime.test.js b/components/date-picker-old/__tests__/showTime.test.js similarity index 100% rename from components/date-picker/__tests__/showTime.test.js rename to components/date-picker-old/__tests__/showTime.test.js diff --git a/components/date-picker/__tests__/utils.js b/components/date-picker-old/__tests__/utils.js similarity index 100% rename from components/date-picker/__tests__/utils.js rename to components/date-picker-old/__tests__/utils.js diff --git a/components/date-picker/createPicker.tsx b/components/date-picker-old/createPicker.tsx similarity index 100% rename from components/date-picker/createPicker.tsx rename to components/date-picker-old/createPicker.tsx diff --git a/components/date-picker/index.ts b/components/date-picker-old/index.ts similarity index 100% rename from components/date-picker/index.ts rename to components/date-picker-old/index.ts diff --git a/components/date-picker/interface.tsx b/components/date-picker-old/interface.tsx similarity index 100% rename from components/date-picker/interface.tsx rename to components/date-picker-old/interface.tsx diff --git a/components/date-picker/locale/ar_EG.ts b/components/date-picker-old/locale/ar_EG.ts similarity index 100% rename from components/date-picker/locale/ar_EG.ts rename to components/date-picker-old/locale/ar_EG.ts diff --git a/components/date-picker/locale/bg_BG.ts b/components/date-picker-old/locale/bg_BG.ts similarity index 100% rename from components/date-picker/locale/bg_BG.ts rename to components/date-picker-old/locale/bg_BG.ts diff --git a/components/date-picker/locale/ca_ES.ts b/components/date-picker-old/locale/ca_ES.ts similarity index 100% rename from components/date-picker/locale/ca_ES.ts rename to components/date-picker-old/locale/ca_ES.ts diff --git a/components/date-picker/locale/cs_CZ.ts b/components/date-picker-old/locale/cs_CZ.ts similarity index 100% rename from components/date-picker/locale/cs_CZ.ts rename to components/date-picker-old/locale/cs_CZ.ts diff --git a/components/date-picker/locale/da_DK.ts b/components/date-picker-old/locale/da_DK.ts similarity index 100% rename from components/date-picker/locale/da_DK.ts rename to components/date-picker-old/locale/da_DK.ts diff --git a/components/date-picker/locale/de_DE.ts b/components/date-picker-old/locale/de_DE.ts similarity index 100% rename from components/date-picker/locale/de_DE.ts rename to components/date-picker-old/locale/de_DE.ts diff --git a/components/date-picker/locale/el_GR.ts b/components/date-picker-old/locale/el_GR.ts similarity index 100% rename from components/date-picker/locale/el_GR.ts rename to components/date-picker-old/locale/el_GR.ts diff --git a/components/date-picker/locale/en_GB.ts b/components/date-picker-old/locale/en_GB.ts similarity index 100% rename from components/date-picker/locale/en_GB.ts rename to components/date-picker-old/locale/en_GB.ts diff --git a/components/date-picker/locale/en_US.ts b/components/date-picker-old/locale/en_US.ts similarity index 100% rename from components/date-picker/locale/en_US.ts rename to components/date-picker-old/locale/en_US.ts diff --git a/components/date-picker/locale/es_ES.ts b/components/date-picker-old/locale/es_ES.ts similarity index 100% rename from components/date-picker/locale/es_ES.ts rename to components/date-picker-old/locale/es_ES.ts diff --git a/components/date-picker/locale/et_EE.ts b/components/date-picker-old/locale/et_EE.ts similarity index 100% rename from components/date-picker/locale/et_EE.ts rename to components/date-picker-old/locale/et_EE.ts diff --git a/components/date-picker-new/locale/example.json b/components/date-picker-old/locale/example.json similarity index 98% rename from components/date-picker-new/locale/example.json rename to components/date-picker-old/locale/example.json index 2fb5ee33f..4c260f922 100644 --- a/components/date-picker-new/locale/example.json +++ b/components/date-picker-old/locale/example.json @@ -1,6 +1,5 @@ { "lang": { - "locale": "en_US", "placeholder": "Select date", "rangePlaceholder": ["Start date", "End date"], "today": "Today", diff --git a/components/date-picker/locale/fa_IR.ts b/components/date-picker-old/locale/fa_IR.ts similarity index 100% rename from components/date-picker/locale/fa_IR.ts rename to components/date-picker-old/locale/fa_IR.ts diff --git a/components/date-picker/locale/fi_FI.ts b/components/date-picker-old/locale/fi_FI.ts similarity index 100% rename from components/date-picker/locale/fi_FI.ts rename to components/date-picker-old/locale/fi_FI.ts diff --git a/components/date-picker/locale/fr_BE.ts b/components/date-picker-old/locale/fr_BE.ts similarity index 100% rename from components/date-picker/locale/fr_BE.ts rename to components/date-picker-old/locale/fr_BE.ts diff --git a/components/date-picker/locale/fr_FR.ts b/components/date-picker-old/locale/fr_FR.ts similarity index 100% rename from components/date-picker/locale/fr_FR.ts rename to components/date-picker-old/locale/fr_FR.ts diff --git a/components/date-picker/locale/ga_IE.ts b/components/date-picker-old/locale/ga_IE.ts similarity index 100% rename from components/date-picker/locale/ga_IE.ts rename to components/date-picker-old/locale/ga_IE.ts diff --git a/components/date-picker/locale/he_IL.ts b/components/date-picker-old/locale/he_IL.ts similarity index 100% rename from components/date-picker/locale/he_IL.ts rename to components/date-picker-old/locale/he_IL.ts diff --git a/components/date-picker/locale/hi_IN.ts b/components/date-picker-old/locale/hi_IN.ts similarity index 100% rename from components/date-picker/locale/hi_IN.ts rename to components/date-picker-old/locale/hi_IN.ts diff --git a/components/date-picker/locale/hr_HR.ts b/components/date-picker-old/locale/hr_HR.ts similarity index 100% rename from components/date-picker/locale/hr_HR.ts rename to components/date-picker-old/locale/hr_HR.ts diff --git a/components/date-picker/locale/hu_HU.ts b/components/date-picker-old/locale/hu_HU.ts similarity index 100% rename from components/date-picker/locale/hu_HU.ts rename to components/date-picker-old/locale/hu_HU.ts diff --git a/components/date-picker/locale/id_ID.ts b/components/date-picker-old/locale/id_ID.ts similarity index 100% rename from components/date-picker/locale/id_ID.ts rename to components/date-picker-old/locale/id_ID.ts diff --git a/components/date-picker/locale/is_IS.ts b/components/date-picker-old/locale/is_IS.ts similarity index 100% rename from components/date-picker/locale/is_IS.ts rename to components/date-picker-old/locale/is_IS.ts diff --git a/components/date-picker/locale/it_IT.ts b/components/date-picker-old/locale/it_IT.ts similarity index 100% rename from components/date-picker/locale/it_IT.ts rename to components/date-picker-old/locale/it_IT.ts diff --git a/components/date-picker/locale/ja_JP.ts b/components/date-picker-old/locale/ja_JP.ts similarity index 100% rename from components/date-picker/locale/ja_JP.ts rename to components/date-picker-old/locale/ja_JP.ts diff --git a/components/date-picker/locale/kn_IN.ts b/components/date-picker-old/locale/kn_IN.ts similarity index 100% rename from components/date-picker/locale/kn_IN.ts rename to components/date-picker-old/locale/kn_IN.ts diff --git a/components/date-picker/locale/ko_KR.ts b/components/date-picker-old/locale/ko_KR.ts similarity index 100% rename from components/date-picker/locale/ko_KR.ts rename to components/date-picker-old/locale/ko_KR.ts diff --git a/components/date-picker/locale/ku_IQ.ts b/components/date-picker-old/locale/ku_IQ.ts similarity index 100% rename from components/date-picker/locale/ku_IQ.ts rename to components/date-picker-old/locale/ku_IQ.ts diff --git a/components/date-picker/locale/ku_KU.ts b/components/date-picker-old/locale/ku_KU.ts similarity index 100% rename from components/date-picker/locale/ku_KU.ts rename to components/date-picker-old/locale/ku_KU.ts diff --git a/components/date-picker/locale/lv_LV.ts b/components/date-picker-old/locale/lv_LV.ts similarity index 100% rename from components/date-picker/locale/lv_LV.ts rename to components/date-picker-old/locale/lv_LV.ts diff --git a/components/date-picker/locale/mk_MK.ts b/components/date-picker-old/locale/mk_MK.ts similarity index 100% rename from components/date-picker/locale/mk_MK.ts rename to components/date-picker-old/locale/mk_MK.ts diff --git a/components/date-picker/locale/mn_MN.ts b/components/date-picker-old/locale/mn_MN.ts similarity index 100% rename from components/date-picker/locale/mn_MN.ts rename to components/date-picker-old/locale/mn_MN.ts diff --git a/components/date-picker/locale/ms_MY.ts b/components/date-picker-old/locale/ms_MY.ts similarity index 100% rename from components/date-picker/locale/ms_MY.ts rename to components/date-picker-old/locale/ms_MY.ts diff --git a/components/date-picker/locale/nb_NO.ts b/components/date-picker-old/locale/nb_NO.ts similarity index 100% rename from components/date-picker/locale/nb_NO.ts rename to components/date-picker-old/locale/nb_NO.ts diff --git a/components/date-picker/locale/nl_BE.ts b/components/date-picker-old/locale/nl_BE.ts similarity index 100% rename from components/date-picker/locale/nl_BE.ts rename to components/date-picker-old/locale/nl_BE.ts diff --git a/components/date-picker/locale/nl_NL.ts b/components/date-picker-old/locale/nl_NL.ts similarity index 100% rename from components/date-picker/locale/nl_NL.ts rename to components/date-picker-old/locale/nl_NL.ts diff --git a/components/date-picker/locale/pl_PL.ts b/components/date-picker-old/locale/pl_PL.ts similarity index 100% rename from components/date-picker/locale/pl_PL.ts rename to components/date-picker-old/locale/pl_PL.ts diff --git a/components/date-picker/locale/pt_BR.ts b/components/date-picker-old/locale/pt_BR.ts similarity index 100% rename from components/date-picker/locale/pt_BR.ts rename to components/date-picker-old/locale/pt_BR.ts diff --git a/components/date-picker/locale/pt_PT.ts b/components/date-picker-old/locale/pt_PT.ts similarity index 100% rename from components/date-picker/locale/pt_PT.ts rename to components/date-picker-old/locale/pt_PT.ts diff --git a/components/date-picker/locale/ro_RO.ts b/components/date-picker-old/locale/ro_RO.ts similarity index 100% rename from components/date-picker/locale/ro_RO.ts rename to components/date-picker-old/locale/ro_RO.ts diff --git a/components/date-picker/locale/ru_RU.ts b/components/date-picker-old/locale/ru_RU.ts similarity index 100% rename from components/date-picker/locale/ru_RU.ts rename to components/date-picker-old/locale/ru_RU.ts diff --git a/components/date-picker/locale/sk_SK.ts b/components/date-picker-old/locale/sk_SK.ts similarity index 100% rename from components/date-picker/locale/sk_SK.ts rename to components/date-picker-old/locale/sk_SK.ts diff --git a/components/date-picker/locale/sl_SI.ts b/components/date-picker-old/locale/sl_SI.ts similarity index 100% rename from components/date-picker/locale/sl_SI.ts rename to components/date-picker-old/locale/sl_SI.ts diff --git a/components/date-picker/locale/sr_RS.ts b/components/date-picker-old/locale/sr_RS.ts similarity index 100% rename from components/date-picker/locale/sr_RS.ts rename to components/date-picker-old/locale/sr_RS.ts diff --git a/components/date-picker/locale/sv_SE.ts b/components/date-picker-old/locale/sv_SE.ts similarity index 100% rename from components/date-picker/locale/sv_SE.ts rename to components/date-picker-old/locale/sv_SE.ts diff --git a/components/date-picker/locale/ta_IN.ts b/components/date-picker-old/locale/ta_IN.ts similarity index 100% rename from components/date-picker/locale/ta_IN.ts rename to components/date-picker-old/locale/ta_IN.ts diff --git a/components/date-picker/locale/th_TH.ts b/components/date-picker-old/locale/th_TH.ts similarity index 100% rename from components/date-picker/locale/th_TH.ts rename to components/date-picker-old/locale/th_TH.ts diff --git a/components/date-picker/locale/tr_TR.ts b/components/date-picker-old/locale/tr_TR.ts similarity index 100% rename from components/date-picker/locale/tr_TR.ts rename to components/date-picker-old/locale/tr_TR.ts diff --git a/components/date-picker/locale/uk_UA.ts b/components/date-picker-old/locale/uk_UA.ts similarity index 100% rename from components/date-picker/locale/uk_UA.ts rename to components/date-picker-old/locale/uk_UA.ts diff --git a/components/date-picker/locale/vi_VN.ts b/components/date-picker-old/locale/vi_VN.ts similarity index 100% rename from components/date-picker/locale/vi_VN.ts rename to components/date-picker-old/locale/vi_VN.ts diff --git a/components/date-picker/locale/zh_CN.ts b/components/date-picker-old/locale/zh_CN.ts similarity index 100% rename from components/date-picker/locale/zh_CN.ts rename to components/date-picker-old/locale/zh_CN.ts diff --git a/components/date-picker/locale/zh_TW.ts b/components/date-picker-old/locale/zh_TW.ts similarity index 100% rename from components/date-picker/locale/zh_TW.ts rename to components/date-picker-old/locale/zh_TW.ts diff --git a/components/date-picker/props.ts b/components/date-picker-old/props.ts similarity index 100% rename from components/date-picker/props.ts rename to components/date-picker-old/props.ts diff --git a/components/date-picker/style/Calendar.less b/components/date-picker-old/style/Calendar.less similarity index 100% rename from components/date-picker/style/Calendar.less rename to components/date-picker-old/style/Calendar.less diff --git a/components/date-picker/style/DecadePanel.less b/components/date-picker-old/style/DecadePanel.less similarity index 100% rename from components/date-picker/style/DecadePanel.less rename to components/date-picker-old/style/DecadePanel.less diff --git a/components/date-picker/style/MonthPanel.less b/components/date-picker-old/style/MonthPanel.less similarity index 100% rename from components/date-picker/style/MonthPanel.less rename to components/date-picker-old/style/MonthPanel.less diff --git a/components/date-picker/style/MonthPicker.less b/components/date-picker-old/style/MonthPicker.less similarity index 100% rename from components/date-picker/style/MonthPicker.less rename to components/date-picker-old/style/MonthPicker.less diff --git a/components/date-picker/style/Picker.less b/components/date-picker-old/style/Picker.less similarity index 100% rename from components/date-picker/style/Picker.less rename to components/date-picker-old/style/Picker.less diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker-old/style/RangePicker.less similarity index 100% rename from components/date-picker/style/RangePicker.less rename to components/date-picker-old/style/RangePicker.less diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker-old/style/TimePicker.less similarity index 100% rename from components/date-picker/style/TimePicker.less rename to components/date-picker-old/style/TimePicker.less diff --git a/components/date-picker/style/WeekPicker.less b/components/date-picker-old/style/WeekPicker.less similarity index 100% rename from components/date-picker/style/WeekPicker.less rename to components/date-picker-old/style/WeekPicker.less diff --git a/components/date-picker/style/YearPanel.less b/components/date-picker-old/style/YearPanel.less similarity index 100% rename from components/date-picker/style/YearPanel.less rename to components/date-picker-old/style/YearPanel.less diff --git a/components/date-picker-old/style/index.less b/components/date-picker-old/style/index.less new file mode 100644 index 000000000..14eedcced --- /dev/null +++ b/components/date-picker-old/style/index.less @@ -0,0 +1,17 @@ +@import '../../style/themes/index'; +@import '../../style/mixins/index'; +@import '../../input/style/mixin'; +@import '../../button/style/mixin'; + +@calendar-prefix-cls: ~'@{ant-prefix}-calendar'; +@calendar-timepicker-prefix-cls: ~'@{ant-prefix}-calendar-time-picker'; + +@import 'Picker'; +@import 'Calendar'; +@import 'RangePicker'; +@import 'TimePicker'; +@import 'MonthPanel'; +@import 'YearPanel'; +@import 'DecadePanel'; +@import 'MonthPicker'; +@import 'WeekPicker'; diff --git a/components/date-picker/style/index.ts b/components/date-picker-old/style/index.ts similarity index 100% rename from components/date-picker/style/index.ts rename to components/date-picker-old/style/index.ts diff --git a/components/date-picker/utils.ts b/components/date-picker-old/utils.ts similarity index 100% rename from components/date-picker/utils.ts rename to components/date-picker-old/utils.ts diff --git a/components/date-picker/wrapPicker.tsx b/components/date-picker-old/wrapPicker.tsx similarity index 100% rename from components/date-picker/wrapPicker.tsx rename to components/date-picker-old/wrapPicker.tsx diff --git a/components/date-picker-new/PickerButton.tsx b/components/date-picker/PickerButton.tsx similarity index 100% rename from components/date-picker-new/PickerButton.tsx rename to components/date-picker/PickerButton.tsx diff --git a/components/date-picker-new/PickerTag.tsx b/components/date-picker/PickerTag.tsx similarity index 100% rename from components/date-picker-new/PickerTag.tsx rename to components/date-picker/PickerTag.tsx diff --git a/components/date-picker-new/generatePicker/generateRangePicker.tsx b/components/date-picker/generatePicker/generateRangePicker.tsx similarity index 100% rename from components/date-picker-new/generatePicker/generateRangePicker.tsx rename to components/date-picker/generatePicker/generateRangePicker.tsx diff --git a/components/date-picker-new/generatePicker/generateSinglePicker.tsx b/components/date-picker/generatePicker/generateSinglePicker.tsx similarity index 100% rename from components/date-picker-new/generatePicker/generateSinglePicker.tsx rename to components/date-picker/generatePicker/generateSinglePicker.tsx diff --git a/components/date-picker-new/generatePicker/index.tsx b/components/date-picker/generatePicker/index.tsx similarity index 100% rename from components/date-picker-new/generatePicker/index.tsx rename to components/date-picker/generatePicker/index.tsx diff --git a/components/date-picker-new/index.tsx b/components/date-picker/index.tsx similarity index 100% rename from components/date-picker-new/index.tsx rename to components/date-picker/index.tsx diff --git a/components/date-picker-new/locale/ar_EG.tsx b/components/date-picker/locale/ar_EG.tsx similarity index 100% rename from components/date-picker-new/locale/ar_EG.tsx rename to components/date-picker/locale/ar_EG.tsx diff --git a/components/date-picker-new/locale/az_AZ.tsx b/components/date-picker/locale/az_AZ.tsx similarity index 100% rename from components/date-picker-new/locale/az_AZ.tsx rename to components/date-picker/locale/az_AZ.tsx diff --git a/components/date-picker-new/locale/bg_BG.tsx b/components/date-picker/locale/bg_BG.tsx similarity index 100% rename from components/date-picker-new/locale/bg_BG.tsx rename to components/date-picker/locale/bg_BG.tsx diff --git a/components/date-picker-new/locale/by_BY.tsx b/components/date-picker/locale/by_BY.tsx similarity index 100% rename from components/date-picker-new/locale/by_BY.tsx rename to components/date-picker/locale/by_BY.tsx diff --git a/components/date-picker-new/locale/ca_ES.tsx b/components/date-picker/locale/ca_ES.tsx similarity index 100% rename from components/date-picker-new/locale/ca_ES.tsx rename to components/date-picker/locale/ca_ES.tsx diff --git a/components/date-picker-new/locale/cs_CZ.tsx b/components/date-picker/locale/cs_CZ.tsx similarity index 100% rename from components/date-picker-new/locale/cs_CZ.tsx rename to components/date-picker/locale/cs_CZ.tsx diff --git a/components/date-picker-new/locale/da_DK.tsx b/components/date-picker/locale/da_DK.tsx similarity index 100% rename from components/date-picker-new/locale/da_DK.tsx rename to components/date-picker/locale/da_DK.tsx diff --git a/components/date-picker-new/locale/de_DE.tsx b/components/date-picker/locale/de_DE.tsx similarity index 100% rename from components/date-picker-new/locale/de_DE.tsx rename to components/date-picker/locale/de_DE.tsx diff --git a/components/date-picker-new/locale/el_GR.tsx b/components/date-picker/locale/el_GR.tsx similarity index 100% rename from components/date-picker-new/locale/el_GR.tsx rename to components/date-picker/locale/el_GR.tsx diff --git a/components/date-picker-new/locale/en_GB.tsx b/components/date-picker/locale/en_GB.tsx similarity index 100% rename from components/date-picker-new/locale/en_GB.tsx rename to components/date-picker/locale/en_GB.tsx diff --git a/components/date-picker-new/locale/en_US.tsx b/components/date-picker/locale/en_US.tsx similarity index 100% rename from components/date-picker-new/locale/en_US.tsx rename to components/date-picker/locale/en_US.tsx diff --git a/components/date-picker-new/locale/es_ES.tsx b/components/date-picker/locale/es_ES.tsx similarity index 100% rename from components/date-picker-new/locale/es_ES.tsx rename to components/date-picker/locale/es_ES.tsx diff --git a/components/date-picker-new/locale/et_EE.tsx b/components/date-picker/locale/et_EE.tsx similarity index 100% rename from components/date-picker-new/locale/et_EE.tsx rename to components/date-picker/locale/et_EE.tsx diff --git a/components/date-picker/locale/example.json b/components/date-picker/locale/example.json index 4c260f922..2fb5ee33f 100644 --- a/components/date-picker/locale/example.json +++ b/components/date-picker/locale/example.json @@ -1,5 +1,6 @@ { "lang": { + "locale": "en_US", "placeholder": "Select date", "rangePlaceholder": ["Start date", "End date"], "today": "Today", diff --git a/components/date-picker-new/locale/fa_IR.tsx b/components/date-picker/locale/fa_IR.tsx similarity index 100% rename from components/date-picker-new/locale/fa_IR.tsx rename to components/date-picker/locale/fa_IR.tsx diff --git a/components/date-picker-new/locale/fi_FI.tsx b/components/date-picker/locale/fi_FI.tsx similarity index 100% rename from components/date-picker-new/locale/fi_FI.tsx rename to components/date-picker/locale/fi_FI.tsx diff --git a/components/date-picker-new/locale/fr_BE.tsx b/components/date-picker/locale/fr_BE.tsx similarity index 100% rename from components/date-picker-new/locale/fr_BE.tsx rename to components/date-picker/locale/fr_BE.tsx diff --git a/components/date-picker-new/locale/fr_CA.tsx b/components/date-picker/locale/fr_CA.tsx similarity index 100% rename from components/date-picker-new/locale/fr_CA.tsx rename to components/date-picker/locale/fr_CA.tsx diff --git a/components/date-picker-new/locale/fr_FR.tsx b/components/date-picker/locale/fr_FR.tsx similarity index 100% rename from components/date-picker-new/locale/fr_FR.tsx rename to components/date-picker/locale/fr_FR.tsx diff --git a/components/date-picker-new/locale/ga_IE.tsx b/components/date-picker/locale/ga_IE.tsx similarity index 100% rename from components/date-picker-new/locale/ga_IE.tsx rename to components/date-picker/locale/ga_IE.tsx diff --git a/components/date-picker-new/locale/gl_ES.tsx b/components/date-picker/locale/gl_ES.tsx similarity index 100% rename from components/date-picker-new/locale/gl_ES.tsx rename to components/date-picker/locale/gl_ES.tsx diff --git a/components/date-picker-new/locale/he_IL.tsx b/components/date-picker/locale/he_IL.tsx similarity index 100% rename from components/date-picker-new/locale/he_IL.tsx rename to components/date-picker/locale/he_IL.tsx diff --git a/components/date-picker-new/locale/hi_IN.tsx b/components/date-picker/locale/hi_IN.tsx similarity index 100% rename from components/date-picker-new/locale/hi_IN.tsx rename to components/date-picker/locale/hi_IN.tsx diff --git a/components/date-picker-new/locale/hr_HR.tsx b/components/date-picker/locale/hr_HR.tsx similarity index 100% rename from components/date-picker-new/locale/hr_HR.tsx rename to components/date-picker/locale/hr_HR.tsx diff --git a/components/date-picker-new/locale/hu_HU.tsx b/components/date-picker/locale/hu_HU.tsx similarity index 100% rename from components/date-picker-new/locale/hu_HU.tsx rename to components/date-picker/locale/hu_HU.tsx diff --git a/components/date-picker-new/locale/id_ID.tsx b/components/date-picker/locale/id_ID.tsx similarity index 100% rename from components/date-picker-new/locale/id_ID.tsx rename to components/date-picker/locale/id_ID.tsx diff --git a/components/date-picker-new/locale/is_IS.tsx b/components/date-picker/locale/is_IS.tsx similarity index 100% rename from components/date-picker-new/locale/is_IS.tsx rename to components/date-picker/locale/is_IS.tsx diff --git a/components/date-picker-new/locale/it_IT.tsx b/components/date-picker/locale/it_IT.tsx similarity index 100% rename from components/date-picker-new/locale/it_IT.tsx rename to components/date-picker/locale/it_IT.tsx diff --git a/components/date-picker-new/locale/ja_JP.tsx b/components/date-picker/locale/ja_JP.tsx similarity index 100% rename from components/date-picker-new/locale/ja_JP.tsx rename to components/date-picker/locale/ja_JP.tsx diff --git a/components/date-picker-new/locale/kk_KZ.tsx b/components/date-picker/locale/kk_KZ.tsx similarity index 100% rename from components/date-picker-new/locale/kk_KZ.tsx rename to components/date-picker/locale/kk_KZ.tsx diff --git a/components/date-picker-new/locale/kmr_IQ.tsx b/components/date-picker/locale/kmr_IQ.tsx similarity index 100% rename from components/date-picker-new/locale/kmr_IQ.tsx rename to components/date-picker/locale/kmr_IQ.tsx diff --git a/components/date-picker-new/locale/kn_IN.tsx b/components/date-picker/locale/kn_IN.tsx similarity index 100% rename from components/date-picker-new/locale/kn_IN.tsx rename to components/date-picker/locale/kn_IN.tsx diff --git a/components/date-picker-new/locale/ko_KR.tsx b/components/date-picker/locale/ko_KR.tsx similarity index 100% rename from components/date-picker-new/locale/ko_KR.tsx rename to components/date-picker/locale/ko_KR.tsx diff --git a/components/date-picker-new/locale/lt_LT.tsx b/components/date-picker/locale/lt_LT.tsx similarity index 100% rename from components/date-picker-new/locale/lt_LT.tsx rename to components/date-picker/locale/lt_LT.tsx diff --git a/components/date-picker-new/locale/lv_LV.tsx b/components/date-picker/locale/lv_LV.tsx similarity index 100% rename from components/date-picker-new/locale/lv_LV.tsx rename to components/date-picker/locale/lv_LV.tsx diff --git a/components/date-picker-new/locale/mk_MK.tsx b/components/date-picker/locale/mk_MK.tsx similarity index 100% rename from components/date-picker-new/locale/mk_MK.tsx rename to components/date-picker/locale/mk_MK.tsx diff --git a/components/date-picker-new/locale/mn_MN.tsx b/components/date-picker/locale/mn_MN.tsx similarity index 100% rename from components/date-picker-new/locale/mn_MN.tsx rename to components/date-picker/locale/mn_MN.tsx diff --git a/components/date-picker-new/locale/ms_MY.tsx b/components/date-picker/locale/ms_MY.tsx similarity index 100% rename from components/date-picker-new/locale/ms_MY.tsx rename to components/date-picker/locale/ms_MY.tsx diff --git a/components/date-picker-new/locale/nb_NO.tsx b/components/date-picker/locale/nb_NO.tsx similarity index 100% rename from components/date-picker-new/locale/nb_NO.tsx rename to components/date-picker/locale/nb_NO.tsx diff --git a/components/date-picker-new/locale/nl_BE.tsx b/components/date-picker/locale/nl_BE.tsx similarity index 100% rename from components/date-picker-new/locale/nl_BE.tsx rename to components/date-picker/locale/nl_BE.tsx diff --git a/components/date-picker-new/locale/nl_NL.tsx b/components/date-picker/locale/nl_NL.tsx similarity index 100% rename from components/date-picker-new/locale/nl_NL.tsx rename to components/date-picker/locale/nl_NL.tsx diff --git a/components/date-picker-new/locale/pl_PL.tsx b/components/date-picker/locale/pl_PL.tsx similarity index 100% rename from components/date-picker-new/locale/pl_PL.tsx rename to components/date-picker/locale/pl_PL.tsx diff --git a/components/date-picker-new/locale/pt_BR.tsx b/components/date-picker/locale/pt_BR.tsx similarity index 100% rename from components/date-picker-new/locale/pt_BR.tsx rename to components/date-picker/locale/pt_BR.tsx diff --git a/components/date-picker-new/locale/pt_PT.tsx b/components/date-picker/locale/pt_PT.tsx similarity index 100% rename from components/date-picker-new/locale/pt_PT.tsx rename to components/date-picker/locale/pt_PT.tsx diff --git a/components/date-picker-new/locale/ro_RO.tsx b/components/date-picker/locale/ro_RO.tsx similarity index 100% rename from components/date-picker-new/locale/ro_RO.tsx rename to components/date-picker/locale/ro_RO.tsx diff --git a/components/date-picker-new/locale/ru_RU.tsx b/components/date-picker/locale/ru_RU.tsx similarity index 100% rename from components/date-picker-new/locale/ru_RU.tsx rename to components/date-picker/locale/ru_RU.tsx diff --git a/components/date-picker-new/locale/sk_SK.tsx b/components/date-picker/locale/sk_SK.tsx similarity index 100% rename from components/date-picker-new/locale/sk_SK.tsx rename to components/date-picker/locale/sk_SK.tsx diff --git a/components/date-picker-new/locale/sl_SI.tsx b/components/date-picker/locale/sl_SI.tsx similarity index 100% rename from components/date-picker-new/locale/sl_SI.tsx rename to components/date-picker/locale/sl_SI.tsx diff --git a/components/date-picker-new/locale/sr_RS.tsx b/components/date-picker/locale/sr_RS.tsx similarity index 100% rename from components/date-picker-new/locale/sr_RS.tsx rename to components/date-picker/locale/sr_RS.tsx diff --git a/components/date-picker-new/locale/sv_SE.tsx b/components/date-picker/locale/sv_SE.tsx similarity index 100% rename from components/date-picker-new/locale/sv_SE.tsx rename to components/date-picker/locale/sv_SE.tsx diff --git a/components/date-picker-new/locale/ta_IN.tsx b/components/date-picker/locale/ta_IN.tsx similarity index 100% rename from components/date-picker-new/locale/ta_IN.tsx rename to components/date-picker/locale/ta_IN.tsx diff --git a/components/date-picker-new/locale/th_TH.tsx b/components/date-picker/locale/th_TH.tsx similarity index 100% rename from components/date-picker-new/locale/th_TH.tsx rename to components/date-picker/locale/th_TH.tsx diff --git a/components/date-picker-new/locale/tr_TR.tsx b/components/date-picker/locale/tr_TR.tsx similarity index 100% rename from components/date-picker-new/locale/tr_TR.tsx rename to components/date-picker/locale/tr_TR.tsx diff --git a/components/date-picker-new/locale/uk_UA.tsx b/components/date-picker/locale/uk_UA.tsx similarity index 100% rename from components/date-picker-new/locale/uk_UA.tsx rename to components/date-picker/locale/uk_UA.tsx diff --git a/components/date-picker-new/locale/vi_VN.tsx b/components/date-picker/locale/vi_VN.tsx similarity index 100% rename from components/date-picker-new/locale/vi_VN.tsx rename to components/date-picker/locale/vi_VN.tsx diff --git a/components/date-picker-new/locale/zh_CN.tsx b/components/date-picker/locale/zh_CN.tsx similarity index 100% rename from components/date-picker-new/locale/zh_CN.tsx rename to components/date-picker/locale/zh_CN.tsx diff --git a/components/date-picker-new/locale/zh_TW.tsx b/components/date-picker/locale/zh_TW.tsx similarity index 100% rename from components/date-picker-new/locale/zh_TW.tsx rename to components/date-picker/locale/zh_TW.tsx diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less index 14eedcced..b707b9bd0 100644 --- a/components/date-picker/style/index.less +++ b/components/date-picker/style/index.less @@ -1,17 +1,357 @@ @import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; -@import '../../button/style/mixin'; -@calendar-prefix-cls: ~'@{ant-prefix}-calendar'; -@calendar-timepicker-prefix-cls: ~'@{ant-prefix}-calendar-time-picker'; +@picker-prefix-cls: ~'@{ant-prefix}-picker'; -@import 'Picker'; -@import 'Calendar'; -@import 'RangePicker'; -@import 'TimePicker'; -@import 'MonthPanel'; -@import 'YearPanel'; -@import 'DecadePanel'; -@import 'MonthPicker'; -@import 'WeekPicker'; +.picker-padding(@input-height, @font-size, @padding-horizontal) { + // font height probably 22.0001， So use floor better + @font-height: floor(@font-size * @line-height-base) + 2; + @padding-top: max(((@input-height - @font-height) / 2), 0); + @padding-bottom: max(@input-height - @font-height - @padding-top, 0); + padding: @padding-top @padding-horizontal @padding-bottom; +} + +.@{picker-prefix-cls} { + @arrow-size: 10px; + + .reset-component(); + .picker-padding(@input-height-base, @font-size-base, @input-padding-horizontal-base); + position: relative; + display: inline-flex; + align-items: center; + background: @picker-bg; + border: @border-width-base @border-style-base @select-border-color; + border-radius: @border-radius-base; + transition: border @animation-duration-slow, box-shadow @animation-duration-slow; + + &:hover, + &-focused { + .hover(); + } + + &-focused { + .active(); + } + + &&-disabled { + background: @input-disabled-bg; + border-color: @select-border-color; + cursor: not-allowed; + } + + &&-disabled &-suffix { + color: @disabled-color; + } + + &&-borderless { + background-color: transparent !important; + border-color: transparent !important; + box-shadow: none !important; + } + + // ======================== Input ========================= + &-input { + position: relative; + display: inline-flex; + align-items: center; + width: 100%; + + > input { + .input(); + flex: auto; + + // Fix Firefox flex not correct: + // https://github.com/ant-design/ant-design/pull/20023#issuecomment-564389553 + min-width: 1px; + height: auto; + padding: 0; + background: transparent; + + border: 0; + + &:focus { + box-shadow: none; + } + + &[disabled] { + background: transparent; + } + } + + &:hover { + .@{picker-prefix-cls}-clear { + opacity: 1; + } + } + + &-placeholder { + > input { + color: @input-placeholder-color; + } + } + } + + // Size + &-large { + .picker-padding(@input-height-lg, @font-size-lg, @input-padding-horizontal-lg); + + .@{picker-prefix-cls}-input > input { + font-size: @font-size-lg; + } + } + + &-small { + .picker-padding(@input-height-sm, @font-size-base, @input-padding-horizontal-sm); + } + + &-suffix { + align-self: center; + margin-left: (@padding-xs / 2); + color: @disabled-color; + line-height: 1; + pointer-events: none; + + > * { + vertical-align: top; + } + } + + &-clear { + position: absolute; + top: 50%; + right: 0; + color: @disabled-color; + line-height: 1; + background: @component-background; + transform: translateY(-50%); + cursor: pointer; + opacity: 0; + transition: opacity @animation-duration-slow, color @animation-duration-slow; + + > * { + vertical-align: top; + } + + &:hover { + color: @text-color-secondary; + } + } + + &-separator { + position: relative; + display: inline-block; + width: 1em; + height: @font-size-lg; + color: @disabled-color; + font-size: @font-size-lg; + vertical-align: top; + cursor: default; + + .@{picker-prefix-cls}-focused & { + color: @text-color-secondary; + } + + .@{picker-prefix-cls}-range-separator & { + .@{picker-prefix-cls}-disabled & { + cursor: not-allowed; + } + } + } + + // ======================== Range ========================= + &-range { + position: relative; + display: inline-flex; + + // Clear + .@{picker-prefix-cls}-clear { + right: @input-padding-horizontal-base; + } + + &:hover { + .@{picker-prefix-cls}-clear { + opacity: 1; + } + } + + // Active bar + .@{picker-prefix-cls}-active-bar { + bottom: -@border-width-base; + height: 2px; + margin-left: @input-padding-horizontal-base; + background: @primary-color; + opacity: 0; + transition: all @animation-duration-slow ease-out; + pointer-events: none; + } + + &.@{picker-prefix-cls}-focused { + .@{picker-prefix-cls}-active-bar { + opacity: 1; + } + } + + &-separator { + align-items: center; + padding: 0 @padding-xs; + line-height: 1; + } + + &.@{picker-prefix-cls}-small { + .@{picker-prefix-cls}-clear { + right: @input-padding-horizontal-sm; + } + + .@{picker-prefix-cls}-active-bar { + margin-left: @input-padding-horizontal-sm; + } + } + } + + // ======================= Dropdown ======================= + &-dropdown { + .reset-component(); + position: absolute; + z-index: @zindex-picker; + + &-hidden { + display: none; + } + + &-placement-bottomLeft { + .@{picker-prefix-cls}-range-arrow { + top: (@arrow-size / 2) - (@arrow-size / 3); + display: block; + transform: rotate(-45deg); + } + } + + &-placement-topLeft { + .@{picker-prefix-cls}-range-arrow { + bottom: (@arrow-size / 2) - (@arrow-size / 3); + display: block; + transform: rotate(135deg); + } + } + + &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-topLeft, + &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-topRight, + &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-topLeft, + &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-topRight { + animation-name: antSlideDownIn; + } + + &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-bottomLeft, + &.@{ant-prefix}-slide-up-enter.@{ant-prefix}-slide-up-enter-active&-placement-bottomRight, + &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-bottomLeft, + &.@{ant-prefix}-slide-up-appear.@{ant-prefix}-slide-up-appear-active&-placement-bottomRight { + animation-name: antSlideUpIn; + } + + &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-topLeft, + &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-topRight { + animation-name: antSlideDownOut; + } + + &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-bottomLeft, + &.@{ant-prefix}-slide-up-leave.@{ant-prefix}-slide-up-leave-active&-placement-bottomRight { + animation-name: antSlideUpOut; + } + } + + &-dropdown-range { + padding: (@arrow-size * 2 / 3) 0; + + &-hidden { + display: none; + } + } + + // Time picker with additional style + &-dropdown &-panel > &-time-panel { + padding-top: (@padding-xs / 2); + } + + // ======================== Ranges ======================== + &-ranges { + margin-bottom: 0; + padding: (@padding-xs / 2) @padding-sm; + overflow: hidden; + line-height: @picker-text-height - 2 * @border-width-base - (@padding-xs / 2); + text-align: left; + list-style: none; + + > li { + display: inline-block; + } + + // https://github.com/ant-design/ant-design/issues/23687 + .@{picker-prefix-cls}-preset > .@{ant-prefix}-tag-blue { + color: @primary-color; + background: @primary-1; + border-color: @primary-3; + cursor: pointer; + } + + .@{picker-prefix-cls}-ok { + float: right; + margin-left: @padding-xs; + } + } + + &-range-wrapper { + display: flex; + } + + &-range-arrow { + position: absolute; + z-index: 1; + display: none; + width: @arrow-size; + height: @arrow-size; + margin-left: @input-padding-horizontal-base * 1.5; + box-shadow: 2px -2px 6px fade(@black, 6%); + transition: left @animation-duration-slow ease-out; + + &::after { + position: absolute; + top: @border-width-base; + right: @border-width-base; + width: @arrow-size; + height: @arrow-size; + border: (@arrow-size / 2) solid @border-color-split; + border-color: @calendar-bg @calendar-bg transparent transparent; + content: ''; + } + } + + &-panel-container { + overflow: hidden; + vertical-align: top; + background: @calendar-bg; + border-radius: @border-radius-base; + box-shadow: @box-shadow-base; + transition: margin @animation-duration-slow; + + .@{picker-prefix-cls}-panels { + display: inline-flex; + flex-wrap: nowrap; + direction: ltr; + } + + .@{picker-prefix-cls}-panel { + vertical-align: top; + background: transparent; + border-width: 0 0 @border-width-base 0; + border-radius: 0; + + &-focused { + border-color: @border-color-split; + } + } + } +} + +@import './panel'; +@import './rtl'; diff --git a/components/date-picker-new/style/index.tsx b/components/date-picker/style/index.tsx similarity index 100% rename from components/date-picker-new/style/index.tsx rename to components/date-picker/style/index.tsx diff --git a/components/date-picker-new/style/panel.less b/components/date-picker/style/panel.less similarity index 100% rename from components/date-picker-new/style/panel.less rename to components/date-picker/style/panel.less diff --git a/components/date-picker-new/style/rtl.less b/components/date-picker/style/rtl.less similarity index 100% rename from components/date-picker-new/style/rtl.less rename to components/date-picker/style/rtl.less diff --git a/components/date-picker-new/util.ts b/components/date-picker/util.ts similarity index 100% rename from components/date-picker-new/util.ts rename to components/date-picker/util.ts diff --git a/examples/App.vue b/examples/App.vue index 65b1ba433..237f9908d 100644 --- a/examples/App.vue +++ b/examples/App.vue @@ -1,39 +1,22 @@ -