@nutui/nutui-react 3.0.20 → 3.1.0-beta.2

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

@@ -38,14 +38,8 @@ export interface BaseDialog extends DialogWrapProps {
     * 取消按钮文案
     */
     cancelText: ReactNode
-    /**
-    * 确认按钮徽标
-    */
-    confirmBadge: ReactNode
-    /**
-    * 取消按钮徽标
-    */
-    cancelBadge: ReactNode
+    confirmBadge: ReactNode;
+    cancelBadge: ReactNode;
     /**
     * 是否隐藏确定按钮
     */

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

@@ -0,0 +1,45 @@
+import { ReactNode } from 'react';
+import { BaseProps } from '../../base/props';
+export type QuickEnterRef = QuickEnterActions;
+export type QuickEnterActions = {
+    open: () => void;
+    close: () => void;
+};
+export interface QuickEnterOption extends Record<string, any> {
+    title?: string;
+    icon?: ReactNode;
+    type?: string;
+    url?: string;
+    badge?: boolean | ReactNode;
+    badgeProps?: any;
+}
+export interface BaseQuickEnter<POPUP_PROPS = any> extends BaseProps {
+    /**
+    * 是否可见
+    */
+    visible?: boolean
+    /**
+    * 标题
+    */
+    title?: ReactNode
+    /**
+    * 选项列表
+    */
+    options?: QuickEnterOption[]
+    /**
+    * 透传给 Popup 组件的属性
+    */
+    popupProps?: POPUP_PROPS
+    /**
+    * 是否在点击遮罩层后关闭
+    */
+    closeOnOverlayClick?: boolean
+    /**
+    * 自定义关闭图标
+    */
+    closeIcon?: ReactNode
+    safeAreaInsetTop?: boolean;
+    onClose?: () => void;
+    onChange?: (item: QuickEnterOption, index: number) => void;
+    children?: ReactNode;
+}

package/dist/es/types/spec/quickenter/base.js

@@ -0,0 +1 @@
+export { };

package/dist/es/types/spec/quickenter/h5.d.ts

@@ -0,0 +1,5 @@
+import { BaseQuickEnter, QuickEnterOption } from './base';
+import { WebPopupProps } from '../popup/h5';
+export interface WebQuickEnterProps extends BaseQuickEnter<WebPopupProps> {
+}
+export type { QuickEnterOption };

package/dist/es/types/spec/quickenter/h5.js

@@ -0,0 +1 @@
+export { };

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

@@ -0,0 +1,5 @@
+import { BaseQuickEnter, QuickEnterOption } from './base';
+import { TaroPopupProps } from '../popup/taro';
+export interface TaroQuickEnterProps extends BaseQuickEnter<TaroPopupProps> {
+}
+export type { QuickEnterOption };

package/dist/es/types/spec/quickenter/taro.js

@@ -0,0 +1 @@
+export { };

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

@@ -20,6 +20,7 @@ export * from './px-check';
 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

@@ -20,6 +20,7 @@ export * from "./px-check";
 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.taro.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,19 @@
+/** 字体档位：标准、大字、老年 */
+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,115 @@
+/**
+ * 响应式缩放系数（--nut-scale-f）：按视口宽度计算，
+ * 写入根节点 CSS 变量（--nut-scale-f / --nut-scale-font / --nut-scale-icon），
+ * 供布局/字号/icon 等按比例换算（见 calcByProfile）。H5 与 Taro WebView 共用此实现。
+ */ 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;
+}
+/** 统一获取缩放：按视口规则计算 */ function getScaleF() {
+    return 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) {
+    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() {};
+    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

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

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

@@ -0,0 +1,24 @@
+var CJK = /[\u4E00-\u9FFF]/;
+var RE_NUM = /\d+(?:\.\d+)?/g;
+function hasNoExtractablePrice(s) {
+    var t = s.trim();
+    if (!t) return true;
+    if (!/\d/.test(t)) return true;
+    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];
+    var b = matches[1];
+    var i0 = a.index;
+    var i1 = b.index;
+    var between = t.slice(i0 + a[0].length, i1);
+    return CJK.test(between);
+}

package/dist/es/utils/taro/{ConfigurableCSSTransition copy.js → ConfigurableCSSTransition.js}

@@ -10,84 +10,45 @@ var ConfigurableCSSTransition = function(props) {
         if (inPhase) return "".concat(baseClassName, "-enter-done");
         return "".concat(baseClassName, "-exit-done");
     }), 2), classes = _useState1[0], setClasses = _useState1[1];
-    var fallbackTimerRef = useRef(null);
+    var timerRef = useRef(null);
     var statusRef = useRef(status);
     var prevInPhase = useRef(inPhase);
