@nutui/nutui-react 3.0.20 → 4.0.0-beta.1

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

@@ -22,7 +22,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        margin-bottom: 4px;
+        margin-bottom: scale-px(4px);
       }
     }
   }
@@ -32,7 +32,7 @@
     align-items: center;
     justify-content: center;
     width: 100%;
-    padding-top: 6px;
+    padding-top: scale-px(6px);
     color: $infiniteloading-color;
     text-align: center;
 
@@ -43,7 +43,7 @@
       font-size: $font-size-xxs;
 
       &-icons {
-        margin-right: 8px;
+        margin-right: scale-px(8px);
       }
     }
   }
@@ -62,7 +62,7 @@
     &-tips {
       &-icons {
         margin-right: 0;
-        margin-left: 8px;
+        margin-left: scale-px(8px);
       }
     }
   }

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

@@ -26,14 +26,14 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-bottom: 4px;
+  margin-bottom: scale-px(4px);
 }
 .nut-infiniteloading .nut-infinite-bottom {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 100%;
-  padding-top: 6px;
+  padding-top: scale-px(6px);
   color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help));
   text-align: center;
 }
@@ -44,7 +44,7 @@
   font-size: var(--nutui-font-text-mini);
 }
 .nut-infiniteloading .nut-infinite-bottom-tips-icons {
-  margin-right: 8px;
+  margin-right: scale-px(8px);
 }
 .nut-infiniteloading-primary {
   background-color: var(--nutui-color-primary);
@@ -57,5 +57,5 @@
 [dir=rtl] .nut-infiniteloading .nut-infinite-bottom-tips-icons,
 .nut-rtl .nut-infiniteloading .nut-infinite-bottom-tips-icons {
   margin-right: 0;
-  margin-left: 8px;
+  margin-left: scale-px(8px);
 }

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

@@ -22,7 +22,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        margin-bottom: 4px;
+        margin-bottom: scale-px(4px);
       }
     }
   }
@@ -32,7 +32,7 @@
     align-items: center;
     justify-content: center;
     width: 100%;
-    padding-top: 6px;
+    padding-top: scale-px(6px);
     color: $infiniteloading-color;
     text-align: center;
 
@@ -43,7 +43,7 @@
       font-size: $font-size-xxs;
 
       &-icons {
-        margin-right: 8px;
+        margin-right: scale-px(8px);
       }
     }
   }
@@ -62,7 +62,7 @@
     &-tips {
       &-icons {
         margin-right: 0;
-        margin-left: 8px;
+        margin-left: scale-px(8px);
       }
     }
   }

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

@@ -26,14 +26,14 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-bottom: 4px;
+  margin-bottom: scale-px(4px);
 }
 .nut-infiniteloading .nut-infinite-bottom {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 100%;
-  padding-top: 6px;
+  padding-top: scale-px(6px);
   color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help));
   text-align: center;
 }
