@tamagui/static 2.0.0-rc.30 → 2.0.0-rc.32

package/dist/extractor/extractToNative.cjs

@@ -156,7 +156,7 @@ function getBabelParseDefinition(options) {
                   expressions = [],
                   finalAttrs = [],
                   themeKeysUsed = /* @__PURE__ */new Set();
-                function getStyleExpression(style) {
+                function getStyleExpression(style, forTernary = !1) {
                   if (!style) return;
                   const {
                     plain,
@@ -167,8 +167,8 @@ function getBabelParseDefinition(options) {
                     for (const key in themed) themeKeysUsed.add(themed[key].split("$")[1]);
                     themeExpr = getThemedStyleExpression(themed);
                   }
-                  const ident = addSheetStyle(plain, props.node);
-                  return themeExpr ? (addStyleExpression(ident), addStyleExpression(ident, !0), themeExpr) : ident;
+                  const ident = Object.keys(plain).length > 0 ? addSheetStyle(plain, props.node) : null;
+                  return themeExpr ? forTernary ? ident ? t.arrayExpression([ident, themeExpr]) : themeExpr : (ident && (addStyleExpression(ident), addStyleExpression(ident, !0)), themeExpr) : ident;
                 }
                 function addStyleExpression(expr, HOC = !1) {
                   Array.isArray(expr) ? (HOC ? hocStylesExpr : stylesExpr).elements.push(...expr) : (HOC ? hocStylesExpr : stylesExpr).elements.push(expr);
@@ -184,7 +184,8 @@ function getBabelParseDefinition(options) {
                     }
                   }), themedStylesAst;
                 }
-                let hasDynamicStyle = !1;
+                let hasDynamicStyle = !1,
+                  hasMediaKeys = !1;
                 for (const attr of props.attrs) switch (attr.type) {
                   case "style":
                     {
@@ -198,9 +199,9 @@ function getBabelParseDefinition(options) {
                           consequent,
                           alternate
                         } = attr.value,
-                        consExpr = getStyleExpression(consequent),
-                        altExpr = getStyleExpression(alternate);
-                      expressions.push(attr.value.test), addStyleExpression(t.conditionalExpression(t.identifier(`_expressions[${expressions.length - 1}]`), consExpr || t.nullLiteral(), altExpr || t.nullLiteral()), !0);
+                        consExpr = getStyleExpression(consequent, !0),
+                        altExpr = getStyleExpression(alternate, !0);
+                      attr.value.inlineMediaQuery && (hasMediaKeys = !0), expressions.push(attr.value.test), addStyleExpression(t.conditionalExpression(t.identifier(`_expressions[${expressions.length - 1}]`), consExpr || t.nullLiteral(), altExpr || t.nullLiteral()), !0);
                       const styleExpr = t.conditionalExpression(attr.value.test, consExpr || t.nullLiteral(), altExpr || t.nullLiteral());
                       addStyleExpression(styleExpr);
                       break;
@@ -216,10 +217,11 @@ function getBabelParseDefinition(options) {
                   const name = props.flatNodeName || props.node.name.name,
                     wrapperName = `_${name.replace(/^_+/, "")}Styled${wrapperCount++}`,
                     WrapperIdentifier = t.identifier(wrapperName),
-                    WrapperJSXIdentifier = t.jsxIdentifier(wrapperName);
+                    WrapperJSXIdentifier = t.jsxIdentifier(wrapperName),
+                    hasThemeKeysFlag = themeKeysUsed.size > 0;
                   root.pushContainer("body", t.variableDeclaration("const", [t.variableDeclarator(WrapperIdentifier, t.callExpression(t.identifier("_withStableStyle"), [t.identifier(name), t.arrowFunctionExpression([t.identifier("theme"), t.identifier("_expressions")],
                   // return styles directly - no useMemo, theme changes must trigger style recalc
-                  t.arrayExpression([...hocStylesExpr.elements]))]))])), props.node.name = WrapperJSXIdentifier, props.jsxPath.node.openingElement.name = WrapperJSXIdentifier, props.jsxPath.node.closingElement && (props.jsxPath.node.closingElement.name = t.jsxIdentifier(wrapperName)), expressions.length && props.node.attributes.push(t.jsxAttribute(t.jsxIdentifier("_expressions"), t.jsxExpressionContainer(t.arrayExpression(expressions))));
+                  t.arrayExpression([...hocStylesExpr.elements])), t.booleanLiteral(hasThemeKeysFlag), t.booleanLiteral(hasMediaKeys)]))])), props.node.name = WrapperJSXIdentifier, props.jsxPath.node.openingElement.name = WrapperJSXIdentifier, props.jsxPath.node.closingElement && (props.jsxPath.node.closingElement.name = t.jsxIdentifier(wrapperName)), expressions.length && props.node.attributes.push(t.jsxAttribute(t.jsxIdentifier("_expressions"), t.jsxExpressionContainer(t.arrayExpression(expressions))));
                 } else props.node.attributes.push(t.jsxAttribute(t.jsxIdentifier("style"), t.jsxExpressionContainer(stylesExpr.elements.length === 1 ? stylesExpr.elements[0] : stylesExpr)));
               }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "2.0.0-rc.30",
+  "version": "2.0.0-rc.32",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "source": "src/index.ts",
@@ -50,19 +50,19 @@
     "@babel/template": "^7.25.0",
     "@babel/traverse": "^7.25.4",
     "@babel/types": "^7.25.4",
