@mpxjs/webpack-plugin 2.9.62 → 2.9.65

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 (95) hide show
  1. package/lib/config.js +38 -10
  2. package/lib/index.js +1 -3
  3. package/lib/platform/style/wx/index.js +115 -66
  4. package/lib/platform/template/wx/index.js +12 -8
  5. package/lib/react/processStyles.js +1 -0
  6. package/lib/react/processTemplate.js +2 -3
  7. package/lib/react/style-helper.js +9 -7
  8. package/lib/runtime/components/react/context.ts +9 -7
  9. package/lib/runtime/components/react/dist/context.js +1 -0
  10. package/lib/runtime/components/react/dist/getInnerListeners.js +12 -1
  11. package/lib/runtime/components/react/dist/mpx-button.jsx +53 -74
  12. package/lib/runtime/components/react/dist/mpx-checkbox-group.jsx +20 -18
  13. package/lib/runtime/components/react/dist/mpx-checkbox.jsx +30 -42
  14. package/lib/runtime/components/react/dist/mpx-form.jsx +18 -15
  15. package/lib/runtime/components/react/dist/mpx-icon.jsx +15 -17
  16. package/lib/runtime/components/react/dist/mpx-image/index.jsx +36 -34
  17. package/lib/runtime/components/react/dist/mpx-image/svg.jsx +3 -1
  18. package/lib/runtime/components/react/dist/mpx-input.jsx +36 -31
  19. package/lib/runtime/components/react/dist/mpx-label.jsx +30 -37
  20. package/lib/runtime/components/react/dist/mpx-movable-area.jsx +15 -19
  21. package/lib/runtime/components/react/dist/mpx-movable-view.jsx +10 -9
  22. package/lib/runtime/components/react/dist/mpx-picker/date.jsx +2 -1
  23. package/lib/runtime/components/react/dist/mpx-picker/index.jsx +11 -10
  24. package/lib/runtime/components/react/dist/mpx-picker/multiSelector.jsx +9 -5
  25. package/lib/runtime/components/react/dist/mpx-picker/region.jsx +13 -8
  26. package/lib/runtime/components/react/dist/mpx-picker/selector.jsx +3 -2
  27. package/lib/runtime/components/react/dist/mpx-picker/time.jsx +22 -20
  28. package/lib/runtime/components/react/dist/mpx-picker-view-column.jsx +103 -10
  29. package/lib/runtime/components/react/dist/mpx-picker-view.jsx +149 -54
  30. package/lib/runtime/components/react/dist/mpx-radio-group.jsx +20 -18
  31. package/lib/runtime/components/react/dist/mpx-radio.jsx +29 -43
  32. package/lib/runtime/components/react/dist/mpx-root-portal.jsx +8 -4
  33. package/lib/runtime/components/react/dist/mpx-scroll-view.jsx +36 -27
  34. package/lib/runtime/components/react/dist/mpx-swiper/carouse.jsx +141 -75
  35. package/lib/runtime/components/react/dist/mpx-swiper/index.jsx +16 -7
  36. package/lib/runtime/components/react/dist/mpx-swiper-item.jsx +20 -11
  37. package/lib/runtime/components/react/dist/mpx-switch.jsx +18 -14
  38. package/lib/runtime/components/react/dist/mpx-text.jsx +20 -35
  39. package/lib/runtime/components/react/dist/mpx-textarea.jsx +1 -1
  40. package/lib/runtime/components/react/dist/mpx-view.jsx +296 -210
  41. package/lib/runtime/components/react/dist/mpx-web-view.jsx +11 -7
  42. package/lib/runtime/components/react/dist/parser.js +218 -0
  43. package/lib/runtime/components/react/dist/useNodesRef.js +1 -5
  44. package/lib/runtime/components/react/dist/utils.jsx +445 -0
  45. package/lib/runtime/components/react/getInnerListeners.ts +18 -8
  46. package/lib/runtime/components/react/mpx-button.tsx +83 -91
  47. package/lib/runtime/components/react/mpx-checkbox-group.tsx +50 -43
  48. package/lib/runtime/components/react/mpx-checkbox.tsx +56 -64
  49. package/lib/runtime/components/react/mpx-form.tsx +51 -22
  50. package/lib/runtime/components/react/mpx-icon.tsx +31 -27
  51. package/lib/runtime/components/react/mpx-image/index.tsx +54 -47
  52. package/lib/runtime/components/react/mpx-image/svg.tsx +5 -3
  53. package/lib/runtime/components/react/mpx-input.tsx +59 -38
  54. package/lib/runtime/components/react/mpx-label.tsx +55 -59
  55. package/lib/runtime/components/react/mpx-movable-area.tsx +40 -25
  56. package/lib/runtime/components/react/mpx-movable-view.tsx +29 -29
  57. package/lib/runtime/components/react/mpx-navigator.tsx +2 -2
  58. package/lib/runtime/components/react/mpx-picker/date.tsx +4 -4
  59. package/lib/runtime/components/react/mpx-picker/index.tsx +12 -11
  60. package/lib/runtime/components/react/mpx-picker/multiSelector.tsx +17 -13
  61. package/lib/runtime/components/react/mpx-picker/region.tsx +23 -19
  62. package/lib/runtime/components/react/mpx-picker/selector.tsx +7 -7
  63. package/lib/runtime/components/react/mpx-picker/time.tsx +29 -31
  64. package/lib/runtime/components/react/mpx-picker/type.ts +1 -1
  65. package/lib/runtime/components/react/mpx-picker-view-column.tsx +149 -20
  66. package/lib/runtime/components/react/mpx-picker-view.tsx +180 -63
  67. package/lib/runtime/components/react/mpx-radio-group.tsx +51 -47
  68. package/lib/runtime/components/react/mpx-radio.tsx +57 -72
  69. package/lib/runtime/components/react/mpx-root-portal.tsx +10 -8
  70. package/lib/runtime/components/react/mpx-scroll-view.tsx +136 -104
  71. package/lib/runtime/components/react/mpx-swiper/carouse.tsx +175 -96
  72. package/lib/runtime/components/react/mpx-swiper/index.tsx +21 -9
  73. package/lib/runtime/components/react/mpx-swiper/type.ts +16 -5
  74. package/lib/runtime/components/react/mpx-swiper-item.tsx +48 -14
  75. package/lib/runtime/components/react/mpx-switch.tsx +46 -24
  76. package/lib/runtime/components/react/mpx-text.tsx +38 -45
  77. package/lib/runtime/components/react/mpx-textarea.tsx +1 -1
  78. package/lib/runtime/components/react/mpx-view.tsx +401 -241
  79. package/lib/runtime/components/react/mpx-web-view.tsx +22 -22
  80. package/lib/runtime/components/react/parser.ts +245 -0
  81. package/lib/runtime/components/react/types/common.ts +4 -4
  82. package/lib/runtime/components/react/types/global.d.ts +24 -2
  83. package/lib/runtime/components/react/useNodesRef.ts +1 -7
  84. package/lib/runtime/components/react/utils.tsx +524 -0
  85. package/lib/runtime/components/web/mpx-scroll-view.vue +25 -5
  86. package/lib/style-compiler/index.js +5 -4
  87. package/lib/template-compiler/compiler.js +133 -161
  88. package/lib/template-compiler/gen-node-react.js +1 -3
  89. package/lib/utils/const.js +2 -1
  90. package/lib/web/processStyles.js +2 -1
  91. package/lib/web/processTemplate.js +2 -3
  92. package/lib/wxml/loader.js +1 -1
  93. package/package.json +7 -4
  94. package/lib/runtime/components/react/dist/utils.js +0 -148
  95. package/lib/runtime/components/react/utils.ts +0 -170
@@ -3,10 +3,11 @@
3
3
  * ✔ size
4
4
  * ✔ color
5
5
  */
