element-plus 2.1.7 → 2.1.10

package/theme-chalk/src/input.scss

@@ -15,13 +15,13 @@
 }
 
 @mixin inset-prepend-input-border($color) {
-  box-shadow: 1px 0 0 0px $color inset, 1px 0 0 0px $color,
-    0px 1px 0 0px $color inset, 0px -1px 0 0px $color inset !important;
+  box-shadow: 1px 0 0 0 $color inset, 1px 0 0 0 $color, 0 1px 0 0 $color inset,
+    0 -1px 0 0 $color inset !important;
 }
 
 @mixin inset-append-input-border($color) {
-  box-shadow: -1px 0 0 0px $color, -1px 0 0 0px $color inset,
-    0px 1px 0 0px $color inset, 0px -1px 0 0px $color inset !important;
+  box-shadow: -1px 0 0 0 $color, -1px 0 0 0 $color inset, 0 1px 0 0 $color inset,
+    0 -1px 0 0 $color inset !important;
 }
 
 @mixin mixed-input-border($color) {
@@ -122,13 +122,15 @@
   display: inline-flex;
   width: 100%;
   line-height: map.get($input-height, 'default');
+  box-sizing: border-box;
   @include scroll-bar;
 
-  & .#{$namespace}-input__clear {
+  & .#{$namespace}-input__clear,
+  & .#{$namespace}-input__password {
     color: var(--el-input-icon-color);
     font-size: map.get($input-font-size, 'default');
     cursor: pointer;
-    transition: var(--el-transition-color);
+    transition: var(--el-transition-color) !important;
     margin-left: 8px;
 
     &:hover {
@@ -151,29 +153,49 @@
     }
   }
 
-  @include e(inner) {
-    position: relative;
-    -webkit-appearance: none;
+  @include e(wrapper) {
+    display: inline-flex;
+    flex-grow: 1;
+    align-items: center;
+    justify-content: center;
+    padding: 0 map.get($input-padding-horizontal, 'default')-$border-width;
     background-color: var(--el-input-bg-color, map.get($input, 'bg-color'));
     background-image: none;
     border-radius: var(
       --el-input-border-radius,
       map.get($input, 'border-radius')
     );
-    box-sizing: border-box;
+    transition: var(--el-transition-box-shadow);
+    @include inset-input-border(
+      var(--el-input-border-color, map.get($input, 'border-color'))
+    );
+
+    &:hover {
+      @include inset-input-border(var(--el-input-hover-border-color));
+    }
+
+    @include when(focus) {
+      @include inset-input-border(var(--el-input-focus-border-color));
+    }
+  }
+
+  @include e(inner) {
+    width: 100%;
+    flex-grow: 1;
+    -webkit-appearance: none;
     color: var(--el-input-text-color, map.get($input, 'text-color'));
-    display: inline-block;
     font-size: inherit;
     height: map.get($input-height, 'default');
     line-height: map.get($input-height, 'default');
+    padding: 0;
     outline: none;
-    padding: 0 map.get($input-padding-horizontal, 'default')-$border-width;
-    transition: var(--el-transition-box-shadow);
-    width: 100%;
-    @include inset-input-border(
-      var(--el-input-border-color, map.get($input, 'border-color'))
-    );
     border: none;
+    background: none;
+
+    &:focus {
+      outline: none;
+    }
+
     &::placeholder {
       color: var(
         --el-input-placeholder-color,
@@ -181,53 +203,41 @@
       );
     }
 
-    &:hover {
-      @include inset-input-border(var(--el-input-hover-border-color));
-    }
-
-    &:focus {
-      outline: none;
-      @include inset-input-border(var(--el-input-focus-border-color));
-    }
     // override edge default style
     &[type='password']::-ms-reveal {
       display: none;
     }
   }
 
-  @include e(suffix) {
-    display: inline-flex;
-
-    position: absolute;
-    height: 100%;
-    right: map.get($input-padding-horizontal, 'default');
-    top: 0;
-    text-align: center;
-    color: var(--el-input-icon-color, map.get($input, 'icon-color'));
-    transition: all var(--el-transition-duration);
-    pointer-events: none;
-  }
-
-  @include e(suffix-inner) {
-    pointer-events: all;
-    display: inline-flex;
-  }
-
-  @include e(prefix) {
-    display: inline-flex;
+  @each $slot in (prefix, suffix) {
+    @include e($slot) {
+      display: inline-flex;
+      white-space: nowrap;
+      flex-shrink: 0;
+      flex-wrap: nowrap;
+      height: 100%;
+      text-align: center;
+      color: var(--el-input-icon-color, map.get($input, 'icon-color'));
+      transition: all var(--el-transition-duration);
+      pointer-events: none;
+    }
 
-    position: absolute;
-    height: 100%;
-    left: map.get($input-padding-horizontal, 'default');
-    top: 0;
-    text-align: center;
-    color: var(--el-input-icon-color, map.get($input, 'icon-color'));
-    transition: all var(--el-transition-duration);
-  }
+    @include e(#{$slot}-inner) {
+      pointer-events: all;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
 
-  @include e(prefix-inner) {
-    pointer-events: all;
-    display: inline-flex;
+      @if $slot == prefix {
+        > :last-child {
+          margin-right: 8px;
+        }
+      } @else {
+        > :first-child {
+          margin-left: 8px;
+        }
+      }
+    }
   }
 
   & .#{$namespace}-input__icon {
@@ -243,19 +253,23 @@
   }
 
   @include when(active) {
-    .#{$namespace}-input__inner {
-      outline: none;
-      box-shadow: 0 0 0 1px
-        var(--el-input-focus-border, map.get($input, 'focus-color')) inset;
+    .#{$namespace}-input__wrapper {
+      @include mixed-input-border(
+        var(--el-input-focus-border, map.get($input, 'focus-color'))
+      );
     }
   }
 
   @include when(disabled) {
-    .#{$namespace}-input__inner {
+    cursor: not-allowed;
+
+    .#{$namespace}-input__wrapper {
       background-color: map.get($input-disabled, 'fill');
-      box-shadow: 0 0 0 1px map.get($input-disabled, 'border') inset;
+      @include mixed-input-border(map.get($input-disabled, 'border'));
+    }
+
+    .#{$namespace}-input__inner {
       color: map.get($input-disabled, 'text-color');
