@tamagui/core 1.0.1-beta.68 → 1.0.1-beta.69

package/dist/jsx/helpers/generateAtomicStyles.js

@@ -3,8 +3,43 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import { simpleHash } from "@tamagui/helpers";
 import hyphenateStyleName from "hyphenate-style-name";
 import normalizeCSSColor from "normalize-css-color";
+import { getConfig } from "../conf";
 import { isWeb } from "../constants/platform";
+import { reversedShorthands } from "../createTamagui";
 import { pseudos } from "./pseudos";
+const generateAtomicStyles = /* @__PURE__ */ __name((style, pseudo) => {
+  const res = expandStyles(style);
+  const out = [];
+  for (const key in res) {
+    const value = res[key];
+    if (value != null) {
+      const valueString = stringifyValueWithProperty(value, key);
+      const hash = simpleHash(key + valueString + ((pseudo == null ? void 0 : pseudo.name) || ""));
+      const cachedResult = cache.get(hash, valueString);
+      if (cachedResult != null) {
+        out.push(cachedResult);
+      } else {
+        const pseudoPrefix = pseudo ? `0${pseudo.name}-` : "";
+        const shortProp = reversedShorthands[key] || key;
+        const identifier = `_${shortProp}-${pseudoPrefix}${hash}`;
+        const rules = createAtomicRules(identifier, key, valueString, pseudo);
+        const styleObject = {
+          property: key,
+          pseudo: pseudo == null ? void 0 : pseudo.name,
+          value,
+          identifier,
+          rules
+        };
+        cache.set(hash, valueString, styleObject);
+        out.push(styleObject);
+      }
+    }
+  }
+  if (style.borderColor === "transparent") {
+    debugger;
+  }
+  return out;
+}, "generateAtomicStyles");
 const reducedStyleKeys = {
   shadowColor: true,
   shadowOffset: true,
@@ -14,58 +49,116 @@ const reducedStyleKeys = {
   textShadowOffset: true,
   textShadowRadius: true
 };
+let shorthands = null;
 function expandStyles(style) {
   const res = {};
   boxShadowReducer(res, style);
   textShadowReducer(res, style);
-  for (const key in style) {
+  borderReducer(res, style);
+  for (let key in style) {
+    shorthands = shorthands || getConfig().shorthands;
+    if (shorthands) {
+      key = shorthands[key] || key;
+    }
     if (reducedStyleKeys[key])
       continue;
     if (key in pseudos) {
       res[key] = expandStyles(style[key]);
     } else {
-      updateReactDOMStyle(res, key, style[key]);
+      const val = normalizeValueWithProperty(style[key], key);
+      const out = expandStyle(key, val);
+      if (out) {
+        Object.assign(res, Object.fromEntries(out));
+      } else {
+        res[key] = val;
+      }
     }
   }
   return res;
 }
 __name(expandStyles, "expandStyles");
-function updateReactDOMStyle(style, key, value) {
-  value = normalizeValueWithProperty(value, key);
-  const out = expandStyle(key, value);
-  if (out) {
-    Object.assign(style, Object.fromEntries(out));
-  } else {
-    style[key] = value;
+function borderReducer(res, cur) {
+  for (const key in borderDefaults) {
+    if (key in cur) {
+      res[borderDefaults[key]] = cur[borderDefaults[key]] || "solid";
+    }
   }
 }
-__name(updateReactDOMStyle, "updateReactDOMStyle");
-const generateAtomicStyles = /* @__PURE__ */ __name((style) => {
-  const res = expandStyles(style);
-  const out = {};
-  for (const key in res) {
-    const value = res[key];
-    if (value != null) {
-      const valueString = stringifyValueWithProperty(value, key);
-      const cachedResult = cache.get(key, valueString);
-      if (cachedResult != null) {
-        const { identifier } = cachedResult;
-        out[identifier] = cachedResult;
-      } else {
-        const identifier = simpleHash(key + valueString);
-        const rules = createAtomicRules(identifier, key, valueString);
-        const cachedResult2 = cache.set(key, valueString, {
-          property: key,
-          value: valueString,
-          identifier,
-          rules
-        });
-        out[identifier] = cachedResult2;
+__name(borderReducer, "borderReducer");
+const borderDefaults = {
+  borderWidth: "borderStyle",
+  borderBottomWidth: "borderBottomStyle",
+  borderTopWidth: "borderTopStyle",
+  borderLeftWidth: "borderLeftStyle",
+  borderRightWidth: "borderRightStyle"
+};
+function createDeclarationBlock(style, important = false) {
+  let declarations = "";
+  for (const key in style) {
+    const prop = hyphenateStyleName(key);
+    const value = style[key];
+    declarations += `${prop}:${value}`;
+  }
+  return `{${declarations}${important ? ` !important` : ""};}`;
+}
+__name(createDeclarationBlock, "createDeclarationBlock");
+const pseudoSelectorPrefixes = (() => {
+  const res = {};
+  for (const key in pseudos) {
+    const pseudo = pseudos[key];
+    res[pseudo.name] = [...Array(pseudo.priority)].map(() => ":root").join("") + " ";
+  }
+  return res;
+})();
+function createAtomicRules(identifier, property, value, pseudo) {
+  const selector = pseudo ? `${pseudoSelectorPrefixes[pseudo.name]} .${identifier}:${pseudo.name}` : `.${identifier}`;
+  const important = !!pseudo;
+  let rules = [];
+  switch (property) {
+    case "placeholderTextColor": {
+      const block = createDeclarationBlock({ color: value, opacity: 1 }, important);
+      rules.push(`${selector}::placeholder${block}`);
+      break;
+    }
+    case "pointerEvents": {
+      let finalValue = value;
+      if (value === "auto" || value === "box-only") {
+        finalValue = "auto!important";
+        if (value === "box-only") {
+          const block2 = createDeclarationBlock({ pointerEvents: "none" }, important);
+          rules.push(`${selector}>*${block2}`);
+        }
+      } else if (value === "none" || value === "box-none") {
+        finalValue = "none!important";
+        if (value === "box-none") {
+          const block2 = createDeclarationBlock({ pointerEvents: "auto" }, important);
+          rules.push(`${selector}>*${block2}`);
+        }
       }
+      const block = createDeclarationBlock({ pointerEvents: finalValue }, important);
+      rules.push(`${selector}${block}`);
+      break;
+    }
+    case "scrollbarWidth": {
+      if (value === "none") {
+        rules.push(`${selector}::-webkit-scrollbar{display:none}`);
+      }
+      const block = createDeclarationBlock({ scrollbarWidth: value }, important);
+      rules.push(`${selector}${block}`);
+      break;
+    }
+    default: {
+      const block = createDeclarationBlock({ [property]: value }, important);
+      rules.push(`${selector}${block}`);
+      break;
     }
   }
-  return out;
-}, "generateAtomicStyles");
+  if ((pseudo == null ? void 0 : pseudo.name) === "hover") {
+    rules = rules.map((r) => `@media not all and (hover: none) { ${r} }`);
+  }
+  return rules;
+}
+__name(createAtomicRules, "createAtomicRules");
 function expandStyle(key, value) {
   if (key === "flex") {
     if (value <= -1) {
@@ -130,61 +223,6 @@ function expandStyle(key, value) {
   }
 }
 __name(expandStyle, "expandStyle");
-function createAtomicRules(identifier, property, value) {
-  const rules = [];
-  const selector = `.${identifier}`;
-  switch (property) {
-    case "placeholderTextColor": {
-      const block = createDeclarationBlock({ color: value, opacity: 1 });
-      rules.push(`${selector}::placeholder${block}`);
-      break;
-    }
-    case "pointerEvents": {
-      let finalValue = value;
-      if (value === "auto" || value === "box-only") {
-        finalValue = "auto!important";
-        if (value === "box-only") {
-          const block2 = createDeclarationBlock({ pointerEvents: "none" });
-          rules.push(`${selector}>*${block2}`);
-        }
-      } else if (value === "none" || value === "box-none") {
-        finalValue = "none!important";
-        if (value === "box-none") {
-          const block2 = createDeclarationBlock({ pointerEvents: "auto" });
-          rules.push(`${selector}>*${block2}`);
-        }
-      }
-      const block = createDeclarationBlock({ pointerEvents: finalValue });
-      rules.push(`${selector}${block}`);
-      break;
-    }
-    case "scrollbarWidth": {
-      if (value === "none") {
-        rules.push(`${selector}::-webkit-scrollbar{display:none}`);
-      }
-      const block = createDeclarationBlock({ scrollbarWidth: value });
-      rules.push(`${selector}${block}`);
-      break;
-    }
-    default: {
-      const block = createDeclarationBlock({ [property]: value });
-      rules.push(`${selector}${block}`);
-      break;
-    }
-  }
-  return rules;
-}
-__name(createAtomicRules, "createAtomicRules");
-function createDeclarationBlock(style) {
-  const domStyle = expandStyles(style);
-  const declarationsString = Object.keys(domStyle).map((property) => {
-    const value = domStyle[property];
-    const prop = hyphenateStyleName(property);
-    return `${prop}:${value}`;
-  }).sort().join(";");
-  return `{${declarationsString};}`;
-}
-__name(createDeclarationBlock, "createDeclarationBlock");
 const cache = {
   get(property, value) {
     if (cache[property] != null && cache[property].hasOwnProperty(value) && cache[property][value] != null) {
@@ -257,7 +295,13 @@ const normalizeColor = /* @__PURE__ */ __name((color, opacity = 1) => {
   }
   return `${color}`;
 }, "normalizeColor");
-const isWebColor = /* @__PURE__ */ __name((color) => color === "currentcolor" || color === "currentColor" || color === "inherit" || color.indexOf("var(") === 0, "isWebColor");
+const webColors = {
+  currentColor: true,
+  currentcolor: true,
+  transparent: true,
+  inherit: true
+};
+const isWebColor = /* @__PURE__ */ __name((color) => webColors[color] || color.indexOf("var(") === 0, "isWebColor");
 const processColor = /* @__PURE__ */ __name((color) => {
   if (color === void 0 || color === null) {
     return color;

package/dist/jsx/helpers/getSplitStyles.js

@@ -7,7 +7,7 @@ import { isClient, isWeb, useIsomorphicLayoutEffect } from "../constants/platfor
 import { mediaQueryConfig, mediaState } from "../hooks/useMedia";
 import { createMediaStyle } from "./createMediaStyle";
 import { fixNativeShadow } from "./fixNativeShadow";
-import { getStylesAtomic, pseudoCNInverse } from "./getStylesAtomic";
+import { getStylesAtomic } from "./getStylesAtomic";
 import {
   insertStyleRule,
   insertedTransforms,
@@ -36,8 +36,13 @@ const skipProps = {
   }
 };
 let conf;
+const pseudoCNInverse = {
+  hover: "hoverStyle",
+  focus: "focusStyle",
+  press: "pressStyle"
+};
 const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state, defaultClassNames, debug) => {
-  var _a, _b;
+  var _a;
   conf = conf || getConfig();
   const validStyleProps = staticConfig.isText ? stylePropsText : validStyles;
   const viewProps = {};
@@ -45,6 +50,9 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
   const medias = {};
   const usedKeys = /* @__PURE__ */ new Set();
   let style = {};
+  if (state.hasTextAncestor) {
+    style.display = "inline-flex";
+  }
   let classNames = {};
   let transforms = null;
   const rulesToInsert = [];
@@ -91,6 +99,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
   }
   __name(mergeClassName, "mergeClassName");
   const propKeys = Object.keys(props);
+  const shouldDoClasses = isWeb && !state.noClassNames;
   if (process.env.NODE_ENV === "development" && debug === "verbose") {
     console.log("propKeys", propKeys);
   }
@@ -138,10 +147,10 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
           if (isMedia2) {
             let mediaShortKey = mediaOrPseudo.slice(1);
             mediaShortKey = mediaShortKey.slice(0, mediaShortKey.indexOf("_"));
-            fullKey += `-${mediaShortKey}`;
+            fullKey += `_${mediaShortKey}`;
           } else if (isPseudo2) {
             const pseudoShortKey = mediaOrPseudo.slice(1);
-            fullKey += `-${pseudoCNInverse[pseudoShortKey]}`;
+            fullKey += `_${pseudoShortKey}`;
           }
           usedKeys.add(fullKey);
           mergeClassName(fullKey, cn, isMediaOrPseudo2);
@@ -155,7 +164,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
       }
       continue;
     }
-    if (validStyleProps[keyInit] && valInit && valInit[0] === "_") {
+    if (valInit && valInit[0] === "_") {
       usedKeys.add(keyInit);
       mergeClassName(keyInit, valInit);
       continue;
@@ -205,14 +214,10 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
         }
         pseudos[key] = pseudos[key] || {};
         pseudos[key] = getSubStyle(val, staticConfig, theme, props, state, true);
-        if (isWeb && !state.noClassNames) {
-          const shorthand = pseudoAttrs[key].name;
-          if ((_b = props.forceStyle) == null ? void 0 : _b[shorthand]) {
-            console.warn("force");
-          }
+        if (shouldDoClasses) {
           const pseudoStyles = getStylesAtomic({ [key]: pseudos[key] });
           for (const style2 of pseudoStyles) {
-            const fullKey = `${style2.property}-${key}`;
+            const fullKey = `${style2.property}_${pseudoAttrs[key].name}`;
             if (!usedKeys.has(fullKey)) {
               usedKeys.add(fullKey);
               addStyle(style2.identifier, style2.rules.join(";"));
@@ -232,7 +237,6 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
           continue;
         }
         const mediaStyle = getSubStyle(val, staticConfig, theme, props, state);
-        const shouldDoClasses = isWeb && !state.noClassNames;
         if (process.env.NODE_ENV === "development" && debug === "verbose") {
           console.log("  \xBB getSplitStyles mediaStyle", { mediaKey, mediaStyle, props, shouldDoClasses });
         }
@@ -240,7 +244,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
           const mediaStyles = getStylesAtomic(mediaStyle);
           for (const style2 of mediaStyles) {
             const out = createMediaStyle(style2, mediaKeyShort, mediaQueryConfig);
-            const fullKey = `${style2.property}-${mediaKeyShort}`;
+            const fullKey = `${style2.property}_${mediaKeyShort}`;
             if (!usedKeys.has(fullKey)) {
               usedKeys.add(fullKey);
               addStyle(out.identifier, out.styleRule);
@@ -266,15 +270,10 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
         usedKeys.add(key);
         if (val && val[0] === "_") {
           classNames[key] = val;
+        } else if (key in stylePropsTransform) {
+          mergeTransform(style, key, val, true);
         } else {
-          if (key in stylePropsTransform) {
-            if (process.env.NODE_ENV === "development" && debug) {
-              console.log("  > mergeTransform", key, val);
-            }
-            mergeTransform(style, key, val, true);
-          } else {
-            style[key] = val;
-          }
+          style[key] = val;
         }
         continue;
       }
@@ -292,7 +291,7 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
       ...classNames
     };
   }
-  if (isWeb && !state.noClassNames) {
+  if (shouldDoClasses) {
     const atomic = getStylesAtomic(style);
     for (const atomicStyle of atomic) {
       const key = atomicStyle.property;
@@ -380,5 +379,6 @@ export {
   getSubStyle,
   insertSplitStyles,
   normalizeStyleObject,
+  pseudoCNInverse,
   useSplitStyles
 };

package/dist/jsx/helpers/getStylesAtomic.js

@@ -1,18 +1,15 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { stylePropsTransform } from "@tamagui/helpers";
-import { reversedShorthands } from "../createTamagui";
 import { isVariable } from "../createVariable";
 import { generateAtomicStyles } from "./generateAtomicStyles";
 import { invertMapTransformKeys, mergeTransform } from "./mergeTransform";
 import { pseudos } from "./pseudos";
 const pseudosOrdered = Object.values(pseudos);
-const pseudoCNInverse = {
-  hover: "hoverStyle",
-  focus: "focusStyle",
-  press: "pressStyle"
-};
-function getStylesAtomic(stylesIn, options = {}) {
+function getStylesAtomic(stylesIn, options) {
+  if (!stylesIn.hoverStyle && !stylesIn.pressStyle && !stylesIn.focusStyle) {
+    return getAtomicStyle(stylesIn, void 0, options);
+  }
   const { hoverStyle, pressStyle, focusStyle, ...base } = stylesIn;
   let res = [];
   for (const [index, style] of [hoverStyle, pressStyle, focusStyle, base].entries()) {
@@ -36,75 +33,33 @@ function getStylesAtomic(stylesIn, options = {}) {
 }
 __name(getStylesAtomic, "getStylesAtomic");
 function getAtomicStyle(style, pseudo, options) {
-  var _a;
-  if (style == null || typeof style !== "object") {
-    throw new Error(`Wrong style type: "${typeof style}": ${style}`);
-  }
-  for (const key in borderDefaults) {
-    if (key in style) {
-      style[borderDefaults[key]] = (_a = style[borderDefaults[key]]) != null ? _a : "solid";
+  if (process.env.NODE_ENV === "development") {
+    if (!style || typeof style !== "object") {
+      throw new Error(`Wrong style type: "${typeof style}": ${style}`);
+    }
+  } else {
+    if (!style) {
+      console.warn(`Invalid style`);
+      return [];
     }
   }
-  let atomicStyles = {};
-  if (options.splitTransforms && style.transform) {
+  if (options && options.splitTransforms && style.transform) {
+    let atomicStyles = [];
     let { transform, ...rest } = style;
-    style = rest;
     for (const t of transform) {
       const tKey = Object.keys(t)[0];
       const transformProperty = invertMapTransformKeys[tKey] || tKey;
-      const out = generateAtomicStyles({ transform: [t] });
-      const key = Object.keys(out)[0];
-      atomicStyles[key] = {
-        ...out[key],
-        transformProperty
-      };
+      const out = generateAtomicStyles({ transform: [t] }, pseudo)[0];
+      atomicStyles.push({
+        ...out,
+        property: transformProperty
+      });
     }
+    return [...atomicStyles, ...generateAtomicStyles(rest, pseudo)];
   }
-  if (style) {
-    Object.assign(atomicStyles, generateAtomicStyles(style));
-  }
-  return Object.keys(atomicStyles).map((key) => {
-    const val = atomicStyles[key];
-    const hash = val.identifier;
-    const pseudoPrefix = pseudo ? `0${pseudo.name}-` : "";
-    if (!val.property) {
-      throw new Error(`no prop`);
-    }
-    const shortProp = reversedShorthands[val.property] || val.property;
-    const identifier = `_${shortProp}-${pseudoPrefix}${hash}`;
-    const className = `.${identifier}`;
-    const rules = val.rules.map((rule) => {
-      if (pseudo) {
-        const pseudoPrefixSelect = [...Array(pseudo.priority)].map(() => ":root").join("") + " ";
-        let res = rule.replace(`.${val.identifier}`, `${pseudoPrefixSelect} ${className}`).replace("{", `:${pseudo.name}{`).replace(";", " !important;");
-        if (pseudo.name === "hover") {
-          res = `@media not all and (hover: none) { ${res} }`;
-        }
-        return res;
-      }
-      return rule.replace(`.${val.identifier}`, className).replace(importantRegex, "");
-    });
-    const result = {
-      property: val.transformProperty || val.property,
-      pseudo: pseudo == null ? void 0 : pseudo.name,
-      value: val.value,
-      identifier,
-      className,
-      rules
-    };
-    return result;
-  });
+  return generateAtomicStyles(style, pseudo);
 }
 __name(getAtomicStyle, "getAtomicStyle");
-const importantRegex = /\!important*/g;
-const borderDefaults = {
-  borderWidth: "borderStyle",
-  borderBottomWidth: "borderBottomStyle",
-  borderTopWidth: "borderTopStyle",
-  borderLeftWidth: "borderLeftStyle",
-  borderRightWidth: "borderRightStyle"
-};
 export {
-  getStylesAtomic,
-  pseudoCNInverse
+  getStylesAtomic
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.1-beta.68",
+  "version": "1.0.1-beta.69",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -21,11 +21,11 @@
   ],
   "dependencies": {
     "@expo/match-media": "^0.3.0",
-    "@tamagui/compose-refs": "^1.0.1-beta.68",
-    "@tamagui/helpers": "^1.0.1-beta.68",
+    "@tamagui/compose-refs": "^1.0.1-beta.69",
+    "@tamagui/helpers": "^1.0.1-beta.69",
     "@tamagui/ow": "^0.28.1",
-    "@tamagui/use-debounce": "^1.0.1-beta.68",
-    "@tamagui/use-force-update": "^1.0.1-beta.68",
+    "@tamagui/use-debounce": "^1.0.1-beta.69",
+    "@tamagui/use-force-update": "^1.0.1-beta.69",
     "expo-screen-orientation": "^4.2.0",
     "hyphenate-style-name": "^1.0.4",
     "normalize-css-color": "^1.0.2",
@@ -36,7 +36,7 @@
     "react-native-web": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.68",
+    "@tamagui/build": "^1.0.1-beta.69",
     "@types/react": "^17.0.35",
     "csstype": "^3.0.10",
     "esbuild": "^0.14.36",

package/types/constants/rnw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rnw.d.ts","sourceRoot":"","sources":["../../src/constants/rnw.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,EAAE,GAAQ,CAAA"}
+{"version":3,"file":"rnw.d.ts","sourceRoot":"","sources":["../../src/constants/rnw.tsx"],"names":[],"mappings":"AACA,eAAO,MAAM,GAAG,EAAE,GAAQ,CAAA"}

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAEA,OAAO,KAWN,MAAM,OAAO,CAAA;AAqBd,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAGhB,cAAc,EAGf,MAAM,SAAS,CAAA;AAgBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA0B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EAAE,eAAe,CAAC,EAAE,iBAAiB,4DAy7B1F;AAKD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAEjD,CAAA;AAMD,aAAK,cAAc,GAAG,UAAU,GAAG,YAAY,CAAA;AAE/C,oBAAY,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,GAAG;IACjE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;IAC3B,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,cAAc,CAAA;CAC3B,CAAA;AACD,eAAO,MAAM,MAAM,0DA2CjB,CAAA;AAEF,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,kBAAkB,CAAA;IAC9B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC5B,CAAA;AAED,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,GACV,EAAE,mBAAmB,OAgFrB;AA2BD,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,eAMjE;AA6BD,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,QA6K3F"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAEA,OAAO,KAWN,MAAM,OAAO,CAAA;AAqBd,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAGhB,cAAc,EAGf,MAAM,SAAS,CAAA;AAgBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA0B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EAAE,eAAe,CAAC,EAAE,iBAAiB,4DAq7B1F;AAKD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAEjD,CAAA;AAMD,aAAK,cAAc,GAAG,UAAU,GAAG,YAAY,CAAA;AAE/C,oBAAY,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,GAAG;IACjE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;IAC3B,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,cAAc,CAAA;CAC3B,CAAA;AACD,eAAO,MAAM,MAAM,0DA2CjB,CAAA;AAEF,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,kBAAkB,CAAA;IAC9B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC5B,CAAA;AAED,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,GACV,EAAE,mBAAmB,OAgFrB;AA2BD,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,eAMjE;AA6BD,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,QA6K3F"}

package/types/helpers/generateAtomicStyles.d.ts

@@ -1,21 +1,12 @@
+import { StyleObject } from '@tamagui/helpers';
 import { TextStyle, ViewStyle } from 'react-native';
+import { PseudoDescriptor } from './pseudos';
 declare type Value = Object | Array<any> | string | number;
 export declare type Style = {
     [key: string]: Value;
 };
-declare type Rule = string;
-declare type Rules = Array<Rule>;
-export declare type RulesData = {
-    property?: string;
-    value?: string;
-    identifier: string;
-    rules: Rules;
-};
-declare type CompilerOutput = {
-    [key: string]: RulesData;
-};
+export declare const generateAtomicStyles: (style: ViewStyle & TextStyle, pseudo?: PseudoDescriptor) => StyleObject[];
 export declare function expandStyles(style: any): {};
-export declare const generateAtomicStyles: (style: ViewStyle & TextStyle) => CompilerOutput;
 export declare function expandStyle(key: string, value: any): any;
 export {};
 //# sourceMappingURL=generateAtomicStyles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generateAtomicStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/generateAtomicStyles.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKnD,aAAK,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,MAAM,CAAA;AAClD,oBAAY,KAAK,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,CAAA;AAE5C,aAAK,IAAI,GAAG,MAAM,CAAA;AAClB,aAAK,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;AAExB,oBAAY,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,aAAK,cAAc,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAA;AAYlD,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,MAatC;AAYD,eAAO,MAAM,oBAAoB,UAAW,SAAS,GAAG,SAAS,KAAG,cA2BnE,CAAA;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OA8ElD"}
+{"version":3,"file":"generateAtomicStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/generateAtomicStyles.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAc,MAAM,kBAAkB,CAAA;AAG1D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAW,MAAM,WAAW,CAAA;AAErD,aAAK,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,MAAM,CAAA;AAClD,oBAAY,KAAK,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,CAAA;AAE5C,eAAO,MAAM,oBAAoB,UACxB,SAAS,GAAG,SAAS,WACnB,gBAAgB,KACxB,WAAW,EAgCb,CAAA;AAeD,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,MAwBtC;AAiHD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OA8ElD"}

package/types/helpers/getSplitStyles.d.ts

@@ -7,6 +7,7 @@ declare type StyleSplitter = (props: {
     [key: string]: any;
 }, staticConfig: StaticConfigParsed, theme: ThemeObject, state: SplitStyleState & {
     keepVariantsAsProps?: boolean;
+    hasTextAncestor?: boolean;
 }, defaultClassNames?: any, debug?: DebugProp) => {
     pseudos: PseudoStyles;
     medias: Record<MediaKeys, ViewStyle>;
@@ -15,6 +16,11 @@ declare type StyleSplitter = (props: {
     rulesToInsert: [string, string][];
     viewProps: StackProps;
 };
+export declare const pseudoCNInverse: {
+    hover: string;
+    focus: string;
+    press: string;
+};
 export declare const getSplitStyles: StyleSplitter;
 export declare const insertSplitStyles: StyleSplitter;
 export declare const useSplitStyles: StyleSplitter;

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKxC,OAAO,EACL,SAAS,EACT,SAAS,EAGT,YAAY,EACZ,eAAe,EACf,UAAU,EACV,kBAAkB,EAElB,WAAW,EACZ,MAAM,UAAU,CAAA;AAajB,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAC3D,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AACrD,oBAAY,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AA2BhE,aAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,GAAG;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,EACD,iBAAiB,CAAC,EAAE,GAAG,EACvB,KAAK,CAAC,EAAE,SAAS,KACd;IACH,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACpC,KAAK,EAAE,SAAS,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACjC,SAAS,EAAE,UAAU,CAAA;CACtB,CAAA;AASD,eAAO,MAAM,cAAc,EAAE,aAoX5B,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,aAM/B,CAAA;AAID,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA;AAED,eAAO,MAAM,WAAW,YACb,MAAM,gBACD,kBAAkB,SACzB,WAAW,SACX,GAAG,SACH,eAAe,sBACF,OAAO,KAC1B,SAeF,CAAA;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,QAI9C"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAKxC,OAAO,EACL,SAAS,EACT,SAAS,EAGT,YAAY,EACZ,eAAe,EACf,UAAU,EACV,kBAAkB,EAElB,WAAW,EACZ,MAAM,UAAU,CAAA;AAajB,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAC3D,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AACrD,oBAAY,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AA2BhE,aAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,GAAG;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,EACD,iBAAiB,CAAC,EAAE,GAAG,EACvB,KAAK,CAAC,EAAE,SAAS,KACd;IACH,OAAO,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACpC,KAAK,EAAE,SAAS,CAAA;IAChB,UAAU,EAAE,gBAAgB,CAAA;IAC5B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACjC,SAAS,EAAE,UAAU,CAAA;CACtB,CAAA;AAID,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AASD,eAAO,MAAM,cAAc,EAAE,aA8W5B,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,aAM/B,CAAA;AAID,eAAO,MAAM,cAAc,EAAE,aAQ5B,CAAA;AAED,eAAO,MAAM,WAAW,YACb,MAAM,gBACD,kBAAkB,SACzB,WAAW,SACX,GAAG,SACH,eAAe,sBACF,OAAO,KAC1B,SAeF,CAAA;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,QAI9C"}

package/types/helpers/getStylesAtomic.d.ts

@@ -8,11 +8,6 @@ export declare type ViewStyleWithPseudos = ViewStyle & {
 declare type AtomicStyleOptions = {
     splitTransforms?: boolean;
 };
-export declare const pseudoCNInverse: {
-    hover: string;
-    focus: string;
-    press: string;
-};
 export declare function getStylesAtomic(stylesIn: ViewStyleWithPseudos, options?: AtomicStyleOptions): StyleObject[];
 export {};
 //# sourceMappingURL=getStylesAtomic.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAQxC,oBAAY,oBAAoB,GAAG,SAAS,GAAG;IAC7C,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;CACvB,CAAA;AAED,aAAK,kBAAkB,GAAG;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAQD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,GAAE,kBAAuB,iBAwB/F"}
+{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AASxC,oBAAY,oBAAoB,GAAG,SAAS,GAAG;IAC7C,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,UAAU,CAAC,EAAE,SAAS,CAAA;CACvB,CAAA;AAED,aAAK,kBAAkB,GAAG;IAExB,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B,CAAA;AAID,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,kBAAkB,iBA4B3F"}

package/types/helpers/pseudos.d.ts

@@ -12,4 +12,5 @@ export declare const pseudos: {
         readonly priority: 3;
     };
 };
+export declare type PseudoDescriptor = typeof pseudos[keyof typeof pseudos];
 //# sourceMappingURL=pseudos.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pseudos.d.ts","sourceRoot":"","sources":["../../src/helpers/pseudos.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO;;;;;;;;;;;;;CAaV,CAAA"}
+{"version":3,"file":"pseudos.d.ts","sourceRoot":"","sources":["../../src/helpers/pseudos.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO;;;;;;;;;;;;;CAaV,CAAA;AAEV,oBAAY,gBAAgB,GAAG,OAAO,OAAO,CAAC,MAAM,OAAO,OAAO,CAAC,CAAA"}