6
- import { useRef, forwardRef } from 'react';
6
+ import { forwardRef, useRef } 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
11
  const IconTypeMap = new Map([
11
12
  ['success', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKwAAACsCAYAAAGRNndOAAAABGdBTUEAALGPC/xhBQAAOVpJREFUeAHtfQu8JEV5b1fPnHmdsyzL8tCVBeHyUCSB3wWRR1B29yyrsGJEEb2KxEc0IVejhojEX66riQaNV3xEE9+Ceg0Q8xBcYfcsi1FEDSgYJQoYQGCBFdhd9pyZOfPovv//11093T3dM91zZuY8dmr3TFfX46uvvvrXV19VV1cbRkJX2lr4dWFroVKYKrw2SRYVl6iwrXCRsuyrGW9btmGY9CG5bRtKtbJV1s+2bpjEdZGBxa15UOrsJIFbCAq6ujxZvdifo41wEqJ+AqgCbh0yfu6lgjpheqLMCaJu/YpTeUvT8gj3RtQlI7RBHeIPEGZDecXqmJRXBZo2ZK4ZdNpaWt8rLCXJVnI/WjxRtKIT+pRR9zeWPxe57okwqv14ZXI2p6vtJ6ob0kSP+u9ARPebt5fXV59R3BKDdVeiWeDjmVHSZTVR6A7bsJ+py9JVj+TUTURgoBnRUZXxZp3Rf0XmBjhbVanMHsnwJESZTtkOlIXZeA7sJyvrawcyA118Oife/9ul8dRKEKumJcradSEsPOQTc4oOop0Q1vLTgT1fHXV6D/N7HFP1id7tmaqTEUweS18AaVLllhZMXAQgKSDz1zxAmJSo+qBMUKm2qI4F+YkyYWxur8GYgtD0p6S/1U736Ooj1HP+5F6g3+MV4A+EP8xhKDrZ7bJtxY+VpvKN0rb8nUlyxHKruWSjeA5ev77F4Gni3pfASdlGVMYrNC4x7hvdPbqeh6Tc3GFxeNhlYnIHziRpR4JM7BL0D0EMpvM4lep2Zc/JFP4lYYpFcyycHnXvUdDQ3eobJtW613LW7SBEH3ngoWpa4LdItvuk+sWtObLZHttjiOmw3ANByzxjzLReECjXJRNo/UCCDjeVXbNZM9OcrlvmjwLJCDO4tERttnBhReG1lq3ucki0/8YRrYObfCj5DAiapZtzL8PIelUoLnAbR3SscFBhlYs76ET7vfBPTNyUv8Ruqn8NUIi4yUaESZBq2PcDumMVNSsFj28pXNRU9qfj0vvDaVw8YRnWyjicVlbAJNqdvwQFfNyfMdLv9kgBQWFLDlXsAVYRlEHnYalaPwiSSTqow9Uee7rfOlEpf0kFRN2GbeFUBzAyjeMMS/IoY6/OF4CUEEapAW2vU0Zcmc5Eeojvati4++kkXvV1AK+eKMiFP4Xc40euToRXQx8BfxZfsOOd2Jp7btNQd4cjAL8mzNF4jIczpLn3apQiExh6Egx5JmyKrAGhdczHUYeDRCCRtD5C2GBdnDcXR5OEu0ZU00SR61qKlp4Dtjg9EUW6e1jUEN6J8VhmNZPdi5x7CkeBOEaEphbFdBuz2q6y2B2To0SXMecrW1C3n8raLy+vqXmjToDZYUqzc61E13hJtJQ9ZUhGac8tDAcZ+qxrLUSRrL4ZJqOmsi/D1GsvxPOZuHL9HTBj2Md5knWn+XH5+hV+b8WanWCzwlb4TzDa0WjxWxMcRExOn8hJorl9jyxjyvSPZBB/x5Qy+TUCOcvYzGLTkFSc50HcmaSZlGn/yLZU0L6OyTw2Pnv006cb9zG69J38eXbWYM9OxaAfCllk/Tm0xQkx5QWDMZcqN2rrjA3GDCOKWwq3oiOc7k8ExXN/tV59rnGOMVtBRGlr/lw09w29dl1/zVodjNT8MX4Own7baFbGZg801hi7JWqzsd9YZuzo+ob6HTppaUv+TzBp/Tt9349ri9keqKF+M1Vr9hAtaZIYv6lwuWXaH+qBXHsWnwBpkXmyFND7Ro/2nPEhIPIbdNBrLcu4ND5Vyhgfo8zJDuoxiwEBna2AxaBQqpRl9Cu5XnDQjPLqMasLkQGCoeE1LJ1g0NeQrChRXaQ3KOgAiXQzDHP4pQEjZqjLmsxnfIySP49rzaz/qodhsYRE4bXVzZ+8N79fkZICZnH+SZefaEdmdcLS9tzv2w31L/qeNoagJFFunQtXnclnpOhYf3PrsPA1bXGSX0s8TCzNPZr5Yc7WU+VJk7hTWmfGmvmcMpq/g1FsP8zLHjdt+45z1p33suvUdc1OeZPG9SRZEi9uK/yNYdnvSVqQTpcpjR0yfcb0Tn2f5pqa2SgISC9mqSG1I/cIDs9mmRSW2M6Zyeoh9Cd1iZnVczMSFpWGnE7mJCRQC/6XPMH0qMgXgd3IZ3DhSnTVRZvsTc5yLYAoTFJ6YNOZ1AULDhNv3ZNLJ49klx8nFjTfFNVarbwtX8fSilsLt0Eep7pkcemYvEU1iY+Sxj8/RF6QPW3sljW3NOKyx5aO5c9ZEMtRmlxwAdk4GnMMp5hbtM1C9sSZM2cil6UjYYBF3cfJKHU3az44RllP0m85q9q4c9Xtq0qtkJavjdnizbnzLWUfTIk6T3xaiQflo1z9g9quXU/KTCRcXkv+bgzBTiyxxm2R4dz9vg/ZCeEhOCDZVq+cB0ZZcWoMMuw6bGgISNhjtrCl8AdMgwn98CXqMseLRQxrhpURwK7X0tL8SERmW8v2PirD9MbAQSRb2F44S3ghyj1ZD5O7UFmigVpw0LHCGp5HbZdO1dtGHE2rr1fw6zm0+n/xJiBHfwIv5QA8kNk0H3SitZ+OJR/Um89hOrM0VXo+PcPqVliQ+6/q+tllLBOLVjvkGvPjdTQ3XrXUVUyOPgY3DfvC2vratcZ2I1uo5+9GSx7diTwF6Oh8pMqaZ8Y+c+pEpJc4ZRnn1TbUrmfeYjP/APh4Vjc6fFTgQbdpbRZmyf2gYAB8zpSWza566lTg81ojV1pReATNm/45mG0sE2ZFt3pV6FbfFPFKPVitVY+tnmrMsumLzcI9aRgVe8HHl6MNfAHdWAGK/rlbGsbDrLyxkqkexaVP3hetwv0Ymg6nv1fnMNuufyPpmYZ1cXl97RV4HvA6sXUiU1Gz2O+fmZx9CZZEG8btxhg6cQWTy0NjkicOFmZtv33WKautnsHomcna100z+xJwVQ8l54D9JlRok4R/Fow+VXgM/kIoXaLbsAxFdaXqYEr9oDJZPUNKu9bIlFaMfQ5ziTeS8Uoea7VnGrskjhLdRUbtAxJxFpEoZCI4I1gqTWDbp2Om+y2h/SoDj9zrb4L/3ZXvzxY8RhFQ3JUHVntnNMw7dPIvsNUk34S4A8NuOGHUvWk3J2fObmxri9ts5ItjBYxM/WCUPd8Bw8bJ87KcXssiMoc2/0yzjYmIAKi8L5bP9s35rzdKxWLuYcyHVkQkTx3khydnDa1dfSnUly4VHfNNmFx+Sd8XC/mn+sUoaYbhGWh+Ajqtw+TyDaWpzEaoJ+rT8CattOS89Gxp7eyMeiv9njzFoKEKC5pmOv1wr2SDJoBrs+qJY5tkfRUaLoO+0mzOxFxGseNtj47yJMsASrfV/3SS4V4pLJdPKVhLlTcByTKASGETzJfjUpXnlH2B54fHHyXhgl2JcBSHP/Gg/dj8zXVbrxi/VBnYivGSOHDgLeUbmcCXtl/esJ4PM8py2mDAwKzKiXFMRofV4XSHYvlRjDI8ktm9k3ufzGfVEUzAVrExJxmIgyTC/SOOUeGlExN6KGYaIQpd4YNUp6yd44Av24QeDen0ToySYCJI6k7HDIJjrSwS5WYux8X1AYiA7++M6XRx18TF7ffd/NH1miEvngixuJLDJUlTc5RHhohm6SZNP7nEzOpMxW25lxuWSjQP03mirmmY1PlTM6sz8goj/E4ILNn+GqRXGfWB8trq+/w00vjnxGyaguLSOstXzauAlufGpUkTjgphW795ZXld+c+hDgnWeXFDEyyXgM26vQ3KKlK1D6X2prq5sq66bhhlDUywfEIBwHw5rhLOEINYcMBHHlzFNiF1PlGg68aYY0nolIEFPBkK/IO3EIz6UVglnnQXX6Pi5xDWjf9UpOP0GIXoTJcwMrBzErOD7KSkjT8uM3Es4g2HdceP2xinmplV5ReXH42JThU8Z8Hy0anRVN8Ml6oFOVgJhkvtcC+C7t4TSAFob2D/Q1c7pUNpXXtcbF4+NOezaH8CbeijZ0eZK/6k8+8nqtH6vPAnTnVwDkLTPi3DqRGrt0voglz+fN1Oxyyeq6OqnGdCcQLmnGn3muoDSWuVWLDBjTKitVCGqzMTU0nK1jylE5Q4dYvTx1ARrVXMDmx2NX28LVLu7iOn8ziDgshzqQiVQnLrQqFSrUU5boTG30NRcf6wjmIJj/JOl0H2iPmen+iS8tMUhJSiENxp+hgrWAi1ZRy6XWRJCSxpZVB3bDZwwdyO4rGccczTL5q9N0wuUhXIsgt7Ox1bLJxrX7oXtFK6kEOEeuBqz8S20h+HRdKG2MBaFgg5vb4tWZjOvnEPeVgQReT7nKZ9fmVdzdu4H0AsXi7y9o63cDoSqocaoEwmjVFdGEt+fHdap/UEy/3weoFEDH2q66U5SO2BdLDuqXqculIujkmmhaiv/hfSPcEGXzJYcijlwL47Y5gXYiTfv7Ju9hXY0XEoHg18Ugsl9TUKtSAilhSusjUKelU2IpK4o6CXjGB3YuXsC0Yh+3flF7qLK9inkzs6d445pf4W+vIo1rkXJ72Zwg2Lyl1Ml2D/gCUJY1qjFwbmJ4/6rWnar5sxZ2+W3VkuE/mp/HosTX4B8FkdIZLUrNIMM/CeZpvKVOo65T+6gwOWtthSl7IwMvw3XnffOL2+5vVAsjW+ZexES2Ww1agfW4paFaX1FTcMZZtG5vPOy3nIEAXtFp2F6bPtXRnT+Lvpp2ofMV5lTHtMyv6s4rnQbZ/AKhz2EQ6oG8bILItX9o7XcwGPqYXv4VBwt5kx/rxs1raju7eOh8H2wsL+hbNwMsBXcA7roW06sI91C6tXP+kshLqfDmjTFTqi9+vOjDX2O9Mrp3cVd49hdmJeAeAUeycnOT9Vyc6+y687Nb3SFN6utdU1QGduUADVZbWuFG97b1CwXx+FqSU7YMV+jVMaLUqJfFgf+mE5W7sAAnjYy8DNqstLL7VM65MYrYmmTo2us3H69zgQ+hc4zuH/6T3NOpI7xsdXjv0vyzJpOjkvD3iRA/ZAns4CTXs5anwqfwMOVjqXUX0fvHD+Bah+aqxU+PDTpz/9lL94PLV9tlk33ojnUhcj/DB/nM//XZUxPlZ+YvZG6M+aL9zgPuzSE/mzYexfgcodH4gb0g2Pgok7YUVdYF+QuWHqW/LmpZ5xJcJRGuZxVgdY+G7Gzr5mekPEW8s3GgcUs7lPo/m5E65iW9afVvfUv9YmTLfMwtax12Ny+WncTqRho99pO1gFBHJrI1y/C46gxxN4/m/5B9X3G5tCCIxIHAiCYV86Mv9m9D4KNIkKCWQfyA3Upg3YhjWamTXf4wh2qvhRjKB/JoVrPTxQ1u2nsBHyymq1+jHjpUa5Y6W3GssLRu5/K2X+GWrRlx3jHctLE0lZRciJC+BesH/21XddG8MsulIto8xvFsuVtz7xstaxiTr5xLbCpoZlvwtMDndQ0gx0uUYN9nrPlyfYiVsnDm6W64+TliNY+rxo3gzMoeExyKk/qk5Wv4oibTTyO1DYlQMrcI6EKVCKJqwCyDt21sjCVkByML22wfRay3IpXJ6Wgjcr5shGqux8nSGHv6EWmorDmO5PGv5nYG0VGJ/CRgzb2YgxMCshVU0WUGIsuNgAWhtSQ0Ilx631WJd/OQ9FOeeu6ZkYZjNu7L57IVDjhHrZ5OVth/DFSgzPzr8AxPItOUfnauHG5liiQqdEtYuou7/762S8RiRtRZduLD3TzjS9d8ups5mjY6ZW9kXvk0EKfTr8BgIrBnXQcYN/IhkBvXUUIk8bSFTewoWQo3QN4xe/w9BNAOleGq6QaR5aWVd5JBzsv2/Tsf5I7eeWRh46pO+lQFE6ELK/q+gEi/QqdYEwxZqKFup97PrdhMrqJ0KsX07j3xs/gWcP+cMcv6sn2iMWfojLulhBrTmTxzeCmuXJWa/HehEdPKkFq2nxUKfwWUmik7jjGMZGz4R1AYO+ApZ8w5B2egeVRoQe3Qsrfak/d99BqDHHKEDQorB6Ya+PedjedElqnECHOsTif5MUE587IkbOowod88RkMpND5fzoYF0jel4E1YRBbhty0ki67Dx43hUoM5YSXt6tTNb+KTY+ZUTfBesvn5vFmlYz9jBxphX1QY/mhEJhM0AyFEx4DPGSSTo2mCNEuXpESLCz47vl7173FwdsUpsG8kqr5rMzF32Kdb8LwYFPDn/qE9nuZDjQm1jkWVv9XPfE/UkxVMF2Yrm4vfh7RtN+OzD4YsAw7TIhAX63yphfPeesjR/t18GwnfjtFrdgBKsZ5aOi67dd/2psvHgN1MCh0JCHYJF+f4AuD+FhFcTG3gHzSYTvyJrGf9hW8/PhDRqa1nxe51Ww0K+qtK30t/gO4zuhIxNNVroJC8LHLpjMxeXJ8n90SzvI+KELlgvqVrlxN4anlYOsmEfbVFfg/dnLvfsheYYmWP8i+pDqFigGFoZljal11TXVWwIRA7oZqGDZ1Se2FR/TC+dxddA2rhffjSvHtnJsLTeTXjv2aHTwwEJ4fXUdHgMN0HWrQs9FYwPuNEb38SgCYruyZPzhc9fQrvBQWHT0YtRidJxjQ9DGbSWSECc5wpMKGeW8oXp29Stx5cwlvBP/PdH1L5CHCXiTAUZglKEweZmz040iy1IgS5rOT3chw9x41uGri/cdfR+ft/XN9aNawkxpS2mVrZpta5QOllAMS+Ich1f+aWHA23fn0g6U3a0QZdyFJ6wndkuWNL4vJg5QelWkULl6BOQQSPLJKwqUbpBCJX238agSWBS4YCj46FAwtrjzpUG+4iqJ5/ijq9ozmfDTBRJqabw5k++Zr0BGvzyDyjmQzLvJ2K+orK3hzZreXc81P2v7WdkfNW4LH3gKTiBWVESGn56p916hZDnBIHVwR/7UDyvrq6clo9eeqiPp9uROyLKpZSsbdu0Jf7wz0oMchdoTVT+1wfsFxPyhuorZlIIXQXbOnJ3u8yia89T6hI9m/EKlQL2uv0iEyspL2/MHEojTvTxBhAdfaGGluabC1v7YLDzLjzm7zmEInV4vnKaipqnM79UTKniPs54RXsNZdt7rnEk4ToxYPuPyC5XEyYgjS+EqSXkLLg0tB6cW8ahAj8zxDJw0zCcSLFpVtT04RClig6cpbaGmdXGh9S5VW9hRLTjHt4Rjou8TCba0rYCt7j5HXco/BsU3tC/D4vDq+pix3wixT5XjsBJUp6tg+QQWDdgSn/bpa4JCFlsSHi0SO5fAGWNJJhEdxRP+KqHTRbhnoL2rLDbhJeGXA1vkgg4EoDcYx9HpiFj/px5FqFT0sU0ZV8TiDac9HqVv2YP16/NxtYsVrP97VSQuGOVPR4zHFbM4w4khnGmgax+sBNYW/CdqBCNjnjPxyGAIUL6tJSJlAQjYh2QqcqIasKSXRtf8kQcfwrsT0S4SsYFzmJFPdmIRrfugo0idpd0IAUAl6A/OhUXTJtioo46EcHSjhektyftOVY87I7dNsP4tQbGj4pIUX5dKyUgWgVpkK2wrXBTOHRCsnGzuppA5tPSDcJZ9+B7CFbmERIDndleHgri243O+4+KlbaIbyJdh3/Pi1dPISnufoXRjvVR+04GWgCxNEP4j15JAB7TxYPdWQp+5hcO4vO3vi2A/tr8Ow/MDZ04nbu/KGOA9kJIh/423tZLZlixWlfF99Mire20NeWQGKUbpWp62p+mKYHlElA7QE4KlKFnTsK+p2LMbq9naW6HletsrS9QSdVHIs+z3aDmKYJtKfUMHyONqfbN0rhXU60Mz2dqbjfXGHgOnHpWLs3+JedVUL1VMsl7iqIIU32DphZH5zAO19jQ03ifKjeqHIVDnXC58inB8OrMeu5Wf3xNvrk0rvTtEQH+h2BGsG0m9Ifo1CuYhAovk9j702betqK74K5x+BAHD/chYic8mXtE0cZCbrZb3Xg/qhKjczasYmpUt6o2BvN8QVerQwjC8fLtu2e+r5+p37XjpDjlMaP/v4GHobvuTGLI3wJzkuQg9O5qjUYgFNmW8yjr7/l36aIRFD1Z8fBZVvqJs1D5hbDC8D0Pst2W/o2dV/UsYzk9FbVO9ZRglfRnAZG06WmIoAC9TaLkudjvLNsrYdv/usl3/CoQ6o+s1PmUcUrdnrwTETgNy2s4W0OnSXEWc7hQ36ilDFoV5b6gscrlWMzhfYXpl/ZvGyUZr69N2Y8Jq5rlVfkO/hKobIFLFIpLma2DwWqx6AE/nd2aU+tD0ntp1AaFea0yUmrl3ATyXoL5z7v5aoPrqoFbfta7KzPxhsLDFCFnb+GXWtD8+nZn9Ik6Waz2mx3ldRZV/E6pEo907EqBV/T75ImQGW+CUgGAX1cMXnJsIfq+BLfq56cnKbX4xFaYKR2KQugxIvRjhqbYG+el09csiFSUbdBg8VwUES/NhkQj3CdWw/qKcr18Ho3+3v1oTUxPHNa3GZ1CRMxEeVHX+hH3wy3pBBGKxdf2AQMHSAH0o0COhjL2msm+CIf5bL2zungezmcaby1b96rBQl99UOqmpmlfD0hm4UKUa7WB1aqfURACxc69zgAL13S0zzdprxjP50zHAfB094qBAitQ36hHsUvmTvWubm5E1WK3rjQNrZvML0LInDmsQlkmCLHcFKwLz1gwgNsRqMHXaO1s9OqbMv6Y9OTM5u1Vlm2djFP05yLRMoeQ0IUT1G2xLecfs+tlvI1tQqBioSqXcHyH8d4clVLIuW7yCnDCYCtU5h0/uJED75nxtoMmmnl5e+ammNLOmfmc5O3sajOkvofK7Q6LRyaKudWy5vl1Z5vmVyUr7QQ03GCtKKvundlNtQuYgUKKo9TUsQqqgj6c3u4OMRM/OemEli/fi1pX2lF7Mk4k9AlhdKv+6+jaohXdh/vNLCDiaMzcDpo17keZb+Ht5eUP5Do+O9mw2DioWcu+x7cz/QZq+zKg06SRXLrFGOVTrcTXA400ptPuggi4tj81uxkAjCyHCyHYs/tSKp2Aj2MfQcU6OFop9j2Vbn52tNb5sbDR2hSvgfL/BfB/MqguQPwiQcOJB3aNyfM0qPKU1lfHtQTLE5jwajfoPOTt3rrHJV3kIubKh8oPKbHUjWveDEExrqw4CYJ1sbRq1V87+oPHxSKHeNLG2qUwMYPaF8yZUNlbMomDTUN8gYhktmB6QHUvkPtCctc+tbQx+UYO8GfwQRC73cnSrzyLhfhDrHabVfNPMhvrPwFWbqpiYysFONa8C2k+W/PP5E4PYjZPnZVVpKv9zmAfPc/hjPaL1xpz5V8bDGGBeWN1QvT+KVvGm4mrDtN5uZM1PVNZUHo5KU9pirDJU/nPg8tyo+OGHAYpgJqwKeJqcGt9evMxqWFeQKc4kZOY1INmiiN80LXtDbUPtVyyOZSZ2sFMLhfwHwdpbEucZcEI5+DxiAwcFa/JwGl2+zLwGJ1QWc1jWVN9YdlPuWIg1uX7H6D9ezF0K1t6seV0Q14ipKngUzWv6T/xJB6HeqoYyTqib6obiVPHVgQEthlxxKntaYSx/jWWry5AkeWPE0OtXMFVAlLOVKWeLCz7x9l0D2kLsQGcjAhTCYJFLpfNAs9Y8v35O/a6oQYpMl24qvdRQzQ/DsvD2PURVZuhhEKptApj40lpYv+ovLTsIyBgf1MyJPAcrVBaFdrOfPZbLfCr/HeNIXbb/iiNPLrCU9UkI1duh44+fVz/lEyFU8gRBC5Y9EeqJAk0uWgYS7cUyy0BcEy17y0x29tWYQHgvPRdvHnuBappfAqyPG5SRMtfaRJmmkNqTeDX0QNJu6SzXZkTksITK8jPoUOsKjfzX+ZUjBhRvMlbbTfOv0bwLV6hUsIJLctxyZil7nL7zBMuz/3QgURKnnL00ffSguLPHV+Sncrcax6tM7jO4n+wj+f6SEsEAfBGD0PQZrQ8UBTq7VgfCiaMR+stUN2qc2s79Q2rdSplbPHSrvKMUpmKqm3Fw2jod7CGWAWiF1oxHRB6Bd51zENcFL1QKKVomfqFSNAHBwlRYHZAXaUTTCSTbZ264NhAhWFOpnWEZBATLSB5YqxOJTPlq3sjJdJ+S4OAedtPrKvJpRH94m2B5CrBOQAXN9caRaCERyDNqwEL4NMLbRNQuftDAIMZFkmMoYMdeo4eUGbKPOYisU9W54BIlkTbEMhESH6sTE/rSHJHZdaolfGW92/Do1BdI/WJczSMFK4lxyrqXia2Gm2Hatl7Z8+hxeqvUPJILDPaxq22xguXR9UCrPKcS3QKp0ibeV4QrIEV9eVholG5VzcyqSGm7gbGCZTzmvd4TVhLnyhcelMV2DZfm4r9QmJQsBu5IoSp1dfnF5Uc7VbSjYCUjvmKhCbAQfrAhzkjW6Rb9leDBX4xQG1ABF3erY1fB8ktAKOBqTUi/rkT9sxQdLYBOVYNQvV7cqf5dBcvMbgvdpwmJkQy5inCXinxZD/yJCqBwI5z/01sR0YGgGBKBNN4NDph5GoX7ttZjQEMTkycObIvVcUB2gMoBOroiWZU7cO/kXu9lkW51TYRYTQRHIu2HcrmLUJxj4zrWgrBGCS8mB36TCNUsZE9MI1SKILp5uginDbngjg0trd5pmtKF7jCjpZeBb9GpIohoUeSz6ojda6oPpOUtFWI1cSIX/pbOhVTJKG0+uoU+sAlKKVSHXQAiWqgrVqwc70WoJBtN0S2w20XO5rbt1/vTkV0y7ti7ID+nEvyU++AHLyJO2KfkK06giLDL66p4EUeGsp4KnnO1i9uKz8I3MVoL5C4b8hgdSO40yvbEcS+ZBJoQqVvbWIGCNoT5MKyg4Lp0D2XOWbC6TOxNqIP1rL4PXFkxqguZH4o3EN33G5QnspRiWUX2ovgRX5evsvbLy2tq/6rv53Ltm2DJRHEq90rA4roohtgFZRur4gIvihVF19fiRZjhHuKU26UcvCpaOXt2PIrvXsO6lNgbWf96biQFQTBjCC2w4ErDC47MFBEoA5DbsVkTmib48Lk4+hO4sZxxzNMvmr03QdJUSXqyCrqVwPVcfmjc/5gnkMetM0FLRMnV+ZEuy25LIVPg/n/SEJJeTnh10vCX6dz8jt3XXagZM3MJF6kHIVRhPVDhAd3wcF9U3FvMGVAxycia9vmVdbV/SZa491Tdm7Z32m05CzcX3oJT1f4BIBtquWDkl8969uoT+/2hnrYK+gKGXUGv6NLNhfdjcvxedOLBvO2Cj/LgNfvXzNf3FOdNsJ6E4eEHKDffcsOldtO6CKqS+5/S8cXXlgx1o5FRn8Q2++/7ac+XP10F5ovLIZXLBr7hlhtOw4h+htW0T4LlfRyGxsOguibAwqBlRQU5jUJ+A8/dZkbdAfvm1o1nbbzNvzl8SKJYsMUMuhEWXMX53p2VMV+NSeDLsJR8/MBU/IBqDqO9iV1OP8d3h/7NbFr/OF9DyICq15XskgUsD219+KGHL0bzvhOai+/oLNm6Sitz3dY2fmVn1JWHrj70qmEall1R1scES6YReQa2ss1PDnJ6J3NmSIwP+cRxNUAm3h1aBPFEUtyDtA45+xLFNVBbWW8fxlSzLwx3IbIoAcsP6Hz05o+81bIbf4NzD5Z3qWP3aC7eEIj4R3CBJlHpANOVkIQReC41wWk3wDpknBwCXJAVAg4d5yEGAkhM9iCjfPIC12khXhL0+MNFMVNlL7907bs/u0ltcpcBeyQ2D9m0/Oeh6HRF8gst+JjIDcglW3bT5QYmXCAQMbLySwKCHgLU8xIpDoD0lfihvx+ScrDYKgNkA06X4XYYOV/C+c6N5Gll1wkDuXu9uQfL0RsHtXLaK1Nx+fpa87hCeg2XhzyWugpgKaWlQYC2tBRASaCmJbLA0lP707Em0v/Y8/C/b+YGHk5B01/MzbsLrOoeOwuuDfm5O6NhXofGiX7U67HOttI6xwl02g9hOJTKOZl8wVXPx32/vK4UCFyQ9CSCm7l0UeRtGFnrgn49ru5XbRdEi3KzBwB2G7Ri1w0SHkhpfbl2n1RCWkpaqV+yWcR0IAz85+ZwmSC6rdwrgKHBH8IIdRr3SM+3UOYNsACnGt9W/AoAeBGEG8uH2J6+WDYAp0aWq0/6NhzOd0v0u3zpwPjRsiOG6ZfwHs0ICB7S/+rMusofQO4upX4z3pmerk7nVH2M5ZfD8ZHru0DyqE5kxQblgUta0K6kh85wJyYXWRwR5sCMyHNsfKfr9yTVe7G59cQdJ+8oD1MMPXHaC4P7b8enMpr2z4A778WFMB0Z7sGR4uk1iORBC3ReXx4at065S/LX1YuOtoWcKVyGUTcEJqoJa4/9BvmM+t1ed2UnLMVLNnAIjH9v/AR7tnEHZBG7y0Xbpd6CPNkjZ6ISPF5HnkFIQPDq2rpcV4ZzRrd00MAiTFPlsyfNnDnD0XNgLh1XKdhYNrVsZcOo3d9NozogBWS5JgrhydJoinJGSfsrAW3n9gwMaNyskTsi7RtbSWvh9qmkybunO2v7WVns4b63YdeeiAIrey//RHu6F6pTCmgE1u7yHXQKWghigrntJO2FxpI2S1I4TD62PTBwD7GQJEuaND13pKhCilsLVwOJF0XFSYVZmmjRvhYbVdworE8SYLtJs0mT4Yf3qTSL+mplffX1fWJHeJkzLXcd9QFUrq1HOUCVKmMy5ShWqbAIYM5FjwgMQwJQMqJ2YS8IgNl2KUCL9m7A5Ht2P9Zx52wS8PVZvuEZBVYZ9ilQGkb8QyVHYKVAFpkjQF3dJiuN8l40lQ+R3N0JNoARwUr35B1TCCsdU8RElm4sPROH6GJ3fJxWZad0yEsHJZ2eS4thYhQ8fxIQrDqAlfZNqHGhshpG0zys25lPcRXrScNyU4qdae6IAqsuiNMopzqiWEdg1YJZKlcqH/5B2zoPvXRrd64gMUPsyMamzkkjY1MDFmr9Cxje216Tp20jf1KMo0ql0420aqTgl0YgGld21DqNDAQIBhLVDRgSLCVK3EqUCk5xRw4QqM5wzwVo9IFUVFvMjHyLVwKiX90VBAKXI2xCd4//BN1ueRJpWO7wx6la0yDWtnlaa1XZlOLarN0KHcUvPQnox+fEgzztpRJL5o4BtvYSY0mSd+0GYAC7qvK7cGl7FUWYQymCU/wktLuT8DVKs1glEMKp3mTTrTp8dWdm3ewKrCKFKARzdkU1PvP0WCxYXSOV6r8r8oPlju6WqgQIBPzRLBBQdIRfSwjEGLHWCon2dQQsjOKHLNs+2J/VMQE0M+6VCUaI9Ytpn/eLCiM8iDACOIGJQKwRc52EFwvY4rbCNhQScyKWq1NHNkAn2e7bcVqBcRVBVhKSiYOYI/biUkcClqeL4SjdteFMsmyhGUnQY8L5R/f7mAQEK631eFoJiRywJxiMSKzh50VN3DpxcLNSf0xWJrxQR6XjeByod5Ta5NUXOfIuZAnwZN4a2pNvFbHl+AZy7N7kQVSEOBXYwsMJeqIZDzJkimPP8H9rkry1bVaxyo27hT5jXaftD25eoSMDI7fgJdAEOp7C0s2jprK+hxc2f2s3jSqMypcBMYdjBD0E16EA19Ft+MV47mApwTotkrhYlE/5amk7tNw7noFpN+3/oyNbVyaTeR/qOHILWAKOxajsb+IBzi/rteYNWSu7s1LB264XQMO+31Cl00vPqDfrz8rl1DsAnqNs2zxlWPURReeakrIJKkHBKqM+UF5bfZ9O6uEPzKvxqSKPfo/udZ4611lH1wUjAWU0oE9moJRuUA3r2xWjdhtOdn0CIJ2BhmkNiJsMc/8zC6urVuMIZWQ/AiV0GOpwyDDrIczQrGTXAvq6mQeIb85MVsb0+qxnEpS2lf4WFQiA1dGprI6Daw/dw6zhqKxOEqBd+gAS/KyeaX50bGbsgcpE7XFjjXxIqQVUJJi4yTi4aY4dOWvZ71UqcyLGZgLVa3/4h+IEQ+QMK0xiHnQBFRWog03jUjIoyXmQ77envlUDncCqAQlKgtbPUCo1KqS7BNDc/4nme7Rh2X9WrBcf2XPunt1orABIhcr1Rik/nl9tNtQbeAwRUvB7zbnuJQwuBRUhNavgK8HSKOBnnTt5Xo4HOwsUx7cXL7Ma1hVtLAKwNDmEZgLCbflHAf2UAMFYxZ6Nn2Ak/GmjZn+mVq792ngVVgDC7lpMpopGvpQdex58J9nKvBwteSBAkvqMsjDpvty7oEoKWJZpZs33zKypfFiGBJ6BH8WILEGMgBolmmGFNVEQtcp90Ek7oTr+PpPN3rV37V5+eL3dXQvNeZCRKzVK65TdeE5TmZcA3Achf7GbrdhObIAhGlOwZfWQ0I0/F6MfVnKu/9S36mBPtK1ms0WKEYEonWR0HZwEGphk7FW2dSOWoX5jW81/GmuYu/b8ePZ+Y1PEcyMAdXzcOMDK5n4PG6rPAAg2Yr0c55WpAlhckI0nQKWmJXsAbgKM2RsnzxtThanCa3EQ29fCsneQD0LOSm84enQ/CAnYRg2blX4O2d9r2tbnZ8Yav8A5OU8bJxkVtKjTJP5yMfRPHDBxbDPTPA5H478FSuZopDoUaTNiJvrTLjC/VIarBcSXMNu9X+FFxtdlUbPXcIWhzYGWkOhOpy3rKCC1BOqmsm+Elnl4ulb7OObuu43bsCwVpU1d0stuXnZs3a4f0mw2/wYPAQ7DNr5nIoqT5ihop2Zo4BmILwEr4Spcdy2SWM1CK3MtLsaN0BojmH4FN9FY/w6EbZmZqH0ZK6J7jCPwNKqDK24vHopFq9XNev0DOAb3eHy/4CAkDyxHdsi+oKK49ZXGgIPY7qwRq1mo2YNlKaAtPYiBVgLboi3nKCBWAhzMmlh2eQxAvRu+D2HJ/8HKubMPxuZgBGf9eaNUWpZfYzeaF6JVzsebSFyaCixDdqSxwCI9ayAFX8QqNezyWD1KXR0bmaKkwSXlygiXdfTGjiL8C07bQIx8EjULjXifYZsPKKuxKW9nn3xqQ+WhjqK5FzDFX0nlz8Ir9auNhnof2oNvfszrOmpHnpNGAleu+Zo0B/Xq8iyGo3xUDudZLxG7AB3ZMglUbOww7c2qqXZjMxIfTa5DzGqA49mSQr50Dd98OXYmpX5r2vbPTVvdbuBDcONG5f7HNxgzMwYXZmLcZ40xY5WxfPy/C+faGesI21R/jNWC/dFiix+o/ipHTp78CYJ+YjWLJTFs9I7QShqrC0/DYteDMY0PyV6P6tw505z9jLESwDjJaBa2Fb7RaDaeMZbNvJITEcRPAtRc2onslEFx9O2O2/mqENtPYFTdhy/BXAuteF/5tuqvOYnim5yxbruRXW7lD2/YxpGWrS5Ge64F/3jjA4/MdXvEZl6EEbIeS4Alqxyxqkpbc9BOUS8YUgCIEaILRBg2FtGV/Z9KmffO2LKDZ4exHhMVvwPLxq3ybdhlhdnsc0zLfCFsnzXolKdANATvoNwswLUHWvAfMfv9RcOo/jvU4VPTGwws+HdxAOqyWvGUht18Jj4ogmfm9oGoxZHItWht1C41lmhOuSAzVDcZzqBh92QhkyeRo+2NWC7mLjgnQ7w6AvXLlYz8kZlMztpr7A0CFrUC3/gKtbG3ajR2GLcb3zMeMz5RGsu/GgI6DJvQL4GGLiLVWF/qp7BGahuPYFnpWsuwr6mtqD2I0mewAaXR/sy0vcSJG3PPazTtkxum/T5oh4PQePwQ89J3aCXqVjqxZR1vl1/zSVXcWvw+5ixnhFO62A8HL4x72T1v74Zt8NOMst+prNrjCTVZodAonKpM+3cwTftLSAx2YW/AhXxmTW5AUfjqdlN9eLmxfOfjGx6fSSygzcZBxVzuRVAYrwBI8Qc+dAsmJrJ4Ezr44i8Ai79kq1Hm99WybcWPNSzrnZLT9wMtBpdMVfuyDduLSY2BXfXG1xvK+mq9Wr/f+LExTVuxIyPyKHP8AKPQeDeq+TzYmdzEzBWGbrZuA2nqUOKbTdv8xXS9+vfGw8aTxls7zaB8nHAytcJYVjww92Jg83i7qf4csRz2l/TQ75OA5yW+xNrElaZBEtMza5pXKn6OHQuDfC0m4ASvMAv004hA5AK7QYXLqPBvlWl9BMPLTyq/rWNHE1Y5X4W/Tm4TgHIclo1WFF6DUWa1bZhvBK0DAKZxZNP6jqLgbP9JBGzB35RqVrcm0ui6bG5K2c+YGM8WzkE5x2NC9TZE0Z7e54CqReIAlmhF9yfOPHHrFO1XzDyPk0bBUTFPA+SBr7twgZPOI6Sbr53OQgkB1uxdqPqjEMEHM7b5yHSu+mMw16A92ZXJzUZ+2Vjx+U3bXgsZvhC1PwxVzuM9tocghHvwDbuv5Qx1b9e1U39BAGppfwPvJOVPtk37DMxxX4now0Fvwa0V+9keht8DLPqs835kF4Dh2wmVydn9XMAWrkVjXxBm1NuvSOx2oRfOO2/3Dq+csT+F7vtjjBA3mHb2W9NnTz+BOnQ2Fcg0nypNGNlisXgQ3m/LVTPVnZhW1Y1zDNBM6LBpGu5FOHf6eMu03oxOvxK9aWXC3Es/maMLBagCLGDLU4xxtVfquspk9VUOYLcXf89o4M3KNgcxI8zB6mJBrFsJrhZgGQzMP6gs85eNsealxWzx8T1nYmc+zaZBuNuNsfGnxl+IV6ye0zDV27ELjq+htK/ADKLsRUVTo0rjKwG2suaZlTWV73spS1P5u6Gmn+uvt2hYTXshrcf6mezuZw2wv9T4L5iMD1lN+235en73no17dnXPmjxF8aaxF8DOPQua4iKYFP8DOTmB8+SbnNLST6lHbn3tVmO2XXly9jim8wRamio937abtPkCzukDTpBMwLwcgWSL4gbIraPG96IeP81mx96x9x6s4Sad4cfUsLgVu91U/pXo7OdANHw0PHLdJOAYsLBCMeNIoAjx0uQp5cnyf5BsAH6YfN2JwfKEtvJAGFpDkgcytCVcHAEA7jRA+6u6arwXj3J/hi3SO7uuKPirxln/cmN/vDZ1IeRyAmT+WkQP8imav/TF6+dYB8dVAccDAHYDrDLuwmTrRCdDCLBxS1ykzyII2qUAWF15XB+EwJ4wrPoHYC7sKN9fv8t4C1YUaP9Guc3GfsUMdrdlc29E9PF4YPASyJtLYCOXQAKeUOHphlNNjktZ0+trMOcc14Y/nBzHHezv0Ql4peqmk95A9PKrxW05Jcli/OHKwSP4e8JS1mcztvHj8q76zwIal0AdGzsOA9g6COFFsFNPhlBWLMbKzhvPhJDAyBmtu2pWMmqqKyrrqpf7eY6EHb5lQEQ/x5+wZW+w1Mhs/uSLz8/FQBObVyzjp1gZvLNu25+v5WoPjxuF38eZVMehE/8+RP0MAHYE1JStK/pOHg5Q+bmKrzuNX+LbB4FFAGaJRN5R9x6V33H/Q2WYAIEnMTIBQ4Em9Ln4o7N3Z2Vhp8DuPqwq2OoxVI+n/h2IuuZHQ//cGk2eZtGmTOCAbWvVEatL9x19X9vadyyFwvbCWVj43h6mr4GKNUZ2lXD06H4kgZYEABGcNiP3GKVEPSYxBeysWlNdU71FMoZ+AhrUHycZTPt8fxj9fCJBmLKzuKZtOMnofiQBsVdFn3GGwDkPkJYErAD4+XFgpVhjAcvIyrrav+D1jNfT3+ZEwULf4ordTsJgW5pRwL4nAUehAp30uMstwKuj5jqLg1gj5jql6ghYZqyuq341Y2YuCRNxegvYIDOYWms+w+lG9/uYBABU5x8Ua4KtG1o6xBixpu/jroBbMlfYUvgDvJ7y5XBqWfLy9yCnY4WTje6XuAQc8xCN70NUEq1KsWAj/huqZ1e/kkREPvLdk+/33fzR9brxK3ShQD72KAbI0pcJn6jbQJLuxEcpFqcE0NbOkyu2OwGbFKaoLiyGsTHj2KdfNHtv0sp3NQn8hEj4WYev5vtQZX+4wyIYBrN8pZWAFSNBgOtPOfIvKQm47UvV5Fqr8CVsdGCIWEoDVsqOZfXkYvcdgJrzZIwAdgtgHXouqSf2RpmGIAFtDrKoFHqViQP7A9KwmkrD+glzQ4LK2i9H4W1dihMymYy5GfiB7xFg/dJb3H5ZGdKtjmtisAIrxIx/M0taSfQMWBZUXlP718vWXY7DONRDcQWzF+LUE1nlCFQ0LsMofGFKAMBk+9GZon2cm0Rrq8hDjBArxIwQ6fGnbwN18ebc+Vgg/ifo2zaaYs9KRVlpdrORwu2xvYaeTWCJH/lmLG/Yug5Wk/HCEdi0X1lZW/vnZBk6p2oDV+fknWOhTVVpqvgD1OjUuJSOfeuPdcwHf8jIvwAk4ILSw6Y8CCBe00BG/bA8WTkd2tUjM9eapSk9cVmrbl9V2vPUU/dbKvglcD8BrXXdByLAuMvKQDjylzzyd5IAh32NLx4SxrkIXRqgwgTcufyAA47YcfKOwGqSQ2luvwOFx/7bC8+uNYxfAZyxp+5R47L7aVtIGJKAuVVslDuFBChvOH0+gKdMUmlTAXUtlzWO3b2m+oAQHMDPQAGr+R3/3vgJdrX5407AlbTSvSE4TtKoekfGrhbhYK4UMf45WhTGJuSvFUeaAtFaNVXInDJz5sxdafL1knYogNWMLZtattKy6nd3MhWYlkJkp8+ghzs+sMkAuqFy7BS5ZH4pQ1eUIkZXpg5o0wuWQ79pjh23d3IvDhQcjpvTslZaFlmxmbOrh7wgexpODlQ/jMtPe4lLJ5SnyNTVtLxwEYJXD8BxREbhjowgQJEjhCYLOLjK4CWmGGIgy/RaVf2Qbci2HCZY2aTpu1WfgcDlMBx0cQ2GIxz9Ge/06oK87SCmg0btvFchnulhx0jvZqGiM7EUhSu2fuqJE5HLJOkBKnkatmld2K/lqV5FM1QNG8UkBVCerI5dNnl5BoK82lWsbUkpZP5Jm/AqGsJpGjaP/GPrEMxMJAnbyCy5gFZVIQGqTvzJCIR+LPuUpcbs1PhzZZhYCBzM0CZsG7bRfIOVfC9I9VTaUlplm83NAF37GQkR0tba16sNQcuuyOFPp5dWXKg11kwmuTo9kb+sGzuqqFBuoncdO/acHJ71q0bmJeUXlx+dE50BZJ5jzQbAUYikvBD54MOfRsO8EW2TmF9pSKdtHW3rjiXO4gOBjBR+QCemHGJwQLcOIB0eDRyh6KhNB5vsjy5aexre21imJjXUl1YdfuifRL3415Z+HgMWWDN1l4RsJDftTwFvcz5aXYNa4AtJEMSCBA10hGlsiMe7cflMIr1wHsmKkjk80y8mjBTuFOaWSN7mrCldNiMv+LCJbam3Jd04HUljHgKTiHwe2EpWJEwBVby5+Dq8ofNRfArn4GS50qcS8CCbxrGAmpLjMNxFgtIJJKPodCl8oECUEtp/MFndic+CX1pZW/kaym9VpT3pgg7pIu4FzXskc/J6Or5fgI8Fn4Vxbt4nlZFMDjgQcLTsjLoF2zr/qtMbqANmYyDklxxgo6Q0cevEwc1qAx/vMP4Q2nJJHSwMw+JJAPPzmUL2yukzpndG1X8phe0TgI1rMJoU49vGTwaIL8Qa0LkQxjEYKxeUVgZP3INyDxZVvw1wXjOzbub2xTykx7VF0vB9GrBJhXSBfUHmO1P/dkxDmf9zTKmTLNs6xrLN/XEC/X4wYidgepSUbRVwOFcen5EfwzxKQI95lYUPcNRNw5q1lVnFUI3dS/Y0op82lbXbVOY9OMPrjqxt/eQlky+75zp1XeePiCRleAmn+//FaHPquT+49gAAAABJRU5ErkJggg=='],
12
13
  ['success_no_circle', 'data:image/png;base64,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'],
@@ -19,30 +20,27 @@ const IconTypeMap = new Map([
19
20
  ['clear', 'data:image/png;base64,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']
20
21
  ]);
21
22
  const Icon = forwardRef((props, ref) => {
22
- const { type, size = 23, color, style = {}, 'enable-offset': enableOffset } = props;
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;
23
24
  const uri = IconTypeMap.get(type);
24
25
  const defaultStyle = { width: ~~size, height: ~~size };
25
- const layoutRef = useRef({});
26
- const { nodeRef } = useNodesRef(props, ref, {
27
- defaultStyle
28
- });
29
- const onLayout = () => {
30
- nodeRef.current?.measure((x, y, width, height, offsetLeft, offsetTop) => {
31
- layoutRef.current = { x, y, width, height, offsetLeft, offsetTop };
32
- });
26
+ const styleObj = {
27
+ ...defaultStyle,
28
+ ...style
33
29
  };
30
+ const { hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
31
+ const nodeRef = useRef(null);
32
+ useNodesRef(props, ref, nodeRef, { defaultStyle });
33
+ const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
34
34
  const innerProps = useInnerProps(props, {
35
35
  ref: nodeRef,
36
36
  style: {
37
- ...defaultStyle,
38
- tintColor: color,
39
- ...style
37
+ ...normalStyle,
38
+ ...layoutStyle,
39
+ tintColor: color
40
40
  },
41
41
  source: { uri },
42
- ...(enableOffset ? { onLayout } : {})
43
- }, [
44
- 'enable-offset'
45
- ], {
42
+ ...layoutProps
43
+ }, [], {
46
44
  layoutRef
47
45
  });
48
46
  return <Image {...innerProps}/>;
@@ -11,9 +11,10 @@
11
11
  * ✔ DEFAULT_SIZE
12
12
  */
13
13
  import { useEffect, useMemo, useState, useRef, forwardRef } from 'react';
14
- import { Image as RNImage, View, StyleSheet, } from 'react-native';
14
+ import { Image as RNImage, View, StyleSheet } from 'react-native';
15
15
  import useInnerProps, { getCustomEvent } from '../getInnerListeners';
16
16
  import useNodesRef from '../useNodesRef';
17
+ import { useLayout, useTransformStyle } from '../utils';
17
18
  const DEFAULT_IMAGE_WIDTH = 320;
18
19
  const DEFAULT_IMAGE_HEIGHT = 240;
19
20
  // const REMOTE_SVG_REGEXP = /https?:\/\/.*\.(?:svg)/i
@@ -35,7 +36,7 @@ const cropMode = [
35
36
  'top left',
36
37
  'top right',
37
38
  'bottom left',
38
- 'bottom right',
39
+ 'bottom right'
39
40
  ];
40
41
  const ModeMap = new Map([
41
42
  ['scaleToFill', 'stretch'],
@@ -43,7 +44,7 @@ const ModeMap = new Map([
43
44
  ['aspectFill', 'cover'],
44
45
  ['widthFix', 'stretch'],
45
46
  ['heightFix', 'stretch'],
46
- ...cropMode.map(mode => [mode, 'stretch']),
47
+ ...cropMode.map(mode => [mode, 'stretch'])
47
48
  ]);
48
49
  const isNumber = (value) => typeof value === 'number';
49
50
  const relativeCenteredSize = (viewSize, imageSize) => (viewSize - imageSize) / 2;
@@ -56,15 +57,27 @@ const relativeCenteredSize = (viewSize, imageSize) => (viewSize - imageSize) / 2
56
57
  const Image = forwardRef((props, ref) => {
57
58
  const { src = '', mode = 'scaleToFill',
58
59
  // svg = false,
59
- style = {}, 'enable-offset': enableOffset, bindload, binderror } = props;
60
- const { width = DEFAULT_IMAGE_WIDTH, height = DEFAULT_IMAGE_HEIGHT } = style;
61
- const { nodeRef } = useNodesRef(props, ref, {
62
- defaultStyle: {
63
- width: DEFAULT_IMAGE_WIDTH,
64
- height: DEFAULT_IMAGE_HEIGHT
65
- }
60
+ style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindload, binderror } = props;
61
+ const defaultStyle = {
62
+ width: DEFAULT_IMAGE_WIDTH,
63
+ height: DEFAULT_IMAGE_HEIGHT
64
+ };
65
+ const styleObj = {
66
+ ...defaultStyle,
67
+ ...style,
68
+ overflow: 'hidden'
69
+ };
70
+ const nodeRef = useRef(null);
71
+ useNodesRef(props, ref, nodeRef, {
72
+ defaultStyle
66
73
  });
67
- const layoutRef = useRef({});
74
+ const onLayout = ({ nativeEvent: { layout: { width, height } } }) => {
75
+ setViewWidth(width);
76
+ setViewHeight(height);
77
+ };
78
+ const { normalStyle, hasSelfPercent, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
79
+ const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef, onLayout });
80
+ const { width, height } = normalStyle;
68
81
  const preSrc = useRef();
69
82
  const resizeMode = ModeMap.get(mode) || 'stretch';
70
83
  const isWidthFixMode = mode === 'widthFix';
@@ -138,15 +151,6 @@ const Image = forwardRef((props, ref) => {
138
151
  layoutRef
139
152
  }, props));
140
153
  };
141
- const onViewLayout = ({ nativeEvent: { layout: { width, height }, }, }) => {
142
- setViewWidth(width);
143
- setViewHeight(height);
144
- };
145
- const onImageLayout = () => {
146
- nodeRef.current?.measure((x, y, width, height, offsetLeft, offsetTop) => {
147
- layoutRef.current = { x, y, width, height, offsetLeft, offsetTop };
148
- });
149
- };
150
154
  useEffect(() => {
151
155
  if (!isWidthFixMode && !isHeightFixMode && !isCropMode) {
152
156
  setLoaded(true);
@@ -181,10 +185,14 @@ const Image = forwardRef((props, ref) => {
181
185
  }, [isWidthFixMode, isHeightFixMode, isCropMode, src]);
182
186
  const innerProps = useInnerProps(props, {
183
187
  ref: nodeRef,
184
- ...(enableOffset ? { onLayout: onImageLayout } : {})
185
- }, [
186
- 'enable-offset'
187
- ], {
188
+ style: {
189
+ ...normalStyle,
190
+ ...layoutStyle,
191
+ ...(isHeightFixMode && { width: fixedWidth }),
192
+ ...(isWidthFixMode && { height: fixedHeight })
193
+ },
194
+ ...layoutProps
195
+ }, [], {
188
196
  layoutRef
189
197
  });
190
198
  // if (typeof src === 'string' && REMOTE_SVG_REGEXP.test(src)) {
@@ -205,17 +213,11 @@ const Image = forwardRef((props, ref) => {
205
213
  // </Suspense>
206
214
  // )
207
215
  // }
208
- return (<View style={{
209
- width, height,
210
- ...style,
211
- ...(isHeightFixMode && { width: fixedWidth }),
212
- ...(isWidthFixMode && { height: fixedHeight }),
213
- overflow: 'hidden',
214
- }} onLayout={onViewLayout}>
215
- {loaded && <RNImage {...innerProps} source={source} resizeMode={resizeMode} onLoad={onImageLoad} onError={onImageError} style={{
216
+ return (<View {...innerProps}>
217
+ {loaded && <RNImage source={source} resizeMode={resizeMode} onLoad={onImageLoad} onError={onImageError} style={{
216
218
  ...StyleSheet.absoluteFillObject,
217
- width: !isCropMode ? '100%' : imageWidth,
218
- height: !isCropMode ? '100%' : imageHeight,
219
+ width: isCropMode ? imageWidth : '100%',
220
+ height: isCropMode ? imageHeight : '100%',
219
221
  ...(isCropMode && cropModeStyle)
220
222
  }}/>}
221
223
  </View>);
@@ -1,5 +1,7 @@
1
1
  import { SvgCssUri, WithLocalSvg } from 'react-native-svg/css';
2
2
  const Svg = ({ local = false, src, style, width, height }) => {
3
- return local ? (<WithLocalSvg style={style} asset={src} width={width} height={height}/>) : (<SvgCssUri style={style} uri={src} width={width} height={height}/>);
3
+ return local
4
+ ? (<WithLocalSvg style={style} asset={src} width={width} height={height}/>)
5
+ : (<SvgCssUri style={style} uri={src} width={width} height={height}/>);
4
6
  };
5
7
  export default Svg;
@@ -39,7 +39,8 @@
39
39
  */
40
40
  import { forwardRef, useMemo, useRef, useState, useContext, useEffect } from 'react';
41
41
  import { Platform, TextInput } from 'react-native';
42
- import { parseInlineStyle, useUpdateEffect, throwReactWarning } from './utils';
42
+ import { warn } from '@mpxjs/utils';
43
+ import { parseInlineStyle, useUpdateEffect, useTransformStyle, useLayout } from './utils';
43
44
  import useInnerProps, { getCustomEvent } from './getInnerListeners';
44
45
  import useNodesRef from './useNodesRef';
45
46
  import { FormContext } from './context';
@@ -49,29 +50,38 @@ const keyboardTypeMap = {
49
50
  idcard: 'default',
50
51
  digit: Platform.select({
51
52
  ios: 'decimal-pad',
52
- android: 'numeric',
53
- }) || '',
53
+ android: 'numeric'
54
+ }) || ''
54
55
  };
55
56
  const Input = forwardRef((props, ref) => {
56
- const { style = {}, type = 'text', value, password, 'placeholder-style': placeholderStyle, disabled, maxlength = 140, 'auto-focus': autoFocus, focus, 'confirm-type': confirmType = 'done', 'confirm-hold': confirmHold = false, cursor, 'cursor-color': cursorColor, 'selection-start': selectionStart = -1, 'selection-end': selectionEnd = -1, 'enable-offset': enableOffset, bindinput, bindfocus, bindblur, bindconfirm, bindselectionchange,
57
+ const { style = {}, type = 'text', value, password, 'placeholder-style': placeholderStyle, disabled, maxlength = 140, 'auto-focus': autoFocus, focus, 'confirm-type': confirmType = 'done', 'confirm-hold': confirmHold = false, cursor, 'cursor-color': cursorColor, 'selection-start': selectionStart = -1, 'selection-end': selectionEnd = -1, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindinput, bindfocus, bindblur, bindconfirm, bindselectionchange,
57
58
  // private
58
- multiline, 'auto-height': autoHeight, bindlinechange, } = props;
59
+ multiline, 'auto-height': autoHeight, bindlinechange } = props;
59
60
  const formContext = useContext(FormContext);
60
61
  let formValuesMap;
61
62
  if (formContext) {
62
63
  formValuesMap = formContext.formValuesMap;
63
64
  }
64
- const { nodeRef } = useNodesRef(props, ref);
65
65
  const keyboardType = keyboardTypeMap[type];
66
66
  const defaultValue = type === 'number' && value ? value + '' : value;
67
67
  const placeholderTextColor = parseInlineStyle(placeholderStyle)?.color;
68
68
  const textAlignVertical = multiline ? 'top' : 'auto';
69
- const layoutRef = useRef({});
70
69
  const tmpValue = useRef();
71
70
  const cursorIndex = useRef(0);
72
71
  const lineCount = useRef(0);
73
72
  const [inputValue, setInputValue] = useState(defaultValue);
74
73
  const [contentHeight, setContentHeight] = useState(0);
74
+ const styleObj = {
75
+ padding: 0,
76
+ ...style,
77
+ ...multiline && autoHeight && {
78
+ height: Math.max(style?.minHeight || 35, contentHeight)
79
+ }
80
+ };
81
+ const { hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
82
+ const nodeRef = useRef(null);
83
+ useNodesRef(props, ref, nodeRef);
84
+ const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
75
85
  useEffect(() => {
76
86
  if (inputValue !== value) {
77
87
  setInputValue(value);
@@ -88,7 +98,7 @@ const Input = forwardRef((props, ref) => {
88
98
  const onTextInput = ({ nativeEvent }) => {
89
99
  if (!bindinput && !bindblur)
90
100
  return;
91
- const { range: { start, end }, text, } = nativeEvent;
101
+ const { range: { start, end }, text } = nativeEvent;
92
102
  cursorIndex.current = start < end ? start : start + text.length;
93
103
  };
94
104
  const onChange = (evt) => {
@@ -98,7 +108,7 @@ const Input = forwardRef((props, ref) => {
98
108
  const result = bindinput(getCustomEvent('input', evt, {
99
109
  detail: {
100
110
  value: evt.nativeEvent.text,
101
- cursor: cursorIndex.current,
111
+ cursor: cursorIndex.current
102
112
  },
103
113
  layoutRef
104
114
  }, props));
@@ -114,7 +124,7 @@ const Input = forwardRef((props, ref) => {
114
124
  bindfocus &&
115
125
  bindfocus(getCustomEvent('focus', evt, {
116
126
  detail: {
117
- value: tmpValue.current || '',
127
+ value: tmpValue.current || ''
118
128
  },
119
129
  layoutRef
120
130
  }, props));
@@ -124,7 +134,7 @@ const Input = forwardRef((props, ref) => {
124
134
  bindblur(getCustomEvent('blur', evt, {
125
135
  detail: {
126
136
  value: tmpValue.current || '',
127
- cursor: cursorIndex.current,
137
+ cursor: cursorIndex.current
128
138
  },
129
139
  layoutRef
130
140
  }, props));
@@ -134,7 +144,7 @@ const Input = forwardRef((props, ref) => {
134
144
  evt.nativeEvent.key === 'Enter' &&
135
145
  bindconfirm(getCustomEvent('confirm', evt, {
136
146
  detail: {
137
- value: tmpValue.current || '',
147
+ value: tmpValue.current || ''
138
148
  },
139
149
  layoutRef
140
150
  }, props));
@@ -144,7 +154,7 @@ const Input = forwardRef((props, ref) => {
144
154
  multiline &&
145
155
  bindconfirm(getCustomEvent('confirm', evt, {
146
156
  detail: {
147
- value: tmpValue.current || '',
157
+ value: tmpValue.current || ''
148
158
  },
149
159
  layoutRef
150
160
  }, props));
@@ -161,7 +171,7 @@ const Input = forwardRef((props, ref) => {
161
171
  detail: {
162
172
  height,
163
173
  lineHeight,
164
- lineCount: lineCount.current,
174
+ lineCount: lineCount.current
165
175
  },
166
176
  layoutRef
167
177
  }, props));
@@ -173,16 +183,11 @@ const Input = forwardRef((props, ref) => {
173
183
  bindselectionchange(getCustomEvent('selectionchange', evt, {
174
184
  detail: {
175
185
  selectionStart: evt.nativeEvent.selection.start,
176
- selectionEnd: evt.nativeEvent.selection.end,
186
+ selectionEnd: evt.nativeEvent.selection.end
177
187
  },
178
188
  layoutRef
179
189
  }, props));
180
190
  };
181
- const onLayout = () => {
182
- nodeRef.current?.measure((x, y, width, height, offsetLeft, offsetTop) => {
183
- layoutRef.current = { x, y, width, height, offsetLeft, offsetTop };
184
- });
185
- };
186
191
  const resetValue = () => {
187
192
  setInputValue('');
188
193
  };
@@ -191,7 +196,7 @@ const Input = forwardRef((props, ref) => {
191
196
  };
192
197
  if (formValuesMap) {
193
198
  if (!props.name) {
194
- throwReactWarning('[Mpx runtime warn]: If a form component is used, the name attribute is required.');
199
+ warn('If a form component is used, the name attribute is required.');
195
200
  }
196
201
  else {
197
202
  formValuesMap.set(props.name, { getValue, resetValue });
@@ -205,21 +210,21 @@ const Input = forwardRef((props, ref) => {
205
210
  ? nodeRef.current?.focus()
206
211
  : nodeRef.current?.blur();
207
212
  }, [focus]);
213
+ const composeStyle = { ...normalStyle, ...layoutStyle };
208
214
  const innerProps = useInnerProps(props, {
209
215
  ref: nodeRef,
210
- ...(enableOffset ? { onLayout } : {}),
211
- }, [
212
- 'enable-offset'
213
- ], {
214
- layoutRef
215
- });
216
- return (<TextInput {...innerProps} keyboardType={keyboardType} secureTextEntry={!!password} defaultValue={defaultValue} value={inputValue} maxLength={maxlength === -1 ? undefined : maxlength} editable={!disabled} autoFocus={!!autoFocus || !!focus} returnKeyType={confirmType} selection={selection} selectionColor={cursorColor} blurOnSubmit={!multiline && !confirmHold} underlineColorAndroid="rgba(0,0,0,0)" textAlignVertical={textAlignVertical} placeholderTextColor={placeholderTextColor} multiline={!!multiline} onTextInput={onTextInput} onChange={onChange} onFocus={onInputFocus} onBlur={onInputBlur} onKeyPress={onKeyPress} onSubmitEditing={onSubmitEditing} onContentSizeChange={onContentSizeChange} onSelectionChange={onSelectionChange} style={{
216
+ style: {
217
217
  padding: 0,
218
- ...style,
218
+ ...composeStyle,
219
219
  ...multiline && autoHeight && {
220
- height: Math.max(style?.minHeight || 35, contentHeight)
220
+ height: Math.max(composeStyle?.minHeight || 35, contentHeight)
221
221
  }
222
- }}/>);
222
+ },
223
+ ...layoutProps
224
+ }, [], {
225
+ layoutRef
226
+ });
227
+ return (<TextInput {...innerProps} keyboardType={keyboardType} secureTextEntry={!!password} defaultValue={defaultValue} value={inputValue} maxLength={maxlength === -1 ? undefined : maxlength} editable={!disabled} autoFocus={!!autoFocus || !!focus} returnKeyType={confirmType} selection={selection} selectionColor={cursorColor} blurOnSubmit={!multiline && !confirmHold} underlineColorAndroid="rgba(0,0,0,0)" textAlignVertical={textAlignVertical} placeholderTextColor={placeholderTextColor} multiline={!!multiline} onTextInput={onTextInput} onChange={onChange} onFocus={onInputFocus} onBlur={onInputBlur} onKeyPress={onKeyPress} onSubmitEditing={onSubmitEditing} onContentSizeChange={onContentSizeChange} onSelectionChange={onSelectionChange}/>);
223
228
  });
224
229
  Input.displayName = 'mpx-input';
225
230
  export default Input;
@@ -2,60 +2,53 @@
2
2
  * ✘ for
3
3
  */
4
4
  import { useRef, forwardRef } from 'react';
5
- import { View, Text, } from 'react-native';
5
+ import { View } from 'react-native';
6
+ import { noop, warn } from '@mpxjs/utils';
6
7
  import useInnerProps, { getCustomEvent } from './getInnerListeners';
7
8
  import useNodesRef from './useNodesRef';
8
- import { every, splitStyle, splitProps, isText, throwReactWarning } from './utils';
9
+ import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren } from './utils';
9
10
  import { LabelContext } from './context';
10
- const Label = forwardRef((props, ref) => {
11
- const { style = {}, 'enable-offset': enableOffset, children, bindtap } = props;
12
- const { textStyle, imageStyle, innerStyle } = splitStyle(style);
13
- if (imageStyle) {
14
- throwReactWarning('[Mpx runtime warn]: Label does not support background image-related styles!');
15
- }
11
+ const Label = forwardRef((labelProps, ref) => {
12
+ const { textProps, innerProps: props = {} } = splitProps(labelProps);
13
+ const { style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, bindtap } = props;
16
14
  const defaultStyle = {
17
- flexDirection: 'row',
15
+ flexDirection: 'row'
16
+ };
17
+ const styleObj = {
18
+ ...defaultStyle,
19
+ ...style
18
20
  };
21
+ const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
22
+ const nodeRef = useRef(null);
23
+ useNodesRef(props, ref, nodeRef, { defaultStyle });
24
+ const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef });
25
+ const { textStyle, backgroundStyle, innerStyle } = splitStyle(normalStyle);
26
+ if (backgroundStyle) {
27
+ warn('Label does not support background image-related styles!');
28
+ }
19
29
  const contextRef = useRef({
20
- triggerChange: () => { }
30
+ triggerChange: noop
21
31
  });
22
- const layoutRef = useRef({});
23
- const { nodeRef } = useNodesRef(props, ref, {
24
- defaultStyle
25
- });
26
- const onLayout = () => {
27
- nodeRef.current?.measure((x, y, width, height, offsetLeft, offsetTop) => {
28
- layoutRef.current = { x, y, width, height, offsetLeft, offsetTop };
29
- });
30
- };
31
32
  const onTap = (evt) => {
32
33
  bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props));
33
34
  contextRef.current.triggerChange?.(evt);
34
35
  };
35
- const wrapChildren = (children, textStyle) => {
36
- const { textProps } = splitProps(props);
37
- if (every(children, (child) => isText(child))) {
38
- if (textStyle || textProps) {
39
- children = <Text key='labelTextWrap' style={textStyle || {}} {...(textProps || {})}>{children}</Text>;
40
- }
41
- }
42
- else {
43
- if (textStyle)
44
- throwReactWarning('[Mpx runtime warn]: Text style will be ignored unless every child of the Label is Text node!');
45
- }
46
- return children;
47
- };
48
36
  const innerProps = useInnerProps(props, {
49
37
  ref: nodeRef,
50
- style: { ...defaultStyle, ...innerStyle },
51
- bindtap: onTap,
52
- ...(enableOffset ? { onLayout } : {})
53
- }, ['enable-offset'], {
38
+ style: { ...innerStyle, ...layoutStyle },
39
+ ...layoutProps,
40
+ bindtap: onTap
41
+ }, [], {
54
42
  layoutRef
55
43
  });
56
44
  return <View {...innerProps}>
57
45
  <LabelContext.Provider value={contextRef}>
58
- {wrapChildren(children, textStyle)}
46
+ {wrapChildren(props, {
47
+ hasVarDec,
48
+ varContext: varContextRef.current,
49
+ textStyle,
50
+ textProps
51
+ })}
59
52
  </LabelContext.Provider>
60
53
  </View>;
61
54
  });
@@ -2,43 +2,39 @@
2
2
  * ✘ scale-area
3
3
  */
4
4
  import { View } from 'react-native';
5
- import { useState, useEffect, useRef, forwardRef } from 'react';
5
+ import { useState, useEffect, forwardRef, useRef } from 'react';
6
6
  import useNodesRef from './useNodesRef';
7
7
  import useInnerProps from './getInnerListeners';
8
8
  import { MovableAreaContext } from './context';
9
+ import { useTransformStyle, wrapChildren, useLayout } from './utils';
9
10
  const _MovableArea = forwardRef((props, ref) => {
10
- const { children, style = {}, width = 10, height = 10 } = props;
11
+ const { style = {}, width = 10, height = 10, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight } = props;
11
12
  const [areaWidth, setAreaWidth] = useState(0);
12
13
  const [areaHeight, setAreaHeight] = useState(0);
13
- const layoutRef = useRef({});
14
14
  useEffect(() => {
15
15
  setAreaWidth(width);
16
16
  setAreaHeight(height);
17
17
  }, [width, height]);
18
- const { nodeRef: movableViewRef } = useNodesRef(props, ref);
18
+ const { hasSelfPercent, normalStyle, hasVarDec, varContextRef, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
19
+ const movableViewRef = useRef(null);
20
+ useNodesRef(props, ref, movableViewRef);
19
21
  const onLayout = (e) => {
20
22
  const { width = 10, height = 10 } = e.nativeEvent.layout;
21
23
  setAreaWidth(width);
22
24
  setAreaHeight(height);
23
- movableViewRef.current?.measure((x, y, width, height, offsetLeft, offsetTop) => {
24
- layoutRef.current = { x, y, width, height, offsetLeft, offsetTop };
25
- });
26
25
  };
26
+ const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: movableViewRef, onLayout });
27
27
  const innerProps = useInnerProps(props, {
28
+ style: { height: areaHeight, width: areaWidth, overflow: 'hidden', ...normalStyle, ...layoutStyle },
28
29
  ref: movableViewRef,
29
- onLayout
30
- }, [
31
- 'children',
32
- 'style',
33
- ], { layoutRef });
30
+ ...layoutProps
31
+ }, [], { layoutRef });
34
32
  return (<MovableAreaContext.Provider value={{ height: areaHeight, width: areaWidth }}>
35
- <View {...innerProps} style={{
36
- height: areaHeight,
37
- width: areaWidth,
38
- overflow: 'hidden',
39
- ...style
40
- }}>
41
- {children}
33
+ <View {...innerProps}>
34
+ {wrapChildren(props, {
35
+ hasVarDec,
36
+ varContext: varContextRef.current
37
+ })}
42
38
  </View>
43
39
  </MovableAreaContext.Provider>);
44
40
  });
@@ -27,7 +27,7 @@ const styles = StyleSheet.create({
27
27
  position: 'absolute',
28
28
  left: 0,
29
29
  top: 0
30
- },
30
+ }
31
31
  });
32
32
  const _MovableView = forwardRef((props, ref) => {
33
33
  const { children, friction = 7, scale = false, direction = 'none', x = 0, y = 0, style = {}, 'scale-min': scaleMin = 0.1, 'scale-max': scaleMax = 10, 'scale-value': originScaleValue = 1, bindscale, bindchange } = props;
@@ -41,13 +41,14 @@ const _MovableView = forwardRef((props, ref) => {
41
41
  x: Number(x),
42
42
  y: Number(y)
43
43
  });
44
- const { nodeRef } = useNodesRef(props, ref, {
44
+ const nodeRef = useRef(null);
45
+ useNodesRef(props, ref, nodeRef, {
45
46
  defaultStyle: styles.container
46
47
  });
47
48
  let panResponder = {};
48
- let isFirstTouch = useRef(true);
49
- let touchEvent = useRef('');
50
- let initialDistance = useRef(0);
49
+ const isFirstTouch = useRef(true);
50
+ const touchEvent = useRef('');
51
+ const initialDistance = useRef(0);
51
52
  propsRef.current = props;
52
53
  useEffect(() => {
53
54
  if (scale && (scaleValue.current._value !== originScaleValue)) {
@@ -55,7 +56,7 @@ const _MovableView = forwardRef((props, ref) => {
55
56
  Animated.spring(scaleValue.current, {
56
57
  toValue: clampedScale,
57
58
  friction,
58
- useNativeDriver: false,
59
+ useNativeDriver: false
59
60
  }).start(() => {
60
61
  bindscale && bindscale(getCustomEvent('scale', {}, {
61
62
  detail: {
@@ -186,7 +187,7 @@ const _MovableView = forwardRef((props, ref) => {
186
187
  null,
187
188
  {
188
189
  dx: direction === 'all' || direction === 'horizontal' ? pan.current.x : new Animated.Value(0),
189
- dy: direction === 'all' || direction === 'vertical' ? pan.current.y : new Animated.Value(0),
190
+ dy: direction === 'all' || direction === 'vertical' ? pan.current.y : new Animated.Value(0)
190
191
  }
191
192
  ], {
192
193
  useNativeDriver: false
@@ -316,8 +317,8 @@ const _MovableView = forwardRef((props, ref) => {
316
317
  ref: nodeRef,
317
318
  ...panResponder.panHandlers,
318
319
  onLayout,
319
- ...(hasTouchmove() ? { 'bindtouchmove': onTouchMove } : {}),
320
- ...(hasCatchTouchmove() ? { 'catchtouchmove': onCatchTouchMove } : {}),
320
+ ...(hasTouchmove() ? { bindtouchmove: onTouchMove } : {}),
321
+ ...(hasCatchTouchmove() ? { catchtouchmove: onCatchTouchMove } : {})
321
322
  }, [
322
323
  'children',
323
324
  'style',
@@ -27,7 +27,8 @@ const _DatePicker = forwardRef((props, ref) => {
27
27
  const [datevalue, setDateValue] = useState(value);
28
28
  // 存储layout布局信息
29
29
  const layoutRef = useRef({});
30
- const { nodeRef: viewRef } = useNodesRef(props, ref, {});
30
+ const viewRef = useRef(null);
31
+ useNodesRef(props, ref, viewRef, {});
31
32
  useEffect(() => {
32
33
  value && setDateValue(value);
33
34
  }, [value]);