@tamagui/static 3.0.0-beta.901.1 → 3.0.0-beta.917.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "3.0.0-beta.901.1",
+  "version": "3.0.0-beta.917.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "source": "src/index.ts",
@@ -45,21 +45,21 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/cli-color": "3.0.0-beta.901.1",
-    "@tamagui/compiler-core": "3.0.0-beta.901.1",
-    "@tamagui/config-default": "3.0.0-beta.901.1",
-    "@tamagui/core": "3.0.0-beta.901.1",
-    "@tamagui/dom": "3.0.0-beta.901.1",
-    "@tamagui/fake-react-native": "3.0.0-beta.901.1",
-    "@tamagui/generate-themes": "3.0.0-beta.901.1",
-    "@tamagui/helpers": "3.0.0-beta.901.1",
-    "@tamagui/helpers-node": "3.0.0-beta.901.1",
-    "@tamagui/react-native-web-internals": "3.0.0-beta.901.1",
-    "@tamagui/react-native-web-lite": "3.0.0-beta.901.1",
-    "@tamagui/shorthands": "3.0.0-beta.901.1",
-    "@tamagui/style-grammar": "3.0.0-beta.901.1",
-    "@tamagui/types": "3.0.0-beta.901.1",
-    "@tamagui/web": "3.0.0-beta.901.1",
+    "@tamagui/cli-color": "3.0.0-beta.917.1",
+    "@tamagui/compiler-core": "3.0.0-beta.917.1",
+    "@tamagui/config-default": "3.0.0-beta.917.1",
+    "@tamagui/core": "3.0.0-beta.917.1",
+    "@tamagui/dom": "3.0.0-beta.917.1",
+    "@tamagui/fake-react-native": "3.0.0-beta.917.1",
+    "@tamagui/generate-themes": "3.0.0-beta.917.1",
+    "@tamagui/helpers": "3.0.0-beta.917.1",
+    "@tamagui/helpers-node": "3.0.0-beta.917.1",
+    "@tamagui/react-native-web-internals": "3.0.0-beta.917.1",
+    "@tamagui/react-native-web-lite": "3.0.0-beta.917.1",
+    "@tamagui/shorthands": "3.0.0-beta.917.1",
+    "@tamagui/style-grammar": "3.0.0-beta.917.1",
+    "@tamagui/types": "3.0.0-beta.917.1",
+    "@tamagui/web": "3.0.0-beta.917.1",
     "browserslist": "^4.28.1",
     "check-dependency-version-consistency": "^4.1.0",
     "esbuild": "0.28.1",
@@ -71,7 +71,7 @@
     "react-native-web": "~0.21.0"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.901.1",
+    "@tamagui/build": "3.0.0-beta.917.1",
     "@types/find-root": "^1.1.2",
     "@types/node": "^22.1.0",
     "@types/webpack": "^4.41.26",

package/src/compilerHost.ts

