@tamagui/web 3.0.0-beta.1562.1 → 3.0.0-beta.1564.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "3.0.0-beta.1562.1",
+  "version": "3.0.0-beta.1564.1",
   "license": "MIT",
   "author": {
     "name": "Nate Wienert"
@@ -100,23 +100,23 @@
     "test:web": "vitest --typecheck --run"
   },
   "dependencies": {
-    "@tamagui/animation-helpers": "3.0.0-beta.1562.1",
-    "@tamagui/compose-refs": "3.0.0-beta.1562.1",
-    "@tamagui/constants": "3.0.0-beta.1562.1",
-    "@tamagui/dom": "3.0.0-beta.1562.1",
-    "@tamagui/helpers": "3.0.0-beta.1562.1",
-    "@tamagui/is-equal-shallow": "3.0.0-beta.1562.1",
-    "@tamagui/native": "3.0.0-beta.1562.1",
-    "@tamagui/normalize-css-color": "3.0.0-beta.1562.1",
-    "@tamagui/react-native-types": "3.0.0-beta.1562.1",
-    "@tamagui/style-grammar": "3.0.0-beta.1562.1",
-    "@tamagui/types": "3.0.0-beta.1562.1",
-    "@tamagui/use-did-finish-ssr": "3.0.0-beta.1562.1",
-    "@tamagui/use-event": "3.0.0-beta.1562.1",
-    "@tamagui/use-force-update": "3.0.0-beta.1562.1"
+    "@tamagui/animation-helpers": "3.0.0-beta.1564.1",
+    "@tamagui/compose-refs": "3.0.0-beta.1564.1",
+    "@tamagui/constants": "3.0.0-beta.1564.1",
+    "@tamagui/dom": "3.0.0-beta.1564.1",
+    "@tamagui/helpers": "3.0.0-beta.1564.1",
+    "@tamagui/is-equal-shallow": "3.0.0-beta.1564.1",
+    "@tamagui/native": "3.0.0-beta.1564.1",
+    "@tamagui/normalize-css-color": "3.0.0-beta.1564.1",
+    "@tamagui/react-native-types": "3.0.0-beta.1564.1",
+    "@tamagui/style-grammar": "3.0.0-beta.1564.1",
+    "@tamagui/types": "3.0.0-beta.1564.1",
+    "@tamagui/use-did-finish-ssr": "3.0.0-beta.1564.1",
+    "@tamagui/use-event": "3.0.0-beta.1564.1",
+    "@tamagui/use-force-update": "3.0.0-beta.1564.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1562.1",
+    "@tamagui/build": "3.0.0-beta.1564.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",

package/src/helpers/getSplitStyles.tsx

@@ -1730,10 +1730,8 @@ export const getSplitStyles: StyleSplitter = (
     }
   }
 
-  // native style stability: the inline per-key compare during mergeStyle found
-  // no value changes. fixStyles/transforms/parent defaults are all deterministic
-  // on those same values, so if key count matches the style is identical — swap
-  // in the prev ref so RN skips diffNestedProperty entirely.
+  // native style stability: mergeStyle compares scalar values inline, but
+  // transforms finalize later and need their own value comparison.
   if (process.env.TAMAGUI_TARGET === 'native') {
     const direct = styleState as DirectState
     const prevStyle = direct.flatPrevStyle
@@ -1743,7 +1741,56 @@ export const getSplitStyles: StyleSplitter = (
       !direct.flatStyleChanged &&
       Object.keys(prevStyle).length === Object.keys(styleState.style).length
     ) {
-      styleState.style = prevStyle as any
+      const previousTransform = prevStyle.transform
+      const nextTransform = styleState.style.transform
+      let transformMatches = previousTransform === nextTransform
+      if (
+        !transformMatches &&
+        Array.isArray(previousTransform) &&
+        Array.isArray(nextTransform) &&
+        previousTransform.length === nextTransform.length
+      ) {
+        transformMatches = true
+        for (let index = 0; index < nextTransform.length; index++) {
+          const previousPart = previousTransform[index]
+          const nextPart = nextTransform[index]
+          if (previousPart === nextPart) continue
+          if (
+            !previousPart ||
+            !nextPart ||
+            typeof previousPart !== 'object' ||
+            typeof nextPart !== 'object'
+          ) {
+            transformMatches = false
+            break
+          }
+          const keys = Object.keys(nextPart)
+          if (keys.length !== Object.keys(previousPart).length) {
+            transformMatches = false
+            break
+          }
+          for (const key of keys) {
+            const previousValue = previousPart[key]
+            const nextValue = nextPart[key]
+            if (
+              previousValue !== nextValue &&
+              !(
+                Array.isArray(previousValue) &&
+                Array.isArray(nextValue) &&
+                previousValue.length === nextValue.length &&
+                nextValue.every(
+                  (value, valueIndex) => value === previousValue[valueIndex]
+                )
+              )
+            ) {
+              transformMatches = false
+              break
+            }
+          }
+          if (!transformMatches) break
+        }
+      }
+      if (transformMatches) styleState.style = prevStyle as any
     }
   }
 

package/types/helpers/getSplitStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAGb,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,qBAAqB,EAErB,WAAW,EAGZ,MAAM,UAAU,CAAA;AAkBjB,OAAO,EAAE,oBAAoB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAqB/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAe3D,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAK3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,MAAM,MAAM,aAAa,GAAG,CAC1B,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,EAC5C,iBAAiB,CAAC,EAAE,iBAAiB,KAClC,IAAI,GAAG,cAAc,CAAA;AA6U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AA2rBD,eAAO,MAAM,cAAc,EAAE,aAwrB5B,CAAA;AAoYD,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AA63CT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAgCnF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,oBAAoB,GAAG,IAAI,EACjC,QAAQ,SAAI,EACZ,WAAW,UAAQ,WA4OpB;AA6HD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,QAyBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAGb,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,qBAAqB,EAErB,WAAW,EAGZ,MAAM,UAAU,CAAA;AAkBjB,OAAO,EAAE,oBAAoB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAqB/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAe3D,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAK3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,MAAM,MAAM,aAAa,GAAG,CAC1B,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,EAC5C,iBAAiB,CAAC,EAAE,iBAAiB,KAClC,IAAI,GAAG,cAAc,CAAA;AA6U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AA2rBD,eAAO,MAAM,cAAc,EAAE,aAuuB5B,CAAA;AAoYD,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AA63CT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAgCnF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,oBAAoB,GAAG,IAAI,EACjC,QAAQ,SAAI,EACZ,WAAW,UAAQ,WA4OpB;AA6HD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,QAyBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}