@nutui/nutui-react 3.0.0-beta.1 → 3.0.0-beta.10

package/dist/cjs/packages/indicator/style/indicator.scss

@@ -1,19 +1,24 @@
 .nut-indicator {
   display: flex;
-  flex-direction: row;
   width: auto;
+  flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: center;
 
-  &-dot {
+  &-fixed-width {
+    width: 21px;
+  }
+
+  &-dot,
+  &-line {
     display: inline-block;
     vertical-align: middle;
     width: $indicator-dot-size;
     height: $indicator-dot-size;
     border-radius: 50%;
-    background-color: $indicator-dot-color;
+    background-color: $color-border-disabled;
     margin: 0 $indicator-dot-margin;
+    opacity: 0.4;
 
     &:first-child {
       margin-left: 0px;
@@ -22,20 +27,119 @@
     &:last-child {
       margin-right: 0px;
     }
+
+    &-active {
+      width: $indicator-dot-active-size;
+      border-radius: $indicator-border-radius;
+      background: $indicator-color;
+      opacity: 1;
+    }
+  }
+
+  // 固定宽度
+  &-fixed-width {
+    // 两个页码的时候
+    .nut-indicator-dot {
+      width: 12px;
+      border-radius: $indicator-border-radius;
+
+      &-active {
+        width: 6px;
+      }
+    }
   }
 
-  &-active {
+  &-vertical {
+    // 竖向固定高度
+    &.nut-indicator-fixed-width {
+      justify-content: flex-start;
+      height: 21px;
+      width: auto;
+
+      // 竖向两个页码
+      .nut-indicator-dot {
+        width: 3px;
+        height: 12px;
+        border-radius: $indicator-border-radius;
+
+        &-active {
+          height: 6px;
+        }
+      }
+    }
+  }
+
+  &-line {
     width: $indicator-dot-active-size;
+    margin: 0;
+
     border-radius: $indicator-border-radius;
-    background: $indicator-color;
+    background-color: transparent;
+
+    &-active {
+      transition: transform 0.3s ease-in-out;
+      background: $indicator-color;
+    }
   }
+}
 
-  &-vertical {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
+.nut-indicator-track {
+  position: relative;
 
+  &:after {
+    display: block;
+    content: ' ';
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    border-radius: $indicator-border-radius;
+    background-color: $color-border-disabled;
+    opacity: 0.4;
+  }
+}
+
+.nut-indicator-white {
+  .nut-indicator {
+    &-dot,
+    &-line {
+      position: relative;
+      box-sizing: content-box;
+      background: rgba(255, 255, 255, 0.4);
+      border: 1px solid rgba(0, 0, 0, 0.06);
+      opacity: 1;
+    }
+
+    &-line {
+      opacity: 0;
+
+      &-active {
+        opacity: 1;
+        background: rgba(255, 255, 255, 1);
+      }
+    }
+    &-dot {
+      &-active {
+        background: rgba(255, 255, 255, 1);
+      }
+    }
+  }
+}
+
+.nut-indicator-track.nut-indicator-white {
+  &:after {
+    border: 1px solid rgba(0, 0, 0, 0.06);
+    background: rgba(255, 255, 255, 0.4);
+  }
+}
+
+.nut-indicator-vertical {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  .nut-indicator {
     &-dot {
       margin: $indicator-dot-margin 0;
 
@@ -46,11 +150,20 @@
       &:last-child {
         margin-bottom: 0px;
       }
+
+      &-active {
+        width: $indicator-dot-size;
+        height: $indicator-dot-active-size;
+      }
     }
+  }
 
-    &-active {
-      width: $indicator-dot-size;
-      height: $indicator-dot-active-size;
+  &.nut-indicator-track {
+    .nut-indicator {
+      &-line {
+        width: $indicator-dot-size;
+        height: $indicator-dot-active-size;
+      }
     }
   }
 }

package/dist/cjs/packages/indicator/style/style.css

@@ -1,58 +1,139 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-indicator {
   display: flex;
-  flex-direction: row;
   width: auto;
+  flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: center;
 }
-.nut-indicator-dot {
+.nut-indicator-fixed-width {
+  width: 21px;
+}
+.nut-indicator-dot, .nut-indicator-line {
   display: inline-block;
   vertical-align: middle;
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-size, 4px);
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-size, 3px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
-  margin: 0 var(--nutui-indicator-dot-margin, 2px);
+  background-color: var(--nutui-gray-4);
+  margin: 0 var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
+  opacity: 0.4;
 }
-.nut-indicator-dot:first-child {
+.nut-indicator-dot:first-child, .nut-indicator-line:first-child {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child {
+.nut-indicator-dot:last-child, .nut-indicator-line:last-child {
   margin-right: 0px;
 }
-.nut-indicator-active {
-  width: var(--nutui-indicator-dot-active-size, 8px);
-  border-radius: var(--nutui-indicator-border-radius, 2px);
-  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
+.nut-indicator-dot-active, .nut-indicator-line-active {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+  opacity: 1;
+}
+.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-fixed-width .nut-indicator-dot-active {
+  width: 6px;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width {
+  justify-content: flex-start;
+  height: 21px;
+  width: auto;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 3px;
+  height: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
+  height: 6px;
+}
+.nut-indicator-line {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  margin: 0;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: transparent;
+}
+.nut-indicator-line-active {
+  transition: transform 0.3s ease-in-out;
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
 }
+
+.nut-indicator-track {
+  position: relative;
+}
+.nut-indicator-track:after {
+  display: block;
+  content: " ";
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: var(--nutui-gray-4);
+  opacity: 0.4;
+}
+
+.nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
+  position: relative;
+  box-sizing: content-box;
+  background: rgba(255, 255, 255, 0.4);
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  opacity: 1;
+}
+.nut-indicator-white .nut-indicator-line {
+  opacity: 0;
+}
+.nut-indicator-white .nut-indicator-line-active {
+  opacity: 1;
+  background: rgb(255, 255, 255);
+}
+.nut-indicator-white .nut-indicator-dot-active {
+  background: rgb(255, 255, 255);
+}
+
+.nut-indicator-track.nut-indicator-white:after {
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  background: rgba(255, 255, 255, 0.4);
+}
+
 .nut-indicator-vertical {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
 }
-.nut-indicator-vertical-dot {
-  margin: var(--nutui-indicator-dot-margin, 2px) 0;
+.nut-indicator-vertical .nut-indicator-dot {
+  margin: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px)) 0;
 }
-.nut-indicator-vertical-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot:first-child {
   margin-top: 0px;
 }
-.nut-indicator-vertical-dot:last-child {
+.nut-indicator-vertical .nut-indicator-dot:last-child {
   margin-bottom: 0px;
 }
-.nut-indicator-vertical-active {
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-active-size, 8px);
+.nut-indicator-vertical .nut-indicator-dot-active {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
+}
+.nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
 }
 
 [dir=rtl] .nut-indicator-dot:first-child,
 .nut-rtl .nut-indicator-dot:first-child {
-  margin-left: var(--nutui-indicator-dot-margin, 2px);
+  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-right: 0px;
 }
 [dir=rtl] .nut-indicator-dot:last-child,
 .nut-rtl .nut-indicator-dot:last-child {
-  margin-right: var(--nutui-indicator-dot-margin, 2px);
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-left: 0px;
 }

package/dist/cjs/packages/infiniteloading/style/infiniteloading.scss

@@ -33,7 +33,6 @@
     justify-content: center;
     width: 100%;
     padding-top: 6px;
-    font-size: $font-size-s;
     color: $infiniteloading-color;
     text-align: center;
 
@@ -41,6 +40,7 @@
       display: flex;
       justify-content: center;
       align-items: center;
+      font-size: $font-size-xxs;
 
       &-icons {
         margin-right: 8px;

package/dist/cjs/packages/infiniteloading/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-infiniteloading {
   display: block;
   width: 100%;
@@ -9,7 +13,7 @@
   width: 100%;
   overflow: hidden;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-infiniteloading-color, var(--nutui-gray-5));
 }
 .nut-infiniteloading .nut-infinite-top-tips {
   width: 100%;
@@ -30,20 +34,20 @@
   justify-content: center;
   width: 100%;
   padding-top: 6px;
-  font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-infiniteloading-color, var(--nutui-gray-5));
   text-align: center;
 }
 .nut-infiniteloading .nut-infinite-bottom-tips {
   display: flex;
   justify-content: center;
   align-items: center;
+  font-size: var(--nutui-font-size-xxs, 10px);
 }
 .nut-infiniteloading .nut-infinite-bottom-tips-icons {
   margin-right: 8px;
 }
 .nut-infiniteloading-primary {
-  background-color: var(--nutui-color-primary, #ff0f23);
+  background-color: var(--nutui-brand-6);
 }
 .nut-infiniteloading-primary .nut-infinite-bottom,
 .nut-infiniteloading-primary .nut-infinite-top {

package/dist/cjs/packages/input/input.d.ts

@@ -19,6 +19,7 @@ export interface InputProps extends BasicComponent {
     formatTrigger: InputFormatTrigger;
     autoFocus: boolean;
     confirmType: InputConfirmType;
+    plain: boolean;
     formatter?: (value: string) => void;
     onChange?: (value: string) => void;
     onBlur?: (value: string) => void;

package/dist/cjs/packages/input/input.js

@@ -32,12 +32,13 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     clearable: false,
     clearIcon: null,
     formatTrigger: 'onChange',
-    autoFocus: false
+    autoFocus: false,
+    plain: false
 });
 var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
     var rtl = (0, _configprovider.useRtl)();
     var locale = (0, _configprovider.useConfig)().locale;
-    var _ref = (0, _object_spread._)({}, defaultProps, props), type = _ref.type, name = _ref.name, placeholder = _ref.placeholder, align = _ref.align, disabled = _ref.disabled, readOnly = _ref.readOnly, maxLength = _ref.maxLength, clearable = _ref.clearable, clearIcon = _ref.clearIcon, formatTrigger = _ref.formatTrigger, autoFocus = _ref.autoFocus, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onFocus = _ref.onFocus, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, onCompositionStart = _ref.onCompositionStart, onCompositionEnd = _ref.onCompositionEnd, rest = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), type = _ref.type, name = _ref.name, placeholder = _ref.placeholder, align = _ref.align, disabled = _ref.disabled, readOnly = _ref.readOnly, maxLength = _ref.maxLength, clearable = _ref.clearable, clearIcon = _ref.clearIcon, formatTrigger = _ref.formatTrigger, autoFocus = _ref.autoFocus, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onFocus = _ref.onFocus, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, plain = _ref.plain, defaultValue = _ref.defaultValue, _value = _ref.value, onCompositionStart = _ref.onCompositionStart, onCompositionEnd = _ref.onCompositionEnd, rest = (0, _object_without_properties._)(_ref, [
         "type",
         "name",
         "placeholder",
@@ -57,6 +58,7 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         "formatter",
         "onClick",
         "confirmType",
+        "plain",
         "defaultValue",
         "value",
         "onCompositionStart",
@@ -93,7 +95,9 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         var classPrefix = 'nut-input';
         return [
             classPrefix,
-            "".concat(disabled ? "".concat(classPrefix, "-disabled") : '')
+            disabled ? "".concat(classPrefix, "-disabled") : '',
+            readOnly ? "".concat(classPrefix, "-readonly") : '',
+            plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container")
         ].filter(Boolean).join(' ');
     }, [
         disabled

package/dist/cjs/packages/input/style/input.scss

@@ -5,23 +5,29 @@
   flex-wrap: nowrap;
   flex: 1;
   align-items: center;
-  padding: $input-padding;
-  line-height: 24px;
   font-size: $input-font-size;
   box-sizing: border-box;
-  border-radius: $input-border-radius;
-  background-color: $input-background-color;
-  border-bottom: $input-border-bottom-width solid $input-border-bottom;
 
   .nut-icon {
-    color: #c8c9cc;
+    color: $color-text-disabled;
+    width: 14px;
+    height: 14px;
+    font-size: 14px;
+  }
+  &-container {
+    height: 38px;
+    padding: $input-padding;
+    background-color: $input-background-color;
+    border-radius: $input-border-radius;
+    border-bottom: $input-border-bottom-width solid $input-border-bottom;
   }
 }
 
 .nut-input-native {
   flex: 1;
-  color: $input-color;
+  color: $color-title;
   font-size: $input-font-size;
+  line-height: $input-font-size;
   padding: 0;
   border: 0;
   outline: 0 none;
@@ -31,19 +37,28 @@
 
 /* #ifndef rn */
 .nut-input-native::placeholder {
-  color: #757575;
+  color: $color-text-help;
 }
-
 /* #endif */
 
+.nut-input-readonly {
+  .nut-input-native {
+    color: $color-text-help;
+  }
+}
+
 .nut-input-disabled {
-  color: $input-disabled-color !important;
+  color: $color-text-disabled !important;
 
   input:disabled {
-    color: $input-disabled-color;
+    color: $color-text-disabled;
     cursor: not-allowed;
     background: none;
     opacity: 1;
-    -webkit-text-fill-color: $input-disabled-color;
+    -webkit-text-fill-color: $color-text-disabled;
   }
 }
+
+.nut-input-clear {
+  // flex: 0;
+}

package/dist/cjs/packages/input/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-input {
   position: relative;
   display: flex;
@@ -5,22 +9,28 @@
   flex-wrap: nowrap;
   flex: 1;
   align-items: center;
-  padding: var(--nutui-input-padding, 10px 25px);
-  line-height: 24px;
   font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
   box-sizing: border-box;
-  border-radius: var(--nutui-input-border-radius, 0);
-  background-color: var(--nutui-input-background-color, var(--nutui-color-background-overlay, #ffffff));
-  border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-input .nut-icon {
-  color: #c8c9cc;
+  color: var(--nutui-gray-4);
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
+.nut-input-container {
+  height: 38px;
+  padding: var(--nutui-input-padding, 12px);
+  background-color: var(--nutui-input-background-color, var(--nutui-gray-1));
+  border-radius: var(--nutui-input-border-radius, var(--nutui-radius-s, 6px));
+  border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-black-3));
 }
 
 .nut-input-native {
   flex: 1;
-  color: var(--nutui-input-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-gray-7);
   font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
+  line-height: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
   padding: 0;
   border: 0;
   outline: 0 none;
@@ -30,17 +40,21 @@
 
 /* #ifndef rn */
 .nut-input-native::placeholder {
-  color: #757575;
+  color: var(--nutui-gray-5);
 }
 
 /* #endif */
+.nut-input-readonly .nut-input-native {
+  color: var(--nutui-gray-5);
+}
+
 .nut-input-disabled {
-  color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
+  color: var(--nutui-gray-4) !important;
 }
 .nut-input-disabled input:disabled {
-  color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-gray-4);
   cursor: not-allowed;
   background: none;
   opacity: 1;
-  -webkit-text-fill-color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  -webkit-text-fill-color: var(--nutui-gray-4);
 }

package/dist/cjs/packages/inputnumber/style/inputnumber.scss

@@ -1,8 +1,13 @@
 .nut-inputnumber {
-  display: flex;
+  display: inline-flex;
+  width: calc(
+    2 * #{$inputnumber-input-margin} + 2 * #{$inputnumber-button-width} + #{$inputnumber-input-width}
+  );
   flex-direction: row;
   align-items: center;
-
+  background-color: $color-background;
+  border-radius: $inputnumber-input-border-radius;
+  overflow: hidden;
   &-minus,
   &-add {
     display: flex;
@@ -11,21 +16,18 @@
     width: $inputnumber-button-width;
     height: $inputnumber-button-height;
     background-color: $inputnumber-button-background-color;
-    border-radius: $inputnumber-button-border-radius;
+    .nut-icon {
+      --nut-icon-width: 10px;
+      --nut-icon-height: 10px;
+    }
   }
 
   &-icon {
-    color: $inputnumber-icon-color;
-    /*  #ifdef rn harmony  */
-    font-size: 14px;
-    /*  #endif  */
-    /*  #ifndef  rn harmony  */
-    font-size: $inputnumber-icon-size;
-    /*  #endif */
+    color: $color-text;
     cursor: pointer;
 
     &-disabled {
-      color: $inputnumber-disabled-color;
+      color: $color-text-disabled;
       cursor: not-allowed;
     }
   }
@@ -35,16 +37,17 @@
     justify-content: center;
     align-items: center;
     width: $inputnumber-input-width;
+    font-size: $inputnumber-input-font-size;
     height: $inputnumber-input-height;
     text-align: center;
     outline: none;
     border: $inputnumber-input-border;
-    border-radius: $inputnumber-input-border-radius;
-    margin: $inputnumber-input-margin;
-    color: $inputnumber-input-font-color;
+    margin-left: $inputnumber-input-margin;
+    margin-right: $inputnumber-input-margin;
+    color: $color-text;
     background-color: $inputnumber-input-background-color;
     &-disabled {
-      color: $inputnumber-disabled-color;
+      color: $color-text-disabled;
     }
     &::-webkit-outer-spin-button,
     &::-webkit-inner-spin-button {
@@ -53,7 +56,7 @@
   }
 
   &-input-disabled {
-    color: $inputnumber-disabled-color;
+    color: $color-text-disabled;
   }
 
   &-icon-minus {