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

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

@@ -2,6 +2,7 @@ import { BaseProps } from '../../base/props';
 import { UIType } from '../../base/atoms';
 export type IndicatorType = 'anchor' | 'slide' | 'dualScreen';
 export type IndicatorColor = Extract<UIType, 'primary' | 'default'>;
+export type IndicatorPlacement = 'outside' | 'inside-top-right' | 'inside-bottom-center' | 'inside-bottom-left';
 export interface BaseIndicator extends BaseProps {
     /**
     * 总页数
@@ -23,4 +24,8 @@ export interface BaseIndicator extends BaseProps {
     * 交互类型
     */
     type: IndicatorType
+    /**
+    * 定位布局
+    */
+    placement: IndicatorPlacement
 }

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/nutui.react.umd.js

@@ -2784,81 +2784,8 @@ React keys must be passed directly to JSX without using spread:
     }
     return 1;
   }
-  function getScaleByNative() {
-    return _async_to_generator(function() {
-      var _window_jmfe, _res_data, res, parsed;
-      return __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) !== void 0) {
-              parsed = Number(res.data.scale);
-              if (Number.isFinite(parsed) && parsed > 0) {
-                return [
-                  2,
-                  parsed
-                ];
-              }
-            }
-            return [
-              3,
-              4
-            ];
-          case 3:
-            _state.sent();
-            return [
-              3,
-              4
-            ];
-          case 4:
-            return [
-              2,
-              null
-            ];
-        }
-      });
-    })();
-  }
   function getScaleF() {
-    return _async_to_generator(function() {
-      var nativeScale;
-      return __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()
-            ];
-        }
-      });
-    })();
+    return getScaleByViewport();
   }
   function setScaleF(nextScale) {
     var validScale = Number.isFinite(nextScale) && nextScale > 0 ? nextScale : 1;
@@ -2867,27 +2794,11 @@ React keys must be passed directly to JSX without using spread:
     return scale;
   }
   function refreshScaleF(nextProfile) {
-    return _async_to_generator(function() {
-      var nextScale;
-      return __generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            return [
-              4,
-              getScaleF()
-            ];
-          case 1:
-            nextScale = _state.sent();
-            if (!scale || nextScale !== scale) {
-              setScaleF(nextScale);
-            }
-            return [
-              2,
-              scale
-            ];
-        }
-      });
-    })();
+    var nextScale = getScaleF();
+    if (!scale || nextScale !== scale) {
+      setScaleF(nextScale);
+    }
+    return scale;
   }
   function initScaleF(nextProfile) {
     if (!canUseDom) return function() {
@@ -24252,17 +24163,18 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
       return "";
     };
-    var _ref = _object_spread({}, defaultProps$k, props), color = _ref.color, type2 = _ref.type, total = _ref.total, current = _ref.current, children = _ref.children, className = _ref.className, direction = _ref.direction, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$k, props), color = _ref.color, type2 = _ref.type, total = _ref.total, current = _ref.current, children = _ref.children, className = _ref.className, direction = _ref.direction, placement = _ref.placement, rest = _object_without_properties(_ref, [
       "color",
       "type",
       "total",
       "current",
       "children",
       "className",
-      "direction"
+      "direction",
+      "placement"
     ]);
     var _obj;
-    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix$3, "-vertical"), direction === "vertical"), _define_property(_obj, "".concat(classPrefix$3, "-white"), color === "default"), _define_property(_obj, "".concat(classPrefix$3, "-track"), type2 === "slide"), _obj));
+    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix$3, "-vertical"), direction === "vertical"), _define_property(_obj, "".concat(classPrefix$3, "-white"), color === "default"), _define_property(_obj, "".concat(classPrefix$3, "-track"), type2 === "slide"), _define_property(_obj, "".concat(classPrefix$3, "-").concat(placement), !!placement), _obj));
     var renderDotElement = function() {
       var childs = [];
       for (var item = 0; item < total; item++) {
@@ -24277,12 +24189,10 @@ Please add \`${key2}Action\` when creating your handler.`);
       return childs;
     };
     var renderLineElement = function() {
-      var trackWidth = 21;
-      var sliderWidth = 6;
-      var stride = (trackWidth - sliderWidth) / (total - 1);
       return /* @__PURE__ */ React.createElement("div", {
         style: {
-          transform: "".concat(direction === "vertical" ? "translateY" : "translateX", "(").concat(current * stride, "px)")
+          "--nutui-indicator-current": current,
+          "--nutui-indicator-total": total
         },
         className: "".concat(classPrefix$3, "-line ").concat(classPrefix$3, "-line-active")
       });