@nutui/nutui-react-taro 3.0.21-cpp → 4.0.0-beta.1

package/dist/es/types/spec/dialog/taro.d.ts

@@ -2,8 +2,6 @@ import { ITouchEvent } from '@tarojs/components';
 import { BaseDialog, BaseContentProps } from './base';
 export interface TaroContentProps extends BaseContentProps {
     onClick: (event: ITouchEvent) => void;
-    ariaRole?: string;
-    ariaLabel?: string;
 }
 export interface TaroDialogProps extends Omit<BaseDialog, 'onOverlayClick' | 'onClick'> {
     onClick: (event: ITouchEvent) => void;

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

@@ -32,5 +32,4 @@ export interface BaseOverlay extends BaseProps {
     * 点击时触发
     */
     onClick: (event: any) => void
-    ariaLabel?: string;
 }

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

@@ -34,7 +34,7 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     */
     title?: ReactNode
     /**
-    * 頂部佔位
+    * 顶部占位
     */
     top?: ReactNode
     /**
@@ -89,7 +89,8 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     * 结束触碰时触发
     */
     onTouchEnd: (height: number, e: any) => void
-    closeAriaLabel?: string;
-    overlayProps?: any;
-    animated?: boolean;
+    /**
+    * 关闭图标的 aria-label
+    */
+    closeAriaLabel?: string
 }

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

@@ -41,8 +41,4 @@ export interface BasePrice extends BaseProps {
     * 是否划线价
     */
     line: boolean
-    /**
-    * 开启后，当 price 包含非法字符时，原样展示，不做格式化处理
-    */
-    raw: boolean
 }

package/dist/es/utils/index.d.ts

@@ -26,6 +26,7 @@ export * from './taro/px-transform';
 export * from './raf';
 export * from './render';
 export * from './rubberband';
+export * from './scale-f';
 export * from './sleep';
 export * from './supports-passive';
 export * from './to-array';

package/dist/es/utils/index.js

@@ -26,6 +26,7 @@ export * from "./taro/px-transform";
 export * from "./raf";
 export * from "./render";
 export * from "./rubberband";
+export * from "./scale-f";
 export * from "./sleep";
 export * from "./supports-passive";
 export * from "./to-array";

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

@@ -0,0 +1,36 @@
+/** 原生 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 等默认可不额外放大） */
+export type ScaleScene = 'layout' | 'font' | 'icon' | 'lego';
+export type ScaleDevice = 'phone' | 'pad';
+/** 首次计算缩放并订阅 resize；返回卸载函数（SSR 下为空函数） */
+export declare function initScaleF(nextProfile?: ScaleProfile): () => void;
+/** calcByProfile 的可选覆盖项：临时指定档位、场景、scale 或设备 */
+type CalcByProfileOptions = {
+    profile?: ScaleProfile;
+    scene?: ScaleScene;
+    scale?: number;
+    device?: ScaleDevice;
+};
+/**
+ * 按档位与场景将设计稿基准值换算为实际数值：base × 场景倍率 × 当前 scale，再按规则取整。
+ */
+export declare function calcByProfile(baseValue: number, options?: CalcByProfileOptions): number;
+export {};

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

