@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

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

@@ -1,56 +1,172 @@
 .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;
-    margin: 0 $indicator-dot-margin;
+    background-color: $color-border-disabled;
+    margin-left: $indicator-dot-margin;
+    opacity: 0.4;
 
-    &:first-child {
+    &-0 {
       margin-left: 0px;
     }
 
-    &: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;
+      }
+    }
+  }
+
+  &-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;
+        }
+      }
+
+      &.nut-indicator-fixed-width {
+        &.nut-indicator-white {
+          .nut-indicator-dot {
+            &-active {
+              height: 6px;
+            }
+          }
+        }
+      }
     }
   }
 
-  &-active {
+  &-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);
+      opacity: 1;
+    }
+
+    &-line {
+      opacity: 0;
+
+      &-active {
+        opacity: 1;
+        background: rgba(255, 255, 255, 1);
+      }
+    }
 
     &-dot {
-      margin: $indicator-dot-margin 0;
+      &-active {
+        background: rgba(255, 255, 255, 1);
+      }
+    }
+  }
+}
 
-      &:first-child {
+.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: 0px;
+      margin-top: $indicator-dot-margin;
+
+      &-0 {
         margin-top: 0px;
       }
 
-      &: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;
+      }
     }
   }
 }
@@ -58,12 +174,7 @@
 [dir='rtl'] .nut-indicator,
 .nut-rtl .nut-indicator {
   &-dot {
-    &:first-child {
-      margin-left: $indicator-dot-margin;
-      margin-right: 0px;
-    }
-
-    &:last-child {
+    &-0 {
       margin-right: $indicator-dot-margin;
       margin-left: 0px;
     }

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

@@ -4,59 +4,128 @@
 /* #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-color-border-disabled, #c2c4cc);
+  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
+  opacity: 0.4;
 }
-.nut-indicator-dot:first-child {
+.nut-indicator-dot-0, .nut-indicator-line-0 {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child {
-  margin-right: 0px;
+.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-color-primary, #ff0f23));
+  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-vertical.nut-indicator-fixed-width.nut-indicator-fixed-width.nut-indicator-white .nut-indicator-dot-active {
+  height: 6px;
 }
-.nut-indicator-active {
-  width: var(--nutui-indicator-dot-active-size, 8px);
-  border-radius: var(--nutui-indicator-border-radius, 2px);
+.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-color-primary, #ff0f23));
 }
+
+.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-color-border-disabled, #c2c4cc);
+  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);
+  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: 0px;
+  margin-top: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
 }
-.nut-indicator-vertical-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot-0 {
   margin-top: 0px;
 }
-.nut-indicator-vertical-dot:last-child {
-  margin-bottom: 0px;
+.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-active {
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-active-size, 8px);
+.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-right: 0px;
-}
-[dir=rtl] .nut-indicator-dot:last-child,
-.nut-rtl .nut-indicator-dot:last-child {
-  margin-right: var(--nutui-indicator-dot-margin, 2px);
+[dir=rtl] .nut-indicator-dot-0,
+.nut-rtl .nut-indicator-dot-0 {
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
   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

@@ -34,7 +34,6 @@
   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));
   text-align: center;
 }
@@ -42,6 +41,7 @@
   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;
@@ -51,7 +51,7 @@
 }
 .nut-infiniteloading-primary .nut-infinite-bottom,
 .nut-infiniteloading-primary .nut-infinite-top {
-  color: var(--nutui-white-12);
+  color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
 }
 
 [dir=rtl] .nut-infiniteloading .nut-infinite-bottom-tips-icons,

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

@@ -19,11 +19,12 @@ export interface InputProps extends BasicComponent {
     formatTrigger: InputFormatTrigger;
     autoFocus: boolean;
     confirmType: InputConfirmType;
-    formatter?: (value: string) => void;
+    plain: boolean;
+    formatter?: (value: string) => string;
     onChange?: (value: string) => void;
     onBlur?: (value: string) => void;
     onFocus?: (value: string) => void;
     onClear?: (value: string) => void;
-    onClick?: (value: MouseEvent<HTMLDivElement>) => void;
+    onClick?: (event: MouseEvent<HTMLDivElement>) => void;
 }
 export declare const Input: React.ForwardRefExoticComponent<Partial<InputProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onClick" | "onFocus" | "onBlur" | "onChange"> & React.RefAttributes<unknown>>;

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

@@ -18,7 +18,7 @@ var _iconsreact = require("@nutui/icons-react");
 var _utils = require("./utils");
 var _configprovider = require("../configprovider");
 var _typings = require("../../utils/typings");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'text',
     name: '',
@@ -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",
@@ -74,87 +76,82 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
     (0, _react.useImperativeHandle)(ref, function() {
         return {
             clear: function clear() {
-                setValue('');
+                return setValue('');
             },
             focus: function focus() {
                 var _inputRef_current;
-                (_inputRef_current = inputRef.current) === null || _inputRef_current === void 0 ? void 0 : _inputRef_current.focus();
+                return (_inputRef_current = inputRef.current) === null || _inputRef_current === void 0 ? void 0 : _inputRef_current.focus();
             },
             blur: function blur() {
                 var _inputRef_current;
-                (_inputRef_current = inputRef.current) === null || _inputRef_current === void 0 ? void 0 : _inputRef_current.blur();
+                return (_inputRef_current = inputRef.current) === null || _inputRef_current === void 0 ? void 0 : _inputRef_current.blur();
             },
             get nativeElement () {
                 return inputRef.current;
             }
         };
     });
-    var inputClass = (0, _react.useCallback)(function() {
+    var getInputClass = (0, _react.useCallback)(function() {
         var classPrefix = 'nut-input';
         return [
             classPrefix,
-            "".concat(disabled ? "".concat(classPrefix, "-disabled") : '')
+            "".concat(disabled ? "".concat(classPrefix, "-disabled") : ''),
+            readOnly ? "".concat(classPrefix, "-readonly") : '',
+            "".concat(plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container"))
         ].filter(Boolean).join(' ');
     }, [
-        disabled
+        disabled,
+        readOnly,
+        plain
     ]);
-    var updateValue = function updateValue(value) {
-        var trigger = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 'onChange';
-        var val = value;
-        if (type === 'number') {
-            val = (0, _utils.formatNumber)(val, false, true);
-        }
-        if (type === 'digit') {
-            val = (0, _utils.formatNumber)(val, true, true);
-        }
-        if (formatter && trigger === formatTrigger) {
-            val = formatter(val);
-        }
-        setValue(val);
-        var eventHandler = props[trigger];
-        if (eventHandler && typeof eventHandler === 'function' && trigger !== 'onChange') {
-            eventHandler(val);
+    var handleValueUpdate = function handleValueUpdate(inputValue, trigger) {
+        var updatedValue = inputValue;
+        if (type === 'number') updatedValue = (0, _utils.formatNumber)(updatedValue, false, true);
+        if (type === 'digit') updatedValue = (0, _utils.formatNumber)(updatedValue, true, true);
+        if (formatter && trigger === formatTrigger) updatedValue = formatter(updatedValue);
+        setValue(updatedValue);
+        if (trigger !== 'onChange') {
+            var eventHandler = props[trigger];
+            eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler(updatedValue);
         }
     };
     var handleFocus = function handleFocus(event) {
-        var val = event.target.value;
-        onFocus && onFocus(val);
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event.target.value);
         setActive(true);
     };
-    var handleInput = function handleInput(value) {
-        updateValue(value, 'onChange');
-    };
     var handleBlur = function handleBlur(event) {
-        var val = event.target.value;
-        updateValue(val, 'onBlur');
+        handleValueUpdate(event.target.value, 'onBlur');
         setTimeout(function() {
-            setActive(false);
+            return setActive(false);
         }, 200);
     };
-    var inputType = function inputType(type) {
-        if (type === 'digit') {
-            return 'text';
-        }
-        if (type === 'number') {
-            return 'tel';
+    var handleInputChange = function handleInputChange(event) {
+        handleValueUpdate(event.target.value, 'onChange');
+    };
+    var getInputType = function getInputType(inputType) {
+        if (inputType === 'digit') return 'text';
+        if (inputType === 'number') return 'tel';
+        return inputType;
+    };
+    var getTextAlign = function getTextAlign() {
+        if (rtl) {
+            if (align === 'right') return 'left';
+            if (align === 'left') return 'right';
         }
-        return type;
+        return align;
     };
     return /*#__PURE__*/ _react.default.createElement("div", {
-        className: "".concat(inputClass(), "  ").concat(className || ''),
+        className: "".concat(getInputClass(), " ").concat(className || ''),
         style: style,
-        onClick: function onClick1(e) {
-            onClick && onClick(e);
-        }
+        onClick: onClick
     }, /*#__PURE__*/ _react.default.createElement("input", (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
+        ref: inputRef,
         name: name,
         className: "nut-input-native",
-        ref: inputRef,
         style: {
-            // eslint-disable-next-line no-nested-ternary
-            textAlign: rtl ? align === 'right' ? 'left' : align === 'left' ? 'right' : 'center' : align
+            textAlign: getTextAlign()
         },
-        type: inputType(type),
+        type: getInputType(type),
         maxLength: maxLength,
         placeholder: placeholder === undefined ? locale.placeholder : placeholder,
         disabled: disabled,
@@ -162,15 +159,9 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         value: value,
         autoFocus: autoFocus,
         enterKeyHint: confirmType,
-        onBlur: function onBlur(e) {
-            handleBlur(e);
-        },
-        onFocus: function onFocus(e) {
-            handleFocus(e);
-        },
-        onChange: function onChange(e) {
-            handleInput(e.currentTarget.value);
-        },
+        onFocus: handleFocus,
+        onBlur: handleBlur,
+        onChange: handleInputChange,
         onCompositionStart: function onCompositionStart1(e) {
             composingRef.current = true;
             onCompositionStart === null || onCompositionStart === void 0 ? void 0 : onCompositionStart(e);
@@ -179,7 +170,7 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
             composingRef.current = false;
             onCompositionEnd === null || onCompositionEnd === void 0 ? void 0 : onCompositionEnd(e);
         }
-    })), clearable && !readOnly && active && value.length > 0 ? /*#__PURE__*/ _react.default.createElement("span", {
+    })), clearable && !readOnly && active && value.length > 0 && /*#__PURE__*/ _react.default.createElement("span", {
         style: {
             display: 'flex',
             alignItems: 'center',
@@ -188,11 +179,11 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         onClick: function onClick() {
             if (!disabled) {
                 setValue('');
-                onClear && onClear('');
+                onClear === null || onClear === void 0 ? void 0 : onClear('');
             }
         }
     }, clearIcon || /*#__PURE__*/ _react.default.createElement(_iconsreact.MaskClose, {
         className: "nut-input-clear"
-    })) : null);
+    })));
 });
 Input.displayName = 'NutInput';