diff --git a/components/_util/scrollTo.ts b/components/_util/scrollTo.ts index 1c79cc93cb..b3648407d3 100644 --- a/components/_util/scrollTo.ts +++ b/components/_util/scrollTo.ts @@ -24,8 +24,8 @@ export default function scrollTo(y: number, options: ScrollToOptions = {}) { const nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration); if (isWindow(container)) { (container as Window).scrollTo(window.pageXOffset, nextScrollTop); - } else if (container instanceof Document) { - container.documentElement.scrollTop = nextScrollTop; + } else if (container instanceof HTMLDocument || container.constructor.name === 'HTMLDocument') { + (container as HTMLDocument).documentElement.scrollTop = nextScrollTop; } else { (container as HTMLElement).scrollTop = nextScrollTop; } diff --git a/components/card/style/index.less b/components/card/style/index.less index c1bdc2a984..5469b8d2f0 100644 --- a/components/card/style/index.less +++ b/components/card/style/index.less @@ -76,7 +76,7 @@ // https://stackoverflow.com/a/22429853/3040605 margin-left: auto; padding: @card-head-padding 0; - color: @text-color; + color: @card-head-extra-color; font-weight: normal; font-size: @font-size-base; diff --git a/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap b/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap index 71e19976f3..9df2139763 100644 --- a/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap @@ -587,7 +587,8 @@ Array [ class="ant-picker-footer" > Today diff --git a/components/date-picker/style/panel.less b/components/date-picker/style/panel.less index 3871390d52..7203a0d039 100644 --- a/components/date-picker/style/panel.less +++ b/components/date-picker/style/panel.less @@ -436,6 +436,11 @@ &:active { color: @link-active-color; } + + &&-disabled { + color: @disabled-color; + cursor: not-allowed; + } } // ======================================================== diff --git a/components/style/themes/default.less b/components/style/themes/default.less index 1169cfd142..801f657188 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -660,6 +660,7 @@ 0 5px 12px 4px rgba(0, 0, 0, 0.09); @card-radius: @border-radius-base; @card-head-tabs-margin-bottom: -17px; +@card-head-extra-color: @text-color; // Comment // --- diff --git a/package.json b/package.json index 98f8c3a503..5edc2650d2 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "rc-menu": "~8.1.0", "rc-notification": "~4.3.0", "rc-pagination": "~2.2.0", - "rc-picker": "~1.4.0", + "rc-picker": "~1.4.16", "rc-progress": "~3.0.0", "rc-rate": "~2.6.0", "rc-resize-observer": "^0.2.0",