chore: sync ant-design v4.2.3 (ant-design-blazor#120)

lexigua · May 16, 2020 · 76cf6ab · 76cf6ab
1 parent 6f45149
commit 76cf6ab
Show file tree

Hide file tree

Showing 18 changed files with 162 additions and 139 deletions.
diff --git a/components/button/style/index.less b/components/button/style/index.less
@@ -22,13 +22,6 @@
   line-height: @line-height-base;
   .btn;
   .btn-default;
-  // Make sure that the target of Button's click event always be `button`
-  // Ref: https://github.com/ant-design/ant-design/issues/7034
-  > i,
-  > span {
-    display: inline-block;
-    pointer-events: none;
-  }
 
   &-primary {
     .btn-primary;

diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less
@@ -254,7 +254,6 @@
     .button-size(
       @btn-height-sm; @btn-padding-horizontal-sm; @btn-font-size-sm; @btn-border-radius-sm
     );
-    line-height: @btn-height-sm - 2px;
   }
 }
 // primary button style

diff --git 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/style/panel.less b/components/date-picker/style/panel.less
@@ -10,7 +10,8 @@
   @picker-panel-width: @picker-panel-cell-width * 7 + @padding-sm * 2 + 4;
 
   &-panel {
-    display: inline-block;
+    display: inline-flex;
+    flex-direction: column;
     text-align: center;
     background: @calendar-bg;
     border: @border-width-base @border-style-base @picker-border-color;
@@ -400,6 +401,8 @@
 
   // ======================== Footer ========================
   &-footer {
+    width: min-content;
+    min-width: 100%;
     line-height: @picker-text-height - 2 * @border-width-base;
     text-align: center;
     border-bottom: @border-width-base @border-style-base transparent;
@@ -433,6 +436,11 @@
     &:active {
       color: @link-active-color;
     }
+
+    &&-disabled {
+      color: @disabled-color;
+      cursor: not-allowed;
+    }
   }
 
   // ========================================================

diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less
@@ -19,7 +19,10 @@
 
   &-content-wrapper {
     position: absolute;
+    width: 100%;
+    height: 100%;
   }
+
   .@{drawer-prefix-cls}-content {
     width: 100%;
     height: 100%;
@@ -37,13 +40,6 @@
       width: 100%;
       transition: transform @animation-duration-slow @ease-base-out;
     }
-    &.@{drawer-prefix-cls}-open.no-mask {
-      height: 0%;
-
-      .@{drawer-prefix-cls}-content-wrapper {
-        height: 100vh;
-      }
-    }
   }
 
   &-left {
@@ -95,13 +91,6 @@
       height: 100%;
       transition: transform @animation-duration-slow @ease-base-out;
     }
