@tarojs/components-rn 3.3.13 → 3.3.17

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.
@@ -15,6 +15,8 @@
15
15
  */
16
16
  import * as React from 'react';
17
17
  import { Image, StyleSheet } from 'react-native';
18
+ // @ts-ignore
19
+ import { SvgCssUri, WithLocalSvg } from 'react-native-svg';
18
20
  import { noop, omit } from '../../utils';
19
21
  import ClickableSimplified from '../ClickableSimplified';
20
22
  const resizeModeMap = {
@@ -116,8 +118,19 @@ export class _Image extends React.Component {
116
118
  }
117
119
  }
118
120
  render() {
119
- const { style, src, mode = 'scaleToFill' } = this.props;
121
+ const { style, src, mode = 'scaleToFill', svg = false } = this.props;
120
122
  const flattenStyle = StyleSheet.flatten(style) || {};
123
+ const defaultWidth = flattenStyle.width || 300;
124
+ const defaultHeight = flattenStyle.height || 225;
125
+ // remote svg image support, svg 图片暂不支持 mode
126
+ const remoteSvgReg = /(https?:\/\/.*\.(?:svg|svgx))/i;
127
+ if (typeof src === 'string' && remoteSvgReg.test(src)) {
128
+ return (React.createElement(SvgCssUri, { uri: src, width: defaultWidth, height: defaultHeight }));
129
+ }
130
+ // local svg image support, svg 图片暂不支持 mode
131
+ if (svg) {
132
+ return (React.createElement(WithLocalSvg, { asset: src, width: defaultWidth, height: defaultHeight }));
133
+ }
121
134
  // The parameter passed to require mpxTransformust be a string literal
122
135
  const source = typeof src === 'string' ? { uri: src } : src;
123
136
  const isWidthFix = mode === 'widthFix';
@@ -135,7 +148,7 @@ export class _Image extends React.Component {
135
148
  }
136
149
  }
137
150
  else {
138
- return flattenStyle.height || 225;
151
+ return defaultHeight;
139
152
  }
140
153
  })();
141
154
  const restImageProps = omit(this.props, ['source', 'src', 'resizeMode', 'onLoad', 'onError', 'onLayout', 'style']);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Image/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Image/index.tsx"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ export default class DateSelector extends React.Component {
15
15
  super(...arguments);
16
16
  this.state = {
17
17
  pValue: null,
18
- value: 0,
18
+ value: new Date(),
19
19
  };
20
20
  this.dismissByOk = false;
21
21
  this.onChange = (date) => {
@@ -51,7 +51,7 @@ export default class DateSelector extends React.Component {
51
51
  };
52
52
  }
