@nutui/nutui-react 4.0.0-beta.1 → 4.0.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +23 -18
- package/dist/cjs/utils/scale-f.d.ts +0 -17
- package/dist/cjs/utils/scale-f.js +14 -105
- package/dist/es/utils/scale-f.d.ts +0 -17
- package/dist/es/utils/scale-f.js +15 -106
- package/dist/nutui.react.umd.js +6 -95
- package/dist/style-jmapp.css +1 -1
- package/dist/style-jmapp.scss +33 -33
- package/dist/style-jrkf.css +1 -1
- package/dist/style-jrkf.scss +38 -38
- package/dist/style.css +1 -1
- package/dist/style.scss +36 -36
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,24 +1,29 @@
|
|
|
1
|
-
# v4.0.0-beta.
|
|
2
|
-
`2026-06-
|
|
1
|
+
# v4.0.0-beta.2
|
|
2
|
+
`2026-06-08`
|
|
3
|
+
|
|
4
|
+
* :bug: fix: 移除jmfe桥接方式 (#3479)
|
|
3
5
|
|
|
4
6
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
* :sparkles: feat(toast): 适配v16,增加升级v4版本的文档 (#3471)
|
|
9
|
-
* :sparkles: feat: inputnumber暗黑适配 (#3470)
|
|
10
|
-
* :sparkles: feat: inputnumber更新 (#3466)
|
|
11
|
-
* :sparkles: feat(checkbox): 适配v16并补充主题相关文档 (#3469)
|
|
12
|
-
* :sparkles: feat(radio): 适配V16 (#3468)
|
|
13
|
-
* :sparkles: feat(test): 单测处理 (#3467)
|
|
14
|
-
* :sparkles: feat(button): v16 重构+无障碍支持 (#3465)
|
|
15
|
-
* :bug: fix(swipe): resolve infinite re-render loop causing page freeze
|
|
16
|
-
* :bug: fix(datepicker): 解决时间解析为 Invalid Date 的 Bug (#3472)
|
|
17
|
-
* :bug: fix: conflicts
|
|
18
|
-
* 🪵 refactor: 添加手动触发 (#3474)
|
|
19
|
-
* 🪵 refactor: 添加GitHub Actions 自动化的 workflow 配置文件 (#3473)
|
|
20
|
-
* 💡 test(swipe): add touch interaction tests for coverage
|
|
7
|
+
# v4.0.0-beta.1
|
|
8
|
+
|
|
9
|
+
`2026-06-05`
|
|
21
10
|
|
|
11
|
+
- 🤖 ci: add strict error handling and exit codes to issue resolver agent
|
|
12
|
+
- 📖 docs: 修订文档
|
|
13
|
+
- :sparkles: feat(agents): add local issue watcher daemon script
|
|
14
|
+
- :sparkles: feat(toast): 适配v16,增加升级v4版本的文档 (#3471)
|
|
15
|
+
- :sparkles: feat: inputnumber暗黑适配 (#3470)
|
|
16
|
+
- :sparkles: feat: inputnumber更新 (#3466)
|
|
17
|
+
- :sparkles: feat(checkbox): 适配v16并补充主题相关文档 (#3469)
|
|
18
|
+
- :sparkles: feat(radio): 适配V16 (#3468)
|
|
19
|
+
- :sparkles: feat(test): 单测处理 (#3467)
|
|
20
|
+
- :sparkles: feat(button): v16 重构+无障碍支持 (#3465)
|
|
21
|
+
- :bug: fix(swipe): resolve infinite re-render loop causing page freeze
|
|
22
|
+
- :bug: fix(datepicker): 解决时间解析为 Invalid Date 的 Bug (#3472)
|
|
23
|
+
- :bug: fix: conflicts
|
|
24
|
+
- 🪵 refactor: 添加手动触发 (#3474)
|
|
25
|
+
- 🪵 refactor: 添加GitHub Actions 自动化的 workflow 配置文件 (#3473)
|
|
26
|
+
- 💡 test(swipe): add touch interaction tests for coverage
|
|
22
27
|
|
|
23
28
|
# v3.0.20
|
|
24
29
|
|
|
@@ -1,20 +1,3 @@
|
|
|
1
|
-
/** 原生 DongScreenAdapterPlugin.getScale 的典型返回结构 */
|
|
2
|
-
type NativeScaleResponse = {
|
|
3
|
-
status?: string;
|
|
4
|
-
data?: {
|
|
5
|
-
scale?: number | string;
|
|
6
|
-
};
|
|
7
|
-
};
|
|
8
|
-
/** jmfe 通用 callNative 签名 */
|
|
9
|
-
type NativeCaller = (plugin: string, method: string, params: string, extra: string) => Promise<NativeScaleResponse>;
|
|
10
|
-
/** 站内容器的 jmfe 桥接方法(可选) */
|
|
11
|
-
declare global {
|
|
12
|
-
interface Window {
|
|
13
|
-
jmfe?: {
|
|
14
|
-
callNative?: NativeCaller;
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
1
|
/** 字体档位:标准、大字、老年 */
|
|
19
2
|
export type ScaleProfile = 'standard' | 'large' | 'elderly';
|
|
20
3
|
/** 不同场景可选用不同放大比例(layout 等默认可不额外放大) */
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* 响应式缩放系数(--nut-scale-f
|
|
2
|
+
* 响应式缩放系数(--nut-scale-f):按视口宽度计算,
|
|
3
3
|
* 写入根节点 CSS 变量(--nut-scale-f / --nut-scale-font / --nut-scale-icon),
|
|
4
4
|
* 供布局/字号/icon 等按比例换算(见 calcByProfile)。H5 与 Taro WebView 共用此实现。
|
|
5
5
|
*/ "use strict";
|
|
@@ -20,10 +20,8 @@ _export(exports, {
|
|
|
20
20
|
return initScaleF;
|
|
21
21
|
}
|
|
22
22
|
});
|
|
23
|
-
var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
|
|
24
|
-
var _ts_generator = require("@swc/helpers/_/_ts_generator");
|
|
25
23
|
var _canusedom = require("./can-use-dom");
|
|
26
|
-
/**
|
|
24
|
+
/** 当前基准缩放(来自视口计算) */ var scale = 1;
|
|
27
25
|
/** 大字模式下仅 font 场景的相对倍率 */ var LARGE_FONT_RATIO = 1.15;
|
|
28
26
|
/** 老年模式下 font/icon/lego 场景的相对倍率 */ var ELDERLY_RATIO = 1.3;
|
|
29
27
|
/** 全局当前档位,与 scale 共同参与 calcByProfile */ var profile = 'standard';
|
|
@@ -67,7 +65,7 @@ var _canusedom = require("./can-use-dom");
|
|
|
67
65
|
}
|
|
68
66
|
return Math.round(value);
|
|
69
67
|
}
|
|
70
|
-
/**
|
|
68
|
+
/** 按屏宽推算 scale(含平板与 375 基准窄屏区间) */ function getScaleByViewport() {
|
|
71
69
|
if (!_canusedom.canUseDom) return 1;
|
|
72
70
|
var deviceWidth = window.innerWidth;
|
|
73
71
|
if (!deviceWidth) return 1;
|
|
@@ -80,81 +78,8 @@ var _canusedom = require("./can-use-dom");
|
|
|
80
78
|
}
|
|
81
79
|
return 1;
|
|
82
80
|
}
|
|
83
|
-
/**
|
|
84
|
-
return (
|
|
85
|
-
var _window_jmfe, _res_data, res, parsed, e;
|
|
86
|
-
return (0, _ts_generator._)(this, function(_state) {
|
|
87
|
-
switch(_state.label){
|
|
88
|
-
case 0:
|
|
89
|
-
if (!_canusedom.canUseDom || !((_window_jmfe = window.jmfe) === null || _window_jmfe === void 0 ? void 0 : _window_jmfe.callNative)) return [
|
|
90
|
-
2,
|
|
91
|
-
null
|
|
92
|
-
];
|
|
93
|
-
_state.label = 1;
|
|
94
|
-
case 1:
|
|
95
|
-
_state.trys.push([
|
|
96
|
-
1,
|
|
97
|
-
3,
|
|
98
|
-
,
|
|
99
|
-
4
|
|
100
|
-
]);
|
|
101
|
-
return [
|
|
102
|
-
4,
|
|
103
|
-
window.jmfe.callNative('DongScreenAdapterPlugin', 'getScale', JSON.stringify({}), '')
|
|
104
|
-
];
|
|
105
|
-
case 2:
|
|
106
|
-
res = _state.sent();
|
|
107
|
-
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) {
|
|
108
|
-
parsed = Number(res.data.scale);
|
|
109
|
-
if (Number.isFinite(parsed) && parsed > 0) {
|
|
110
|
-
return [
|
|
111
|
-
2,
|
|
112
|
-
parsed
|
|
113
|
-
];
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
return [
|
|
117
|
-
3,
|
|
118
|
-
4
|
|
119
|
-
];
|
|
120
|
-
case 3:
|
|
121
|
-
e = _state.sent();
|
|
122
|
-
return [
|
|
123
|
-
3,
|
|
124
|
-
4
|
|
125
|
-
];
|
|
126
|
-
case 4:
|
|
127
|
-
return [
|
|
128
|
-
2,
|
|
129
|
-
null
|
|
130
|
-
];
|
|
131
|
-
}
|
|
132
|
-
});
|
|
133
|
-
})();
|
|
134
|
-
}
|
|
135
|
-
/** 统一获取缩放:站内原生优先,失败则用视口规则 */ function getScaleF() {
|
|
136
|
-
return (0, _async_to_generator._)(function() {
|
|
137
|
-
var nativeScale;
|
|
138
|
-
return (0, _ts_generator._)(this, function(_state) {
|
|
139
|
-
switch(_state.label){
|
|
140
|
-
case 0:
|
|
141
|
-
return [
|
|
142
|
-
4,
|
|
143
|
-
getScaleByNative()
|
|
144
|
-
];
|
|
145
|
-
case 1:
|
|
146
|
-
nativeScale = _state.sent();
|
|
147
|
-
if (nativeScale) return [
|
|
148
|
-
2,
|
|
149
|
-
nativeScale
|
|
150
|
-
];
|
|
151
|
-
return [
|
|
152
|
-
2,
|
|
153
|
-
getScaleByViewport()
|
|
154
|
-
];
|
|
155
|
-
}
|
|
156
|
-
});
|
|
157
|
-
})();
|
|
81
|
+
/** 统一获取缩放:按视口规则计算 */ function getScaleF() {
|
|
82
|
+
return getScaleByViewport();
|
|
158
83
|
}
|
|
159
84
|
/** 校验后更新内存中的 scale,并写入 --nut-scale-f */ function setScaleF(nextScale) {
|
|
160
85
|
var validScale = Number.isFinite(nextScale) && nextScale > 0 ? nextScale : 1;
|
|
@@ -162,31 +87,15 @@ var _canusedom = require("./can-use-dom");
|
|
|
162
87
|
applyScaleCssVars(validScale);
|
|
163
88
|
return scale;
|
|
164
89
|
}
|
|
165
|
-
/**
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
return [
|
|
175
|
-
4,
|
|
176
|
-
getScaleF()
|
|
177
|
-
];
|
|
178
|
-
case 1:
|
|
179
|
-
nextScale = _state.sent();
|
|
180
|
-
if (!scale || nextScale !== scale) {
|
|
181
|
-
setScaleF(nextScale);
|
|
182
|
-
}
|
|
183
|
-
return [
|
|
184
|
-
2,
|
|
185
|
-
scale
|
|
186
|
-
];
|
|
187
|
-
}
|
|
188
|
-
});
|
|
189
|
-
})();
|
|
90
|
+
/** 重新计算缩放;可选同时切换 profile,避免与当前值相同时重复写 DOM */ function refreshScaleF(nextProfile) {
|
|
91
|
+
if (nextProfile) {
|
|
92
|
+
setScaleProfile(nextProfile);
|
|
93
|
+
}
|
|
94
|
+
var nextScale = getScaleF();
|
|
95
|
+
if (!scale || nextScale !== scale) {
|
|
96
|
+
setScaleF(nextScale);
|
|
97
|
+
}
|
|
98
|
+
return scale;
|
|
190
99
|
}
|
|
191
100
|
function initScaleF(nextProfile) {
|
|
192
101
|
if (!_canusedom.canUseDom) return function() {};
|
|
@@ -1,20 +1,3 @@
|
|
|
1
|
-
/** 原生 DongScreenAdapterPlugin.getScale 的典型返回结构 */
|
|
2
|
-
type NativeScaleResponse = {
|
|
3
|
-
status?: string;
|
|
4
|
-
data?: {
|
|
5
|
-
scale?: number | string;
|
|
6
|
-
};
|
|
7
|
-
};
|
|
8
|
-
/** jmfe 通用 callNative 签名 */
|
|
9
|
-
type NativeCaller = (plugin: string, method: string, params: string, extra: string) => Promise<NativeScaleResponse>;
|
|
10
|
-
/** 站内容器的 jmfe 桥接方法(可选) */
|
|
11
|
-
declare global {
|
|
12
|
-
interface Window {
|
|
13
|
-
jmfe?: {
|
|
14
|
-
callNative?: NativeCaller;
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
1
|
/** 字体档位:标准、大字、老年 */
|
|
19
2
|
export type ScaleProfile = 'standard' | 'large' | 'elderly';
|
|
20
3
|
/** 不同场景可选用不同放大比例(layout 等默认可不额外放大) */
|
package/dist/es/utils/scale-f.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* 响应式缩放系数(--nut-scale-f
|
|
2
|
+
* 响应式缩放系数(--nut-scale-f):按视口宽度计算,
|
|
3
3
|
* 写入根节点 CSS 变量(--nut-scale-f / --nut-scale-font / --nut-scale-icon),
|
|
4
4
|
* 供布局/字号/icon 等按比例换算(见 calcByProfile)。H5 与 Taro WebView 共用此实现。
|
|
5
|
-
*/ import {
|
|
6
|
-
|
|
7
|
-
import { canUseDom } from "./can-use-dom";
|
|
8
|
-
/** 当前基准缩放(来自原生或视口计算) */ var scale = 1;
|
|
5
|
+
*/ import { canUseDom } from "./can-use-dom";
|
|
6
|
+
/** 当前基准缩放(来自视口计算) */ var scale = 1;
|
|
9
7
|
/** 大字模式下仅 font 场景的相对倍率 */ var LARGE_FONT_RATIO = 1.15;
|
|
10
8
|
/** 老年模式下 font/icon/lego 场景的相对倍率 */ var ELDERLY_RATIO = 1.3;
|
|
11
9
|
/** 全局当前档位,与 scale 共同参与 calcByProfile */ var profile = 'standard';
|
|
@@ -49,7 +47,7 @@ import { canUseDom } from "./can-use-dom";
|
|
|
49
47
|
}
|
|
50
48
|
return Math.round(value);
|
|
51
49
|
}
|
|
52
|
-
/**
|
|
50
|
+
/** 按屏宽推算 scale(含平板与 375 基准窄屏区间) */ function getScaleByViewport() {
|
|
53
51
|
if (!canUseDom) return 1;
|
|
54
52
|
var deviceWidth = window.innerWidth;
|
|
55
53
|
if (!deviceWidth) return 1;
|
|
@@ -62,81 +60,8 @@ import { canUseDom } from "./can-use-dom";
|
|
|
62
60
|
}
|
|
63
61
|
return 1;
|
|
64
62
|
}
|
|
65
|
-
/**
|
|
66
|
-
return
|
|
67
|
-
var _window_jmfe, _res_data, res, parsed, e;
|
|
68
|
-
return _ts_generator(this, function(_state) {
|
|
69
|
-
switch(_state.label){
|
|
70
|
-
case 0:
|
|
71
|
-
if (!canUseDom || !((_window_jmfe = window.jmfe) === null || _window_jmfe === void 0 ? void 0 : _window_jmfe.callNative)) return [
|
|
72
|
-
2,
|
|
73
|
-
null
|
|
74
|
-
];
|
|
75
|
-
_state.label = 1;
|
|
76
|
-
case 1:
|
|
77
|
-
_state.trys.push([
|
|
78
|
-
1,
|
|
79
|
-
3,
|
|
80
|
-
,
|
|
81
|
-
4
|
|
82
|
-
]);
|
|
83
|
-
return [
|
|
84
|
-
4,
|
|
85
|
-
window.jmfe.callNative('DongScreenAdapterPlugin', 'getScale', JSON.stringify({}), '')
|
|
86
|
-
];
|
|
87
|
-
case 2:
|
|
88
|
-
res = _state.sent();
|
|
89
|
-
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) {
|
|
90
|
-
parsed = Number(res.data.scale);
|
|
91
|
-
if (Number.isFinite(parsed) && parsed > 0) {
|
|
92
|
-
return [
|
|
93
|
-
2,
|
|
94
|
-
parsed
|
|
95
|
-
];
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
return [
|
|
99
|
-
3,
|
|
100
|
-
4
|
|
101
|
-
];
|
|
102
|
-
case 3:
|
|
103
|
-
e = _state.sent();
|
|
104
|
-
return [
|
|
105
|
-
3,
|
|
106
|
-
4
|
|
107
|
-
];
|
|
108
|
-
case 4:
|
|
109
|
-
return [
|
|
110
|
-
2,
|
|
111
|
-
null
|
|
112
|
-
];
|
|
113
|
-
}
|
|
114
|
-
});
|
|
115
|
-
})();
|
|
116
|
-
}
|
|
117
|
-
/** 统一获取缩放:站内原生优先,失败则用视口规则 */ function getScaleF() {
|
|
118
|
-
return _async_to_generator(function() {
|
|
119
|
-
var nativeScale;
|
|
120
|
-
return _ts_generator(this, function(_state) {
|
|
121
|
-
switch(_state.label){
|
|
122
|
-
case 0:
|
|
123
|
-
return [
|
|
124
|
-
4,
|
|
125
|
-
getScaleByNative()
|
|
126
|
-
];
|
|
127
|
-
case 1:
|
|
128
|
-
nativeScale = _state.sent();
|
|
129
|
-
if (nativeScale) return [
|
|
130
|
-
2,
|
|
131
|
-
nativeScale
|
|
132
|
-
];
|
|
133
|
-
return [
|
|
134
|
-
2,
|
|
135
|
-
getScaleByViewport()
|
|
136
|
-
];
|
|
137
|
-
}
|
|
138
|
-
});
|
|
139
|
-
})();
|
|
63
|
+
/** 统一获取缩放:按视口规则计算 */ function getScaleF() {
|
|
64
|
+
return getScaleByViewport();
|
|
140
65
|
}
|
|
141
66
|
/** 校验后更新内存中的 scale,并写入 --nut-scale-f */ function setScaleF(nextScale) {
|
|
142
67
|
var validScale = Number.isFinite(nextScale) && nextScale > 0 ? nextScale : 1;
|
|
@@ -144,31 +69,15 @@ import { canUseDom } from "./can-use-dom";
|
|
|
144
69
|
applyScaleCssVars(validScale);
|
|
145
70
|
return scale;
|
|
146
71
|
}
|
|
147
|
-
/**
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
return [
|
|
157
|
-
4,
|
|
158
|
-
getScaleF()
|
|
159
|
-
];
|
|
160
|
-
case 1:
|
|
161
|
-
nextScale = _state.sent();
|
|
162
|
-
if (!scale || nextScale !== scale) {
|
|
163
|
-
setScaleF(nextScale);
|
|
164
|
-
}
|
|
165
|
-
return [
|
|
166
|
-
2,
|
|
167
|
-
scale
|
|
168
|
-
];
|
|
169
|
-
}
|
|
170
|
-
});
|
|
171
|
-
})();
|
|
72
|
+
/** 重新计算缩放;可选同时切换 profile,避免与当前值相同时重复写 DOM */ function refreshScaleF(nextProfile) {
|
|
73
|
+
if (nextProfile) {
|
|
74
|
+
setScaleProfile(nextProfile);
|
|
75
|
+
}
|
|
76
|
+
var nextScale = getScaleF();
|
|
77
|
+
if (!scale || nextScale !== scale) {
|
|
78
|
+
setScaleF(nextScale);
|
|
79
|
+
}
|
|
80
|
+
return scale;
|
|
172
81
|
}
|
|
173
82
|
/** 首次计算缩放并订阅 resize;返回卸载函数(SSR 下为空函数) */ export function initScaleF(nextProfile) {
|
|
174
83
|
if (!canUseDom) return function() {};
|
package/dist/nutui.react.umd.js
CHANGED
|
@@ -2784,81 +2784,8 @@ React keys must be passed directly to JSX without using spread:
|
|
|
2784
2784
|
}
|
|
2785
2785
|
return 1;
|
|
2786
2786
|
}
|
|
2787
|
-
function getScaleByNative() {
|
|
2788
|
-
return _async_to_generator(function() {
|
|
2789
|
-
var _window_jmfe, _res_data, res, parsed;
|
|
2790
|
-
return __generator(this, function(_state) {
|
|
2791
|
-
switch (_state.label) {
|
|
2792
|
-
case 0:
|
|
2793
|
-
if (!canUseDom || !((_window_jmfe = window.jmfe) === null || _window_jmfe === void 0 ? void 0 : _window_jmfe.callNative)) return [
|
|
2794
|
-
2,
|
|
2795
|
-
null
|
|
2796
|
-
];
|
|
2797
|
-
_state.label = 1;
|
|
2798
|
-
case 1:
|
|
2799
|
-
_state.trys.push([
|
|
2800
|
-
1,
|
|
2801
|
-
3,
|
|
2802
|
-
,
|
|
2803
|
-
4
|
|
2804
|
-
]);
|
|
2805
|
-
return [
|
|
2806
|
-
4,
|
|
2807
|
-
window.jmfe.callNative("DongScreenAdapterPlugin", "getScale", JSON.stringify({}), "")
|
|
2808
|
-
];
|
|
2809
|
-
case 2:
|
|
2810
|
-
res = _state.sent();
|
|
2811
|
-
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) {
|
|
2812
|
-
parsed = Number(res.data.scale);
|
|
2813
|
-
if (Number.isFinite(parsed) && parsed > 0) {
|
|
2814
|
-
return [
|
|
2815
|
-
2,
|
|
2816
|
-
parsed
|
|
2817
|
-
];
|
|
2818
|
-
}
|
|
2819
|
-
}
|
|
2820
|
-
return [
|
|
2821
|
-
3,
|
|
2822
|
-
4
|
|
2823
|
-
];
|
|
2824
|
-
case 3:
|
|
2825
|
-
_state.sent();
|
|
2826
|
-
return [
|
|
2827
|
-
3,
|
|
2828
|
-
4
|
|
2829
|
-
];
|
|
2830
|
-
case 4:
|
|
2831
|
-
return [
|
|
2832
|
-
2,
|
|
2833
|
-
null
|
|
2834
|
-
];
|
|
2835
|
-
}
|
|
2836
|
-
});
|
|
2837
|
-
})();
|
|
2838
|
-
}
|
|
2839
2787
|
function getScaleF() {
|
|
2840
|
-
return
|
|
2841
|
-
var nativeScale;
|
|
2842
|
-
return __generator(this, function(_state) {
|
|
2843
|
-
switch (_state.label) {
|
|
2844
|
-
case 0:
|
|
2845
|
-
return [
|
|
2846
|
-
4,
|
|
2847
|
-
getScaleByNative()
|
|
2848
|
-
];
|
|
2849
|
-
case 1:
|
|
2850
|
-
nativeScale = _state.sent();
|
|
2851
|
-
if (nativeScale) return [
|
|
2852
|
-
2,
|
|
2853
|
-
nativeScale
|
|
2854
|
-
];
|
|
2855
|
-
return [
|
|
2856
|
-
2,
|
|
2857
|
-
getScaleByViewport()
|
|
2858
|
-
];
|
|
2859
|
-
}
|
|
2860
|
-
});
|
|
2861
|
-
})();
|
|
2788
|
+
return getScaleByViewport();
|
|
2862
2789
|
}
|
|
2863
2790
|
function setScaleF(nextScale) {
|
|
2864
2791
|
var validScale = Number.isFinite(nextScale) && nextScale > 0 ? nextScale : 1;
|
|
@@ -2867,27 +2794,11 @@ React keys must be passed directly to JSX without using spread:
|
|
|
2867
2794
|
return scale;
|
|
2868
2795
|
}
|
|
2869
2796
|
function refreshScaleF(nextProfile) {
|
|
2870
|
-
|
|
2871
|
-
|
|
2872
|
-
|
|
2873
|
-
|
|
2874
|
-
|
|
2875
|
-
return [
|
|
2876
|
-
4,
|
|
2877
|
-
getScaleF()
|
|
2878
|
-
];
|
|
2879
|
-
case 1:
|
|
2880
|
-
nextScale = _state.sent();
|
|
2881
|
-
if (!scale || nextScale !== scale) {
|
|
2882
|
-
setScaleF(nextScale);
|
|
2883
|
-
}
|
|
2884
|
-
return [
|
|
2885
|
-
2,
|
|
2886
|
-
scale
|
|
2887
|
-
];
|
|
2888
|
-
}
|
|
2889
|
-
});
|
|
2890
|
-
})();
|
|
2797
|
+
var nextScale = getScaleF();
|
|
2798
|
+
if (!scale || nextScale !== scale) {
|
|
2799
|
+
setScaleF(nextScale);
|
|
2800
|
+
}
|
|
2801
|
+
return scale;
|
|
2891
2802
|
}
|
|
2892
2803
|
function initScaleF(nextProfile) {
|
|
2893
2804
|
if (!canUseDom) return function() {
|