-    &.@{drawer-prefix-cls}-open.no-mask {
-      width: 0%;
-
-      .@{drawer-prefix-cls}-content-wrapper {
-        width: 100vw;
-      }
-    }
   }
 
   &-top {

diff --git a/components/menu/style/dark.less b/components/menu/style/dark.less
@@ -40,7 +40,8 @@
 
   &-dark &-item,
   &-dark &-item-group-title,
-  &-dark &-item > a {
+  &-dark &-item > a,
+  &-dark &-item > span > a {
     color: @menu-dark-color;
   }
 
@@ -76,7 +77,8 @@
   &-dark &-submenu-title:hover {
     color: @menu-dark-highlight-color;
     background-color: transparent;
-    > a {
+    > a,
+    > span > a {
       color: @menu-dark-highlight-color;
     }
     > .@{menu-prefix-cls}-submenu-title,
@@ -105,7 +107,9 @@
       border-right: 0;
     }
     > a,
-    > a:hover {
+    > span > a,
+    > a:hover,
+    > span > a:hover {
       color: @menu-dark-highlight-color;
     }
     .@{iconfont-css-prefix} {
@@ -125,7 +129,8 @@
   &-dark &-item-disabled,
   &-dark &-submenu-disabled {
     &,
-    > a {
+    > a,
+    > span > a {
       color: @disabled-color-dark !important;
       opacity: 0.8;
     }

diff --git a/components/menu/style/rtl.less b/components/menu/style/rtl.less
@@ -22,12 +22,11 @@
     }
   }
 
-  &-dark {
-    .@{menu-prefix-cls}-inline,
-    .@{menu-prefix-cls}-vertical {
-      .@{menu-prefix-cls}-rtl& {
-        border-left: none;
-      }
+
+  &-dark&-inline,
+  &-dark&-vertical {
+    .@{menu-prefix-cls}-rtl& {
+      border-left: none;
     }
   }
 
@@ -152,6 +151,7 @@
   }
 
   &-sub&-inline {
+    border: 0;
     & .@{menu-prefix-cls}-item-group-title {
       .@{menu-prefix-cls}-rtl& {
         padding-right: 32px;

diff --git a/components/pagination/style/index.less b/components/pagination/style/index.less
@@ -252,6 +252,7 @@
     vertical-align: top;
     .@{pagination-prefix-cls}-item-link {
       height: @pagination-item-size-sm;
+      background-color: transparent;
       border: 0;
       &::after {
         height: @pagination-item-size-sm;

diff --git a/components/pagination/style/rtl.less b/components/pagination/style/rtl.less
@@ -32,6 +32,12 @@
     }
   }
 
+  &-slash {
+    .@{pagination-prefix-cls}-rtl & {
+      margin: 0 5px 0 10px;
+    }
+  }
+
   &-options {
     .@{pagination-prefix-cls}-rtl & {
       margin-right: 16px;

diff --git a/components/select/style/rtl.less b/components/select/style/rtl.less
@@ -66,6 +66,7 @@
     .@{select-prefix-cls}-rtl& {
       margin-right: 0;
       margin-left: @input-padding-vertical-base;
+      padding: 0 @padding-xs 0 (@padding-xs / 2);
       text-align: right;
     }
     // It's ok not to do this, but 24px makes bottom narrow in view should adjust

diff --git a/components/select/style/single.less b/components/select/style/single.less
@@ -24,7 +24,6 @@
       padding: 0;
       line-height: @select-height-without-border;
       transition: all 0.3s;
-      pointer-events: none;
 
       // Firefox inline-block position calculation is not same as Chrome & Safari. Patch this:
       @supports (-moz-appearance: meterbar) {
@@ -34,6 +33,15 @@
       }
     }
 
+    .@{select-prefix-cls}-selection-item {
+      position: relative;
+      user-select: none;
+    }
+
+    .@{select-prefix-cls}-selection-placeholder {
+      pointer-events: none;
+    }
+
     // For common baseline align
     &::after,
     // For '' value baseline align

diff --git a/components/style/themes/compact.less b/components/style/themes/compact.less
@@ -40,9 +40,9 @@
 @btn-padding-horizontal-base: @default-padding-sm - 1px;
 @btn-padding-horizontal-lg: @btn-padding-horizontal-base;
 @btn-padding-horizontal-sm: @default-padding-xs - 1px;
-@btn-square-only-icon-size: 14px;
-@btn-square-only-icon-size-sm: 14px;
 @btn-square-only-icon-size-lg: 16px;
+@btn-square-only-icon-size: 14px;
+@btn-square-only-icon-size-sm: 12px;
 
 // Breadcrumb
 // ---

diff --git 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
 // ---

diff --git a/components/switch/style/index.less b/components/switch/style/index.less
@@ -103,8 +103,8 @@
       height: @switch-sm-height - 4px;
     }
 
-    &:active::before,
-    &:active::after {
+    &:not(.@{switch-prefix-cls}-loading):active::before,
+    &:not(.@{switch-prefix-cls}-loading):active::after {
       width: 16px;
     }
   }
@@ -119,6 +119,12 @@
       margin-right: 18px;
       margin-left: 3px;
     }
+    &::after {
+      left: @switch-sm-min-width - (@switch-sm-height - 2px);
+    }
+    &:not(.@{switch-prefix-cls}-disabled):active::after {
+      left: 2px;
+    }
   }
 
   &-small&-checked &-loading-icon {
@@ -141,9 +147,11 @@
     }
 
     &::after {
-      left: 100%;
+      left: @switch-min-width - (@switch-height - 2px);
       margin-left: -1px;
-      transform: translateX(-100%);
+    }
+    &:not(.@{switch-prefix-cls}-disabled):active::after {
+      left: @switch-min-width - (@switch-height + 4px);
     }
   }