@nutui/nutui-react 3.1.0-beta.1 → 4.0.0-beta.2

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

@@ -42,8 +42,8 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: scale-px(96px);
-  max-width: 60%;
+  min-width: var(--nutui-toast-inner-min-width, scale-px(88px));
+  max-width: var(--nutui-toast-inner-max-width, scale-px(200px));
   box-sizing: border-box;
   font-size: var(--nutui-toast-text-font-size, 14px);
   text-align: var(--nutui-toast-inner-text-align, center);
@@ -53,8 +53,9 @@
   border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xs));
   color: var(--nutui-toast-font-color, #ffffff);
 }
-.nut-toast-inner-descrption {
-  max-width: 68.2%;
+.nut-toast-has-icon .nut-toast-inner {
+  min-width: var(--nutui-toast-inner-has-icon-min-width, scale-px(97px));
+  max-width: var(--nutui-toast-inner-has-icon-max-width, scale-px(225px));
 }
 .nut-toast-inner-normal {
   word-break: normal;
@@ -80,8 +81,9 @@
   top: var(--nutui-toast-inner-top, 20%);
 }
 .nut-toast-text {
-  color: #ffffff;
+  color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
   text-align: var(--nutui-toast-inner-text-align, center);
+  font-weight: var(--nutui-toast-text-font-weight, 400);
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
@@ -91,9 +93,9 @@
   height: auto;
 }
 .nut-toast-title {
-  color: #ffffff;
+  color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
   font-size: var(--nutui-toast-title-font-size, 16px);
-  font-weight: 600;
+  font-weight: var(--nutui-toast-title-font-weight, 600);
   text-align: var(--nutui-toast-inner-text-align, center);
   /* #ifdef harmony dynamic*/
   line-height: normal;
@@ -103,21 +105,22 @@
   /* #endif */
 }
 .nut-toast .nut-icon {
-  width: scale-px(24px);
-  height: scale-px(24px);
-  color: #ffffff;
+  width: scale-px(20px);
+  height: scale-px(20px);
+  color: var(--nutui-toast-icon-color, var(--nutui-toast-font-color, var(--nutui-white, #ffffff)));
 }
 .nut-toast-icon-wrapper {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: scale-px(3px) 0 scale-px(5px);
-  color: #ffffff;
+  margin: 0;
+  padding: scale-px(10px) 0;
+  color: var(--nutui-toast-icon-color, var(--nutui-toast-font-color, var(--nutui-white, #ffffff)));
 }
 .nut-toast-icon-wrapper-icon {
-  width: scale-px(24px);
-  height: scale-px(24px);
+  width: scale-px(20px);
+  height: scale-px(20px);
 }
 .nut-toast-rtl {
   left: auto;

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

@@ -42,9 +42,8 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    min-width: scale-px(96px);
-    max-width: 60%;
-    // max-width: 224px;
+    min-width: var(--nutui-toast-inner-min-width, scale-px(88px));
+    max-width: var(--nutui-toast-inner-max-width, scale-px(200px));
     box-sizing: border-box;
     font-size: $toast-text-font-size;
     text-align: $toast-inner-text-align;
@@ -54,9 +53,9 @@
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
 
-    &-descrption {
-      max-width: 68.2%;
-      // max-width: 256px;
+    .nut-toast-has-icon & {
+      min-width: var(--nutui-toast-inner-has-icon-min-width, scale-px(97px));
+      max-width: var(--nutui-toast-inner-has-icon-max-width, scale-px(225px));
     }
 
     &-normal {
@@ -91,8 +90,9 @@
   }
 
   &-text {
-    color: #ffffff;
+    color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
     text-align: $toast-inner-text-align;
+    font-weight: var(--nutui-toast-text-font-weight, 400);
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
@@ -103,9 +103,9 @@
   }
 
   &-title {
-    color: #ffffff;
+    color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
     font-size: $toast-title-font-size;
-    font-weight: 600;
+    font-weight: var(--nutui-toast-title-font-weight, 600);
     text-align: $toast-inner-text-align;
     /* #ifdef harmony dynamic*/
     line-height: normal;
@@ -116,9 +116,12 @@
   }
 
   .nut-icon {
-    width: scale-px(24px);
-    height: scale-px(24px);
-    color: #ffffff;
+    width: scale-px(20px);
+    height: scale-px(20px);
+    color: var(
+      --nutui-toast-icon-color,
+      var(--nutui-toast-font-color, var(--nutui-white, #ffffff))
+    );
   }
 
   &-icon-wrapper {
@@ -126,12 +129,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: scale-px(3px) 0 scale-px(5px);
-    color: #ffffff;
+    margin: 0;
+    padding: scale-px(10px) 0;
+    color: var(
+      --nutui-toast-icon-color,
+      var(--nutui-toast-font-color, var(--nutui-white, #ffffff))
+    );
 
     &-icon {
-      width: scale-px(24px);
-      height: scale-px(24px);
+      width: scale-px(20px);
+      height: scale-px(20px);
     }
   }
 

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

@@ -42,8 +42,8 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: scale-px(96px);
-  max-width: 60%;
+  min-width: var(--nutui-toast-inner-min-width, scale-px(88px));
+  max-width: var(--nutui-toast-inner-max-width, scale-px(200px));
   box-sizing: border-box;
   font-size: var(--nutui-toast-text-font-size, 14px);
   text-align: var(--nutui-toast-inner-text-align, center);
@@ -53,8 +53,9 @@
   border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xs));
   color: var(--nutui-toast-font-color, #ffffff);
 }
-.nut-toast-inner-descrption {
-  max-width: 68.2%;
+.nut-toast-has-icon .nut-toast-inner {
+  min-width: var(--nutui-toast-inner-has-icon-min-width, scale-px(97px));
+  max-width: var(--nutui-toast-inner-has-icon-max-width, scale-px(225px));
 }
 .nut-toast-inner-normal {
   word-break: normal;
@@ -80,8 +81,9 @@
   top: var(--nutui-toast-inner-top, 20%);
 }
 .nut-toast-text {
-  color: #ffffff;
+  color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
   text-align: var(--nutui-toast-inner-text-align, center);
+  font-weight: var(--nutui-toast-text-font-weight, 400);
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
@@ -91,9 +93,9 @@
   height: auto;
 }
 .nut-toast-title {
-  color: #ffffff;
+  color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
   font-size: var(--nutui-toast-title-font-size, 16px);
-  font-weight: 600;
+  font-weight: var(--nutui-toast-title-font-weight, 600);
   text-align: var(--nutui-toast-inner-text-align, center);
   /* #ifdef harmony dynamic*/
   line-height: normal;
@@ -103,21 +105,22 @@
   /* #endif */
 }
 .nut-toast .nut-icon {
-  width: scale-px(24px);
-  height: scale-px(24px);
-  color: #ffffff;
+  width: scale-px(20px);
+  height: scale-px(20px);
+  color: var(--nutui-toast-icon-color, var(--nutui-toast-font-color, var(--nutui-white, #ffffff)));
 }
 .nut-toast-icon-wrapper {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: scale-px(3px) 0 scale-px(5px);
-  color: #ffffff;
+  margin: 0;
+  padding: scale-px(10px) 0;
+  color: var(--nutui-toast-icon-color, var(--nutui-toast-font-color, var(--nutui-white, #ffffff)));
 }
 .nut-toast-icon-wrapper-icon {
-  width: scale-px(24px);
-  height: scale-px(24px);
+  width: scale-px(20px);
+  height: scale-px(20px);
 }
 .nut-toast-rtl {
   left: auto;

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

@@ -42,9 +42,8 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    min-width: scale-px(96px);
-    max-width: 60%;
-    // max-width: 224px;
+    min-width: var(--nutui-toast-inner-min-width, scale-px(88px));
+    max-width: var(--nutui-toast-inner-max-width, scale-px(200px));
     box-sizing: border-box;
     font-size: $toast-text-font-size;
     text-align: $toast-inner-text-align;
@@ -54,9 +53,9 @@
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
 
-    &-descrption {
-      max-width: 68.2%;
-      // max-width: 256px;
+    .nut-toast-has-icon & {
+      min-width: var(--nutui-toast-inner-has-icon-min-width, scale-px(97px));
+      max-width: var(--nutui-toast-inner-has-icon-max-width, scale-px(225px));
     }
 
     &-normal {
@@ -91,8 +90,9 @@
   }
 
   &-text {
-    color: #ffffff;
+    color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
     text-align: $toast-inner-text-align;
+    font-weight: var(--nutui-toast-text-font-weight, 400);
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
@@ -103,9 +103,9 @@
   }
 
   &-title {
-    color: #ffffff;
+    color: var(--nutui-toast-font-color, var(--nutui-white, #ffffff));
     font-size: $toast-title-font-size;
-    font-weight: 600;
+    font-weight: var(--nutui-toast-title-font-weight, 600);
     text-align: $toast-inner-text-align;
     /* #ifdef harmony dynamic*/
     line-height: normal;
@@ -116,9 +116,12 @@
   }
 
   .nut-icon {
-    width: scale-px(24px);
-    height: scale-px(24px);
-    color: #ffffff;
+    width: scale-px(20px);
+    height: scale-px(20px);
+    color: var(
+      --nutui-toast-icon-color,
+      var(--nutui-toast-font-color, var(--nutui-white, #ffffff))
+    );
   }
 
   &-icon-wrapper {
@@ -126,12 +129,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: scale-px(3px) 0 scale-px(5px);
-    color: #ffffff;
+    margin: 0;
+    padding: scale-px(10px) 0;
+    color: var(
+      --nutui-toast-icon-color,
+      var(--nutui-toast-font-color, var(--nutui-white, #ffffff))
+    );
 
     &-icon {
-      width: scale-px(24px);
-      height: scale-px(24px);
+      width: scale-px(20px);
+      height: scale-px(20px);
     }
   }
 

package/dist/es/packages/toast/toast.js

@@ -13,7 +13,7 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps),
     contentClassName: '',
     contentStyle: {},
     wordBreak: 'break-all',
-    duration: 2,
+    duration: 3,
     closeOnOverlayClick: false,
     lockScroll: false,
     zIndex: 1300,

package/dist/es/types/base/atoms.d.ts

@@ -1,9 +1,9 @@
 export type SimpleValue = string | number;
 export type SimpleValues = string[] | number[];
-export type UIType = 'default' | 'primary' | 'info' | 'success' | 'warning' | 'danger';
-export type UISize = 'xlarge' | 'large' | 'normal' | 'small' | 'mini';
+export type UIType = 'default' | 'primary' | 'info' | 'success' | 'warning' | 'danger' | 'service';
+export type UISize = 'xlarge' | 'large' | 'normal' | 'small' | 'mini' | '48' | '44' | '40' | '36' | '32' | '28' | '24';
 export type UIRound = 'square' | 'round';
-export type UIFill = 'solid' | 'outline' | 'dashed' | 'none';
+export type UIFill = 'solid' | 'outline' | 'dashed' | 'none' | 'light';
 export type UILayout = 'row' | 'col';
 export type UITheme = 'light' | 'dark';
 export type FlexAlign = 'flex-start' | 'center' | 'flex-end' | 'baseline';

package/dist/es/types/spec/button/base.d.ts

@@ -43,6 +43,7 @@ export interface BaseButton extends BaseProps {
     * 右侧按钮图标
     */
     rightIcon: ReactNode
+    description?: ReactNode;
     id: string;
     /**
     * 按钮原始类型

package/dist/es/utils/scale-f.d.ts

@@ -1,20 +1,3 @@
-/** 原生 DongScreenAdapterPlugin.getScale 的典型返回结构 */
-type NativeScaleResponse = {
-    status?: string;
-    data?: {
-        scale?: number | string;
-    };
-};
-/** jmfe 通用 callNative 签名 */
-type NativeCaller = (plugin: string, method: string, params: string, extra: string) => Promise<NativeScaleResponse>;
-/** 站内容器的 jmfe 桥接方法（可选） */
-declare global {
-    interface Window {
-        jmfe?: {
-            callNative?: NativeCaller;
-        };
-    }
-}
 /** 字体档位：标准、大字、老年 */
 export type ScaleProfile = 'standard' | 'large' | 'elderly';
 /** 不同场景可选用不同放大比例（layout 等默认可不额外放大） */

package/dist/es/utils/scale-f.js

@@ -1,11 +1,9 @@
 /**
- * 响应式缩放系数（--nut-scale-f）：结合京东站内原生桥与站外视口规则，
+ * 响应式缩放系数（--nut-scale-f）：按视口宽度计算，
  * 写入根节点 CSS 变量（--nut-scale-f / --nut-scale-font / --nut-scale-icon），
  * 供布局/字号/icon 等按比例换算（见 calcByProfile）。H5 与 Taro WebView 共用此实现。
- */ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { canUseDom } from "./can-use-dom";
-/** 当前基准缩放（来自原生或视口计算） */ var scale = 1;
+ */ import { canUseDom } from "./can-use-dom";
+/** 当前基准缩放（来自视口计算） */ var scale = 1;
 /** 大字模式下仅 font 场景的相对倍率 */ var LARGE_FONT_RATIO = 1.15;
 /** 老年模式下 font/icon/lego 场景的相对倍率 */ var ELDERLY_RATIO = 1.3;
 /** 全局当前档位，与 scale 共同参与 calcByProfile */ var profile = 'standard';
@@ -49,7 +47,7 @@ import { canUseDom } from "./can-use-dom";
     }
     return Math.round(value);
 }
-/** 无原生桥时按屏宽推算 scale（含平板与 375 基准窄屏区间） */ function getScaleByViewport() {
+/** 按屏宽推算 scale（含平板与 375 基准窄屏区间） */ function getScaleByViewport() {
     if (!canUseDom) return 1;
     var deviceWidth = window.innerWidth;
     if (!deviceWidth) return 1;
@@ -62,81 +60,8 @@ import { canUseDom } from "./can-use-dom";
     }
     return 1;
 }
-/** 通过 jmfe.callNative 拉取 DongScreenAdapterPlugin；失败返回 null */ function getScaleByNative() {
-    return _async_to_generator(function() {
-        var _window_jmfe, _res_data, res, parsed, e;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (!canUseDom || !((_window_jmfe = window.jmfe) === null || _window_jmfe === void 0 ? void 0 : _window_jmfe.callNative)) return [
-                        2,
-                        null
-                    ];
-                    _state.label = 1;
-                case 1:
-                    _state.trys.push([
-                        1,
-                        3,
-                        ,
-                        4
-                    ]);
-                    return [
-                        4,
-                        window.jmfe.callNative('DongScreenAdapterPlugin', 'getScale', JSON.stringify({}), '')
-                    ];
-                case 2:
-                    res = _state.sent();
-                    if ((res === null || res === void 0 ? void 0 : res.status) === '0' && ((_res_data = res.data) === null || _res_data === void 0 ? void 0 : _res_data.scale) !== undefined) {
-                        parsed = Number(res.data.scale);
-                        if (Number.isFinite(parsed) && parsed > 0) {
-                            return [
-                                2,
-                                parsed
-                            ];
-                        }
-                    }
-                    return [
-                        3,
-                        4
-                    ];
-                case 3:
-                    e = _state.sent();
-                    return [
-                        3,
-                        4
-                    ];
-                case 4:
-                    return [
-                        2,
-                        null
-                    ];
-            }
-        });
-    })();
-}
-/** 统一获取缩放：站内原生优先，失败则用视口规则 */ function getScaleF() {
-    return _async_to_generator(function() {
-        var nativeScale;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        getScaleByNative()
-                    ];
-                case 1:
-                    nativeScale = _state.sent();
-                    if (nativeScale) return [
-                        2,
-                        nativeScale
-                    ];
-                    return [
-                        2,
-                        getScaleByViewport()
-                    ];
-            }
-        });
-    })();
+/** 统一获取缩放：按视口规则计算 */ function getScaleF() {
+    return getScaleByViewport();
 }
 /** 校验后更新内存中的 scale，并写入 --nut-scale-f */ function setScaleF(nextScale) {
     var validScale = Number.isFinite(nextScale) && nextScale > 0 ? nextScale : 1;
@@ -144,31 +69,15 @@ import { canUseDom } from "./can-use-dom";
     applyScaleCssVars(validScale);
     return scale;
 }
-/** 重新拉取缩放；可选同时切换 profile，避免与当前值相同时重复写 DOM */ function refreshScaleF(nextProfile) {
-    return _async_to_generator(function() {
-        var nextScale;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (nextProfile) {
-                        setScaleProfile(nextProfile);
-                    }
-                    return [
-                        4,
-                        getScaleF()
-                    ];
-                case 1:
-                    nextScale = _state.sent();
-                    if (!scale || nextScale !== scale) {
-                        setScaleF(nextScale);
-                    }
-                    return [
-                        2,
-                        scale
-                    ];
-            }
-        });
-    })();
+/** 重新计算缩放；可选同时切换 profile，避免与当前值相同时重复写 DOM */ function refreshScaleF(nextProfile) {
+    if (nextProfile) {
+        setScaleProfile(nextProfile);
+    }
+    var nextScale = getScaleF();
+    if (!scale || nextScale !== scale) {
+        setScaleF(nextScale);
+    }
+    return scale;
 }
 /** 首次计算缩放并订阅 resize；返回卸载函数（SSR 下为空函数） */ export function initScaleF(nextProfile) {
     if (!canUseDom) return function() {};

package/dist/es/utils/taro/get-system-info.d.ts

@@ -14,9 +14,4 @@ export declare const getDeviceInfo: () => IDeviceInfo;
  * @returns {Taro.getWindowInfo.Result} 窗口信息
  */
 export declare const getWindowInfo: () => Taro.getWindowInfo.Result;
-/**
- * 获取应用基础信息，兼容新旧 API
- * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
- */
-export declare const getAppBaseInfo: () => Taro.getAppBaseInfo.Result;
 export {};

package/dist/es/utils/taro/get-system-info.js

@@ -13,10 +13,11 @@ import Taro from "@tarojs/taro";
  * @returns {Taro.getWindowInfo.Result} 窗口信息
  */ export var getWindowInfo = function() {
     return typeof Taro.getWindowInfo === 'function' ? Taro.getWindowInfo() : Taro.getSystemInfoSync();
-};
-/**
- * 获取应用基础信息，兼容新旧 API
- * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
- */ export var getAppBaseInfo = function() {
-    return typeof Taro.getAppBaseInfo === 'function' ? Taro.getAppBaseInfo() : Taro.getSystemInfoSync();
-};
+} // /**
+ //  * 获取应用基础信息，兼容新旧 API
+ //  * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
+ //  */
+ // export const getAppBaseInfo = (): Taro.getAppBaseInfo.Result => {
+ //   return canIUse('getAppBaseInfo') ? taroGetAppBaseInfo() : getSystemInfoSync()
+ // }
+;