@nutui/nutui-react 3.0.20-beta.0 → 3.1.0-beta.1

package/dist/es/packages/avatarcropper/style-jrkf/avatarcropper.scss

@@ -72,7 +72,7 @@
 
       &-item {
         color: #fff;
-        padding: 15px;
+        padding: scale-px(15px);
         cursor: pointer;
         display: flex;
         align-items: center;
@@ -98,7 +98,7 @@
         top: 50%;
         transform: translate(-50%, -50%);
         background-color: transparent;
-        box-shadow: 0 0 1000px 1000px rgba(0, 0, 0, 0.6);
+        box-shadow: 0 0 scale-px(1000px) scale-px(1000px) rgba(0, 0, 0, 0.6);
       }
     }
   }

package/dist/es/packages/avatarcropper/style-jrkf/style.css

@@ -69,7 +69,7 @@
 }
 .nut-avatar-cropper-popup-toolbar-item {
   color: #fff;
-  padding: 15px;
+  padding: scale-px(15px);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -92,7 +92,7 @@
   top: 50%;
   transform: translate(-50%, -50%);
   background-color: transparent;
-  box-shadow: 0 0 1000px 1000px rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 scale-px(1000px) scale-px(1000px) rgba(0, 0, 0, 0.6);
 }
 .nut-avatar-cropper.round .nut-avatar-cropper-edit-text {
   border-radius: 50%;

package/dist/es/packages/avatargroup/style/avatargroup.scss

@@ -4,11 +4,11 @@
   flex: 0 0 auto; // 防止被压缩
   &-avatar,
   .nut-avatar {
-    border: 1px solid #fff;
-    margin-left: -8px;
+    border: scale-px(1px) solid #fff;
+    margin-left: scale-px(-8px);
 
     &:not(:first-of-type) {
-      margin-left: -8px;
+      margin-left: scale-px(-8px);
     }
   }
 }
@@ -18,7 +18,7 @@
   .nut-avatar {
     &:not(:first-of-type) {
       margin-left: 0;
-      margin-right: -8px;
+      margin-right: scale-px(-8px);
     }
   }
 }

package/dist/es/packages/avatargroup/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,16 +19,16 @@
 }
 .nut-avatar-group-avatar,
 .nut-avatar-group .nut-avatar {
-  border: 1px solid #fff;
-  margin-left: -8px;
+  border: calc(1px * var(--nut-scale-f, 1)) solid #fff;
+  margin-left: calc(-8px * var(--nut-scale-f, 1));
 }
 .nut-avatar-group-avatar:not(:first-of-type),
 .nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: -8px;
+  margin-left: calc(-8px * var(--nut-scale-f, 1));
 }
 
 [dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
 .nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
   margin-left: 0;
-  margin-right: -8px;
+  margin-right: calc(-8px * var(--nut-scale-f, 1));
 }

package/dist/es/packages/avatargroup/style-jmapp/avatargroup.scss

@@ -4,11 +4,11 @@
   flex: 0 0 auto; // 防止被压缩
   &-avatar,
   .nut-avatar {
-    border: 1px solid #fff;
-    margin-left: -8px;
+    border: scale-px(1px) solid #fff;
+    margin-left: scale-px(-8px);
 
     &:not(:first-of-type) {
-      margin-left: -8px;
+      margin-left: scale-px(-8px);
     }
   }
 }
@@ -18,7 +18,7 @@
   .nut-avatar {
     &:not(:first-of-type) {
       margin-left: 0;
-      margin-right: -8px;
+      margin-right: scale-px(-8px);
     }
   }
 }

package/dist/es/packages/avatargroup/style-jmapp/style.css

@@ -9,16 +9,16 @@
 }
 .nut-avatar-group-avatar,
 .nut-avatar-group .nut-avatar {
-  border: 1px solid #fff;
-  margin-left: -8px;
+  border: scale-px(1px) solid #fff;
+  margin-left: scale-px(-8px);
 }
 .nut-avatar-group-avatar:not(:first-of-type),
 .nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: -8px;
+  margin-left: scale-px(-8px);
 }
 
 [dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
 .nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
   margin-left: 0;
-  margin-right: -8px;
+  margin-right: scale-px(-8px);
 }

package/dist/es/packages/avatargroup/style-jrkf/avatargroup.scss