-    var latestOnAnimationEnd = useRef(children.props.onAnimationEnd);
-    useEffect(function() {
-        latestOnAnimationEnd.current = children.props.onAnimationEnd;
-    });
     var updateStatus = useCallback(function(nextStatus) {
         statusRef.current = nextStatus;
         setStatus(nextStatus);
     }, []);
-    var handleAnimationEnd = useCallback(function(e) {
-        var _latestOnAnimationEnd_current;
-        (_latestOnAnimationEnd_current = latestOnAnimationEnd.current) === null || _latestOnAnimationEnd_current === void 0 ? void 0 : _latestOnAnimationEnd_current.call(latestOnAnimationEnd, e);
-        if (e && e.target !== e.currentTarget) return;
-        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
-        if (statusRef.current === 'entering') {
-            updateStatus('entered');
-            setClasses("".concat(baseClassName, "-enter-done"));
-            onEntered === null || onEntered === void 0 ? void 0 : onEntered();
-        } else if (statusRef.current === 'exiting') {
-            updateStatus('exited');
-            setClasses("".concat(baseClassName, "-exit-done"));
-            if (unmountOnExit) {
-                updateStatus('unmounted');
-            }
-            onExited === null || onExited === void 0 ? void 0 : onExited();
-        }
-    }, [
-        baseClassName,
-        onEntered,
-        onExited,
-        unmountOnExit,
-        updateStatus
-    ]);
     var enter = useCallback(function() {
-        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        if (timerRef.current) clearTimeout(timerRef.current);
         if (statusRef.current === 'unmounted') {
             updateStatus('exited');
         }
-        if (timeout === 0) {
+        updateStatus('entering');
+        setClasses("".concat(baseClassName, "-enter ").concat(baseClassName, "-enter-active"));
+        timerRef.current = setTimeout(function() {
             updateStatus('entered');
             setClasses("".concat(baseClassName, "-enter-done"));
             onEntered === null || onEntered === void 0 ? void 0 : onEntered();
-            return;
-        }
-        updateStatus('entering');
-        setClasses("".concat(baseClassName, "-enter ").concat(baseClassName, "-enter-active"));
-        // Safety fallback: Give it extra time over the expected timeout in case onAnimationEnd misses
-        fallbackTimerRef.current = setTimeout(function() {
-            handleAnimationEnd(null);
-        }, timeout + 200);
+        }, timeout);
     }, [
         baseClassName,
-        handleAnimationEnd,
         onEntered,
         timeout,
         updateStatus
     ]);
     var exit = useCallback(function() {
-        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
-        if (timeout === 0) {
+        if (timerRef.current) clearTimeout(timerRef.current);
+        updateStatus('exiting');
+        setClasses("".concat(baseClassName, "-exit ").concat(baseClassName, "-exit-active"));
+        timerRef.current = setTimeout(function() {
             updateStatus('exited');
             setClasses("".concat(baseClassName, "-exit-done"));
             if (unmountOnExit) {
                 updateStatus('unmounted');
             }
             onExited === null || onExited === void 0 ? void 0 : onExited();
-            return;
-        }
-        updateStatus('exiting');
-        setClasses("".concat(baseClassName, "-exit ").concat(baseClassName, "-exit-active"));
-        fallbackTimerRef.current = setTimeout(function() {
-            handleAnimationEnd(null);
-        }, timeout + 200);
+        }, timeout);
     }, [
         baseClassName,
-        handleAnimationEnd,
         onExited,
         timeout,
         unmountOnExit,
@@ -103,7 +64,7 @@ var ConfigurableCSSTransition = function(props) {
             prevInPhase.current = inPhase;
         }
         return function() {
-            if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+            if (timerRef.current) clearTimeout(timerRef.current);
         };
     }, [
         inPhase,
@@ -112,8 +73,7 @@ var ConfigurableCSSTransition = function(props) {
     ]);
     if (status === 'unmounted') return null;
     return /*#__PURE__*/ cloneElement(children, {
-        className: "".concat(children.props.className || '', " ").concat(classes),
-        onAnimationEnd: handleAnimationEnd
+        className: "".concat(children.props.className || '', " ").concat(classes)
     });
 };
 export default ConfigurableCSSTransition;

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,7 +38,8 @@ export var getRectInMultiPlatform = function(element) {
                             resolve(lru.get(element));
                             return;
                         }
-                        createSelectorQuery().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);
@@ -66,7 +71,8 @@ export var getRectInMultiPlatformWithoutCache = function(element) {
                 return [
                     2,
                     new Promise(function(resolve, reject) {
-                        createSelectorQuery().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);
                         });

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()
+ // }
+;