@@ -0,0 +1,206 @@
+/**
+ * 响应式缩放系数（--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;
+/** 大字模式下仅 font 场景的相对倍率 */ var LARGE_FONT_RATIO = 1.15;
+/** 老年模式下 font/icon/lego 场景的相对倍率 */ var ELDERLY_RATIO = 1.3;
+/** 全局当前档位，与 scale 共同参与 calcByProfile */ var profile = 'standard';
+/** 仅 large / elderly 有效，其余一律视为 standard */ function normalizeProfile(nextProfile) {
+    if (nextProfile === 'large' || nextProfile === 'elderly') return nextProfile;
+    return 'standard';
+}
+/** 计算 CSS 变量要使用的场景缩放（基准 scale × 场景倍率） */ function getCssSceneScale(scene, baseScale) {
+    return baseScale * getSceneRatio(scene, profile);
+}
+/** 将缩放值同步到 :root 的 --nut-scale-f / --nut-scale-font / --nut-scale-icon */ function applyScaleCssVars(nextScale) {
+    if (!canUseDom) return;
+    var rootStyle = document.documentElement.style;
+    rootStyle.setProperty('--nut-scale-f', formatScaleValue(nextScale));
+    rootStyle.setProperty('--nut-scale-font', formatScaleValue(getCssSceneScale('font', nextScale)));
+    rootStyle.setProperty('--nut-scale-icon', formatScaleValue(getCssSceneScale('icon', nextScale)));
+}
+/** >1 保留两位小数字符串；否则取整，与 CSS 消费端约定一致 */ function formatScaleValue(nextScale) {
+    if (nextScale > 1) {
+        return (Math.round(nextScale * 100) / 100).toFixed(2);
+    }
+    return "".concat(Math.round(nextScale));
+}
+/** 根据屏宽粗略区分 phone / pad */ function getCurrentDevice() {
+    if (!canUseDom) return 'phone';
+    return window.innerWidth >= 600 ? 'pad' : 'phone';
+}
+/** 在 profile 与 scene 维度上叠加额外倍率（与全局 scale 相乘） */ function getSceneRatio(scene, currentProfile) {
+    if (currentProfile === 'elderly' && (scene === 'font' || scene === 'icon' || scene === 'lego')) {
+        return ELDERLY_RATIO;
+    }
+    if (currentProfile === 'large' && scene === 'font') {
+        return LARGE_FONT_RATIO;
+    }
+    return 1;
+}
+/** 输出 px 等单位时的取整规则：缩放>1 或强制时保留两位小数精度 */ function roundByScaleRule(value, baseScale) {
+    var forceKeepTwoDecimals = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+    if (forceKeepTwoDecimals || baseScale > 1) {
+        return Math.round(value * 100) / 100;
+    }
+    return Math.round(value);
+}
+/** 无原生桥时按屏宽推算 scale（含平板与 375 基准窄屏区间） */ function getScaleByViewport() {
+    if (!canUseDom) return 1;
+    var deviceWidth = window.innerWidth;
+    if (!deviceWidth) return 1;
+    if (deviceWidth >= 600) {
+        return 1.2;
+    }
+    if (deviceWidth >= 375 && deviceWidth < 600) {
+        var ratio = deviceWidth / 375;
+        return ratio >= 1.17 ? 1.17 : ratio;
+    }
+    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()
+                    ];
+            }
+        });
+    })();
+}
+/** 校验后更新内存中的 scale，并写入 --nut-scale-f */ function setScaleF(nextScale) {
+    var validScale = Number.isFinite(nextScale) && nextScale > 0 ? nextScale : 1;
+    scale = validScale;
+    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
+                    ];
+            }
+        });
+    })();
+}
+/** 首次计算缩放并订阅 resize；返回卸载函数（SSR 下为空函数） */ export function initScaleF(nextProfile) {
+    if (!canUseDom) return function() {};
+    setScaleProfile(nextProfile);
+    var handler = function() {
+        refreshScaleF();
+    };
+    handler();
+    window.addEventListener('resize', handler);
+    return function() {
+        window.removeEventListener('resize', handler);
+    };
+}
+/** 更新全局 profile，并在当前 scale 下重刷 CSS 变量 */ function setScaleProfile(nextProfile) {
+    profile = normalizeProfile(nextProfile);
+    // profile 切换后需要重新应用当前缩放值。
+    setScaleF(scale);
+    return profile;
+}
+/**
+ * 按档位与场景将设计稿基准值换算为实际数值：base × 场景倍率 × 当前 scale，再按规则取整。
+ */ export function calcByProfile(baseValue) {
+    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    var _options_profile;
+    var currentProfile = normalizeProfile((_options_profile = options.profile) !== null && _options_profile !== void 0 ? _options_profile : profile);
+    var _options_scene;
+    var scene = (_options_scene = options.scene) !== null && _options_scene !== void 0 ? _options_scene : 'layout';
+    var currentScale = Number.isFinite(options.scale) && Number(options.scale) > 0 ? Number(options.scale) : scale;
+    var _options_device;
+    var device = (_options_device = options.device) !== null && _options_device !== void 0 ? _options_device : getCurrentDevice();
+    var ratio = getSceneRatio(scene, currentProfile);
+    var rawValue = baseValue * ratio * currentScale;
+    var forceKeepTwoDecimals = scene === 'font' && currentProfile === 'large' && device === 'pad';
+    return roundByScaleRule(rawValue, currentScale, forceKeepTwoDecimals);
+}

