From 188e5630b378337ee101391e1c5a28dcb5e1c4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Fri, 15 May 2020 18:18:07 +0800 Subject: [PATCH 1/3] :lipstick: Add @card-head-extra-color (#24189) close #24187 --- components/card/style/index.less | 2 +- components/style/themes/default.less | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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/style/themes/default.less b/components/style/themes/default.less index 50de5a8c41..78b530e33e 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -650,6 +650,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 // --- From a83143bbbc6dc6b15b44932a7d745cc01fc45574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?= Date: Fri, 15 May 2020 18:45:10 +0800 Subject: [PATCH 2/3] fix: Picker disabled today (#24190) --- .../__tests__/__snapshots__/DatePicker.test.js.snap | 3 ++- components/date-picker/style/panel.less | 5 +++++ package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) 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/package.json b/package.json index 74ed394ca5..3a9e36d9b8 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", From 04ad7236e4ff73c29643b7bef363b6c3a9b9daca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Fri, 15 May 2020 23:16:49 +0800 Subject: [PATCH 3/3] :bug: Fix Backtop cannot work in Chrome iframe (#24194) close #24192 --- components/_util/scrollTo.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; }