@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

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-black-3, 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/infiniteloading.d.ts

@@ -1,7 +1,8 @@
 import React, { FunctionComponent, ReactNode } from 'react';
+import { ScrollViewProps } from '@tarojs/components';
 import { BasicComponent } from "../../utils/typings";
 import { InfiniteLoadingType } from './types';
-export interface InfiniteLoadingProps extends BasicComponent {
+export interface InfiniteLoadingProps extends BasicComponent, Omit<ScrollViewProps, 'style' | 'type' | 'onScroll'> {
     type: InfiniteLoadingType;
     hasMore: boolean;
     threshold: number;

package/dist/cjs/packages/infiniteloading/infiniteloading.js

@@ -13,6 +13,7 @@ var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcar
 var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
@@ -21,6 +22,7 @@ var _components = require("@tarojs/components");
 var _taro = require("@tarojs/taro");
 var _configprovider = require("../configprovider/configprovider");
 var _typings = require("../../utils/typings");
+var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'default',
     hasMore: true,
@@ -30,8 +32,31 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var classPrefix = "nut-infiniteloading";
 var InfiniteLoading = function InfiniteLoading(props) {
+    var getBottomTipsText = function getBottomTipsText() {
+        if (isInfiniting) {
+            return loadingText || locale.infiniteloading.loadText;
+        }
+        if (!hasMore) {
+            return loadMoreText || locale.infiniteloading.loadMoreText;
+        }
+        return null;
+    };
     var locale = (0, _configprovider.useConfig)().locale;
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, type = _$_object_spread.type, hasMore = _$_object_spread.hasMore, threshold = _$_object_spread.threshold, target = _$_object_spread.target, pullRefresh = _$_object_spread.pullRefresh, pullingText = _$_object_spread.pullingText, loadingText = _$_object_spread.loadingText, loadMoreText = _$_object_spread.loadMoreText, className = _$_object_spread.className, onRefresh = _$_object_spread.onRefresh, onLoadMore = _$_object_spread.onLoadMore, onScroll = _$_object_spread.onScroll;
+    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, type = _ref.type, hasMore = _ref.hasMore, threshold = _ref.threshold, target = _ref.target, pullRefresh = _ref.pullRefresh, pullingText = _ref.pullingText, loadingText = _ref.loadingText, loadMoreText = _ref.loadMoreText, className = _ref.className, onRefresh = _ref.onRefresh, onLoadMore = _ref.onLoadMore, onScroll = _ref.onScroll, rest = (0, _object_without_properties._)(_ref, [
+        "children",
+        "type",
+        "hasMore",
+        "threshold",
+        "target",
+        "pullRefresh",
+        "pullingText",
+        "loadingText",
+        "loadMoreText",
+        "className",
+        "onRefresh",
+        "onLoadMore",
+        "onScroll"
+    ]);
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isInfiniting = _useState[0], setIsInfiniting = _useState[1];
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(0), 2), topDisScoll = _useState1[0], setTopDisScoll = _useState1[1];
     var refreshTop = (0, _react.useRef)(null);
@@ -44,12 +69,16 @@ var InfiniteLoading = function InfiniteLoading(props) {
     var classes = (0, _classnames.default)(classPrefix, className, "".concat(classPrefix, "-").concat(type));
     (0, _react.useEffect)(function() {
         refreshMaxH.current = threshold;
-        setTimeout(function() {
+        var timer = setTimeout(function() {
             getScrollHeight();
         }, 200);
+        return function() {
+            return clearTimeout(timer);
+        };
     }, [
         hasMore,
-        isInfiniting
+        isInfiniting,
+        threshold
     ]);
     /** 获取需要滚动的距离 */ var getScrollHeight = function getScrollHeight() {
         var parentElement = getParentElement('scroller');
@@ -60,7 +89,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
     };
     var getStyle = function getStyle() {
         return {
-            height: topDisScoll < 0 ? "0px" : "".concat(topDisScoll, "px"),
+            height: topDisScoll < 0 ? (0, _pxtransform.default)(0) : (0, _pxtransform.default)(topDisScoll),
             transition: "height 0.2s cubic-bezier(0.25,0.1,0.25,1)"
         };
     };
@@ -84,7 +113,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
         }
         onScroll && onScroll(e.target.scrollTop);
     };
-    var lower = function() {
+    var lower = /*#__PURE__*/ function() {
         var _ref = (0, _async_to_generator._)(function() {
             return (0, _ts_generator._)(this, function(_state) {
                 switch(_state.label){
@@ -134,7 +163,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
             isTouching.current = false;
         }
     };
-    var touchEnd = function() {
+    var touchEnd = /*#__PURE__*/ function() {
         var _ref = (0, _async_to_generator._)(function() {
             return (0, _ts_generator._)(this, function(_state) {
                 switch(_state.label){
@@ -170,7 +199,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
             return _ref.apply(this, arguments);
         };
     }();
-    return /*#__PURE__*/ _react.default.createElement(_components.ScrollView, {
+    return /*#__PURE__*/ _react.default.createElement(_components.ScrollView, (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
         className: classes,
         scrollY: true,
         id: "scroller",
@@ -183,20 +212,18 @@ var InfiniteLoading = function InfiniteLoading(props) {
         onTouchStart: touchStart,
         onTouchMove: touchMove,
         onTouchEnd: touchEnd
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-top",
         ref: refreshTop,
         style: getStyle()
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-top-tips"
-    }, pullingText || locale.infiniteloading.pullRefreshText)), /*#__PURE__*/ _react.default.createElement("div", {
+    }, pullingText || locale.infiniteloading.pullRefreshText)), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-container"
-    }, children), /*#__PURE__*/ _react.default.createElement("div", {
+    }, children), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-bottom"
-    }, isInfiniting ? /*#__PURE__*/ _react.default.createElement("div", {
-        className: "nut-infinite-bottom-tips"
-    }, loadingText || locale.infiniteloading.loadText) : !hasMore && /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-bottom-tips"
-    }, loadMoreText || locale.infiniteloading.loadMoreText)));
+    }, getBottomTipsText())));
 };
 InfiniteLoading.displayName = 'NutInfiniteLoading';

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

@@ -8,7 +8,7 @@
     justify-content: center;
     width: 100%;
     overflow: hidden;
-    font-size: $font-size-small;
+    font-size: $font-size-s;
     color: $infiniteloading-color;
 
     &-tips {
@@ -33,7 +33,6 @@
     justify-content: center;
     width: 100%;
     padding-top: 6px;
-    font-size: $font-size-small;
     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%;
@@ -8,8 +12,8 @@
   justify-content: center;
   width: 100%;
   overflow: hidden;
-  font-size: var(--nutui-font-size-2, 12px);
-  color: var(--nutui-infiniteloading-color, var(--nutui-gray-5, #888b94));
+  font-size: var(--nutui-font-size-s, 12px);
+  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-2, 12px);
-  color: var(--nutui-infiniteloading-color, var(--nutui-gray-5, #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

@@ -21,7 +21,6 @@ var _utils = require("./utils");
 var _index = require("../configprovider/index");
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../utils/use-props-value");
-var _platformtaro = require("../../utils/platform-taro");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'text',
     name: '',
@@ -35,12 +34,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, _index.useRtl)();
     var locale = (0, _index.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, onBlur = _ref.onBlur, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, 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, plain = _ref.plain, onChange = _ref.onChange, onFocus = _ref.onFocus, onBlur = _ref.onBlur, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, rest = (0, _object_without_properties._)(_ref, [
         "type",
         "name",
         "placeholder",
@@ -54,6 +54,7 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         "autoFocus",
         "style",
         "className",
+        "plain",
         "onChange",
         "onFocus",
         "onBlur",
@@ -94,7 +95,9 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         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
@@ -106,13 +109,11 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
     var updateValue = function updateValue(value) {
         var trigger = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 'onChange';
         var val = value;
-        if ((0, _taro.getEnv)() === _taro.ENV_TYPE.WEB) {
-            if (type === 'number') {
-                val = (0, _utils.formatNumber)(val, false, true);
-            }
-            if (type === 'digit') {
-                val = (0, _utils.formatNumber)(val, true, true);
-            }
+        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);
@@ -182,8 +183,7 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         onBlur: handleBlur,
         onFocus: handleFocus,
         onInput: function onInput(e) {
-            console.log('eeeeee', e.detail.value);
-            handleInput((e.currentTarget || e.detail).value);
+            handleInput((e.detail || e.currentTarget).value);
         }
     })), /*#__PURE__*/ _react.default.createElement(_components.View, {
         style: {
@@ -198,8 +198,8 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
                 onClear === null || onClear === void 0 ? void 0 : onClear('');
             }
         }
-    }, clearIcon || (!(0, _platformtaro.harmonyAndRn)() ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.MaskClose, {
+    }, clearIcon || /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.MaskClose, {
         className: "nut-input-clear"
-    }) : null)));
+    })));
 });
 Input.displayName = 'NutInput';

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-3, 14px));
+  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-gray-1, #ffffff));
-  border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-black-3, 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-gray-7, #1a1a1a));
-  font-size: var(--nutui-input-font-size, var(--nutui-font-size-3, 14px));
+  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/inputnumber.d.ts

@@ -13,10 +13,11 @@ export interface InputNumberProps extends BasicComponent {
     step: number;
     digits: number;
     async: boolean;
+    select: boolean;
     formatter?: (value?: string | number) => string;
     onPlus: (e: ITouchEvent) => void;
     onMinus: (e: ITouchEvent) => void;
-    onOverlimit: (e: ITouchEvent) => void;
+    onOverlimit: (e: ITouchEvent | ChangeEvent<HTMLInputElement>) => void;
     onBlur: (e: React.FocusEvent<HTMLInputElement>) => void;
     onFocus: (e: React.FocusEvent<HTMLInputElement>) => void;
     onChange: (param: string | number, e: ITouchEvent | ChangeEvent<HTMLInputElement>) => void;