Merge branch 'master' into feat-router-lock-addpath-v2

Author: hiyuki

docs-vitepress/guide/rn/style.md

@@ -1369,6 +1369,10 @@ transform: scale(1.2) skewX(10deg);
 /* RN 数组格式，仅 rn 支持 */
 transform: [{translateX: 50}, {rotate: '45deg'}];
 ```
+> [!tip] 注意
+>
+> 1.RN transform 不支持 scaleZ/scale3d/translateZ/translate3d/rotate3d/matrix3d
+> 2.skew/skewX/skewY 在 RN Android 上不生效
 
 ### transform-origin
 

packages/core/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -10,9 +10,8 @@ global.__mpxAppDimensionsInfo = {
 global.__mpxSizeCount = 0
 global.__mpxPageSizeCountMap = reactive({})
 
-global.__classCaches = []
 global.__GCC = function (className, classMap, classMapValueCache) {
-  if (!classMapValueCache.get(className)) {
+  if (!classMapValueCache.has(className)) {
     const styleObj = classMap[className]?.()
     styleObj && classMapValueCache.set(className, styleObj)
   }

packages/webpack-plugin/lib/react/processStyles.js

@@ -64,6 +64,7 @@ module.exports = function (styles, {
         }, '')
         if (ctorType === 'app') {
           output += `
+          global.__classCaches = global.__classCaches || []
           const __classCache = new Map()
           global.__classCaches.push(__classCache)
           let __appClassMap
@@ -75,6 +76,7 @@ module.exports = function (styles, {
           };\n`
         } else {
           output += `
+          global.__classCaches = global.__classCaches || []
           const __classCache = new Map()
           global.__classCaches.push(__classCache)
           let __classMap

packages/webpack-plugin/lib/react/style-helper.js

@@ -9,7 +9,14 @@ const hairlineRegExp = /^\s*hairlineWidth\s*$/
 const varRegExp = /^--/
 const cssPrefixExp = /^-(webkit|moz|ms|o)-/
 function getClassMap ({ content, filename, mode, srcMode, ctorType, warn, error }) {
-  const classMap = ctorType === 'page' ? { [MPX_TAG_PAGE_SELECTOR]: { flex: 1 } } : {}
+  const classMap = ctorType === 'page'
+      ? {
+          [MPX_TAG_PAGE_SELECTOR]: {
+            _media: [],
+            _default: { flex: 1, height: "'100%'" }
+          }
+        }
+      : {}
 
   const root = postcss.parse(content, {
     from: filename

packages/webpack-plugin/lib/runtime/components/react/mpx-portal/portal-manager.tsx

@@ -19,7 +19,7 @@ const _PortalManager = forwardRef((props: PortalManagerProps, ref:ForwardedRef<u
     setState((prevState) => ({
       portals: [...prevState.portals, { key, children }]
     }))
-  }, [state])
+  }, [])
 
   const update = useCallback((key: number, children: ReactNode) => {
     setState((prevState) => ({
@@ -30,7 +30,7 @@ const _PortalManager = forwardRef((props: PortalManagerProps, ref:ForwardedRef<u
         return item
       })
     }))
-  }, [state])
+  }, [])
 
   const unmount = useCallback((key: number) => {
     setState((prevState) => ({

packages/webpack-plugin/lib/runtime/components/react/utils.tsx

@@ -288,6 +288,10 @@ function transformStringify (styleObj: Record<string, any>) {
   if (isNumber(styleObj.fontWeight)) {
     styleObj.fontWeight = '' + styleObj.fontWeight
   }
+  // transformOrigin 20px 需要转换为 transformOrigin '20'
+  if (isNumber(styleObj.transformOrigin)) {
+    styleObj.transformOrigin = '' + styleObj.transformOrigin
+  }
 }
 
 function transformPosition (styleObj: Record<string, any>, meta: PositionMeta) {