-    "@tamagui/cli-color": "2.0.0-rc.30",
-    "@tamagui/config-default": "2.0.0-rc.30",
-    "@tamagui/core": "2.0.0-rc.30",
-    "@tamagui/fake-react-native": "2.0.0-rc.30",
-    "@tamagui/generate-themes": "2.0.0-rc.30",
-    "@tamagui/helpers": "2.0.0-rc.30",
-    "@tamagui/helpers-node": "2.0.0-rc.30",
-    "@tamagui/proxy-worm": "2.0.0-rc.30",
-    "@tamagui/react-native-web-internals": "2.0.0-rc.30",
-    "@tamagui/react-native-web-lite": "2.0.0-rc.30",
-    "@tamagui/shorthands": "2.0.0-rc.30",
-    "@tamagui/types": "2.0.0-rc.30",
-    "@tamagui/web": "2.0.0-rc.30",
+    "@tamagui/cli-color": "2.0.0-rc.32",
+    "@tamagui/config-default": "2.0.0-rc.32",
+    "@tamagui/core": "2.0.0-rc.32",
+    "@tamagui/fake-react-native": "2.0.0-rc.32",
+    "@tamagui/generate-themes": "2.0.0-rc.32",
+    "@tamagui/helpers": "2.0.0-rc.32",
+    "@tamagui/helpers-node": "2.0.0-rc.32",
+    "@tamagui/proxy-worm": "2.0.0-rc.32",
+    "@tamagui/react-native-web-internals": "2.0.0-rc.32",
+    "@tamagui/react-native-web-lite": "2.0.0-rc.32",
+    "@tamagui/shorthands": "2.0.0-rc.32",
+    "@tamagui/types": "2.0.0-rc.32",
+    "@tamagui/web": "2.0.0-rc.32",
     "babel-literal-to-ast": "^2.1.0",
     "browserslist": "^4.28.1",
     "check-dependency-version-consistency": "^4.1.0",
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.25.4",
-    "@tamagui/build": "2.0.0-rc.30",
+    "@tamagui/build": "2.0.0-rc.32",
     "@types/babel__core": "^7.20.5",
     "@types/find-root": "^1.1.2",
     "@types/node": "^22.1.0",

package/src/extractor/extractToNative.ts

@@ -210,7 +210,7 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
                 const finalAttrs: (t.JSXAttribute | t.JSXSpreadAttribute)[] = []
                 const themeKeysUsed = new Set<string>()
 
-                function getStyleExpression(style: object | null) {
+                function getStyleExpression(style: object | null, forTernary = false) {
                   if (!style) return
 
                   // split theme properties and leave them as props since RN has no concept of theme
@@ -226,13 +226,24 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
                     // make a sub-array
                     themeExpr = getThemedStyleExpression(themed)
                   }
-                  const ident = addSheetStyle(plain, props.node)
+                  const hasPlainKeys = Object.keys(plain).length > 0
+                  const ident = hasPlainKeys ? addSheetStyle(plain, props.node) : null
                   if (themeExpr) {
-                    addStyleExpression(ident)
-                    addStyleExpression(ident, true)
+                    if (forTernary) {
+                      // for ternary branches, return combined expression
+                      // without adding plain styles unconditionally
+                      if (ident) {
+                        return t.arrayExpression([ident, themeExpr])
+                      }
+                      return themeExpr
+                    }
+                    // for base styles, add unconditionally
+                    if (ident) {
+                      addStyleExpression(ident)
+                      addStyleExpression(ident, true)
+                    }
                     return themeExpr
                   }
-                  // since we only do flattened disabling this path
                   return ident
                 }
 
@@ -268,6 +279,7 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
                 }
 
                 let hasDynamicStyle = false
+                let hasMediaKeys = false
 
                 for (const attr of props.attrs) {
                   switch (attr.type) {
@@ -280,8 +292,12 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
 
                     case 'ternary': {
                       const { consequent, alternate } = attr.value
-                      const consExpr = getStyleExpression(consequent)
-                      const altExpr = getStyleExpression(alternate)
+                      const consExpr = getStyleExpression(consequent, true)
+                      const altExpr = getStyleExpression(alternate, true)
+
+                      if (attr.value.inlineMediaQuery) {
+                        hasMediaKeys = true
+                      }
 
                       expressions.push(attr.value.test)
                       addStyleExpression(
@@ -338,6 +354,7 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
                   const WrapperIdentifier = t.identifier(wrapperName)
                   const WrapperJSXIdentifier = t.jsxIdentifier(wrapperName)
 
+                  const hasThemeKeysFlag = themeKeysUsed.size > 0
                   root.pushContainer(
                     'body',
                     t.variableDeclaration('const', [
@@ -350,6 +367,8 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
                             // return styles directly - no useMemo, theme changes must trigger style recalc
                             t.arrayExpression([...hocStylesExpr.elements])
                           ),
+                          t.booleanLiteral(hasThemeKeysFlag),
+                          t.booleanLiteral(hasMediaKeys),
                         ])
                       ),
                     ])

package/types/extractor/extractToNative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractToNative.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,aAAa,CAAA;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAsB9C,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,eAAe,CAoBjB;AAED,wBAAgB,cAAc,QAK7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc;;;;wBAM3C,GAAG;;;EA+WtB"}
+{"version":3,"file":"extractToNative.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,aAAa,CAAA;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAsB9C,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,eAAe,CAoBjB;AAED,wBAAgB,cAAc,QAK7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc;;;;wBAM3C,GAAG;;;EAkYtB"}

package/dist/index.js

@@ -1,40 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-    return to;
-  },
-  __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default")),
-  __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
-var index_exports = {};
-__export(index_exports, {
-  default: () => index_default
-});
-module.exports = __toCommonJS(index_exports);
-var Static1 = __toESM(require("./exports.cjs"));
-__reExport(index_exports, require("./exports.cjs"), module.exports);
-var index_default = Static1;

package/dist/index.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,cAAyB;AACzB,0BAAc,sBAFd;AAGA,IAAO,gBAAQ;",
-  "names": []
-}