@@ -4,11 +4,11 @@
   flex: 0 0 auto; // 防止被压缩
   &-avatar,
   .nut-avatar {
-    border: 1px solid #fff;
-    margin-left: -8px;
+    border: scale-px(1px) solid #fff;
+    margin-left: scale-px(-8px);
 
     &:not(:first-of-type) {
-      margin-left: -8px;
+      margin-left: scale-px(-8px);
     }
   }
 }
@@ -18,7 +18,7 @@
   .nut-avatar {
     &:not(:first-of-type) {
       margin-left: 0;
-      margin-right: -8px;
+      margin-right: scale-px(-8px);
     }
   }
 }

package/dist/es/packages/avatargroup/style-jrkf/style.css

@@ -9,16 +9,16 @@
 }
 .nut-avatar-group-avatar,
 .nut-avatar-group .nut-avatar {
-  border: 1px solid #fff;
-  margin-left: -8px;
+  border: scale-px(1px) solid #fff;
+  margin-left: scale-px(-8px);
 }
 .nut-avatar-group-avatar:not(:first-of-type),
 .nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: -8px;
+  margin-left: scale-px(-8px);
 }
 
 [dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
 .nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
   margin-left: 0;
-  margin-right: -8px;
+  margin-right: scale-px(-8px);
 }