@@ -44,7 +44,7 @@
   font-size: var(--nutui-font-text-mini);
 }
 .nut-infiniteloading .nut-infinite-bottom-tips-icons {
-  margin-right: 8px;
+  margin-right: scale-px(8px);
 }
 .nut-infiniteloading-primary {
   background-color: var(--nutui-color-primary, #ff6666);
@@ -57,5 +57,5 @@
 [dir=rtl] .nut-infiniteloading .nut-infinite-bottom-tips-icons,
 .nut-rtl .nut-infiniteloading .nut-infinite-bottom-tips-icons {
   margin-right: 0;
-  margin-left: 8px;
+  margin-left: scale-px(8px);
 }

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

@@ -1,3 +1,3 @@
 import React from 'react';
 import { WebInputProps } from "../../types";
-export declare const Input: React.ForwardRefExoticComponent<Partial<WebInputProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onClick" | "onFocus" | "onBlur" | "onChange"> & React.RefAttributes<unknown>>;
+export declare const Input: React.ForwardRefExoticComponent<Partial<WebInputProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onClick" | "onChange" | "onBlur" | "onFocus"> & React.RefAttributes<unknown>>;

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

@@ -16,12 +16,12 @@
 
   .nut-icon {
     color: $color-text-disabled;
-    width: 14px;
-    height: 14px;
-    font-size: 14px;
+    width: scale-px(14px);
+    height: scale-px(14px);
+    font-size: $font-size-base;
   }
   &-container {
-    height: 38px;
+    height: scale-px(38px);
     padding: $input-padding;
     background-color: $input-background-color;
     border-radius: $input-border-radius;

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

@@ -1,3 +1,13 @@
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
@@ -9,31 +19,31 @@
   flex-wrap: nowrap;
   flex: 1;
   align-items: center;
-  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   box-sizing: border-box;
 }
 .nut-input .nut-input-native .weui-input::placeholder, .nut-input-placeholder {
   color: rgb(117, 117, 117);
-  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-input .nut-icon {
   color: var(--nutui-color-text-disabled, #c2c4cc);
-  width: 14px;
-  height: 14px;
-  font-size: 14px;
+  width: calc(14px * var(--nut-scale-f, 1));
+  height: calc(14px * var(--nut-scale-f, 1));
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-input-container {
-  height: 38px;
-  padding: var(--nutui-input-padding, 12px);
+  height: calc(38px * var(--nut-scale-f, 1));
+  padding: var(--nutui-input-padding, calc(12px * var(--nut-scale-f, 1)));
   background-color: var(--nutui-input-background-color, var(--nutui-color-background-overlay, #ffffff));
-  border-radius: var(--nutui-input-border-radius, var(--nutui-radius-s, 6px));
+  border-radius: var(--nutui-input-border-radius, var(--nutui-radius-s, calc(6px * var(--nut-scale-f, 1))));
   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-native {
   flex: 1;
   color: var(--nutui-input-color, var(--nutui-color-title, #1a1a1a));
-  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   padding: 0;
   border: 0;
   outline: 0 none;

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

@@ -16,12 +16,12 @@
 
   .nut-icon {
     color: $color-text-disabled;
-    width: 14px;
-    height: 14px;
-    font-size: 14px;
+    width: scale-px(14px);
+    height: scale-px(14px);
+    font-size: $font-size-base;
   }
   &-container {
-    height: 38px;
+    height: scale-px(38px);
     padding: $input-padding;
     background-color: $input-background-color;
     border-radius: $input-border-radius;

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

@@ -18,12 +18,12 @@
 }
 .nut-input .nut-icon {
   color: var(--nutui-color-text-disabled);
-  width: 14px;
-  height: 14px;
-  font-size: 14px;
+  width: scale-px(14px);
+  height: scale-px(14px);
+  font-size: var(--nutui-font-text);
 }
 .nut-input-container {
-  height: 38px;
+  height: scale-px(38px);
   padding: var(--nutui-input-padding, 8px 12px);
   background-color: var(--nutui-input-background-color, #ffffff);
   border-radius: var(--nutui-input-border-radius, var(--nutui-radius-xs));

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

@@ -16,12 +16,12 @@
 
   .nut-icon {
     color: $color-text-disabled;
-    width: 14px;
-    height: 14px;
-    font-size: 14px;
+    width: scale-px(14px);
+    height: scale-px(14px);
+    font-size: $font-size-base;
   }
   &-container {
-    height: 38px;
+    height: scale-px(38px);
     padding: $input-padding;
     background-color: $input-background-color;
     border-radius: $input-border-radius;

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

@@ -18,12 +18,12 @@
 }
 .nut-input .nut-icon {
   color: var(--nutui-color-text-disabled);
-  width: 14px;
-  height: 14px;
-  font-size: 14px;
+  width: scale-px(14px);
+  height: scale-px(14px);
+  font-size: var(--nutui-font-text);
 }
 .nut-input-container {
-  height: 38px;
+  height: scale-px(38px);
   padding: var(--nutui-input-padding, 8px 12px);
   background-color: var(--nutui-input-background-color, #ffffff);
   border-radius: var(--nutui-input-border-radius, var(--nutui-radius-xs));

package/dist/cjs/packages/inputnumber/inputnumber.js

@@ -236,7 +236,9 @@ var InputNumber = function InputNumber(props) {
         onClick: handleReduce
     }, /*#__PURE__*/ _react.default.createElement(_iconsreact.Minus, {
         className: (0, _classnames.default)("".concat(classPrefix, "-icon ").concat(classPrefix, "-icon-minus"), (0, _define_property._)({}, "".concat(classPrefix, "-icon-disabled"), Number(shadowValue) <= Number(min) || disabled))
-    })), /*#__PURE__*/ _react.default.createElement("input", {
+    })), /*#__PURE__*/ _react.default.createElement("div", {
+        className: "".concat(classPrefix, "-divider")
+    }), /*#__PURE__*/ _react.default.createElement("input", {
         className: (0, _classnames.default)("".concat(classPrefix, "-input"), (0, _define_property._)({}, "".concat(classPrefix, "-input-disabled"), disabled)),
         ref: inputRef,
         inputMode: "decimal",
@@ -246,6 +248,8 @@ var InputNumber = function InputNumber(props) {
         onInput: handleInputChange,
         onBlur: handleBlur,
         onFocus: handleFocus
+    }), /*#__PURE__*/ _react.default.createElement("div", {
+        className: "".concat(classPrefix, "-divider")
     }), /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-add"),
         onClick: handlePlus

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

@@ -6,12 +6,12 @@
   display: inline-flex;
   /* #endif */
   width: calc(
-    2 * #{$inputnumber-input-margin} + 2 * #{$inputnumber-button-width} +
+    2 * #{$inputnumber-divider-width} + 2 * #{$inputnumber-button-width} +
       #{$inputnumber-input-width}
   );
   flex-direction: row;
   align-items: center;
-  background-color: $color-background;
+  background-color: $inputnumber-input-background-color;
   border-radius: $inputnumber-input-border-radius;
   overflow: hidden;
   &-minus,
@@ -23,8 +23,8 @@
     height: $inputnumber-button-height;
     background-color: $inputnumber-button-background-color;
     .nut-icon {
-      --nut-icon-width: 10px;
-      --nut-icon-height: 10px;
+      width: scale-px(10px);
+      height: scale-px(10px);
     }
   }
 
@@ -38,20 +38,26 @@
     }
   }
 
+  &-divider {
+    width: $inputnumber-divider-width;
+    align-self: stretch;
+    background-color: $color-background-overlay;
+  }
+
   &-input {
     display: flex;
     justify-content: center;
     align-items: center;
     width: $inputnumber-input-width;
-    font-size: $inputnumber-input-font-size;
     height: $inputnumber-input-height;
+    font-size: $inputnumber-input-font-size;
+    font-family: $inputnumber-input-font-family;
     text-align: center;
     outline: none;
     border: $inputnumber-input-border;
-    margin-left: $inputnumber-input-margin;
-    margin-right: $inputnumber-input-margin;
     color: $color-text;
     background-color: $inputnumber-input-background-color;
+    padding: 0;
     &-disabled {
       color: $color-text-disabled;
     }
@@ -66,12 +72,12 @@
   }
 
   &-icon-minus {
-    --nut-icon-width: 16px;
-    --nut-icon-height: 16px;
+    width: scale-px(16px);
+    height: scale-px(16px);
   }
 
   &-icon-plus {
-    --nut-icon-width: 16px;
-    --nut-icon-height: 16px;
+    width: scale-px(16px);
+    height: scale-px(16px);
   }
 }

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

@@ -1,3 +1,13 @@
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
@@ -9,24 +19,24 @@
   /* #ifndef dynamic*/
   display: inline-flex;
   /* #endif */
-  width: calc(2 * var(--nutui-inputnumber-input-margin, 0px) + 2 * var(--nutui-inputnumber-button-width, 20px) + var(--nutui-inputnumber-input-width, 26px));
+  width: calc(2 * var(--nutui-inputnumber-divider-width, 1px) + 2 * var(--nutui-inputnumber-button-width, calc(28px * var(--nut-scale-f, 1))) + var(--nutui-inputnumber-input-width, calc(32px * var(--nut-scale-f, 1))));
   flex-direction: row;
   align-items: center;
-  background-color: var(--nutui-color-background, #f2f3f5);
-  border-radius: var(--nutui-inputnumber-input-border-radius, 4px);
+  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background-component));
+  border-radius: var(--nutui-inputnumber-input-border-radius, var(--nutui-radius-base, calc(8px * var(--nut-scale-f, 1))));
   overflow: hidden;
 }
 .nut-inputnumber-minus, .nut-inputnumber-add {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: var(--nutui-inputnumber-button-width, 20px);
-  height: var(--nutui-inputnumber-button-height, 20px);
-  background-color: var(--nutui-inputnumber-button-background-color, transparent);
+  width: var(--nutui-inputnumber-button-width, calc(28px * var(--nut-scale-f, 1)));
+  height: var(--nutui-inputnumber-button-height, calc(28px * var(--nut-scale-f, 1)));
+  background-color: var(--nutui-inputnumber-button-background-color, var(--nutui-color-background-component));
 }
 .nut-inputnumber-minus .nut-icon, .nut-inputnumber-add .nut-icon {
-  --nut-icon-width: 10px;
-  --nut-icon-height: 10px;
+  width: calc(10px * var(--nut-scale-f, 1));
+  height: calc(10px * var(--nut-scale-f, 1));
 }
 .nut-inputnumber-icon {
   color: var(--nutui-color-text, #505259);
@@ -36,20 +46,25 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
   cursor: not-allowed;
 }
+.nut-inputnumber-divider {
+  width: var(--nutui-inputnumber-divider-width, 1px);
+  align-self: stretch;
+  background-color: var(--nutui-color-background-overlay, #ffffff);
+}
 .nut-inputnumber-input {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: var(--nutui-inputnumber-input-width, 26px);
-  font-size: var(--nutui-inputnumber-input-font-size, var(--nutui-font-size-s, 12px));
-  height: var(--nutui-inputnumber-input-height, 20px);
+  width: var(--nutui-inputnumber-input-width, calc(32px * var(--nut-scale-f, 1)));
+  height: var(--nutui-inputnumber-input-height, calc(28px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-inputnumber-input-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  font-family: var(--nutui-inputnumber-input-font-family, JDZH);
   text-align: center;
   outline: none;
   border: var(--nutui-inputnumber-input-border, 0);
-  margin-left: var(--nutui-inputnumber-input-margin, 0px);
-  margin-right: var(--nutui-inputnumber-input-margin, 0px);
   color: var(--nutui-color-text, #505259);
-  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background, #f2f3f5));
+  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background-component));
+  padding: 0;
 }
 .nut-inputnumber-input-disabled {
   color: var(--nutui-color-text-disabled, #c2c4cc);
@@ -61,10 +76,10 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-inputnumber-icon-minus {
-  --nut-icon-width: 16px;
-  --nut-icon-height: 16px;
+  width: calc(16px * var(--nut-scale-f, 1));
+  height: calc(16px * var(--nut-scale-f, 1));
 }
 .nut-inputnumber-icon-plus {
-  --nut-icon-width: 16px;
-  --nut-icon-height: 16px;
+  width: calc(16px * var(--nut-scale-f, 1));
+  height: calc(16px * var(--nut-scale-f, 1));
 }

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

@@ -6,12 +6,12 @@
   display: inline-flex;
   /* #endif */
   width: calc(
-    2 * #{$inputnumber-input-margin} + 2 * #{$inputnumber-button-width} +
+    2 * #{$inputnumber-divider-width} + 2 * #{$inputnumber-button-width} +
       #{$inputnumber-input-width}
   );
   flex-direction: row;
   align-items: center;
-  background-color: $color-background;
+  background-color: $inputnumber-input-background-color;
   border-radius: $inputnumber-input-border-radius;
   overflow: hidden;
   &-minus,
@@ -23,8 +23,8 @@
     height: $inputnumber-button-height;
     background-color: $inputnumber-button-background-color;
     .nut-icon {
-      --nut-icon-width: 10px;
-      --nut-icon-height: 10px;
+      width: scale-px(10px);
+      height: scale-px(10px);
     }
   }
 
@@ -38,20 +38,26 @@
     }
   }
 
+  &-divider {
+    width: $inputnumber-divider-width;
+    align-self: stretch;
+    background-color: $color-background-overlay;
+  }
+
   &-input {
     display: flex;
     justify-content: center;
     align-items: center;
     width: $inputnumber-input-width;
-    font-size: $inputnumber-input-font-size;
     height: $inputnumber-input-height;
+    font-size: $inputnumber-input-font-size;
+    font-family: $inputnumber-input-font-family;
     text-align: center;
     outline: none;
     border: $inputnumber-input-border;
-    margin-left: $inputnumber-input-margin;
-    margin-right: $inputnumber-input-margin;
     color: $color-text;
     background-color: $inputnumber-input-background-color;
+    padding: 0;
     &-disabled {
       color: $color-text-disabled;
     }
@@ -66,12 +72,12 @@
   }
 
   &-icon-minus {
-    --nut-icon-width: 16px;
-    --nut-icon-height: 16px;
+    width: scale-px(16px);
+    height: scale-px(16px);
   }
 
   &-icon-plus {
-    --nut-icon-width: 16px;
-    --nut-icon-height: 16px;
+    width: scale-px(16px);
+    height: scale-px(16px);
   }
 }

package/dist/cjs/packages/inputnumber/style-jmapp/style.css

@@ -9,10 +9,10 @@
   /* #ifndef dynamic*/
   display: inline-flex;
   /* #endif */
-  width: calc(2 * var(--nutui-inputnumber-input-margin, 0 6px) + 2 * var(--nutui-inputnumber-button-width, 16px) + var(--nutui-inputnumber-input-width, 40px));
+  width: calc(2 * var(--nutui-inputnumber-divider-width, 1px) + 2 * var(--nutui-inputnumber-button-width, 16px) + var(--nutui-inputnumber-input-width, 40px));
   flex-direction: row;
   align-items: center;
-  background-color: var(--nutui-color-surface-1);
+  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-surface-2));
   border-radius: var(--nutui-inputnumber-input-border-radius, 6px);
   overflow: hidden;
 }
@@ -25,8 +25,8 @@
   background-color: var(--nutui-inputnumber-button-background-color, var(--nutui-color-surface-1));
 }
 .nut-inputnumber-minus .nut-icon, .nut-inputnumber-add .nut-icon {
-  --nut-icon-width: 10px;
-  --nut-icon-height: 10px;
+  width: scale-px(10px);
+  height: scale-px(10px);
 }
 .nut-inputnumber-icon {
   color: var(--nutui-color-text);
@@ -36,20 +36,25 @@
   color: var(--nutui-color-text-disabled);
   cursor: not-allowed;
 }
+.nut-inputnumber-divider {
+  width: var(--nutui-inputnumber-divider-width, 1px);
+  align-self: stretch;
+  background-color: var(--nutui-color-surface-2);
+}
 .nut-inputnumber-input {
   display: flex;
   justify-content: center;
   align-items: center;
   width: var(--nutui-inputnumber-input-width, 40px);
-  font-size: var(--nutui-inputnumber-input-font-size, 14px);
   height: var(--nutui-inputnumber-input-height, 24px);
+  font-size: var(--nutui-inputnumber-input-font-size, 14px);
+  font-family: var(--nutui-inputnumber-input-font-family, JDZH);
   text-align: center;
   outline: none;
   border: var(--nutui-inputnumber-input-border, 0);
-  margin-left: var(--nutui-inputnumber-input-margin, 0 6px);
-  margin-right: var(--nutui-inputnumber-input-margin, 0 6px);
   color: var(--nutui-color-text);
   background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-surface-2));
+  padding: 0;
 }
 .nut-inputnumber-input-disabled {
   color: var(--nutui-color-text-disabled);
@@ -61,10 +66,10 @@
   color: var(--nutui-color-text-disabled);
 }
 .nut-inputnumber-icon-minus {
-  --nut-icon-width: 16px;
-  --nut-icon-height: 16px;
+  width: scale-px(16px);
+  height: scale-px(16px);
 }
 .nut-inputnumber-icon-plus {
-  --nut-icon-width: 16px;
-  --nut-icon-height: 16px;
+  width: scale-px(16px);
+  height: scale-px(16px);
 }