@tamagui/web 3.0.0-beta.1111.1 → 3.0.0-beta.1121.1

package/package.json

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

package/src/helpers/getCSSStylesAtomic.ts

@@ -36,6 +36,7 @@ export type AtomicSlotEntry = [
   wrappers: readonly string[] | undefined,
   original?: any,
   flags?: number,
+  lifecycle?: boolean,
 ]
 
 export type SlotIdentity = [

package/src/helpers/getSplitStyles.tsx

@@ -690,7 +690,31 @@ function contributeProp(
         for (const [slot, entries] of hocSlots) {
           for (const entry of entries) {
             if (!ownsSourceLayer(styleState, entry[0], !!entry[2])) continue
-            writeCapturedStyleRecord(slots, slot, entry, pass[passSourceLayer])
+            if (
+              !isHOC &&
+              styleState.styleProps.isAnimated &&
+              (slot === 'transition' || entry[8]) &&
+              !(entry[0] in nonAnimatableStyleProps)
+            ) {
+              // the host owns lifecycle destinations and their transition.
+              const property =
+                entry[0] === '--t-x'
+                  ? 'x'
+                  : entry[0] === '--t-y'
+                    ? 'y'
+                    : entry[0] === '--t-scale-x'
+                      ? 'scaleX'
+                      : entry[0] === '--t-scale-y'
+                        ? 'scaleY'
+                        : entry[0]
+              const value =
+                styleState.animationDriver?.inputStyle === 'value' ? entry[6] : entry[1]
+              entry[3]
+                ? contributeValue(styleState, property, value, entry[6], false, entry[3])
+                : emitValue(styleState, property, value, null, entry[6], false)
+            } else {
+              writeCapturedStyleRecord(slots, slot, entry, pass[passSourceLayer])
+            }
           }
         }
       }
@@ -2342,7 +2366,13 @@ function completeResolvedStyles(state: GetStyleState, merge: MergeStyle = mergeS
       if (capture) {
         // flagged css so the receiving frame keeps them as classes even when
         // it renders its own styles inline
-        for (const entry of cssEntries) entry[7] = entry[7]! | recordCSS
+        for (const entry of cssEntries) {
+          entry[7] = entry[7]! | recordCSS
+          if (!(entry[2] & 12)) continue
+          for (const sibling of cssEntries) {
+            if (sibling[0] === entry[0]) sibling[8] = true
+          }
+        }
         capture.set(property, cssEntries)
       }
     }
@@ -2857,6 +2887,18 @@ function emitProperty(
     return
   }
 
+  // a lifecycle transition must outrank a base transition class while the
+  // enter or exit clause is active. pseudo transitions stay class-selected.
+  if (
+    property === 'transition' &&
+    condition & 12 &&
+    !state.staticConfig.isHOC &&
+    state.styleProps.isAnimated
+  ) {
+    streamWriteInline(state, property, value, cursor, originalValue, false, -1, true)
+    return
+  }
+
   const shouldPromoteAnimatedStyle =
     canGenerateCSS &&
     !condition &&
@@ -3133,7 +3175,11 @@ function emitValue(
     if (canGenerateCSS && state.flatShouldDoClasses && Array.isArray(raw)) {
       raw = transformsToString(raw)
     }
-    if (process.env.TAMAGUI_TARGET === 'native' && typeof raw === 'string') {
+    if (
+      typeof raw === 'string' &&
+      (process.env.TAMAGUI_TARGET === 'native' ||
+        (!state.flatShouldDoClasses && state.animationDriver?.inputStyle === 'value'))
+    ) {
       const transform = parseNativeTransform(raw)
       if (transform) {
         emitProperty(state, property, transform, cursor, originalValue, contextOnly)
@@ -3389,7 +3435,9 @@ function emitConditionalValue(
       property,
       payload,
       condition,
-      mode === 2 ? payload : undefined,
+      mode === 2 || state.staticConfig.isHOC || state.styleProps.stylePieceEntries
+        ? payload
+        : undefined,
       contextOnly,
       mode,
       source

package/types/helpers/getCSSStylesAtomic.d.ts

@@ -17,7 +17,8 @@ export type AtomicSlotEntry = [
     selector: string,
     wrappers: readonly string[] | undefined,
     original?: any,
-    flags?: number
+    flags?: number,
+    lifecycle?: boolean
 ];
 export type SlotIdentity = [
     identifier: string,

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

@@ -1 +1 @@
-{"version":3,"file":"getCSSStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getCSSStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAyB,eAAe,EAAE,MAAM,UAAU,CAAA;AAOrF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,eAAO,MAAM,cAAc,SACkD,CAAA;AAE7E,KAAK,iBAAiB,GAAG,aAAa,GAAG;IACvC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,GAAG;IACV,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS;IACvC,QAAQ,CAAC,EAAE,GAAG;IACd,KAAK,CAAC,EAAE,MAAM;CACf,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,MAAM,EAAE;IACf,KAAK,EAAE,GAAG;IACV,WAAW,CAAC,EAAE,OAAO;CACtB,CAAA;AAoBD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,SAAS,eAAe,EAAE,QAkCpC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,UAAQ,QAkBpE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO,QAuBnF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,iBAaxD;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,GAAG,EACR,SAAS,SAAK,EACd,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,EAC5B,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,UAAQ,EACd,WAAW,SAAM,EACjB,gBAAgB,SAAI,GACnB,WAAW,GAAG,SAAS,CAYzB;AA2DD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,SAAS,eAAe,EAAE,EACnC,SAAS,EAAE,MAAM,GAChB,YAAY,GAAG,SAAS,CAqD1B"}
+{"version":3,"file":"getCSSStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getCSSStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAyB,eAAe,EAAE,MAAM,UAAU,CAAA;AAOrF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,eAAO,MAAM,cAAc,SACkD,CAAA;AAE7E,KAAK,iBAAiB,GAAG,aAAa,GAAG;IACvC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,GAAG;IACV,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS;IACvC,QAAQ,CAAC,EAAE,GAAG;IACd,KAAK,CAAC,EAAE,MAAM;IACd,SAAS,CAAC,EAAE,OAAO;CACpB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,MAAM,EAAE;IACf,KAAK,EAAE,GAAG;IACV,WAAW,CAAC,EAAE,OAAO;CACtB,CAAA;AAoBD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,SAAS,eAAe,EAAE,QAkCpC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,UAAQ,QAkBpE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO,QAuBnF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,iBAaxD;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,GAAG,EACR,SAAS,SAAK,EACd,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,EAC5B,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,UAAQ,EACd,WAAW,SAAM,EACjB,gBAAgB,SAAI,GACnB,WAAW,GAAG,SAAS,CAYzB;AA2DD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,SAAS,eAAe,EAAE,EACnC,SAAS,EAAE,MAAM,GAChB,YAAY,GAAG,SAAS,CAqD1B"}

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,EAEb,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;AAmB/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;AA4U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AAqmBD,eAAO,MAAM,cAAc,EAAE,aA0mB5B,CAAA;AAuWD,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;AAqxCT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AA8BnF,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,WAoNpB;AAqHD,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,QAsBlB;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,EAEb,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;AAmB/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;AA4U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AA6nBD,eAAO,MAAM,cAAc,EAAE,aA0mB5B,CAAA;AAuWD,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;AA2yCT,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,WAoNpB;AAqHD,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,QAsBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}