-      cursor: not-allowed;
 
       &::placeholder {
         color: map.get($input-disabled, 'placeholder-color');
@@ -268,8 +282,8 @@
   }
 
   @include when(exceed) {
-    .#{$namespace}-input__inner {
-      box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+    .#{$namespace}-input__wrapper {
+      @include mixed-input-border(var(--el-color-danger));
     }
 
     .#{$namespace}-input__suffix {
@@ -279,97 +293,42 @@
     }
   }
 
-  $input-padding-size-with-extra-icon: calc(
-    5px + #{map.get($input-font-size, 'default')} + #{map.get(
-        $input-padding-horizontal,
-        'default'
-      )}
-  );
-
-  @include m(suffix) {
-    .#{$namespace}-input__inner {
-      padding-right: $input-padding-size-with-extra-icon;
-    }
-
-    @include m(password-clear) {
-      .#{$namespace}-input__inner {
-        padding-right: 55px;
-      }
-    }
-  }
-
-  @include m(prefix) {
-    .#{$namespace}-input__inner {
-      padding-left: $input-padding-size-with-extra-icon;
-    }
-  }
-
   @each $size in (large, small) {
     @include m($size) {
       font-size: map.get($input-font-size, $size);
       line-height: map.get($input-height, $size) - 2;
 
+      @include e(wrapper) {
+        padding: 0 map.get($input-padding-horizontal, $size)-$border-width;
+      }
+
       @include e(inner) {
         height: map.get($input-height, $size);
         line-height: map.get($input-height, $size);
-        padding: 0 map.get($input-padding-horizontal, $size)-$border-width;
       }
 
       .#{$namespace}-input__icon {
         line-height: map.get($input-height, $size);
       }
-
-      $input-padding-size-with-extra-icon: calc(
-        5px + #{map.get($input-font-size, $size)} + #{map.get(
-            $input-padding-horizontal,
-            $size
-          )}
-      );
-
-      &.#{$namespace}-input--prefix {
-        .#{$namespace}-input__inner {
-          padding-left: $input-padding-size-with-extra-icon;
-        }
-      }
-
-      &.#{$namespace}-input--suffix {
-        .#{$namespace}-input__inner {
-          padding-right: $input-padding-size-with-extra-icon;
-        }
-      }
-
-      @include e(prefix) {
-        left: map.get($input-padding-horizontal, $size);
-      }
-
-      @include e(suffix) {
-        right: map.get($input-padding-horizontal, $size);
-      }
     }
   }
 }
 
 @include b(input-group) {
-  line-height: normal;
-  display: inline-table;
+  display: inline-flex;
   width: 100%;
-  border-collapse: separate;
-  border-spacing: 0;
-
-  > .#{$namespace}-input__inner {
-    vertical-align: middle;
-    display: table-cell;
-  }
+  align-items: center;
 
   @include e((append, prepend)) {
     background-color: getCssVar('fill-color', 'light');
     color: var(--el-color-info);
-    vertical-align: middle;
-    display: table-cell;
     position: relative;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
     border-radius: var(--el-input-border-radius);
     padding: 0 20px;
-    width: 1px;
     white-space: nowrap;
 
     &:focus {
@@ -384,8 +343,8 @@
 
     button.#{$namespace}-button,
     button.#{$namespace}-button:hover,
-    div.#{$namespace}-select .#{$namespace}-input__inner,
-    div.#{$namespace}-select:hover .#{$namespace}-input__inner {
+    div.#{$namespace}-select .#{$namespace}-input__wrapper,
+    div.#{$namespace}-select:hover .#{$namespace}-input__wrapper {
       border-color: transparent;
       background-color: transparent;
       color: inherit;
@@ -412,44 +371,27 @@
   }
 
   @include m(prepend) {
-    .#{$namespace}-input__inner {
-      box-shadow: 1px 0 0 0px var(--el-input-border-color) inset,
-        0px 1px 0 0px var(--el-input-border-color) inset,
-        0px -1px 0 0px var(--el-input-border-color) inset;
-    }
-
-    > .#{$namespace}-input__inner {
+    > .#{$namespace}-input__wrapper {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
-      @include mixed-input-border(var(--el-input-border-color));
-      &:hover {
-        z-index: 1;
-        @include mixed-input-border(var(--el-input-hover-border-color));
-      }
-
-      &:focus {
-        outline: none;
-        z-index: 2;
-        @include mixed-input-border(var(--el-input-focus-border-color));
-      }
     }
 
     @include e(prepend) {
       .#{$namespace}-select {
         .#{$namespace}-input {
           .#{$namespace}-input__inner {
+            box-shadow: none !important;
+          }
+          .#{$namespace}-input__wrapper {
             border-top-right-radius: 0;
             border-bottom-right-radius: 0;