package/dist/es/packages/backtop/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,8 +19,8 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  width: var(--nutui-hoverbutton-item-size, 40px);
-  height: var(--nutui-hoverbutton-item-size, 40px);
+  width: var(--nutui-hoverbutton-item-size, calc(40px * var(--nut-scale-f, 1)));
+  height: var(--nutui-hoverbutton-item-size, calc(40px * var(--nut-scale-f, 1)));
   transition: all 0.2s ease-in-out;
 }
 .nut-backtop-show .nut-hoverbutton-item-container {

package/dist/es/packages/badge/style/badge.scss

@@ -55,7 +55,7 @@
     box-sizing: border-box;
     color: $badge-color;
     font-size: $badge-font-size;
-    line-height: 12px;
+    line-height: scale-px(12px);
     white-space: nowrap;
     font-weight: normal;
     vertical-align: middle;

package/dist/es/packages/badge/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 */
@@ -19,17 +29,17 @@
   justify-content: center;
   align-items: center;
   background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
-  padding: var(--nutui-badge-icon-padding, 2px);
+  padding: var(--nutui-badge-icon-padding, calc(2px * var(--nut-scale-f, 1)));
   text-align: center;
   z-index: var(--nutui-badge-z-index, 1);
 }
 .nut-badge-icon .nut-icon {
-  width: var(--nutui-badge-icon-size, 10px);
-  height: var(--nutui-badge-icon-size, 10px);
-  font-size: var(--nutui-badge-icon-size, 10px);
+  width: var(--nutui-badge-icon-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  height: var(--nutui-badge-icon-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  font-size: var(--nutui-badge-icon-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-badge-sup, .nut-badge-icon {
-  border-radius: var(--nutui-badge-border-radius, var(--nutui-badge-height, 14px));
+  border-radius: var(--nutui-badge-border-radius, var(--nutui-badge-height, calc(14px * var(--nut-scale-f, 1))));
 }
 .nut-badge-sup::after, .nut-badge-icon::after {
   content: "";
@@ -39,8 +49,8 @@
   left: -50%;
   right: -50%;
   transform: scale(0.5);
-  border: var(--nutui-badge-border, 1px solid #ffffff);
-  border-radius: var(--nutui-badge-border-radius, var(--nutui-badge-height, 14px));
+  border: var(--nutui-badge-border, calc(1px * var(--nut-scale-f, 1)) solid #ffffff);
+  border-radius: var(--nutui-badge-border-radius, var(--nutui-badge-height, calc(14px * var(--nut-scale-f, 1))));
 }
 .nut-badge-sup {
   /* #ifdef dynamic*/
@@ -50,12 +60,12 @@
   display: inline-flex;
   /* #endif */
   text-align: center;
-  min-width: var(--nutui-badge-min-width, 6px);
-  padding: var(--nutui-badge-padding, 1px 4px);
+  min-width: var(--nutui-badge-min-width, calc(6px * var(--nut-scale-f, 1)));
+  padding: var(--nutui-badge-padding, calc(1px * var(--nut-scale-f, 1)) calc(4px * var(--nut-scale-f, 1)));
   box-sizing: border-box;
   color: var(--nutui-badge-color, #ffffff);
-  font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxxs, 9px));
-  line-height: 12px;
+  font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxxs, calc(9px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  line-height: calc(12px * var(--nut-scale-f, 1));
   white-space: nowrap;
   font-weight: normal;
   vertical-align: middle;
@@ -69,8 +79,8 @@
   font-family: "JDZH-Regular";
 }
 .nut-badge-one {
-  height: var(--nutui-badge-height, 14px);
-  width: var(--nutui-badge-height, 14px);
+  height: var(--nutui-badge-height, calc(14px * var(--nut-scale-f, 1)));
+  width: var(--nutui-badge-height, calc(14px * var(--nut-scale-f, 1)));
 }
 .nut-badge-content {
   position: absolute;
@@ -81,28 +91,28 @@
   border-radius: 50%;
 }
 .nut-badge-dot::after {
-  border: var(--nutui-badge-dot-border, 1px solid #ffffff);
+  border: var(--nutui-badge-dot-border, calc(1px * var(--nut-scale-f, 1)) solid #ffffff);
   border-radius: 50%;
 }
 .nut-badge-dot-normal {
-  min-width: var(--nutui-badge-dot-width, 6px);
-  width: var(--nutui-badge-dot-width, 6px);
-  height: var(--nutui-badge-dot-width, 6px);
+  min-width: var(--nutui-badge-dot-width, calc(6px * var(--nut-scale-f, 1)));
+  width: var(--nutui-badge-dot-width, calc(6px * var(--nut-scale-f, 1)));
+  height: var(--nutui-badge-dot-width, calc(6px * var(--nut-scale-f, 1)));
 }
 .nut-badge-dot-small {
-  min-width: var(--nutui-badge-dot-small-width, 4px);
-  width: var(--nutui-badge-dot-small-width, 4px);
-  height: var(--nutui-badge-dot-small-width, 4px);
+  min-width: var(--nutui-badge-dot-small-width, calc(4px * var(--nut-scale-f, 1)));
+  width: var(--nutui-badge-dot-small-width, calc(4px * var(--nut-scale-f, 1)));
+  height: var(--nutui-badge-dot-small-width, calc(4px * var(--nut-scale-f, 1)));
 }
 .nut-badge-dot-large {
-  min-width: var(--nutui-badge-dot-large-width, 8px);
-  width: var(--nutui-badge-dot-large-width, 8px);
-  height: var(--nutui-badge-dot-large-width, 8px);
+  min-width: var(--nutui-badge-dot-large-width, calc(8px * var(--nut-scale-f, 1)));
+  width: var(--nutui-badge-dot-large-width, calc(8px * var(--nut-scale-f, 1)));
+  height: var(--nutui-badge-dot-large-width, calc(8px * var(--nut-scale-f, 1)));
 }
 .nut-badge-outline {
   background: #ffffff;
   color: var(--nutui-badge-outline-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-badge-outline::after {
-  border: var(--nutui-badge-outline-border, 1px solid var(--nutui-color-primary, #ff0f23));
+  border: var(--nutui-badge-outline-border, calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-primary, #ff0f23));
 }

package/dist/es/packages/badge/style-jmapp/badge.scss

@@ -55,7 +55,7 @@
     box-sizing: border-box;
     color: $badge-color;
     font-size: $badge-font-size;
-    line-height: 12px;
+    line-height: scale-px(12px);
     white-space: nowrap;
     font-weight: normal;
     vertical-align: middle;

package/dist/es/packages/badge/style-jmapp/style.css

@@ -55,7 +55,7 @@
   box-sizing: border-box;
   color: var(--nutui-badge-color, #fff);
   font-size: var(--nutui-badge-font-size, var(--nutui-font-text-xs));
-  line-height: 12px;
+  line-height: scale-px(12px);
   white-space: nowrap;
   font-weight: normal;
   vertical-align: middle;

package/dist/es/packages/badge/style-jrkf/badge.scss

@@ -55,7 +55,7 @@
     box-sizing: border-box;
     color: $badge-color;
     font-size: $badge-font-size;
-    line-height: 12px;
+    line-height: scale-px(12px);
     white-space: nowrap;
     font-weight: normal;
     vertical-align: middle;

package/dist/es/packages/badge/style-jrkf/style.css

@@ -55,7 +55,7 @@
   box-sizing: border-box;
   color: var(--nutui-badge-color, #fff);
   font-size: var(--nutui-badge-font-size, var(--nutui-font-text-xs));
-  line-height: 12px;
+  line-height: scale-px(12px);
   white-space: nowrap;
   font-weight: normal;
   vertical-align: middle;

package/dist/es/packages/barrage/style/barrage.scss

@@ -13,8 +13,8 @@
     display: block;
     position: absolute;
     right: 0;
-    padding: 4px 16px;
-    border-radius: 16px;
+    padding: scale-px(4px) scale-px(16px);
+    border-radius: scale-px(16px);
     font-size: $font-size-s;
     text-align: center;
     white-space: pre;

package/dist/es/packages/barrage/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 */
@@ -17,9 +27,9 @@
   display: block;
   position: absolute;
   right: 0;
-  padding: 4px 16px;
-  border-radius: 16px;
-  font-size: var(--nutui-font-size-s, 12px);
+  padding: calc(4px * var(--nut-scale-f, 1)) calc(16px * var(--nut-scale-f, 1));
+  border-radius: calc(16px * var(--nut-scale-f, 1));
+  font-size: var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   text-align: center;
   white-space: pre;
   transform: translateX(100%);

package/dist/es/packages/barrage/style-jmapp/barrage.scss

@@ -13,8 +13,8 @@
     display: block;
     position: absolute;
     right: 0;
-    padding: 4px 16px;
-    border-radius: 16px;
+    padding: scale-px(4px) scale-px(16px);
+    border-radius: scale-px(16px);
     font-size: $font-size-s;
     text-align: center;
     white-space: pre;

package/dist/es/packages/barrage/style-jmapp/style.css

@@ -17,8 +17,8 @@
   display: block;
   position: absolute;
   right: 0;
-  padding: 4px 16px;
-  border-radius: 16px;
+  padding: scale-px(4px) scale-px(16px);
+  border-radius: scale-px(16px);
   font-size: var(--nutui-font-text-small);
   text-align: center;
   white-space: pre;

package/dist/es/packages/barrage/style-jrkf/barrage.scss

@@ -13,8 +13,8 @@
     display: block;
     position: absolute;
     right: 0;
-    padding: 4px 16px;
-    border-radius: 16px;
+    padding: scale-px(4px) scale-px(16px);
+    border-radius: scale-px(16px);
     font-size: $font-size-s;
     text-align: center;
     white-space: pre;

package/dist/es/packages/barrage/style-jrkf/style.css

@@ -17,8 +17,8 @@
   display: block;
   position: absolute;
   right: 0;
-  padding: 4px 16px;
-  border-radius: 16px;
+  padding: scale-px(4px) scale-px(16px);
+  border-radius: scale-px(16px);
   font-size: var(--nutui-font-text-small);
   text-align: center;
   white-space: pre;

package/dist/es/packages/button/button.d.ts

@@ -1,23 +1,3 @@
 import React from 'react';
-import type { MouseEvent } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export type ButtonType = 'default' | 'primary' | 'info' | 'success' | 'warning' | 'danger';
-export type ButtonSize = 'xlarge' | 'large' | 'normal' | 'small' | 'mini';
-export type ButtonShape = 'square' | 'round';
-export type ButtonFill = 'solid' | 'outline' | 'dashed' | 'none';
-export interface ButtonProps extends BasicComponent {
-    color: string;
-    shape: ButtonShape;
-    type: ButtonType;
-    size: ButtonSize;
-    fill: ButtonFill;
-    block: boolean;
-    loading: boolean;
-    disabled: boolean;
-    icon: React.ReactNode;
-    rightIcon: React.ReactNode;
-    id: string;
-    nativeType: 'submit' | 'reset' | 'button';
-    onClick: (e: MouseEvent<HTMLButtonElement>) => void;
-}
-export declare const Button: React.ForwardRefExoticComponent<Partial<ButtonProps> & React.RefAttributes<HTMLButtonElement>>;
+import { WebButtonProps } from "../../types";
+export declare const Button: React.ForwardRefExoticComponent<Partial<WebButtonProps> & React.RefAttributes<HTMLButtonElement>>;

package/dist/es/packages/button/index.d.ts

@@ -1,3 +1,2 @@
 import { Button } from './button';
-export type { ButtonType, ButtonProps, ButtonSize, ButtonShape, ButtonFill, } from './button';
 export default Button;

package/dist/es/packages/button/style/button.scss

@@ -3,7 +3,7 @@
   display: flex;
   display: inline-block;
   /* #ifdef harmony dynamic*/
-  width: 80px;
+  width: scale-px(80px);
   /* #endif */
   /* #ifndef harmony dynamic*/
   width: auto;