@mpxjs/webpack-plugin 2.9.69 → 2.9.70-alpha.0

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.
Files changed (138) hide show
  1. package/README.md +1 -1
  2. package/lib/config.js +14 -0
  3. package/lib/dependencies/AddEntryDependency.js +24 -0
  4. package/lib/dependencies/ResolveDependency.js +5 -0
  5. package/lib/index.js +38 -7
  6. package/lib/json-compiler/helper.js +3 -3
  7. package/lib/loader.js +53 -0
  8. package/lib/platform/template/wx/component-config/button.js +14 -2
  9. package/lib/platform/template/wx/component-config/image.js +4 -0
  10. package/lib/platform/template/wx/component-config/input.js +5 -1
  11. package/lib/platform/template/wx/component-config/rich-text.js +4 -0
  12. package/lib/platform/template/wx/component-config/scroll-view.js +4 -0
  13. package/lib/platform/template/wx/component-config/swiper.js +1 -1
  14. package/lib/platform/template/wx/component-config/switch.js +4 -0
  15. package/lib/platform/template/wx/component-config/text.js +4 -0
  16. package/lib/platform/template/wx/component-config/textarea.js +6 -1
  17. package/lib/platform/template/wx/component-config/view.js +4 -0
  18. package/lib/platform/template/wx/index.js +127 -1
  19. package/lib/react/processTemplate.js +3 -0
  20. package/lib/resolve-loader.js +4 -1
  21. package/lib/runtime/components/react/context.ts +4 -0
  22. package/lib/runtime/components/react/dist/context.js +1 -0
  23. package/lib/runtime/components/react/dist/event.config.js +24 -24
  24. package/lib/runtime/components/react/dist/getInnerListeners.js +183 -165
  25. package/lib/runtime/components/react/dist/mpx-button.jsx +35 -42
  26. package/lib/runtime/components/react/dist/mpx-canvas/index.jsx +30 -12
  27. package/lib/runtime/components/react/dist/mpx-checkbox-group.jsx +13 -19
  28. package/lib/runtime/components/react/dist/mpx-checkbox.jsx +29 -38
  29. package/lib/runtime/components/react/dist/mpx-form.jsx +16 -19
  30. package/lib/runtime/components/react/dist/mpx-icon.jsx +8 -16
  31. package/lib/runtime/components/react/dist/mpx-image.jsx +291 -0
  32. package/lib/runtime/components/react/dist/mpx-input.jsx +54 -27
  33. package/lib/runtime/components/react/dist/mpx-label.jsx +15 -22
  34. package/lib/runtime/components/react/dist/mpx-movable-area.jsx +13 -16
  35. package/lib/runtime/components/react/dist/mpx-movable-view.jsx +13 -13
  36. package/lib/runtime/components/react/dist/mpx-navigator.jsx +2 -4
  37. package/lib/runtime/components/react/dist/mpx-picker/date.jsx +6 -2
  38. package/lib/runtime/components/react/dist/mpx-picker/index.jsx +5 -3
  39. package/lib/runtime/components/react/dist/mpx-picker/multiSelector.jsx +6 -2
  40. package/lib/runtime/components/react/dist/mpx-picker/region.jsx +6 -2
  41. package/lib/runtime/components/react/dist/mpx-picker/selector.jsx +6 -2
  42. package/lib/runtime/components/react/dist/mpx-picker/time.jsx +10 -15
  43. package/lib/runtime/components/react/dist/mpx-picker-view-column-item.jsx +39 -0
  44. package/lib/runtime/components/react/dist/mpx-picker-view-column.jsx +110 -97
  45. package/lib/runtime/components/react/dist/mpx-picker-view.jsx +32 -29
  46. package/lib/runtime/components/react/dist/mpx-radio-group.jsx +11 -19
  47. package/lib/runtime/components/react/dist/mpx-radio.jsx +27 -42
  48. package/lib/runtime/components/react/dist/mpx-rich-text/html.js +39 -0
  49. package/lib/runtime/components/react/dist/mpx-rich-text/index.jsx +63 -0
  50. package/lib/runtime/components/react/dist/mpx-root-portal.jsx +6 -4
  51. package/lib/runtime/components/react/dist/mpx-scroll-view.jsx +47 -41
  52. package/lib/runtime/components/react/dist/mpx-simple-text.jsx +11 -0
  53. package/lib/runtime/components/react/dist/mpx-swiper-item.jsx +4 -2
  54. package/lib/runtime/components/react/dist/mpx-swiper.jsx +606 -0
  55. package/lib/runtime/components/react/dist/mpx-switch.jsx +20 -10
  56. package/lib/runtime/components/react/dist/mpx-text.jsx +11 -10
  57. package/lib/runtime/components/react/dist/mpx-textarea.jsx +8 -3
  58. package/lib/runtime/components/react/dist/mpx-view.jsx +29 -44
  59. package/lib/runtime/components/react/dist/mpx-web-view.jsx +105 -42
  60. package/lib/runtime/components/react/dist/pickerFaces.js +12 -6
  61. package/lib/runtime/components/react/dist/pickerVIewContext.js +9 -0
  62. package/lib/runtime/components/react/dist/pickerViewMask.jsx +18 -0
  63. package/lib/runtime/components/react/dist/{pickerOverlay.jsx → pickerViewOverlay.jsx} +5 -3
  64. package/lib/runtime/components/react/dist/useAnimationHooks.js +35 -9
  65. package/lib/runtime/components/react/dist/utils.jsx +20 -24
  66. package/lib/runtime/components/react/getInnerListeners.ts +35 -28
  67. package/lib/runtime/components/react/mpx-button.tsx +55 -36
  68. package/lib/runtime/components/react/mpx-canvas/index.tsx +2 -2
  69. package/lib/runtime/components/react/mpx-checkbox-group.tsx +13 -12
  70. package/lib/runtime/components/react/mpx-checkbox.tsx +28 -28
  71. package/lib/runtime/components/react/mpx-form.tsx +10 -8
  72. package/lib/runtime/components/react/mpx-icon.tsx +10 -15
  73. package/lib/runtime/components/react/mpx-image.tsx +396 -0
  74. package/lib/runtime/components/react/mpx-input.tsx +61 -33
  75. package/lib/runtime/components/react/mpx-label.tsx +14 -13
  76. package/lib/runtime/components/react/mpx-movable-area.tsx +8 -7
  77. package/lib/runtime/components/react/mpx-movable-view.tsx +1 -1
  78. package/lib/runtime/components/react/mpx-picker/date.tsx +5 -2
  79. package/lib/runtime/components/react/mpx-picker/index.tsx +3 -2
  80. package/lib/runtime/components/react/mpx-picker/multiSelector.tsx +5 -2
  81. package/lib/runtime/components/react/mpx-picker/region.tsx +5 -2
  82. package/lib/runtime/components/react/mpx-picker/selector.tsx +5 -2
  83. package/lib/runtime/components/react/mpx-picker/time.tsx +10 -15
  84. package/lib/runtime/components/react/mpx-picker/type.ts +48 -43
  85. package/lib/runtime/components/react/mpx-picker-view-column.tsx +4 -1
  86. package/lib/runtime/components/react/mpx-picker-view.tsx +7 -1
  87. package/lib/runtime/components/react/mpx-radio-group.tsx +11 -12
  88. package/lib/runtime/components/react/mpx-radio.tsx +26 -29
  89. package/lib/runtime/components/react/mpx-scroll-view.tsx +32 -30
  90. package/lib/runtime/components/react/mpx-simple-text.tsx +18 -0
  91. package/lib/runtime/components/react/mpx-swiper/carouse.tsx +4 -2
  92. package/lib/runtime/components/react/mpx-swiper-item.tsx +3 -2
  93. package/lib/runtime/components/react/mpx-switch.tsx +10 -8
  94. package/lib/runtime/components/react/mpx-text.tsx +6 -2
  95. package/lib/runtime/components/react/mpx-view.tsx +37 -45
  96. package/lib/runtime/components/react/mpx-web-view.tsx +25 -15
  97. package/lib/runtime/components/react/types/global.d.ts +1 -16
  98. package/lib/runtime/components/react/utils.tsx +24 -24
  99. package/lib/runtime/components/tenon/getInnerListeners.js +334 -0
  100. package/lib/runtime/components/tenon/tenon-button.vue +309 -0
  101. package/lib/runtime/components/tenon/tenon-image.vue +66 -0
  102. package/lib/runtime/components/tenon/tenon-input.vue +171 -0
  103. package/lib/runtime/components/tenon/tenon-rich-text.vue +26 -0
  104. package/lib/runtime/components/tenon/tenon-scroll-view.vue +127 -0
  105. package/lib/runtime/components/tenon/tenon-switch.vue +96 -0
  106. package/lib/runtime/components/tenon/tenon-text.vue +70 -0
  107. package/lib/runtime/components/tenon/tenon-textarea.vue +86 -0
  108. package/lib/runtime/components/tenon/tenon-view.vue +93 -0
  109. package/lib/runtime/components/web/getInnerListeners.js +6 -6
  110. package/lib/runtime/components/web/mpx-movable-view.vue +334 -344
  111. package/lib/runtime/components/web/mpx-picker-view-column.vue +75 -75
  112. package/lib/runtime/components/web/mpx-picker.vue +382 -385
  113. package/lib/runtime/components/web/mpx-web-view.vue +162 -162
  114. package/lib/runtime/optionProcessor.js +7 -16
  115. package/lib/runtime/optionProcessor.tenon.js +84 -0
  116. package/lib/runtime/utils.js +2 -0
  117. package/lib/style-compiler/index.js +1 -1
  118. package/lib/style-compiler/plugins/hm.js +20 -0
  119. package/lib/template-compiler/bind-this.js +7 -2
  120. package/lib/template-compiler/compiler.js +67 -40
  121. package/lib/template-compiler/gen-node-react.js +2 -2
  122. package/lib/tenon/index.js +117 -0
  123. package/lib/tenon/processJSON.js +352 -0
  124. package/lib/tenon/processScript.js +203 -0
  125. package/lib/tenon/processStyles.js +21 -0
  126. package/lib/tenon/processTemplate.js +126 -0
  127. package/lib/tenon/script-helper.js +223 -0
  128. package/lib/utils/env.js +6 -1
  129. package/lib/utils/get-relative-path.js +25 -0
  130. package/package.json +7 -3
  131. package/LICENSE +0 -433
  132. package/lib/runtime/components/react/dist/mpx-image/index.jsx +0 -226
  133. package/lib/runtime/components/react/dist/mpx-image/svg.jsx +0 -7
  134. package/lib/runtime/components/react/dist/mpx-swiper/carouse.jsx +0 -478
  135. package/lib/runtime/components/react/dist/mpx-swiper/index.jsx +0 -68
  136. package/lib/runtime/components/react/dist/mpx-swiper/type.js +0 -1
  137. package/lib/runtime/components/react/mpx-image/index.tsx +0 -345
  138. package/lib/runtime/components/react/mpx-image/svg.tsx +0 -22