53
53
  static getDerivedStateFromProps(nextProps, lastState) {
54
- if (nextProps.value !== lastState.pValue) {
54
+ if (nextProps.value && nextProps.value !== lastState.pValue) {
55
55
  const now = new Date();
56
56
  if (!nextProps.value || typeof nextProps.value !== 'string') {
57
57
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"date.js","sourceRoot":"","sources":["../../../src/components/Picker/date.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date.js","sourceRoot":"","sources":["../../../src/components/Picker/date.tsx"],"names":[],"mappings":"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"}
@@ -43,7 +43,7 @@ export default class TimeSelector extends React.Component {
43
43
  }
44
44
  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
45
45
  static getDerivedStateFromProps(nextProps, lastState) {
46
- if (nextProps.value !== lastState.pValue) {
46
+ if (nextProps.value && nextProps.value !== lastState.pValue) {
47
47
  const now = new Date();
48
48
  if (!nextProps.value || typeof nextProps.value !== 'string') {
49
49
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/components/Picker/time.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/components/Picker/time.tsx"],"names":[],"mappings":"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"}
@@ -9,6 +9,10 @@ import { omit, parseStyles } from '../../utils';
9
9
  class _RichText extends React.Component {
10
10
  constructor() {
11
11
  super(...arguments);
12
+ this.state = {
13
+ webViewHeight: 0
14
+ };
15
+ this.webview = React.createRef();
12
16
  this.renderChildrens = (arr = []) => {
13
17
  if (arr.length === 0)
14
18
  return;
@@ -29,6 +33,11 @@ class _RichText extends React.Component {
29
33
  const child = this.renderChildrens(item.children);
30
34
  return React.createElement(item.name || 'div', Object.assign(Object.assign({ key: Math.random() }, omit(item.attrs, ['class', 'style'])), { className: item.attrs.class, style: parseStyles(item.attrs.style) }), child);
31
35
  };
36
+ this.onWebViewMessage = (event) => {
37
+ this.setState({
38
+ webViewHeight: Number(event.nativeEvent.data)
39
+ });
40
+ };
32
41
  }
33
42
  render() {
34
43
  const { style, nodes } = this.props;
@@ -37,14 +46,18 @@ class _RichText extends React.Component {
37
46
  : nodes.map((item) => {
38
47
  return ReactDOMServer.renderToStaticMarkup(this.renderNodes(item));
39
48
  }).join(',');
40
- return (React.createElement(View, { style: style },
41
- React.createElement(WebView, { source: { html }, scalesPageToFit: false, injectedJavaScript: `
49
+ return (React.createElement(View, { style: Object.assign({
50
+ height: this.state.webViewHeight,
51
+ width: '100%',
52
+ }, style) },
53
+ React.createElement(WebView, { ref: this.webview, source: { html: '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>' + html }, scalesPageToFit: false, onMessage: this.onWebViewMessage, injectedJavaScript: `
42
54
  document.documentElement.style.padding = 0;
43
55
  document.documentElement.style.margin = 0;
44
56
  document.body.style.padding = 0;
45
57
  document.body.style.margin = 0;
58
+ window.ReactNativeWebView.postMessage(document.body.scrollHeight);
46
59
  true;
47
- `, style: {
60
+ `, onLoadEnd: () => { var _a; return (_a = this.webview.current) === null || _a === void 0 ? void 0 : _a.injectJavaScript('window.ReactNativeWebView.postMessage(document.body.scrollHeight);'); }, style: {
48
61
  backgroundColor: 'transparent'
49
62
  } })));
50
63
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/RichText/index.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EACL,OAAO,EACR,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAG/C,MAAM,SAAU,SAAQ,KAAK,CAAC,SAAwB;IAAtD;;QAKE,oBAAe,GAAG,CAAC,MAAkB,EAAE,EAA6B,EAAE;YACpE,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAC5B,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACtB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;oBACxB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;gBACD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,eAAU,GAAG,CAAC,IAAI,GAAG,EAAE,EAAe,EAAE;YACtC,OAAO,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE;gBACjC,uBAAuB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACzC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;aACnB,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,gBAAW,GAAG,CAAC,IAAU,EAAsB,EAAE;YAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACjD,OAAO,KAAK,CAAC,aAAa,CACxB,IAAI,CAAC,IAAI,IAAI,KAAK,gCAEhB,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,IACf,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KACvC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAC3B,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAEtC,KAAK,CACN,CAAA;QACH,CAAC,CAAA;IAiCH,CAAC;IA/BC,MAAM;QACJ,MAAM,EACJ,KAAK,EACL,KAAK,EACN,GAAG,IAAI,CAAC,KAAK,CAAA;QAEd,MAAM,IAAI,GAAW,OAAO,KAAK,KAAK,QAAQ;YAC5C,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAU,EAAU,EAAE;gBACjC,OAAO,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAA;YACpE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEd,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,KAAK;YAChB,oBAAC,OAAO,IACN,MAAM,EAAE,EAAE,IAAI,EAAE,EAChB,eAAe,EAAE,KAAK,EACtB,kBAAkB,EAAE;;;;;;WAMnB,EACD,KAAK,EAAE;oBACL,eAAe,EAAE,aAAa;iBAC/B,GACD,CACG,CACR,CAAA;IACH,CAAC;;AAjEM,sBAAY,GAAG;IACpB,KAAK,EAAE,EAAE;CACV,CAAA;AAkEH,eAAe,SAAS,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/RichText/index.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/components-rn",
3
- "version": "3.3.13",
3
+ "version": "3.3.17",
4
4
  "description": "多端解决方案基础组件(RN)",
5
5
  "main": "./dist/index.js",
6
6
  "scripts": {
@@ -27,8 +27,8 @@
27
27
  "license": "MIT",
28
28
  "dependencies": {
29
29
  "@ant-design/react-native": "^4.2.0",
30
- "@react-native-community/slider": "4.0.0-rc.3",
31
- "@react-native-picker/picker": "^1.16.4",
30
+ "@react-native-community/slider": "~4.1.12",
31
+ "@react-native-picker/picker": "~2.2.1",
32
32
  "@unimodules/core": "^7.1.2",
33
33
  "@unimodules/react-native-adapter": "^6.3.9",
34
34
  "expo-asset": "^8.3.3",
@@ -37,13 +37,14 @@
37
37
  "expo-camera": "~11.2.2",
38
38
  "prop-types": "^15.6.2",
39
39
  "react-native-maps": "^0.25.0",
40
- "react-native-pager-view": "^5.4.0",
41
- "react-native-webview": "^11.6.4",
40
+ "react-native-pager-view": "~5.4.9",
41
+ "react-native-svg": "~12.1.1",
42
+ "react-native-webview": "~11.14.3",
42
43
  "unimodules-permissions-interface": "~5.3.0"
43
44
  },
44
45
  "devDependencies": {
45
- "@tarojs/components": "3.3.13",
46
- "@types/react-native": "0.65.1",
46
+ "@tarojs/components": "3.3.17",
47
+ "@types/react-native": "0.66.5",
47
48
  "@types/sinon": "^9.0.8",
48
49
  "cpy-cli": "^3.1.1",
49
50
  "expo-constants": "~9.2.0",
@@ -57,17 +58,18 @@
57
58
  "sinon": "^9.2.1"
58
59
  },
59
60
  "peerDependencies": {
60
- "@react-native-community/slider": "4.0.0-rc.3",
61
- "@react-native-picker/picker": "^1.16.4",
61
+ "@react-native-community/slider": "~4.1.12",
62
+ "@react-native-picker/picker": "~2.2.1",
62
63
  "expo-av": "~9.2.3",
63
64
  "expo-barcode-scanner": "~10.2.2",
64
65
  "expo-camera": "~11.2.2",
65
- "react-native-pager-view": "^5.4.0",
66
- "react-native-webview": "^11.6.4"
66
+ "react-native-pager-view": "~5.4.9",
67
+ "react-native-svg": "~12.1.1",
68
+ "react-native-webview": "~11.14.3"
67
69
  },
68
70
  "resolutions": {
69
71
  "@types/react": "17.0.11",
70
72
  "@types/node": "^14.14.41"
71
73
  },
72
- "gitHead": "d84177a97cc27c01ca63c9dd07e5ab5bbaa91d8a"
74
+ "gitHead": "3f3ce5f66d370b1982a30e4a5f2c8eb383652063"
73
75
  }