-            &:focus {
-              outline: none;
-              z-index: 2;
-              @include inset-prepend-input-border(
-                var(--el-input-focus-border-color)
-              );
-            }
+            @include inset-prepend-border(var(--el-input-border-color));
           }
           &.is-focus {
             .#{$namespace}-input__inner {
+              box-shadow: none !important;
+            }
+            .#{$namespace}-input__wrapper {
               @include inset-prepend-input-border(
                 var(--el-input-focus-border-color)
               );
@@ -466,6 +408,9 @@
         }
         &:hover {
           .#{$namespace}-input__inner {
+            box-shadow: none !important;
+          }
+          .#{$namespace}-input__wrapper {
             z-index: 1;
             @include inset-prepend-input-border(
               var(--el-input-hover-border-color)
@@ -477,7 +422,7 @@
   }
 
   @include m(append) {
-    > .#{$namespace}-input__inner {
+    > .#{$namespace}-input__wrapper {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
     }
@@ -485,36 +430,30 @@
       .#{$namespace}-select {
         .#{$namespace}-input {
           .#{$namespace}-input__inner {
+            box-shadow: none !important;
+          }
+          .#{$namespace}-input__wrapper {
             border-top-left-radius: 0;
             border-bottom-left-radius: 0;
-            @include inset-append-input-border(var(--el-input-border-color));
-            &:focus {
-              outline: none;
-              z-index: 2;
-              @include inset-append-input-border(
-                var(--el-input-focus-border-color)
-              );
-            }
+            @include inset-append-border(var(--el-input-border-color));
           }
           &.is-focus {
             .#{$namespace}-input__inner {
-              outline: none;
+              box-shadow: none !important;
+            }
+            .#{$namespace}-input__wrapper {
               z-index: 2;
               @include inset-append-input-border(
                 var(--el-input-focus-border-color)
               );