package/dist/es/utils/should-render-price-raw.d.ts

@@ -1,2 +1 @@
 export declare function shouldRenderPriceAsRaw(s: string): boolean;
-export declare function hasNonPriceChars(s: string): boolean;

package/dist/es/utils/should-render-price-raw.js

@@ -1,7 +1,5 @@
+var CJK = /[\u4E00-\u9FFF]/;
 var RE_NUM = /\d+(?:\.\d+)?/g;
-// 价格合法字符：数字、小数点、负号、大写货币代码（HK USD EUR 等）、常见货币符号 Unicode 区块（含全角 ￥）
-var PRICE_CHARS = /^[\d.\-A-Z¥￥$€£₩₹₽₺₴₪฿\u20A0-\u20CF\uFE69\uFF04\uFFE5]*$/;
-// 无法提取出有效价格时直接按原文展示，避免把纯文案误格式化成 0 或空串
 function hasNoExtractablePrice(s) {
     var t = s.trim();
     if (!t) return true;
@@ -9,12 +7,12 @@ function hasNoExtractablePrice(s) {
     if (t.replace(/[^\d.]/g, '') === '') return true;
     return false;
 }
-// 只有两段数字之间出现非法字符时，才认为该字符串应走原样渲染
 export function shouldRenderPriceAsRaw(s) {
     if (hasNoExtractablePrice(s)) {
         return true;
     }
     var t = s.trim();
+    if (!CJK.test(t)) return false;
     var matches = Array.from(t.matchAll(RE_NUM));
     if (matches.length < 2) return false;
     var a = matches[0];
@@ -22,9 +20,5 @@ export function shouldRenderPriceAsRaw(s) {
     var i0 = a.index;
     var i1 = b.index;
     var between = t.slice(i0 + a[0].length, i1);
-    return !PRICE_CHARS.test(between);
-}
-// 提供给 Price.raw 开关：调用方可用它判断整串是否包含非法字符
-export function hasNonPriceChars(s) {
-    return !PRICE_CHARS.test(s);
+    return CJK.test(between);
 }

package/dist/es/utils/taro/get-rect.js

@@ -5,6 +5,10 @@ import { createSelectorQuery } from "@tarojs/taro";
 import { MiniLru } from "../lru";
 import { getRect, inBrowser } from "../get-rect";
 var lru = new MiniLru(10);
+var createScopedSelectorQuery = function(scope) {
+    var query = createSelectorQuery();
+    return scope ? query.in(scope) : query;
+};
 export function makeRect(width, height) {
     return {
         top: 0,
@@ -34,8 +38,8 @@ export var getRectInMultiPlatform = function(element) {
                             resolve(lru.get(element));
                             return;
                         }
-                        createSelectorQuery()// https://taro.jd.com/docs/reference/config/page/
-                        .in((element === null || element === void 0 ? void 0 : element._scope) || element).select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
+                        createScopedSelectorQuery(element === null || element === void 0 ? void 0 : element._scope)// https://taro.jd.com/docs/reference/config/page/
+                        .select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
                             var _param = _sliced_to_array(param, 1), rects = _param[0];
                             if (rects) {
                                 lru.set(element, rects);
@@ -67,8 +71,8 @@ export var getRectInMultiPlatformWithoutCache = function(element) {
                 return [
                     2,
                     new Promise(function(resolve, reject) {
-                        createSelectorQuery()// https://taro.jd.com/docs/reference/config/page/
-                        .in((element === null || element === void 0 ? void 0 : element._scope) || element).select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
+                        createScopedSelectorQuery(element === null || element === void 0 ? void 0 : element._scope)// https://taro.jd.com/docs/reference/config/page/
+                        .select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
                             var _param = _sliced_to_array(param, 1), rects = _param[0];
                             resolve(rects);
                         });