@mpxjs/webpack-plugin 2.10.16-beta.7 → 2.10.16-perf.1
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/lib/config.js +0 -60
- package/lib/dependencies/AppEntryDependency.js +2 -2
- package/lib/dependencies/ResolveDependency.js +1 -1
- package/lib/file-loader.js +3 -13
- package/lib/helpers.js +0 -2
- package/lib/index.js +15 -40
- package/lib/json-compiler/helper.js +2 -72
- package/lib/json-compiler/index.js +56 -16
- package/lib/json-compiler/plugin.js +2 -2
- package/lib/loader.js +4 -10
- package/lib/native-loader.js +3 -6
- package/lib/platform/json/wx/index.js +29 -30
- package/lib/platform/style/wx/index.js +1 -8
- package/lib/platform/template/wx/component-config/ad.js +0 -5
- package/lib/platform/template/wx/component-config/button.js +5 -21
- package/lib/platform/template/wx/component-config/camera.js +3 -25
- package/lib/platform/template/wx/component-config/canvas.js +1 -8
- package/lib/platform/template/wx/component-config/component.js +33 -31
- package/lib/platform/template/wx/component-config/cover-image.js +2 -7
- package/lib/platform/template/wx/component-config/cover-view.js +1 -3
- package/lib/platform/template/wx/component-config/fix-component-name.js +2 -2
- package/lib/platform/template/wx/component-config/form.js +2 -27
- package/lib/platform/template/wx/component-config/image.js +0 -5
- package/lib/platform/template/wx/component-config/input.js +0 -10
- package/lib/platform/template/wx/component-config/label.js +2 -10
- package/lib/platform/template/wx/component-config/map.js +0 -11
- package/lib/platform/template/wx/component-config/movable-area.js +1 -4
- package/lib/platform/template/wx/component-config/movable-view.js +2 -17
- package/lib/platform/template/wx/component-config/navigator.js +0 -26
- package/lib/platform/template/wx/component-config/picker-view.js +0 -12
- package/lib/platform/template/wx/component-config/picker.js +1 -3
- package/lib/platform/template/wx/component-config/progress.js +1 -11
- package/lib/platform/template/wx/component-config/rich-text.js +0 -5
- package/lib/platform/template/wx/component-config/scroll-view.js +1 -12
- package/lib/platform/template/wx/component-config/slider.js +0 -8
- package/lib/platform/template/wx/component-config/swiper-item.js +2 -5
- package/lib/platform/template/wx/component-config/swiper.js +0 -10
- package/lib/platform/template/wx/component-config/text.js +0 -5
- package/lib/platform/template/wx/component-config/textarea.js +2 -19
- package/lib/platform/template/wx/component-config/unsupported.js +1 -10
- package/lib/platform/template/wx/component-config/video.js +0 -10
- package/lib/platform/template/wx/index.js +1 -21
- package/lib/react/index.js +0 -2
- package/lib/react/processJSON.js +71 -39
- package/lib/react/processStyles.js +2 -3
- package/lib/react/processTemplate.js +6 -8
- package/lib/react/script-helper.js +16 -6
- package/lib/react/style-helper.js +2 -10
- package/lib/runtime/components/react/context.ts +6 -12
- package/lib/runtime/components/react/dist/context.js +0 -1
- package/lib/runtime/components/react/dist/mpx-image.jsx +62 -100
- package/lib/runtime/components/react/dist/mpx-input.jsx +9 -35
- package/lib/runtime/components/react/dist/mpx-keyboard-avoiding-view.jsx +50 -58
- package/lib/runtime/components/react/dist/mpx-picker-view/index.jsx +3 -4
- package/lib/runtime/components/react/dist/mpx-picker-view-column/index.jsx +18 -12
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItem.jsx +11 -8
- package/lib/runtime/components/react/dist/mpx-portal/index.jsx +1 -5
- package/lib/runtime/components/react/dist/mpx-scroll-view.jsx +14 -6
- package/lib/runtime/components/react/dist/mpx-text.jsx +5 -33
- package/lib/runtime/components/react/dist/mpx-view.jsx +1 -1
- package/lib/runtime/components/react/dist/mpx-web-view.jsx +1 -1
- package/lib/runtime/components/react/dist/utils.jsx +6 -16
- package/lib/runtime/components/react/mpx-image.tsx +82 -123
- package/lib/runtime/components/react/mpx-input.tsx +16 -41
- package/lib/runtime/components/react/mpx-keyboard-avoiding-view.tsx +49 -66
- package/lib/runtime/components/react/mpx-picker-view/index.tsx +2 -5
- package/lib/runtime/components/react/mpx-picker-view-column/index.tsx +21 -26
- package/lib/runtime/components/react/mpx-picker-view-column/pickerViewColumnItem.tsx +12 -8
- package/lib/runtime/components/react/mpx-portal/index.tsx +2 -8
- package/lib/runtime/components/react/mpx-scroll-view.tsx +17 -6
- package/lib/runtime/components/react/mpx-text.tsx +5 -38
- package/lib/runtime/components/react/mpx-view.tsx +1 -1
- package/lib/runtime/components/react/mpx-web-view.tsx +1 -1
- package/lib/runtime/components/react/types/common.d.ts +0 -19
- package/lib/runtime/components/react/utils.tsx +6 -15
- package/lib/runtime/stringify.wxs +2 -2
- package/lib/script-setup-compiler/index.js +2 -2
- package/lib/style-compiler/index.js +2 -3
- package/lib/style-compiler/load-postcss-config.js +1 -1
- package/lib/style-compiler/plugins/trans-special.js +2 -10
- package/lib/style-compiler/strip-conditional-loader.js +15 -178
- package/lib/template-compiler/bind-this.js +2 -2
- package/lib/template-compiler/compiler.js +72 -270
- package/lib/template-compiler/gen-node-react.js +6 -18
- package/lib/template-compiler/index.js +10 -12
- package/lib/template-compiler/parse-exps.js +1 -1
- package/lib/utils/const.js +1 -2
- package/lib/utils/dom-tag-config.js +6 -6
- package/lib/utils/env.js +1 -6
- package/lib/utils/pre-process-json.js +0 -5
- package/lib/web/index.js +0 -2
- package/lib/web/processJSON.js +16 -44
- package/lib/web/processScript.js +1 -1
- package/lib/web/processTemplate.js +4 -6
- package/lib/web/script-helper.js +9 -19
- package/lib/wxs/pre-loader.js +1 -1
- package/lib/wxss/loader.js +9 -1
- package/package.json +4 -15
- package/lib/dependencies/RecordModuleIdMapDependency.js +0 -49
- package/lib/runtime/components/react/dist/context.d.ts +0 -75
- package/lib/runtime/components/react/dist/context.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/event.config.d.ts +0 -8
- package/lib/runtime/components/react/dist/event.config.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/getInnerListeners.d.ts +0 -8
- package/lib/runtime/components/react/dist/getInnerListeners.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-async-suspense.d.ts +0 -13
- package/lib/runtime/components/react/dist/mpx-async-suspense.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-button.d.ts +0 -69
- package/lib/runtime/components/react/dist/mpx-button.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-camera.d.ts +0 -28
- package/lib/runtime/components/react/dist/mpx-camera.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-camera.jsx +0 -102
- package/lib/runtime/components/react/dist/mpx-canvas/Bus.d.ts +0 -24
- package/lib/runtime/components/react/dist/mpx-canvas/Bus.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/CanvasGradient.d.ts +0 -8
- package/lib/runtime/components/react/dist/mpx-canvas/CanvasGradient.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/CanvasRenderingContext2D.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-canvas/CanvasRenderingContext2D.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/Image.d.ts +0 -21
- package/lib/runtime/components/react/dist/mpx-canvas/Image.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/ImageData.d.ts +0 -9
- package/lib/runtime/components/react/dist/mpx-canvas/ImageData.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/constructorsRegistry.d.ts +0 -11
- package/lib/runtime/components/react/dist/mpx-canvas/constructorsRegistry.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/html.d.ts +0 -3
- package/lib/runtime/components/react/dist/mpx-canvas/html.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/index.d.ts +0 -33
- package/lib/runtime/components/react/dist/mpx-canvas/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-canvas/utils.d.ts +0 -53
- package/lib/runtime/components/react/dist/mpx-canvas/utils.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-checkbox-group.d.ts +0 -21
- package/lib/runtime/components/react/dist/mpx-checkbox-group.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-checkbox.d.ts +0 -33
- package/lib/runtime/components/react/dist/mpx-checkbox.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-form.d.ts +0 -28
- package/lib/runtime/components/react/dist/mpx-form.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-icon/index.d.ts +0 -19
- package/lib/runtime/components/react/dist/mpx-icon/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-image.d.ts +0 -22
- package/lib/runtime/components/react/dist/mpx-image.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-inline-text.d.ts +0 -8
- package/lib/runtime/components/react/dist/mpx-inline-text.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-input.d.ts +0 -50
- package/lib/runtime/components/react/dist/mpx-input.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-keyboard-avoiding-view.d.ts +0 -13
- package/lib/runtime/components/react/dist/mpx-keyboard-avoiding-view.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-label.d.ts +0 -21
- package/lib/runtime/components/react/dist/mpx-label.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-movable-area.d.ts +0 -21
- package/lib/runtime/components/react/dist/mpx-movable-area.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-movable-view.d.ts +0 -66
- package/lib/runtime/components/react/dist/mpx-movable-view.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-nav.d.ts +0 -9
- package/lib/runtime/components/react/dist/mpx-nav.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-nav.jsx +0 -132
- package/lib/runtime/components/react/dist/mpx-navigator.d.ts +0 -10
- package/lib/runtime/components/react/dist/mpx-navigator.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/date.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-picker/date.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/dateData.d.ts +0 -8
- package/lib/runtime/components/react/dist/mpx-picker/dateData.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/index.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-picker/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/multiSelector.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-picker/multiSelector.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/region.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-picker/region.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/regionData.d.ts +0 -3
- package/lib/runtime/components/react/dist/mpx-picker/regionData.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/selector.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-picker/selector.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/time.d.ts +0 -7
- package/lib/runtime/components/react/dist/mpx-picker/time.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker/type.d.ts +0 -107
- package/lib/runtime/components/react/dist/mpx-picker/type.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view/index.d.ts +0 -33
- package/lib/runtime/components/react/dist/mpx-picker-view/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view/pickerVIewContext.d.ts +0 -9
- package/lib/runtime/components/react/dist/mpx-picker-view/pickerVIewContext.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view-column/index.d.ts +0 -24
- package/lib/runtime/components/react/dist/mpx-picker-view-column/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItem.d.ts +0 -15
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItem.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItemLite.d.ts +0 -14
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItemLite.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewColumnItemLite.jsx +0 -20
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewFaces.d.ts +0 -17
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewFaces.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewIndicator.d.ts +0 -13
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewIndicator.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewMask.d.ts +0 -12
- package/lib/runtime/components/react/dist/mpx-picker-view-column/pickerViewMask.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-popup/index.d.ts +0 -23
- package/lib/runtime/components/react/dist/mpx-popup/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-popup/popupBase.d.ts +0 -17
- package/lib/runtime/components/react/dist/mpx-popup/popupBase.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-portal/index.d.ts +0 -16
- package/lib/runtime/components/react/dist/mpx-portal/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-portal/portal-host.d.ts +0 -30
- package/lib/runtime/components/react/dist/mpx-portal/portal-host.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-portal/portal-manager.d.ts +0 -10
- package/lib/runtime/components/react/dist/mpx-portal/portal-manager.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-progress.d.ts +0 -24
- package/lib/runtime/components/react/dist/mpx-progress.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-radio-group.d.ts +0 -21
- package/lib/runtime/components/react/dist/mpx-radio-group.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-radio.d.ts +0 -27
- package/lib/runtime/components/react/dist/mpx-radio.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-rich-text/html.d.ts +0 -2
- package/lib/runtime/components/react/dist/mpx-rich-text/html.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-rich-text/index.d.ts +0 -25
- package/lib/runtime/components/react/dist/mpx-rich-text/index.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-root-portal.d.ts +0 -15
- package/lib/runtime/components/react/dist/mpx-root-portal.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-scroll-view.d.ts +0 -55
- package/lib/runtime/components/react/dist/mpx-scroll-view.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-simple-text.d.ts +0 -8
- package/lib/runtime/components/react/dist/mpx-simple-text.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-simple-view.d.ts +0 -8
- package/lib/runtime/components/react/dist/mpx-simple-view.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-slider.d.ts +0 -31
- package/lib/runtime/components/react/dist/mpx-slider.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-sticky-header.d.ts +0 -18
- package/lib/runtime/components/react/dist/mpx-sticky-header.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-sticky-section.d.ts +0 -16
- package/lib/runtime/components/react/dist/mpx-sticky-section.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-swiper-item.d.ts +0 -19
- package/lib/runtime/components/react/dist/mpx-swiper-item.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-swiper.d.ts +0 -53
- package/lib/runtime/components/react/dist/mpx-swiper.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-switch.d.ts +0 -27
- package/lib/runtime/components/react/dist/mpx-switch.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-text.d.ts +0 -23
- package/lib/runtime/components/react/dist/mpx-text.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-textarea.d.ts +0 -8
- package/lib/runtime/components/react/dist/mpx-textarea.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-video.d.ts +0 -102
- package/lib/runtime/components/react/dist/mpx-video.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-view.d.ts +0 -35
- package/lib/runtime/components/react/dist/mpx-view.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/mpx-web-view.d.ts +0 -23
- package/lib/runtime/components/react/dist/mpx-web-view.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/parser.d.ts +0 -40
- package/lib/runtime/components/react/dist/parser.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/useAnimationHooks.d.ts +0 -33
- package/lib/runtime/components/react/dist/useAnimationHooks.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/useNodesRef.d.ts +0 -12
- package/lib/runtime/components/react/dist/useNodesRef.d.ts.map +0 -1
- package/lib/runtime/components/react/dist/utils.d.ts +0 -123
- package/lib/runtime/components/react/dist/utils.d.ts.map +0 -1
- package/lib/runtime/components/react/mpx-camera.tsx +0 -167
- package/lib/runtime/components/react/mpx-nav.tsx +0 -155
- package/lib/runtime/components/react/mpx-picker-view-column/pickerViewColumnItemLite.tsx +0 -55
- package/lib/utils/get-build-tag-component.js +0 -35
|
@@ -144,8 +144,8 @@ const Input = forwardRef((props, ref) => {
|
|
|
144
144
|
}
|
|
145
145
|
};
|
|
146
146
|
const setKeyboardAvoidContext = () => {
|
|
147
|
-
if (keyboardAvoid) {
|
|
148
|
-
keyboardAvoid.current = { cursorSpacing, ref: nodeRef
|
|
147
|
+
if (adjustPosition && keyboardAvoid) {
|
|
148
|
+
keyboardAvoid.current = { cursorSpacing, ref: nodeRef };
|
|
149
149
|
}
|
|
150
150
|
};
|
|
151
151
|
const onTouchStart = () => {
|
|
@@ -156,39 +156,13 @@ const Input = forwardRef((props, ref) => {
|
|
|
156
156
|
evt.nativeEvent.origin = 'input';
|
|
157
157
|
};
|
|
158
158
|
const onFocus = (evt) => {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
value: tmpValue.current || '',
|
|
167
|
-
height: keyboardAvoid?.current?.keyboardHeight
|
|
168
|
-
},
|
|
169
|
-
layoutRef
|
|
170
|
-
}, props));
|
|
171
|
-
if (keyboardAvoid?.current?.onKeyboardShow) {
|
|
172
|
-
keyboardAvoid.current.onKeyboardShow = undefined;
|
|
173
|
-
}
|
|
174
|
-
};
|
|
175
|
-
if (keyboardAvoid?.current) {
|
|
176
|
-
// 有 keyboardAvoiding
|
|
177
|
-
if (keyboardAvoid.current.keyboardHeight) {
|
|
178
|
-
// iOS: keyboard 获取高度时机 keyboardWillShow 在 input focus 之前,可以立即执行
|
|
179
|
-
focusAction();
|
|
180
|
-
}
|
|
181
|
-
else {
|
|
182
|
-
// Android,Harmony: keyboard 获取高度时机 keyboardDidShow 在 input focus 之后,需要延迟回调
|
|
183
|
-
evt.persist();
|
|
184
|
-
keyboardAvoid.current.onKeyboardShow = focusAction;
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
// 无 keyboardAvoiding,直接执行 focus 回调
|
|
189
|
-
focusAction();
|
|
190
|
-
}
|
|
191
|
-
}
|
|
159
|
+
setKeyboardAvoidContext();
|
|
160
|
+
bindfocus && bindfocus(getCustomEvent('focus', evt, {
|
|
161
|
+
detail: {
|
|
162
|
+
value: tmpValue.current || ''
|
|
163
|
+
},
|
|
164
|
+
layoutRef
|
|
165
|
+
}, props));
|
|
192
166
|
};
|
|
193
167
|
const onBlur = (evt) => {
|
|
194
168
|
bindblur && bindblur(getCustomEvent('blur', evt, {
|
|
@@ -1,38 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
import React, { useContext, useEffect, useRef } from 'react';
|
|
1
|
+
import React, { useContext, useEffect } from 'react';
|
|
3
2
|
import { Keyboard, View } from 'react-native';
|
|
4
|
-
import Animated, { useSharedValue, useAnimatedStyle, withTiming, Easing
|
|
3
|
+
import Animated, { useSharedValue, useAnimatedStyle, withTiming, Easing } from 'react-native-reanimated';
|
|
5
4
|
import { KeyboardAvoidContext } from './context';
|
|
6
|
-
import {
|
|
5
|
+
import { isIOS } from './utils';
|
|
7
6
|
const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
|
|
8
7
|
const duration = isIOS ? 250 : 300;
|
|
9
8
|
const easing = isIOS ? Easing.inOut(Easing.ease) : Easing.out(Easing.quad);
|
|
10
9
|
const offset = useSharedValue(0);
|
|
11
10
|
const basic = useSharedValue('auto');
|
|
12
11
|
const keyboardAvoid = useContext(KeyboardAvoidContext);
|
|
13
|
-
// fix: 某些特殊机型下隐藏键盘可能会先触发一次 keyboardWillShow,
|
|
14
|
-
// 比如机型 iPhone 11 Pro,可能会导致显隐动画冲突
|
|
15
|
-
// 因此增加状态标记 + cancelAnimation 来优化
|
|
16
|
-
const isShow = useRef(false);
|
|
17
12
|
const animatedStyle = useAnimatedStyle(() => ({
|
|
18
|
-
|
|
19
|
-
marginTop: -offset.value,
|
|
13
|
+
transform: [{ translateY: -offset.value }],
|
|
20
14
|
flexBasis: basic.value
|
|
21
15
|
}));
|
|
22
16
|
const resetKeyboard = () => {
|
|
23
|
-
if (!isShow.current) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
isShow.current = false;
|
|
27
17
|
if (keyboardAvoid?.current) {
|
|
28
|
-
const inputRef = keyboardAvoid.current.ref?.current;
|
|
29
|
-
if (inputRef && inputRef.isFocused()) {
|
|
30
|
-
// 修复 Android 点击键盘收起按钮时当前 input 没触发失焦的问题
|
|
31
|
-
inputRef.blur();
|
|
32
|
-
}
|
|
33
18
|
keyboardAvoid.current = null;
|
|
34
19
|
}
|
|
35
|
-
cancelAnimation(offset);
|
|
36
20
|
offset.value = withTiming(0, { duration, easing });
|
|
37
21
|
basic.value = 'auto';
|
|
38
22
|
};
|
|
@@ -43,58 +27,66 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
|
|
|
43
27
|
};
|
|
44
28
|
useEffect(() => {
|
|
45
29
|
let subscriptions = [];
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (adjustPosition) {
|
|
56
|
-
// 默认沿用旧版本逻辑,在 android 原生关闭键盘避让的情况下应该将该配置设置为 false,走 mpx 的键盘避让逻辑,否则bundle内的所有input都会无法避让键盘
|
|
57
|
-
const enableNativeKeyboardAvoiding = mpxGlobal?.__mpx?.config?.rnConfig?.enableNativeKeyboardAvoiding ?? true;
|
|
58
|
-
const callback = () => {
|
|
59
|
-
ref?.current?.measure((x, y, width, height, pageX, pageY) => {
|
|
60
|
-
function calculateOffset() {
|
|
61
|
-
// enableNativeKeyboardAvoding 默认开启
|
|
62
|
-
if (enableNativeKeyboardAvoiding && isAndroid) {
|
|
63
|
-
const aboveOffset = pageY + height - endCoordinates.screenY;
|
|
64
|
-
const belowOffset = endCoordinates.height - aboveOffset;
|
|
65
|
-
const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing;
|
|
66
|
-
const belowValue = Math.min(belowOffset, cursorSpacing);
|
|
67
|
-
return aboveOffset > 0 ? belowValue : aboveValue;
|
|
68
|
-
}
|
|
30
|
+
if (isIOS) {
|
|
31
|
+
subscriptions = [
|
|
32
|
+
Keyboard.addListener('keyboardWillShow', (evt) => {
|
|
33
|
+
if (!keyboardAvoid?.current)
|
|
34
|
+
return;
|
|
35
|
+
const { endCoordinates } = evt;
|
|
36
|
+
const { ref, cursorSpacing = 0 } = keyboardAvoid.current;
|
|
37
|
+
setTimeout(() => {
|
|
38
|
+
ref?.current?.measure((x, y, width, height, pageX, pageY) => {
|
|
69
39
|
const aboveOffset = offset.value + pageY + height - endCoordinates.screenY;
|
|
70
40
|
const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing;
|
|
71
41
|
const belowValue = Math.min(endCoordinates.height, aboveOffset + cursorSpacing);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
42
|
+
const value = aboveOffset > 0 ? belowValue : aboveValue;
|
|
43
|
+
offset.value = withTiming(value, { duration, easing }, (finished) => {
|
|
44
|
+
if (finished) {
|
|
45
|
+
// Set flexBasic after animation to trigger re-layout and reset layout information
|
|
46
|
+
basic.value = '99.99%';
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
}),
|
|
52
|
+
Keyboard.addListener('keyboardWillHide', resetKeyboard)
|
|
53
|
+
];
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
subscriptions = [
|
|
57
|
+
Keyboard.addListener('keyboardDidShow', (evt) => {
|
|
58
|
+
if (!keyboardAvoid?.current)
|
|
59
|
+
return;
|
|
60
|
+
const { endCoordinates } = evt;
|
|
61
|
+
const { ref, cursorSpacing = 0 } = keyboardAvoid.current;
|
|
62
|
+
ref?.current?.measure((x, y, width, height, pageX, pageY) => {
|
|
63
|
+
const aboveOffset = pageY + height - endCoordinates.screenY;
|
|
64
|
+
const belowOffset = endCoordinates.height - aboveOffset;
|
|
65
|
+
const aboveValue = -aboveOffset >= cursorSpacing ? 0 : aboveOffset + cursorSpacing;
|
|
66
|
+
const belowValue = Math.min(belowOffset, cursorSpacing);
|
|
67
|
+
const value = aboveOffset > 0 ? belowValue : aboveValue;
|
|
68
|
+
offset.value = withTiming(value, { duration, easing }, (finished) => {
|
|
76
69
|
if (finished) {
|
|
77
70
|
// Set flexBasic after animation to trigger re-layout and reset layout information
|
|
78
71
|
basic.value = '99.99%';
|
|
79
72
|
}
|
|
80
73
|
});
|
|
81
74
|
});
|
|
82
|
-
}
|
|
83
|
-
(
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
if (isIOS) {
|
|
87
|
-
subscriptions = [Keyboard.addListener('keyboardWillShow', keybaordAvoding), Keyboard.addListener('keyboardWillHide', resetKeyboard)];
|
|
88
|
-
}
|
|
89
|
-
else {
|
|
90
|
-
subscriptions = [Keyboard.addListener('keyboardDidShow', keybaordAvoding), Keyboard.addListener('keyboardDidHide', resetKeyboard)];
|
|
75
|
+
}),
|
|
76
|
+
Keyboard.addListener('keyboardDidHide', resetKeyboard)
|
|
77
|
+
];
|
|
91
78
|
}
|
|
92
79
|
return () => {
|
|
93
80
|
subscriptions.forEach(subscription => subscription.remove());
|
|
94
81
|
};
|
|
95
82
|
}, [keyboardAvoid]);
|
|
96
|
-
return (<View style={style} onTouchEnd={onTouchEnd}
|
|
97
|
-
<Animated.View style={[
|
|
83
|
+
return (<View style={style} onTouchEnd={onTouchEnd}>
|
|
84
|
+
<Animated.View style={[
|
|
85
|
+
contentContainerStyle,
|
|
86
|
+
animatedStyle
|
|
87
|
+
]}>
|
|
88
|
+
{children}
|
|
89
|
+
</Animated.View>
|
|
98
90
|
</View>);
|
|
99
91
|
};
|
|
100
92
|
KeyboardAvoidingView.displayName = 'MpxKeyboardAvoidingView';
|
|
@@ -17,7 +17,7 @@ const styles = {
|
|
|
17
17
|
};
|
|
18
18
|
const DefaultPickerItemH = 36;
|
|
19
19
|
const _PickerView = forwardRef((props, ref) => {
|
|
20
|
-
const { children, value = [], bindchange, style, '
|
|
20
|
+
const { children, value = [], bindchange, style, 'indicator-style': indicatorStyle = {}, 'mask-style': pickerMaskStyle = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext } = props;
|
|
21
21
|
const { height: indicatorH, ...pickerIndicatorStyle } = indicatorStyle;
|
|
22
22
|
const nodeRef = useRef(null);
|
|
23
23
|
const cloneRef = useRef(null);
|
|
@@ -67,7 +67,7 @@ const _PickerView = forwardRef((props, ref) => {
|
|
|
67
67
|
columnData,
|
|
68
68
|
ref: cloneRef,
|
|
69
69
|
columnIndex: index,
|
|
70
|
-
key: `pick-view-${index}
|
|
70
|
+
key: `pick-view-${index}`,
|
|
71
71
|
wrapperStyle: {
|
|
72
72
|
height: normalStyle?.height || DefaultPickerItemH,
|
|
73
73
|
itemHeight: indicatorH || DefaultPickerItemH
|
|
@@ -75,8 +75,7 @@ const _PickerView = forwardRef((props, ref) => {
|
|
|
75
75
|
onSelectChange: onSelectChange.bind(null, index),
|
|
76
76
|
initialIndex,
|
|
77
77
|
pickerIndicatorStyle,
|
|
78
|
-
pickerMaskStyle
|
|
79
|
-
enableWheelAnimation
|
|
78
|
+
pickerMaskStyle
|
|
80
79
|
});
|
|
81
80
|
const realElement = React.cloneElement(child, wrappedProps);
|
|
82
81
|
return wrapChildren({
|
|
@@ -5,13 +5,12 @@ import { useTransformStyle, splitStyle, splitProps, useLayout, usePrevious, isAn
|
|
|
5
5
|
import useNodesRef from '../useNodesRef';
|
|
6
6
|
import PickerIndicator from './pickerViewIndicator';
|
|
7
7
|
import PickerMask from './pickerViewMask';
|
|
8
|
-
import
|
|
9
|
-
import MpxPickerViewColumnItemLite from './pickerViewColumnItemLite';
|
|
8
|
+
import MpxPickerVIewColumnItem from './pickerViewColumnItem';
|
|
10
9
|
import { PickerViewColumnAnimationContext } from '../mpx-picker-view/pickerVIewContext';
|
|
11
10
|
import { calcHeightOffsets } from './pickerViewFaces';
|
|
12
11
|
const visibleCount = 5;
|
|
13
12
|
const _PickerViewColumn = forwardRef((props, ref) => {
|
|
14
|
-
const { columnData, columnIndex, initialIndex, onSelectChange, style, wrapperStyle, pickerMaskStyle, pickerIndicatorStyle,
|
|
13
|
+
const { columnData, columnIndex, initialIndex, onSelectChange, style, wrapperStyle, pickerMaskStyle, pickerIndicatorStyle, 'enable-var': enableVar, 'external-var-context': externalVarContext } = props;
|
|
15
14
|
const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext });
|
|
16
15
|
const { textStyle = {} } = splitStyle(normalStyle);
|
|
17
16
|
const { textProps = {} } = splitProps(props);
|
|
@@ -44,7 +43,6 @@ const _PickerViewColumn = forwardRef((props, ref) => {
|
|
|
44
43
|
const contentContainerStyle = useMemo(() => {
|
|
45
44
|
return [{ paddingVertical: paddingHeight }];
|
|
46
45
|
}, [paddingHeight]);
|
|
47
|
-
const initialContentOffsetY = useMemo(() => initialIndex * itemRawH, [initialIndex, itemRawH]);
|
|
48
46
|
const getIndex = useCallback((y) => {
|
|
49
47
|
const calc = Math.round(y / itemRawH);
|
|
50
48
|
return Math.max(0, Math.min(calc, maxIndex));
|
|
@@ -94,6 +92,16 @@ const _PickerViewColumn = forwardRef((props, ref) => {
|
|
|
94
92
|
activeIndex.current = initialIndex;
|
|
95
93
|
}, isIOS ? 0 : 200);
|
|
96
94
|
}, [itemRawH, maxIndex, initialIndex]);
|
|
95
|
+
const onContentSizeChange = useCallback((_w, h) => {
|
|
96
|
+
const y = initialIndex * itemRawH;
|
|
97
|
+
if (y <= h) {
|
|
98
|
+
clearTimerScrollTo();
|
|
99
|
+
timerScrollTo.current = setTimeout(() => {
|
|
100
|
+
scrollViewRef.current?.scrollTo({ x: 0, y, animated: false });
|
|
101
|
+
activeIndex.current = initialIndex;
|
|
102
|
+
}, 0);
|
|
103
|
+
}
|
|
104
|
+
}, [itemRawH, initialIndex]);
|
|
97
105
|
const onItemLayout = useCallback((e) => {
|
|
98
106
|
const { height: rawH } = e.nativeEvent.layout;
|
|
99
107
|
const roundedH = Math.round(rawH);
|
|
@@ -209,9 +217,7 @@ const _PickerViewColumn = forwardRef((props, ref) => {
|
|
|
209
217
|
}
|
|
210
218
|
}, [itemRawH, maxIndex, calcOffset, onMomentumScrollEnd]);
|
|
211
219
|
const renderInnerchild = () => columnData.map((item, index) => {
|
|
212
|
-
return
|
|
213
|
-
? (<MpxPickerViewColumnItem key={index} item={item} index={index} itemHeight={itemHeight} textStyle={textStyle} textProps={textProps} visibleCount={visibleCount} onItemLayout={onItemLayout}/>)
|
|
214
|
-
: (<MpxPickerViewColumnItemLite key={index} item={item} index={index} itemHeight={itemHeight} textStyle={textStyle} textProps={textProps} onItemLayout={onItemLayout}/>);
|
|
220
|
+
return (<MpxPickerVIewColumnItem key={index} item={item} index={index} itemHeight={itemHeight} textStyle={textStyle} textProps={textProps} visibleCount={visibleCount} onItemLayout={onItemLayout}/>);
|
|
215
221
|
});
|
|
216
222
|
const renderScollView = () => {
|
|
217
223
|
const innerProps = extendObject({}, layoutProps, {
|
|
@@ -232,17 +238,17 @@ const _PickerViewColumn = forwardRef((props, ref) => {
|
|
|
232
238
|
onScrollEndDrag,
|
|
233
239
|
onMomentumScrollBegin,
|
|
234
240
|
onMomentumScrollEnd,
|
|
235
|
-
|
|
236
|
-
|
|
241
|
+
onContentSizeChange,
|
|
242
|
+
contentContainerStyle
|
|
237
243
|
});
|
|
238
244
|
return createElement(PickerViewColumnAnimationContext.Provider, { value: offsetYShared }, createElement(Reanimated.ScrollView, innerProps, renderInnerchild()));
|
|
239
245
|
};
|
|
240
246
|
const renderIndicator = () => (<PickerIndicator itemHeight={itemHeight} indicatorItemStyle={pickerIndicatorStyle}/>);
|
|
241
247
|
const renderMask = () => (<PickerMask itemHeight={itemHeight} maskContainerStyle={pickerMaskStyle}/>);
|
|
242
248
|
return (<View style={[styles.wrapper, normalStyle]}>
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
249
|
+
{renderScollView()}
|
|
250
|
+
{renderMask()}
|
|
251
|
+
{renderIndicator()}
|
|
246
252
|
</View>);
|
|
247
253
|
});
|
|
248
254
|
const styles = StyleSheet.create({
|
|
@@ -1,20 +1,23 @@
|
|
|
1
|
-
import React, {
|
|
2
|
-
import Reanimated, { Extrapolation, interpolate, useAnimatedStyle } from 'react-native-reanimated';
|
|
1
|
+
import React, { useEffect } from 'react';
|
|
2
|
+
import Reanimated, { Extrapolation, interpolate, useAnimatedStyle, useSharedValue } from 'react-native-reanimated';
|
|
3
3
|
import { extendObject } from '../utils';
|
|
4
4
|
import { createFaces } from './pickerViewFaces';
|
|
5
5
|
import { usePickerViewColumnAnimationContext, usePickerViewStyleContext } from '../mpx-picker-view/pickerVIewContext';
|
|
6
6
|
const PickerViewColumnItem = ({ item, index, itemHeight, itemWidth = '100%', textStyle, textProps, visibleCount, onItemLayout }) => {
|
|
7
7
|
const textStyleFromAncestor = usePickerViewStyleContext();
|
|
8
8
|
const offsetYShared = usePickerViewColumnAnimationContext();
|
|
9
|
-
const facesShared =
|
|
9
|
+
const facesShared = useSharedValue(createFaces(itemHeight, visibleCount));
|
|
10
|
+
useEffect(() => {
|
|
11
|
+
facesShared.value = createFaces(itemHeight, visibleCount);
|
|
12
|
+
}, [itemHeight]);
|
|
10
13
|
const animatedStyles = useAnimatedStyle(() => {
|
|
11
|
-
const inputRange = facesShared.map((f) => itemHeight * (index + f.index));
|
|
14
|
+
const inputRange = facesShared.value.map((f) => itemHeight * (index + f.index));
|
|
12
15
|
return {
|
|
13
|
-
opacity: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.opacity), Extrapolation.CLAMP),
|
|
16
|
+
opacity: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.opacity), Extrapolation.CLAMP),
|
|
14
17
|
transform: [
|
|
15
|
-
{ translateY: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.offsetY), Extrapolation.EXTEND) },
|
|
16
|
-
{ rotateX: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.deg), Extrapolation.CLAMP) + 'deg' },
|
|
17
|
-
{ scale: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.scale), Extrapolation.EXTEND) }
|
|
18
|
+
{ translateY: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.offsetY), Extrapolation.EXTEND) },
|
|
19
|
+
{ rotateX: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.deg), Extrapolation.CLAMP) + 'deg' },
|
|
20
|
+
{ scale: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.scale), Extrapolation.EXTEND) }
|
|
18
21
|
]
|
|
19
22
|
};
|
|
20
23
|
});
|
|
@@ -1,18 +1,14 @@
|
|
|
1
1
|
import { useContext, useEffect, useRef } from 'react';
|
|
2
|
-
import { PortalContext,
|
|
2
|
+
import { PortalContext, RouteContext, VarContext } from '../context';
|
|
3
3
|
import PortalHost, { portal } from './portal-host';
|
|
4
4
|
const Portal = ({ children }) => {
|
|
5
5
|
const manager = useContext(PortalContext);
|
|
6
6
|
const keyRef = useRef(null);
|
|
7
7
|
const { pageId } = useContext(RouteContext) || {};
|
|
8
8
|
const varContext = useContext(VarContext);
|
|
9
|
-
const parentProvides = useContext(ProviderContext);
|
|
10
9
|
if (varContext) {
|
|
11
10
|
children = (<VarContext.Provider value={varContext} key='varContextWrap'>{children}</VarContext.Provider>);
|
|
12
11
|
}
|
|
13
|
-
if (parentProvides) {
|
|
14
|
-
children = (<ProviderContext.Provider value={parentProvides} key='providerContextWrap'>{children}</ProviderContext.Provider>);
|
|
15
|
-
}
|
|
16
12
|
useEffect(() => {
|
|
17
13
|
manager.update(keyRef.current, children);
|
|
18
14
|
}, [children]);
|
|
@@ -48,6 +48,8 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
|
|
|
48
48
|
const scrollOffset = useRef(new RNAnimated.Value(0)).current;
|
|
49
49
|
const simultaneousHandlers = flatGesture(originSimultaneousHandlers);
|
|
50
50
|
const waitForHandlers = flatGesture(waitFor);
|
|
51
|
+
const snapScrollTop = useRef(0);
|
|
52
|
+
const snapScrollLeft = useRef(0);
|
|
51
53
|
const [refreshing, setRefreshing] = useState(false);
|
|
52
54
|
const [enableScroll, setEnableScroll] = useState(true);
|
|
53
55
|
const enableScrollValue = useSharedValue(true);
|
|
@@ -125,12 +127,14 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
|
|
|
125
127
|
warn('scroll-x and scroll-y cannot be set to true at the same time, Mpx will use the value of scroll-y as the criterion');
|
|
126
128
|
}
|
|
127
129
|
useEffect(() => {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
130
|
+
if (snapScrollTop.current !== scrollTop || snapScrollLeft.current !== scrollLeft) {
|
|
131
|
+
initialTimeout.current = setTimeout(() => {
|
|
132
|
+
scrollToOffset(scrollLeft, scrollTop);
|
|
133
|
+
}, 0);
|
|
134
|
+
return () => {
|
|
135
|
+
initialTimeout.current && clearTimeout(initialTimeout.current);
|
|
136
|
+
};
|
|
137
|
+
}
|
|
134
138
|
}, [scrollTop, scrollLeft]);
|
|
135
139
|
useEffect(() => {
|
|
136
140
|
if (scrollIntoView && __selectRef) {
|
|
@@ -312,6 +316,10 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
|
|
|
312
316
|
function scrollToOffset(x = 0, y = 0, animated = scrollWithAnimation) {
|
|
313
317
|
if (scrollViewRef.current) {
|
|
314
318
|
scrollViewRef.current.scrollTo({ x, y, animated });
|
|
319
|
+
scrollOptions.current.scrollLeft = x;
|
|
320
|
+
scrollOptions.current.scrollTop = y;
|
|
321
|
+
snapScrollLeft.current = x;
|
|
322
|
+
snapScrollTop.current = y;
|
|
315
323
|
}
|
|
316
324
|
}
|
|
317
325
|
function onScrollTouchMove(e) {
|
|
@@ -1,40 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* ✔ selectable
|
|
3
3
|
* ✘ space
|
|
4
|
-
*
|
|
4
|
+
* ✘ decode
|
|
5
5
|
*/
|
|
6
6
|
import { Text } from 'react-native';
|
|
7
|
-
import { useRef, forwardRef, createElement
|
|
7
|
+
import { useRef, forwardRef, createElement } from 'react';
|
|
8
8
|
import Portal from './mpx-portal';
|
|
9
9
|
import useInnerProps from './getInnerListeners';
|
|
10
10
|
import useNodesRef from './useNodesRef'; // 引入辅助函数
|
|
11
11
|
import { useTransformStyle, wrapChildren, extendObject } from './utils';
|
|
12
|
-
const decodeMap = {
|
|
13
|
-
'<': '<',
|
|
14
|
-
'>': '>',
|
|
15
|
-
'"': '"',
|
|
16
|
-
'&': '&',
|
|
17
|
-
''': '\'',
|
|
18
|
-
' ': ' '
|
|
19
|
-
};
|
|
20
|
-
const encodedRe = /&(?:lt|gt|quot|amp|#39|nbsp);/g;
|
|
21
|
-
function decode(value) {
|
|
22
|
-
if (value != null) {
|
|
23
|
-
return value.replace(encodedRe, function (match) {
|
|
24
|
-
return decodeMap[match];
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
function getDecodedChildren(children) {
|
|
29
|
-
return Children.map(children, (child) => {
|
|
30
|
-
if (typeof child === 'string') {
|
|
31
|
-
return decode(child);
|
|
32
|
-
}
|
|
33
|
-
return child;
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
12
|
const _Text = forwardRef((props, ref) => {
|
|
37
|
-
const { style = {}, allowFontScaling = false, selectable, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight
|
|
13
|
+
const { style = {}, allowFontScaling = false, selectable, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'user-select': userSelect, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
|
|
38
14
|
const { normalStyle, hasVarDec, varContextRef, hasPositionFixed } = useTransformStyle(style, {
|
|
39
15
|
enableVar,
|
|
40
16
|
externalVarContext,
|
|
@@ -52,13 +28,9 @@ const _Text = forwardRef((props, ref) => {
|
|
|
52
28
|
selectable: !!selectable || !!userSelect,
|
|
53
29
|
allowFontScaling
|
|
54
30
|
}), [
|
|
55
|
-
'user-select'
|
|
56
|
-
'decode'
|
|
31
|
+
'user-select'
|
|
57
32
|
]);
|
|
58
|
-
|
|
59
|
-
let finalComponent = createElement(Text, innerProps, wrapChildren(extendObject({}, props, {
|
|
60
|
-
children
|
|
61
|
-
}), {
|
|
33
|
+
let finalComponent = createElement(Text, innerProps, wrapChildren(props, {
|
|
62
34
|
hasVarDec,
|
|
63
35
|
varContext: varContextRef.current
|
|
64
36
|
}));
|
|
@@ -176,7 +176,7 @@ const _WebView = forwardRef((props, ref) => {
|
|
|
176
176
|
}
|
|
177
177
|
break;
|
|
178
178
|
case 'postMessage':
|
|
179
|
-
bindmessage && bindmessage(getCustomEvent('
|
|
179
|
+
bindmessage && bindmessage(getCustomEvent('messsage', {}, {
|
|
180
180
|
detail: {
|
|
181
181
|
data: params[0]?.data
|
|
182
182
|
}
|
|
@@ -169,34 +169,24 @@ function transformPercent(styleObj, percentKeyPaths, percentConfig) {
|
|
|
169
169
|
function resolveVar(input, varContext) {
|
|
170
170
|
const parsed = parseFunc(input, 'var');
|
|
171
171
|
const replaced = new ReplaceSource(input);
|
|
172
|
-
|
|
172
|
+
parsed.forEach(({ start, end, args }) => {
|
|
173
173
|
const varName = args[0];
|
|
174
|
-
const fallback = args[1];
|
|
174
|
+
const fallback = args[1] || '';
|
|
175
175
|
let varValue = hasOwn(varContext, varName) ? varContext[varName] : fallback;
|
|
176
|
-
if (varValue === undefined)
|
|
177
|
-
return;
|
|
178
176
|
if (varUseRegExp.test(varValue)) {
|
|
179
|
-
varValue = resolveVar(varValue, varContext);
|
|
180
|
-
if (varValue === undefined)
|
|
181
|
-
return;
|
|
177
|
+
varValue = '' + resolveVar(varValue, varContext);
|
|
182
178
|
}
|
|
183
179
|
else {
|
|
184
|
-
varValue = global.__formatValue(varValue);
|
|
180
|
+
varValue = '' + global.__formatValue(varValue);
|
|
185
181
|
}
|
|
186
182
|
replaced.replace(start, end - 1, varValue);
|
|
187
|
-
}
|
|
183
|
+
});
|
|
188
184
|
return global.__formatValue(replaced.source());
|
|
189
185
|
}
|
|
190
186
|
function transformVar(styleObj, varKeyPaths, varContext, visitOther) {
|
|
191
187
|
varKeyPaths.forEach((varKeyPath) => {
|
|
192
188
|
setStyle(styleObj, varKeyPath, ({ target, key, value }) => {
|
|
193
|
-
|
|
194
|
-
if (resolved === undefined) {
|
|
195
|
-
delete target[key];
|
|
196
|
-
error(`Can not resolve css var at ${varKeyPath.join('.')}:${value}.`);
|
|
197
|
-
return;
|
|
198
|
-
}
|
|
199
|
-
target[key] = resolved;
|
|
189
|
+
target[key] = resolveVar(value, varContext);
|
|
200
190
|
visitOther({ target, key, value: target[key], keyPath: varKeyPath });
|
|
201
191
|
});
|
|
202
192
|
});
|