@@ -9,7 +9,7 @@
9
9
  * ✔ bindlongtap
10
10
  * ✔ binderror
11
11
  */
12
- import React, { useRef, useState, useCallback, useEffect, forwardRef } from 'react';
12
+ import { createElement, useRef, useState, useCallback, useEffect, forwardRef } from 'react';
13
13
  import { View, Platform, StyleSheet } from 'react-native';
14
14
  import { WebView } from 'react-native-webview';
15
15
  import useNodesRef from '../useNodesRef';
@@ -41,7 +41,7 @@ const _Canvas = forwardRef((props = {}, ref) => {
41
41
  const { style = {}, originWhitelist = ['*'], 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
42
42
  const [isLoaded, setIsLoaded] = useState(false);
43
43
  const nodeRef = useRef(null);
44
- const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(extendObject(style, stylesheet.container), {
44
+ const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(extendObject({}, style, stylesheet.container), {
45
45
  enableVar,
46
46
  externalVarContext,
47
47
  parentFontSize,
@@ -58,7 +58,7 @@ const _Canvas = forwardRef((props = {}, ref) => {
58
58
  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
59
59
  const innerProps = useInnerProps(props, {
60
60
  ref: nodeRef,
61
- style: extendObject(normalStyle, layoutStyle, { opacity: isLoaded ? 1 : 0 }),
61
+ style: extendObject({}, normalStyle, layoutStyle, { opacity: isLoaded ? 1 : 0 }),
62
62
  ...layoutProps
63
63
  }, [], {
64
64
  layoutRef
@@ -191,24 +191,42 @@ const _Canvas = forwardRef((props = {}, ref) => {
191
191
  });
192
192
  if (Platform.OS === 'android') {
193
193
  const isAndroid9 = Platform.Version >= 28;
194
- return (<View {...innerProps}>
195
- <WebView ref={(element) => {
194
+ return createElement(View, innerProps, createElement(WebView, {
195
+ ref: (element) => {
196
196
  if (canvasRef.current) {
197
197
  canvasRef.current.webview = element;
198
198
  }
199
- }} style={[
199
+ },
200
+ style: [
200
201
  isAndroid9 ? stylesheet.webviewAndroid9 : stylesheet.webview,
201
202
  { height, width }
202
- ]} source={{ html }} originWhitelist={originWhitelist} onMessage={onMessage} onLoad={onLoad} overScrollMode="never" mixedContentMode="always" scalesPageToFit={false} javaScriptEnabled domStorageEnabled thirdPartyCookiesEnabled allowUniversalAccessFromFileURLs/>
203
- </View>);
203
+ ],
204
+ source: { html },
205
+ originWhitelist: originWhitelist,
206
+ onMessage: onMessage,
207
+ onLoad: onLoad,
208
+ overScrollMode: 'never',
209
+ mixedContentMode: 'always',
210
+ scalesPageToFit: false,
211
+ javaScriptEnabled: true,
212
+ domStorageEnabled: true,
213
+ thirdPartyCookiesEnabled: true,
214
+ allowUniversalAccessFromFileURLs: true
215
+ }));
204
216
  }
205
- return (<View {...innerProps}>
206
- <WebView ref={(element) => {
217
+ return createElement(View, innerProps, createElement(WebView, {
218
+ ref: (element) => {
207
219
  if (canvasRef.current) {
208
220
  canvasRef.current.webview = element;
209
221
  }
210
- }} style={[stylesheet.webview, { height, width }]} source={{ html }} originWhitelist={originWhitelist} onMessage={onMessage} onLoad={onLoad} scrollEnabled={false}/>
211
- </View>);
222
+ },
223
+ style: [stylesheet.webview, { height, width }],
224
+ source: { html },
225
+ originWhitelist: originWhitelist,
226
+ onMessage: onMessage,
227
+ onLoad: onLoad,
228
+ scrollEnabled: false
229
+ }));
212
230
  });
213
231
  _Canvas.displayName = 'mpxCanvas';
214
232
  export default _Canvas;
@@ -1,13 +1,13 @@
1
1
  /**
2
2
  * ✔ bindchange
3
3
  */
4
- import { useRef, forwardRef, useContext, useMemo, useEffect } from 'react';
4
+ import { useRef, forwardRef, useContext, useMemo, useEffect, createElement } from 'react';
5
5
  import { View } from 'react-native';
6
6
  import { warn } from '@mpxjs/utils';
7
7
  import { FormContext, CheckboxGroupContext } from './context';
8
8
  import useInnerProps, { getCustomEvent } from './getInnerListeners';
9
9
  import useNodesRef from './useNodesRef';
10
- import { useLayout, useTransformStyle, wrapChildren } from './utils';
10
+ import { useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
11
11
  const CheckboxGroup = forwardRef((props, ref) => {
12
12
  const propsRef = useRef({});
13
13
  propsRef.current = props;
@@ -22,13 +22,10 @@ const CheckboxGroup = forwardRef((props, ref) => {
22
22
  flexDirection: 'row',
23
23
  flexWrap: 'wrap'
24
24
  };
25
- const styleObj = {
26
- ...defaultStyle,
27
- ...style
28
- };
25
+ const styleObj = extendObject({}, defaultStyle, style);
29
26
  const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
30
27
  const nodeRef = useRef(null);
31
- useNodesRef(props, ref, nodeRef, { defaultStyle });
28
+ useNodesRef(props, ref, nodeRef, { style: normalStyle });
32
29
  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
33
30
  const getValue = () => {
34
31
  const arr = [];
@@ -60,11 +57,12 @@ const CheckboxGroup = forwardRef((props, ref) => {
60
57
  }
61
58
  };
62
59
  }, []);
63
- const innerProps = useInnerProps(props, {
60
+ const innerProps = useInnerProps(props, extendObject({
64
61
  ref: nodeRef,
65
- style: { ...normalStyle, ...layoutStyle },
66
- ...layoutProps
67
- }, [], {
62
+ style: extendObject({}, normalStyle, layoutStyle)
63
+ }, layoutProps), [
64
+ 'name'
65
+ ], {
68
66
  layoutRef
69
67
  });
70
68
  const contextValue = useMemo(() => {
@@ -83,14 +81,10 @@ const CheckboxGroup = forwardRef((props, ref) => {
83
81
  notifyChange
84
82
  };
85
83
  }, []);
86
- return (<View {...innerProps}>
87
- <CheckboxGroupContext.Provider value={contextValue}>
88
- {wrapChildren(props, {
89
- hasVarDec,
90
- varContext: varContextRef.current
91
- })}
92
- </CheckboxGroupContext.Provider>
93
- </View>);
84
+ return createElement(View, innerProps, createElement(CheckboxGroupContext.Provider, { value: contextValue }, wrapChildren(props, {
85
+ hasVarDec,
86
+ varContext: varContextRef.current
87
+ })));
94
88
  });
95
89
  CheckboxGroup.displayName = 'MpxCheckboxGroup';
96
90
  export default CheckboxGroup;
@@ -4,13 +4,13 @@
4
4
  * ✔ checked
5
5
  * ✔ color
6
6
  */
7
- import { useState, useRef, forwardRef, useEffect, useContext } from 'react';
7
+ import { useState, useRef, forwardRef, useEffect, useContext, createElement } from 'react';
8
8
  import { View, StyleSheet } from 'react-native';
9
9
  import { warn } from '@mpxjs/utils';
10
10
  import useInnerProps, { getCustomEvent } from './getInnerListeners';
11
11
  import useNodesRef from './useNodesRef';
12
12
  import Icon from './mpx-icon';
13
- import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren } from './utils';
13
+ import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils';
14
14
  import { CheckboxGroupContext, LabelContext } from './context';
15
15
  const styles = StyleSheet.create({
16
16
  container: {
@@ -40,19 +40,13 @@ const styles = StyleSheet.create({
40
40
  });
41
41
  const Checkbox = forwardRef((checkboxProps, ref) => {
42
42
  const { textProps, innerProps: props = {} } = splitProps(checkboxProps);
43
- const { value = '', disabled = false, checked = false, color = '#09BB07', style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindtap, catchtap } = props;
43
+ const { value = '', disabled = false, checked = false, color = '#09BB07', style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindtap, _onChange } = props;
44
44
  const [isChecked, setIsChecked] = useState(!!checked);
45
45
  const groupContext = useContext(CheckboxGroupContext);
46
46
  let groupValue;
47
47
  let notifyChange;
48
- const defaultStyle = {
49
- ...styles.wrapper,
50
- ...(disabled && styles.wrapperDisabled)
51
- };
52
- const styleObj = {
53
- ...styles.container,
54
- ...style
55
- };
48
+ const defaultStyle = extendObject({}, styles.wrapper, disabled ? styles.wrapperDisabled : null);
49
+ const styleObj = extendObject({}, styles.container, style);
56
50
  const onChange = (evt) => {
57
51
  if (disabled)
58
52
  return;
@@ -62,27 +56,21 @@ const Checkbox = forwardRef((checkboxProps, ref) => {
62
56
  groupValue[value].checked = checked;
63
57
  }
64
58
  notifyChange && notifyChange(evt);
59
+ // Called when the switch type attribute is checkbox
60
+ _onChange && _onChange(evt, { checked });
65
61
  };
66
62
  const onTap = (evt) => {
67
- if (disabled)
68
- return;
69
63
  bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props));
70
64
  onChange(evt);
71
65
  };
72
- const catchTap = (evt) => {
73
- if (disabled)
74
- return;
75
- catchtap && catchtap(getCustomEvent('tap', evt, { layoutRef }, props));
76
- onChange(evt);
77
- };
78
66
  const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
79
67
  const nodeRef = useRef(null);
80
68
  useNodesRef(props, ref, nodeRef, {
81
- defaultStyle,
69
+ style: extendObject({}, defaultStyle, normalStyle),
82
70
  change: onChange
83
71
  });
84
72
  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
85
- const { textStyle, backgroundStyle, innerStyle } = splitStyle(normalStyle);
73
+ const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle);
86
74
  if (backgroundStyle) {
87
75
  warn('Checkbox does not support background image-related styles!');
88
76
  }
@@ -94,13 +82,16 @@ const Checkbox = forwardRef((checkboxProps, ref) => {
94
82
  if (labelContext) {
95
83
  labelContext.current.triggerChange = onChange;
96
84
  }
97
- const innerProps = useInnerProps(props, {
85
+ const innerProps = useInnerProps(props, extendObject({
98
86
  ref: nodeRef,
99
- style: { ...innerStyle, ...layoutStyle },
100
- ...layoutProps,
101
- bindtap: onTap,
102
- catchtap: catchTap
103
- }, [], {
87
+ style: extendObject({}, innerStyle, layoutStyle)
88
+ }, layoutProps, {
89
+ bindtap: !disabled && onTap
90
+ }), [
91
+ 'value',
92
+ 'disabled',
93
+ 'checked'
94
+ ], {
104
95
  layoutRef
105
96
  });
106
97
  useEffect(() => {
@@ -124,17 +115,17 @@ const Checkbox = forwardRef((checkboxProps, ref) => {
124
115
  }
125
116
  }
126
117
  }, [checked]);
127
- return (<View {...innerProps}>
128
- <View style={defaultStyle}>
129
- <Icon type='success_no_circle' size={18} color={disabled ? '#ADADAD' : color} style={isChecked ? styles.iconChecked : styles.icon}/>
130
- </View>
131
- {wrapChildren(props, {
132
- hasVarDec,
133
- varContext: varContextRef.current,
134
- textStyle,
135
- textProps
136
- })}
137
- </View>);
118
+ return createElement(View, innerProps, createElement(View, { style: defaultStyle }, createElement(Icon, {
119
+ type: 'success_no_circle',
120
+ size: 18,
121
+ color: disabled ? '#ADADAD' : color,
122
+ style: isChecked ? styles.iconChecked : styles.icon
123
+ })), wrapChildren(props, {
124
+ hasVarDec,
125
+ varContext: varContextRef.current,
126
+ textStyle,
127
+ textProps
128
+ }));
138
129
  });
139
130
  Checkbox.displayName = 'MpxCheckbox';
140
131
  export default Checkbox;
@@ -5,26 +5,27 @@
5
5
  * ✔ bindreset
6
6
  */
7
7
  import { View } from 'react-native';
8
- import { useRef, forwardRef, useMemo } from 'react';
8
+ import { useRef, forwardRef, useMemo, createElement } from 'react';
9
9
  import useNodesRef from './useNodesRef';
10
10
  import useInnerProps, { getCustomEvent } from './getInnerListeners';
11
11
  import { FormContext } from './context';
12
- import { useTransformStyle, splitProps, splitStyle, useLayout, wrapChildren } from './utils';
12
+ import { useTransformStyle, splitProps, splitStyle, useLayout, wrapChildren, extendObject } from './utils';
13
13
  const _Form = forwardRef((fromProps, ref) => {
14
14
  const { textProps, innerProps: props = {} } = splitProps(fromProps);
15
15
  const { style, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
16
16
  const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
17
- const { textStyle, innerStyle } = splitStyle(normalStyle);
17
+ const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
18
18
  const formRef = useRef(null);
19
- useNodesRef(props, ref, formRef);
19
+ useNodesRef(props, ref, formRef, {
20
+ style: normalStyle
21
+ });
20
22
  const propsRef = useRef({});
21
23
  propsRef.current = props;
22
24
  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: formRef });
23
- const innerProps = useInnerProps(props, {
24
- style: { ...innerStyle, ...layoutStyle },
25
- ref: formRef,
26
- ...layoutProps
27
- }, [
25
+ const innerProps = useInnerProps(props, extendObject({
26
+ style: extendObject({}, innerStyle, layoutStyle),
27
+ ref: formRef
28
+ }, layoutProps), [
28
29
  'bindsubmit',
29
30
  'bindreset'
30
31
  ], { layoutRef });
@@ -56,16 +57,12 @@ const _Form = forwardRef((fromProps, ref) => {
56
57
  reset
57
58
  };
58
59
  }, []);
59
- return (<View {...innerProps}>
60
- <FormContext.Provider value={contextValue}>
61
- {wrapChildren(props, {
62
- hasVarDec,
63
- varContext: varContextRef.current,
64
- textStyle,
65
- textProps
66
- })}
67
- </FormContext.Provider>
68
- </View>);
60
+ return createElement(View, innerProps, createElement(FormContext.Provider, { value: contextValue }, wrapChildren(props, {
61
+ hasVarDec,
62
+ varContext: varContextRef.current,
63
+ textStyle,
64
+ textProps
65
+ })));
69
66
  });
70
67
  _Form.displayName = 'MpxForm';
71
68
  export default _Form;
@@ -3,11 +3,11 @@
3
3
  * ✔ size
4
4
  * ✔ color
5
5
  */
6
- import { forwardRef, useRef } from 'react';
6
+ import { forwardRef, useRef, createElement } from 'react';
7
7
  import { Image } from 'react-native';
8
8
  import useInnerProps from './getInnerListeners';
9
9
  import useNodesRef from './useNodesRef';
10
- import { useLayout, useTransformStyle } from './utils';
10
+ import { useLayout, useTransformStyle, extendObject } from './utils';
11
11
  const IconTypeMap = new Map([
12
12
  ['success', 'data:image/png;base64,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'],
13
13
  ['success_no_circle', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAABcCAYAAADj79JYAAAAAXNSR0IArs4c6QAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAACEtJREFUeAHtnGuME1UUgM/tdjszXV6LbwXfikY0wagxLD4W2t0Fo6IREAn4Noo8ookS8AEJYIgoxviKyA+fEVFABDfstssSgYCSABqN8hN/EGNAkce8tu31nGWndNuZzky37e527/3Rufeccx/z9fbcO2dmCiCSICAICAKCgCAgCAgCgoAgIAgIAoKAICAICAKCgCAgCAgCgoAgIAgIAoJA/ybA+vfwe3/0SrsygiWSyzmwWwDYSeD8B+2YsRCmgmk3OgHcjopHmdwq38EY/wbNz86oomtBYzDUQyJDls4G0jmR8UUgHJefQtgxrJQJm9qQahNQ49RY0Ekh5A4E2iGoJKS3OOdzHCwO/BuF/xx0IIA7kbGRD9kKwzsS0jpUTbBRk0iFVOAZB12nWADPRydDJ7VJV5hJ2ISL3nUZ4sysyThMVxu1HzOF2XmxaGYTsSnLcfk2xvl6VJ1joyZRBwM+RY2amxz0abFYNNMo7DOdiyPnbah1hs34VC+wqQfhUuw5A5xeHFfh4jjXyQTlSWB8lhoxv81j000lgHfDcbowOD74rETSpMVxvI3aEiUB+CwtYq61BF6OwodnURrUEhqdDLDvUHxZliqzmOSMP6xHzC8yhV7ywodnUAq3SRMR9k4U5YfN2SOFwKauBPAu4EqrNJ+nYAsWh3aJ7A4pjJk8pjfon9spvciED28GKVwdWs0BZrkA44zBbC2if+pil1c9oIGHW8MXckht5MAx0pc3ocuG2WrU+DCvlQflgF00w7HqMRwCtJ272IUTzew5asR438XOk3pA+nAlHpqGsGlxdIfNYW6xYNM3MrCA44oXjslLgLMv8dzDBCBPQrcO89UG4708Nr5VA8eltMMgDKt+hoQme6LE+AK8qHndk60PowGxaGLw6XJIcAosjfbGhi8sBWzqu+JdihJTxmGkbzf+lD3BxtjJS1rUXOHti/FvVdHAKdIHkNqGWM71gga3hy/rDeZrXmwLtalMl0KRvqS8DGfrAq9gcKP9Kl6uL/dqX6hdxQE/cxuMO90Gy2GFM3sJwl6aoyiBoKJ2KVJcujrAgSJ9o3ywWqlFjRd92PfItGJ8eE1cakLYP/mE/UY5YdM3VRHAKdKHYTy3SF/3mclhFcJ+obuw9CVblzKsHYYZCWkxbaXwcutXxqtWqg3q4dIPx2cPLVCjMOljYPCAn5oM2DI1qr/ip06xbG2Bh2NSC4JuyOjkCAZwHsWYAs2iPpGUFmUkBFJ0MTPG34DYCi2qL/RXp3jWOcDxqqweLxRo75qdcDGHd7QELjCTwMhWlrOstCljIZXagH2e57Pfsi6QdmPL8eEI2+nnib9EmKdUS21ym3yJXWPlkCmtoSkIm57p8wWbM1ijRQzP+/JSnUsOcIR6jUtndSzFf8NfwuMudsVVr4MqXBzfBMbobrpbpK973wze1iPGk3huFAHs1ZQLnLMjHkZUg7+ENUpMXlsby3sP0ENT7ibUh1wrbUFgz7tb51i8q00wnsuR9pIgBzjnsNn7WPg0nUkHMEB0q/c6/iylVukqHaQ9uNg0+avZaf0BupF5fWFmW2PPAa5X6/hgC9trGbgeOVyKAaIdcmtoESwp7r4erxyjgQCjhyPd3FzOMNF3rEbYz/Yl2DTIHOD05D4+LjANdX/mnIWzIMgYW67USZsGNQ9yegbPubaNJtwqP4FXjlvwFY5aG7WLiK3Tg30PNg06Z1tonQkF7dFPb8fySEvm8XiYp9hMvVG321q6N0GL43B5OYIubEfB2Ndalf6Q0ysf7gMorYUjcOqWnokOJGE7fi0jfA4jhXvIpWpQX+bnxIdugdoOSVqH7iDisz/LfD2+X/Ognz6tiuU65gVOgwjFQtdWAWvHrK99b9cJ7OIBNkOfoB/qKjseaHEMsM5In29/3dXoBq0WYd8EHY6d9AFFrg/PGpQZNX9PMj4exX9nqbwU6/ABmv34WILTxVRnGzUxqRFhU6SvMNgMNvYH2HSyrjO8kwh+SFulKwNV6F4ALrJk/o7sKymoP32sHo6l6+GdGbkjtAgX3MUoc/3y0/UyM33cZ2cOlfKegZOxtE0ahT6d3MsFVPaf+FHk+hEuxofwivF8DM7cj21c77+ddI31OLOn93U3kh4tZnwBp4rhtuobeSpAr2AMo3JvJRx4qxo07sUFUu+tMRTSr++fsTqhYx/jqSh2dsY1FNJzD+rguhDrj7DplH3PcItTOF59M+cBitrle57aMi/aEQccV2uMe2AsaEVrtIwN+Z7h1tjUSMdefAm0EQEct2RlOO5QU8bk/gqb+BQ8wy24cot8OwvwZiw7vl9u2fbwuBMvaiaizz7Zw3Z6tXqPgdPou/5VgaD7i1N7P/VdmoKwx8EJ71X6pmVRgNOpdd2ao3ueRYbOd2uK2VgJsIlTwT6cKmcmPaK3Y9DqbpQVcTHje7QOs6lSYBOvogGnxihCiFs2uowvxk3mfSHDnIQ3rMu5KNNplDQVzaVkjhIfs7gLI350Vz2UKfeR31+dNCLHm+AfH3X6hWlRZ7h1xvi21/cs1TnTbf/3ybJzOB6oVNh0viUBTg2rjcZmvEk+FbPew6UMfg6yUEXObGJCqWTAqfHOv7RgfCZmk1R2Sb8Eq0KRE5ETGOCq3FQSH56NCx/emY7RQXqhqSpb11X+IxAM1p+qP/WXg75ixGUBTrTkeGgG4+wTzGZDP4iw7xwIsIlDSV0KdWAl+vcFXEjvw/8YSbsMivqhz64bKLCJRdlmuAUemmGIUq3ckITkUXOXeRCfZUmldSIjCAgCgoAgIAgIAoKAICAICAKCgCAgCAgCgoAgIAgIAoKAICAIlIbA/2gkWglTrArAAAAAAElFTkSuQmCC'],
@@ -23,27 +23,19 @@ const Icon = forwardRef((props, ref) => {
23
23
  const { type, size = 23, color, style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
24
24
  const uri = IconTypeMap.get(type);
25
25
  const defaultStyle = { width: ~~size, height: ~~size };
26
- const styleObj = {
27
- ...defaultStyle,
28
- ...style
29
- };
26
+ const styleObj = extendObject({}, defaultStyle, style);
30
27
  const { hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
31
28
  const nodeRef = useRef(null);
32
- useNodesRef(props, ref, nodeRef, { defaultStyle });
29
+ useNodesRef(props, ref, nodeRef, { style: normalStyle });
33
30
  const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
34
- const innerProps = useInnerProps(props, {
31
+ const innerProps = useInnerProps(props, extendObject({
35
32
  ref: nodeRef,
36
- style: {
37
- ...normalStyle,
38
- ...layoutStyle,
39
- tintColor: color
40
- },
41
33
  source: { uri },
42
- ...layoutProps
43
- }, [], {
34
+ style: extendObject({}, normalStyle, layoutStyle, { tintColor: color })
35
+ }, layoutProps), [], {
44
36
  layoutRef
45
37
  });
46
- return <Image {...innerProps}/>;
38
+ return createElement(Image, innerProps);
47
39
  });
48
40
  Icon.displayName = 'MpxIcon';
49
41
  export default Icon;