@@ -3443,6 +3443,13 @@ export function createTamaguiCompilerHost(
       const webConditionalCSS: string[] = []
       const webConditionalKeys = new Set<string>()
       const webConditionalEntries = supportsWebConditionalClasses ? webClassEntries : []
+      // inline style from conditional branches: a value every branch shares
+      // hoists into the element's style, and a value that differs becomes one
+      // conditional inline property. the css driver keeps transitioned
+      // properties inline, so this is how a conditional className carrying
+      // `transition-*` classes lowers
+      let webInlineStyle: Record<string, unknown> | null = inlineStyle
+      const conditionalInlineProperties: string[] = []
       for (const entry of webConditionalEntries) {
         const tree = entry.value.kind === 'conditional' ? entry.value.tree : null
         const domain = frontendClassDomain(entry, component)
@@ -3454,6 +3461,7 @@ export function createTamaguiCompilerHost(
           (typeof leaves)[number],
           { classes: string[]; css: string[] }
         >()
+        const leafStyles = new Map<(typeof leaves)[number], Record<string, unknown>>()
         const entryConditionalKeys = new Set<string>()
 
         for (const leaf of leaves) {
@@ -3479,7 +3487,7 @@ export function createTamaguiCompilerHost(
             ...Object.keys(branchSplit.viewProps ?? {}),
             ...Object.keys(split.viewProps ?? {}),
           ])) {
-            if (viewPropsKey === 'className') continue
+            if (viewPropsKey === 'className' || viewPropsKey === 'style') continue
             if (
               JSON.stringify(branchSplit.viewProps?.[viewPropsKey]) !==
               JSON.stringify((split.viewProps as any)?.[viewPropsKey])
@@ -3492,6 +3500,19 @@ export function createTamaguiCompilerHost(
               )
             }
           }
+          const branchInline = branchSplit.viewProps?.style
+          if (branchInline !== undefined && !staticObject(branchInline)) {
+            return bailout(
+              input,
+              'local/dynamic-style-value',
+              `Conditional ${entry.name} branch style is not a static object`,
+              entry.value.span
+            )
+          }
+          leafStyles.set(
+            leaf,
+            staticObject(branchInline) ? (branchInline as Record<string, unknown>) : {}
+          )
           const changedKeys = new Set<string>()
           for (const key of new Set([
             ...Object.keys(branchSplit.classNames ?? {}),
@@ -3553,6 +3574,41 @@ export function createTamaguiCompilerHost(
         }
         for (const key of entryConditionalKeys) webConditionalKeys.add(key)
 
+        const styleKeys = new Set<string>(Object.keys(webInlineStyle ?? {}))
+        for (const leaf of leaves) {
+          for (const key of Object.keys(leafStyles.get(leaf) ?? {})) styleKeys.add(key)
+        }
+        for (const key of styleKeys) {
+          const serialized = leaves.map((leaf) =>
+            JSON.stringify(leafStyles.get(leaf)?.[key])
+          )
+          if (serialized.every((value) => value === serialized[0])) {
+            if (serialized[0] === JSON.stringify(webInlineStyle?.[key])) continue
+            const next = { ...webInlineStyle }
+            if (serialized[0] === undefined) delete next[key]
+            else next[key] = leafStyles.get(leaves[0]!)![key]
+            webInlineStyle = Object.keys(next).length > 0 ? next : null
+            continue
+          }
+          if (!tree) {
+            return bailout(
+              input,
+              'local/dynamic-style-value',
+              `Conditional ${entry.name} branch changes style, which a class table cannot express`,
+              entry.value.span
+            )
+          }
+          const serializeValue = (node: BranchDecisionNode): string => {
+            if (node.kind === 'leaf')
+              return String(JSON.stringify(leafStyles.get(node)?.[key]))
+            const test = input.source.slice(node.test.start, node.test.end)
+            return `(${test}) ? ${serializeValue(node.whenTrue)} : ${serializeValue(node.whenFalse)}`
+          }
+          conditionalInlineProperties.push(
+            `${JSON.stringify(key)}: (${serializeValue(tree)})`
+          )
+        }
+
         for (const artifacts of leafArtifactsMap.values()) {
           webConditionalCSS.push(...artifacts.css)
         }
@@ -3585,7 +3641,10 @@ export function createTamaguiCompilerHost(
           return `(${test}) ? ${truePart} : ${falsePart}`
         }
 
-        if (tree) {
+        if (leaves.every((leaf) => leafClasses(leaf) === '')) {
+          // every branch's classes hoisted, or the branches differ only in
+          // inline style
+        } else if (tree) {
           programClassSources.push(serializeWebTree(tree))
         } else {
           // the runtime string picks its resolved classes; a string outside the
@@ -3602,10 +3661,11 @@ export function createTamaguiCompilerHost(
       const classNameExpression = hasStyleProgram
         ? `[${[JSON.stringify(webClassName), ...programClassSources].join(', ')}].filter(Boolean).join(" ")`
         : null
-      const serializedInlineStyle = serializedStyle(
-        inlineStyle,
-        dynamicHostStyleProperties ?? []
-      )
+      const webInlineProperties = [
+        ...(dynamicHostStyleProperties ?? []),
+        ...conditionalInlineProperties,
+      ]
+      const serializedInlineStyle = serializedStyle(webInlineStyle, webInlineProperties)
       const jsxWebStyle = classNameExpression
         ? [
             `className={${classNameExpression}}`,
@@ -3613,7 +3673,7 @@ export function createTamaguiCompilerHost(
           ]
             .filter(Boolean)
             .join(' ')
-        : jsxStyleAttributes(webClassName, inlineStyle, dynamicHostStyleProperties ?? [])
+        : jsxStyleAttributes(webClassName, webInlineStyle, webInlineProperties)
       const objectWebStyle = classNameExpression
         ? [
             `className: ${classNameExpression}`,
@@ -3621,11 +3681,7 @@ export function createTamaguiCompilerHost(
           ]
             .filter(Boolean)
             .join(', ')
-        : objectStyleProperties(
-            webClassName,
-            inlineStyle,
-            dynamicHostStyleProperties ?? []
-          )
+        : objectStyleProperties(webClassName, webInlineStyle, webInlineProperties)
       const webCSS = [...new Set([...artifacts.css, ...programCSS, ...webConditionalCSS])]
       const webExtraProps = serializedProps(input.element.form, webDOMResult.additions)
       if (input.element.form !== 'jsx') {

package/types/compilerHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compilerHost.d.ts","sourceRoot":"","sources":["../src/compilerHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,cAAc,EAQf,MAAM,wBAAwB,CAAA;AAoC/B,OAAO,KAAK,EAAiC,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAExF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAIhE,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,+EAA+E;IAC/E,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;CAClD;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,gBAAgB,EAAE,EACvC,gBAAgB,EAAE,SAAS,uBAAuB,EAAE,GACnD,yBAAyB,CAS3B;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,cAAc,CAAA;IACtB,aAAa,EAAE,qBAAqB,CAAA;IACpC,UAAU,EAAE,gBAAgB,EAAE,CAAA;IAC9B,gBAAgB,EAAE,uBAAuB,EAAE,CAAA;IAC3C,qFAAqF;IACrF,QAAQ,CAAC,EAAE,yBAAyB,CAAA;IACpC,wEAAwE;IACxE,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,mEAAmE;IACnE,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AA+2BD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,oBAAoB,CAgqFtB"}
+{"version":3,"file":"compilerHost.d.ts","sourceRoot":"","sources":["../src/compilerHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,cAAc,EAQf,MAAM,wBAAwB,CAAA;AAoC/B,OAAO,KAAK,EAAiC,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAExF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAIhE,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,+EAA+E;IAC/E,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;CAClD;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,gBAAgB,EAAE,EACvC,gBAAgB,EAAE,SAAS,uBAAuB,EAAE,GACnD,yBAAyB,CAS3B;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,cAAc,CAAA;IACtB,aAAa,EAAE,qBAAqB,CAAA;IACpC,UAAU,EAAE,gBAAgB,EAAE,CAAA;IAC9B,gBAAgB,EAAE,uBAAuB,EAAE,CAAA;IAC3C,qFAAqF;IACrF,QAAQ,CAAC,EAAE,yBAAyB,CAAA;IACpC,wEAAwE;IACxE,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,mEAAmE;IACnE,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AA+2BD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,oBAAoB,CAwtFtB"}