-              &:focus {
-                outline: none;
-                z-index: 2;
-                @include inset-append-input-border(
-                  var(--el-input-focus-border-color)
-                );
-              }
             }
           }
         }
         &:hover {
           .#{$namespace}-input__inner {
+            box-shadow: none !important;
+          }
+          .#{$namespace}-input__wrapper {
             z-index: 1;
             @include inset-append-input-border(
               var(--el-input-hover-border-color)

package/theme-chalk/src/menu.scss

@@ -107,7 +107,7 @@
         color: var(--el-menu-text-color);
 
         &:hover {
-          background-color: #fff;
+          background-color: getCssVar('bg-color', 'overlay');
         }
       }
 

package/theme-chalk/src/message-box.scss

@@ -14,7 +14,7 @@
   width: var(--el-messagebox-width);
   padding-bottom: 10px;
   vertical-align: middle;
-  background-color: var(--el-color-white);
+  background-color: getCssVar('bg-color');
   border-radius: var(--el-messagebox-border-radius);
   border: 1px solid var(--el-border-color-lighter);
   font-size: var(--el-messagebox-font-size);

package/theme-chalk/src/mixins/_var.scss

@@ -12,28 +12,26 @@
   #{joinVarName($name)}: #{$value};
 }
 
-@mixin set-css-color-type-light($type, $i) {
-  #{getCssVarName('color', $type, 'light', $i)}: #{map.get(
-      $colors,
-      $type,
-      'light-#{$i}'
-    )};
+// @include set-css-var-type('color', 'primary', $map);
+// --el-color-primary: #{map.get($map, 'primary')};
+@mixin set-css-var-type($name, $type, $variables) {
+  #{getCssVarName($name, $type)}: #{map.get($variables, $type)};
 }
 
-@mixin set-css-color-type($type) {
-  #{getCssVarName('color', $type)}: #{map.get($colors, $type, 'base')};
+@mixin set-css-color-type($colors, $type) {
+  @include set-css-var-value(('color', $type), map.get($colors, $type, 'base'));
+
   @each $i in (3, 5, 7, 8, 9) {
-    @include set-css-color-type-light($type, $i);
+    @include set-css-var-value(
+      ('color', $type, 'light', $i),
+      map.get($colors, $type, 'light-#{$i}')
+    );
   }
-  #{getCssVarName('color', $type, 'dark-2')}: #{map.get(
-      $colors,
-      $type,
-      'dark-2'
-    )};
-}
 
-@mixin set-css-var-type($name, $type, $variables) {
-  #{getCssVarName($name, $type)}: #{map.get($variables, $type)};
+  @include set-css-var-value(
+    ('color', $type, 'dark-2'),
+    map.get($colors, $type, 'dark-2')
+  );
 }
 
 // set all css var for component by map

package/theme-chalk/src/mixins/mixins.scss

@@ -219,7 +219,7 @@
 
 // dark
 @mixin dark($block) {
-  .dark {
+  html.dark {
     @include b($block) {
       @content;
     }

package/theme-chalk/src/notification.scss

@@ -14,7 +14,7 @@
   box-sizing: border-box;
   border: 1px solid var(--el-notification-border-color);
   position: fixed;
-  background-color: var(--el-color-white);
+  background-color: getCssVar('bg-color', 'overlay');
   box-shadow: var(--el-notification-shadow);
   transition: opacity var(--el-transition-duration),
     transform var(--el-transition-duration), left var(--el-transition-duration),
@@ -48,7 +48,7 @@
   @include e(content) {
     font-size: var(--el-notification-content-font-size);
     line-height: 24px;
-    margin: 6px 0 0 0;
+    margin: 6px 0 0;
     color: var(--el-notification-content-color);
     text-align: justify;
 

package/theme-chalk/src/option.scss

@@ -21,10 +21,6 @@
     @include when(disabled) {
       color: map.get($select-option, 'disabled-color');
       cursor: not-allowed;
-
-      &:hover {
-        background-color: var(--el-color-white);
-      }
     }
 
     &.hover,

package/theme-chalk/src/pagination.scss

@@ -22,6 +22,17 @@
   }
 }
 
+@mixin pagination-button {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: var(--el-pagination-font-size);
+  min-width: var(--el-pagination-button-width);
+  height: var(--el-pagination-button-height);
+  line-height: var(--el-pagination-button-height);
+  box-sizing: border-box;
+}
+
 @include b(pagination) {
   @include set-component-css-var('pagination', $pagination);
 
@@ -35,14 +46,7 @@
 
   span:not([class*='suffix']),
   button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: var(--el-pagination-font-size);
-    min-width: var(--el-pagination-button-width);
-    height: var(--el-pagination-button-height);
-    line-height: var(--el-pagination-button-height);
-    box-sizing: border-box;
+    @include pagination-button;
   }
 
   .#{$namespace}-input__inner {
@@ -287,15 +291,8 @@
   li {
     padding: 0 4px;
     background: var(--el-pagination-bg-color);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: var(--el-pagination-font-size);
-    min-width: var(--el-pagination-button-width);
-    height: var(--el-pagination-button-height);
-    line-height: var(--el-pagination-button-height);
+    @include pagination-button;
     cursor: pointer;
-    box-sizing: border-box;
     text-align: center;
 
     &.btn-quickprev:hover {

package/theme-chalk/src/popper.scss

@@ -8,7 +8,7 @@
 
 @include b(popper) {
   position: absolute;
-  border-radius: var(--el-popper-border-radius);
+  border-radius: getCssVar('popper', 'border-radius');
   padding: 5px 11px;
   z-index: 2000;
   font-size: 12px;
@@ -20,24 +20,24 @@
   $arrow-selector: #{& + '__arrow'};
 
   @include when(dark) {
-    color: var(--el-color-white);
-    background: var(--el-text-color-primary);
-    border: 1px solid var(--el-text-color-primary);
+    color: getCssVar('bg-color');
+    background: getCssVar('text-color', 'primary');
+    border: 1px solid getCssVar('text-color', 'primary');
 
     #{$arrow-selector}::before {
-      border: 1px solid var(--el-text-color-primary);
-      background: var(--el-text-color-primary);
+      border: 1px solid getCssVar('text-color', 'primary');
+      background: getCssVar('text-color', 'primary');
       right: 0;
     }
   }
 
   @include when(light) {
-    background: var(--el-color-white);
-    border: 1px solid var(--el-border-color-light);
+    background: getCssVar('bg-color', 'overlay');
+    border: 1px solid getCssVar('border-color', 'light');
 
     #{$arrow-selector}::before {
-      border: 1px solid var(--el-border-color-light);
-      background: var(--el-color-white);
+      border: 1px solid getCssVar('border-color', 'light');
+      background: getCssVar('bg-color', 'overlay');
       right: 0;
     }
   }
@@ -59,7 +59,7 @@
       z-index: -1;
       content: ' ';
       transform: rotate(45deg);
-      background: var(--el-text-color-primary);
+      background: getCssVar('text-color', 'primary');
       box-sizing: border-box;
     }
   }

package/theme-chalk/src/radio-button.scss

@@ -94,10 +94,7 @@
 
     &:disabled {
       & + .#{$namespace}-radio-button__inner {
-        color: var(
-          --el-button-disabled-text-color,
-          map.get($button, 'disabled-text-color')
-        );
+        color: getCssVar('disabled-text-color');
         cursor: not-allowed;
         background-image: none;
         background-color: var(

package/theme-chalk/src/radio.scss

@@ -32,7 +32,6 @@ $radio-font-size: map.merge(
   user-select: none;
   margin-right: 32px;
   height: map.get($radio-height, 'default');
-  user-select: none;
 
   @each $size in (large, small) {
     &.#{$namespace}-radio--#{$size} {