@tamagui/core 1.0.11 → 1.0.12

package/dist/cjs/helpers/insertStyleRule.js

@@ -53,7 +53,7 @@ function addTransform(identifier, css, rule) {
   return false;
 }
 const isClient = typeof document !== "undefined";
-const scannedNum = /* @__PURE__ */ new WeakMap();
+const scannedCache = /* @__PURE__ */ new WeakMap();
 const totalSheetSelectors = /* @__PURE__ */ new Map();
 function listenForSheetChanges() {
   if (!isClient)
@@ -94,20 +94,27 @@ function track(id, remove = false) {
   return next;
 }
 function updateSheetStyles(sheet2, remove = false) {
+  var _a, _b;
   let rules;
   try {
     rules = sheet2.cssRules;
   } catch {
     return;
   }
-  const len = rules.length;
-  const lastScanned = scannedNum.get(sheet2) || 0;
+  const firstSelector = (_a = getTamaguiSelector(rules[0])) == null ? void 0 : _a[0];
+  if (!firstSelector) {
+    return;
+  }
+  const lastSelector = (_b = getTamaguiSelector(rules[rules.length - 1])) == null ? void 0 : _b[0];
+  const cacheKey = `${rules.length}${firstSelector}${lastSelector}`;
+  const lastScanned = scannedCache.get(sheet2);
   if (!remove) {
-    if (lastScanned === len) {
+    if (lastScanned === cacheKey) {
       return;
     }
   }
-  for (let i = lastScanned; i < len; i++) {
+  const len = rules.length;
+  for (let i = 0; i < len; i++) {
     const rule = rules[i];
     const response = getTamaguiSelector(rule);
     if (!response) {
@@ -129,7 +136,7 @@ function updateSheetStyles(sheet2, remove = false) {
       }
     }
   }
-  scannedNum.set(sheet2, len);
+  scannedCache.set(sheet2, cacheKey);
 }
 function getTamaguiSelector(rule) {
   if (rule instanceof CSSStyleRule) {

package/dist/cjs/helpers/insertStyleRule.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "sourcesContent": ["import type { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors: Record<string, string> = {}\nconst allRules: Record<string, string> = {}\nexport const insertedTransforms = {}\n\nexport const getAllSelectors = () => allSelectors\nexport const getAllRules = () => Object.values(allRules)\nexport const getAllTransforms = () => insertedTransforms\n\n// keep transforms in map for merging later\nfunction addTransform(identifier: string, css: string, rule?: CSSRule) {\n  const s = css.indexOf('transform:')\n  if (s === -1) {\n    if (process.env.NODE_ENV === 'development') {\n      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\n    }\n    return false\n  }\n  const startI = s + 'transform:'.length\n  const endI = css.indexOf(';')\n  const value = css.slice(startI, endI)\n  if (!insertedTransforms[identifier]) {\n    insertedTransforms[identifier] = value\n    return true\n  }\n  return false\n}\n\nconst isClient = typeof document !== 'undefined'\n\n// gets existing ones (client side)\n// takes ~0.1ms for a fairly large page\n// used now for three things:\n//   1. debugging at dev time\n//   2. avoid duplicate insert styles at runtime\n//   3. used now for merging transforms atomically\n\n// multiple sheets could have the same ids so we have to count\n\nconst scannedNum = new WeakMap<CSSStyleSheet, number>()\nconst totalSheetSelectors = new Map<string, number>()\n\nexport function listenForSheetChanges() {\n  if (!isClient) return\n  function handleNode(node: Node, remove = false) {\n    if (node instanceof HTMLStyleElement && node.sheet) {\n      updateSheetStyles(node.sheet, remove)\n    }\n  }\n  const mo = new MutationObserver((entries) => {\n    for (const entry of entries) {\n      entry.addedNodes.forEach((node) => handleNode(node))\n      entry.removedNodes.forEach((node) => handleNode(node, true))\n    }\n  })\n  mo.observe(document.head, {\n    childList: true,\n  })\n}\n\nexport function scanAllSheets() {\n  if (process.env.NODE_ENV === 'test') return\n  if (!isClient) return\n  const sheets = document.styleSheets\n  if (!sheets) return\n  for (let i = 0; i < sheets.length; i++) {\n    const sheet = sheets[i]\n    if (!sheet) continue\n    updateSheetStyles(sheet)\n  }\n}\n\nfunction track(id: string, remove = false) {\n  const next = (totalSheetSelectors.get(id) || 0) + (remove ? -1 : 1)\n  totalSheetSelectors.set(id, next)\n  return next\n}\n\nfunction updateSheetStyles(sheet: CSSStyleSheet, remove = false) {\n  // avoid errors on cross origin sheets\n  // https://stackoverflow.com/questions/49993633/uncaught-domexception-failed-to-read-the-cssrules-property\n  let rules: CSSRuleList\n  try {\n    rules = sheet.cssRules\n  } catch {\n    return\n  }\n\n  const len = rules.length\n  const lastScanned = scannedNum.get(sheet) || 0\n\n  if (!remove) {\n    // avoid work dumb but works\n    if (lastScanned === len) {\n      return\n    }\n  }\n\n  for (let i = lastScanned; i < len; i++) {\n    const rule = rules[i]\n    const response = getTamaguiSelector(rule)\n    if (!response) {\n      return\n    }\n\n    const [identifier, cssRule] = response\n\n    // track references\n    const total = track(identifier, remove)\n\n    if (remove) {\n      if (total === 0) {\n        delete allSelectors[identifier]\n      }\n    } else {\n      if (!(identifier in allSelectors)) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform\n          ? addTransform(identifier, cssRule.cssText, cssRule)\n          : true\n        if (shouldInsert) {\n          allSelectors[identifier] = cssRule.cssText\n        }\n      }\n    }\n  }\n\n  scannedNum.set(sheet, len)\n}\n\nfunction getTamaguiSelector(\n  rule: CSSRule | null\n): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    const text = rule.selectorText\n    if (text[0] === '.' && text[1] === '_') {\n      return [text.slice(1), rule]\n    }\n    if (text.startsWith(':root') && text.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(text), rule]\n    }\n  } else if (rule instanceof CSSMediaRule) {\n    // tamagui only ever inserts 1 rule per media\n    if (rule.cssRules.length > 1) return null\n    return getTamaguiSelector(rule.cssRules[0])\n  }\n  return null\n}\n\nconst getIdentifierFromTamaguiSelector = (selector: string) =>\n  selector\n    .replace(/(:root)+\\s+/, '')\n    .replace(/:[a-z]+$/, '')\n    .slice(1)\n\nconst sheet = isClient\n  ? document.head.appendChild(document.createElement('style')).sheet\n  : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules.join(' ')\n  if (identifier.startsWith('_transform')) {\n    return addTransform(identifier, rules[0])\n  }\n  return true\n}\n\n// [property, identifier, rules]\nexport type PartialStyleObject = Pick<StyleObject, 'identifier' | 'property' | 'rules'>\nexport type RulesToInsert = PartialStyleObject[]\n\nexport function insertStyleRules(rulesToInsert: RulesToInsert) {\n  if (!rulesToInsert.length) return\n  if (isClient && !sheet) {\n    if (process.env.NODE_ENV === 'development') throw 'impossible'\n    return\n  }\n  for (const { identifier, rules } of rulesToInsert) {\n    if (identifier in allSelectors) continue\n    allSelectors[identifier] =\n      process.env.NODE_ENV === 'development' ? rules.join('\\n') : ' '\n    updateRules(identifier, rules)\n    if (sheet) {\n      for (const rule of rules) {\n        try {\n          sheet.insertRule(rule, sheet.cssRules.length)\n        } catch (err) {\n          if (process.env.NODE_ENV !== 'production') {\n            console.groupCollapsed(\n              `Error inserting rule into CSSStyleSheet: ${String(err)}`\n            )\n            console.log({ rule, rulesToInsert })\n            console.trace()\n            console.groupEnd()\n          }\n        }\n      }\n    }\n  }\n}\n\nconst IS_STATIC = process.env.IS_STATIC === 'is_static'\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  if (IS_STATIC) {\n    return true\n  }\n  return !(styleObject.identifier in allSelectors)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors: Record<string, string> = {}\nconst allRules: Record<string, string> = {}\nexport const insertedTransforms = {}\n\nexport const getAllSelectors = () => allSelectors\nexport const getAllRules = () => Object.values(allRules)\nexport const getAllTransforms = () => insertedTransforms\n\n// keep transforms in map for merging later\nfunction addTransform(identifier: string, css: string, rule?: CSSRule) {\n  const s = css.indexOf('transform:')\n  if (s === -1) {\n    if (process.env.NODE_ENV === 'development') {\n      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\n    }\n    return false\n  }\n  const startI = s + 'transform:'.length\n  const endI = css.indexOf(';')\n  const value = css.slice(startI, endI)\n  if (!insertedTransforms[identifier]) {\n    insertedTransforms[identifier] = value\n    return true\n  }\n  return false\n}\n\nconst isClient = typeof document !== 'undefined'\n\n// gets existing ones (client side)\n// takes ~0.1ms for a fairly large page\n// used now for three things:\n//   1. debugging at dev time\n//   2. avoid duplicate insert styles at runtime\n//   3. used now for merging transforms atomically\n\n// multiple sheets could have the same ids so we have to count\n\n// only cache tamagui styles\nconst scannedCache = new WeakMap<CSSStyleSheet, string>()\nconst totalSheetSelectors = new Map<string, number>()\n\nexport function listenForSheetChanges() {\n  if (!isClient) return\n  function handleNode(node: Node, remove = false) {\n    if (node instanceof HTMLStyleElement && node.sheet) {\n      updateSheetStyles(node.sheet, remove)\n    }\n  }\n  const mo = new MutationObserver((entries) => {\n    for (const entry of entries) {\n      entry.addedNodes.forEach((node) => handleNode(node))\n      entry.removedNodes.forEach((node) => handleNode(node, true))\n    }\n  })\n  mo.observe(document.head, {\n    childList: true,\n  })\n}\n\nexport function scanAllSheets() {\n  if (process.env.NODE_ENV === 'test') return\n  if (!isClient) return\n  const sheets = document.styleSheets\n  if (!sheets) return\n  for (let i = 0; i < sheets.length; i++) {\n    const sheet = sheets[i]\n    if (!sheet) continue\n    updateSheetStyles(sheet)\n  }\n}\n\nfunction track(id: string, remove = false) {\n  const next = (totalSheetSelectors.get(id) || 0) + (remove ? -1 : 1)\n  totalSheetSelectors.set(id, next)\n  return next\n}\n\nfunction updateSheetStyles(sheet: CSSStyleSheet, remove = false) {\n  // avoid errors on cross origin sheets\n  // https://stackoverflow.com/questions/49993633/uncaught-domexception-failed-to-read-the-cssrules-property\n  let rules: CSSRuleList\n  try {\n    rules = sheet.cssRules\n  } catch {\n    return\n  }\n\n  // not tamagui stylesheet\n  const firstSelector = getTamaguiSelector(rules[0])?.[0]\n  if (!firstSelector) {\n    return\n  }\n\n  const lastSelector = getTamaguiSelector(rules[rules.length - 1])?.[0]\n\n  const cacheKey = `${rules.length}${firstSelector}${lastSelector}`\n  const lastScanned = scannedCache.get(sheet)\n  if (!remove) {\n    // avoid re-scanning\n    if (lastScanned === cacheKey) {\n      return\n    }\n  }\n\n  const len = rules.length\n  for (let i = 0; i < len; i++) {\n    const rule = rules[i]\n    const response = getTamaguiSelector(rule)\n    if (!response) {\n      return\n    }\n\n    const [identifier, cssRule] = response\n\n    // track references\n    const total = track(identifier, remove)\n\n    if (remove) {\n      if (total === 0) {\n        delete allSelectors[identifier]\n      }\n    } else {\n      if (!(identifier in allSelectors)) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform\n          ? addTransform(identifier, cssRule.cssText, cssRule)\n          : true\n        if (shouldInsert) {\n          allSelectors[identifier] = cssRule.cssText\n        }\n      }\n    }\n  }\n\n  scannedCache.set(sheet, cacheKey)\n}\n\nfunction getTamaguiSelector(\n  rule: CSSRule | null\n): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    const text = rule.selectorText\n    if (text[0] === '.' && text[1] === '_') {\n      return [text.slice(1), rule]\n    }\n    if (text.startsWith(':root') && text.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(text), rule]\n    }\n  } else if (rule instanceof CSSMediaRule) {\n    // tamagui only ever inserts 1 rule per media\n    if (rule.cssRules.length > 1) return null\n    return getTamaguiSelector(rule.cssRules[0])\n  }\n  return null\n}\n\nconst getIdentifierFromTamaguiSelector = (selector: string) =>\n  selector\n    .replace(/(:root)+\\s+/, '')\n    .replace(/:[a-z]+$/, '')\n    .slice(1)\n\nconst sheet = isClient\n  ? document.head.appendChild(document.createElement('style')).sheet\n  : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules.join(' ')\n  if (identifier.startsWith('_transform')) {\n    return addTransform(identifier, rules[0])\n  }\n  return true\n}\n\n// [property, identifier, rules]\nexport type PartialStyleObject = Pick<StyleObject, 'identifier' | 'property' | 'rules'>\nexport type RulesToInsert = PartialStyleObject[]\n\nexport function insertStyleRules(rulesToInsert: RulesToInsert) {\n  if (!rulesToInsert.length) return\n  if (isClient && !sheet) {\n    if (process.env.NODE_ENV === 'development') throw 'impossible'\n    return\n  }\n  for (const { identifier, rules } of rulesToInsert) {\n    if (identifier in allSelectors) continue\n    allSelectors[identifier] =\n      process.env.NODE_ENV === 'development' ? rules.join('\\n') : ' '\n    updateRules(identifier, rules)\n    if (sheet) {\n      for (const rule of rules) {\n        try {\n          sheet.insertRule(rule, sheet.cssRules.length)\n        } catch (err) {\n          if (process.env.NODE_ENV !== 'production') {\n            console.groupCollapsed(\n              `Error inserting rule into CSSStyleSheet: ${String(err)}`\n            )\n            console.log({ rule, rulesToInsert })\n            console.trace()\n            console.groupEnd()\n          }\n        }\n      }\n    }\n  }\n}\n\nconst IS_STATIC = process.env.IS_STATIC === 'is_static'\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  if (IS_STATIC) {\n    return true\n  }\n  return !(styleObject.identifier in allSelectors)\n}\n"],
+  "mappings": "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",
   "names": ["sheet"]
 }

package/dist/cjs/helpers/normalizeColor.js

@@ -44,7 +44,7 @@ const normalizeColor = (color, opacity) => {
   const colorProcessed = (0, import_normalize_css_color.default)(color);
   if (colorProcessed !== null) {
     const { r, g, b, a } = (0, import_normalize_css_color.rgba)(colorProcessed);
-    return `rgba(${r},${g},${b},${a.toFixed(2)})`;
+    return `rgba(${r},${g},${b},${(opacity ?? a).toFixed(2)})`;
   }
   if (import_constants.isWeb) {
     return color;

package/dist/cjs/helpers/normalizeColor.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeColor.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport normalizeCSSColor, { rgba } from '@tamagui/normalize-css-color'\n\nexport { rgba } from '@tamagui/normalize-css-color'\n\nexport const normalizeColor = (color?: string | null, opacity?: number) => {\n  if (color === null || color === undefined) {\n    return\n  }\n  if (color === 'transparent') {\n    return `rgba(0,0,0,0)`\n  }\n  if (\n    color[0] === '$' ||\n    (isWeb && (webColors[color] || color[0] === '_' || color.startsWith('var(')))\n  ) {\n    return color\n  }\n  const colorProcessed = normalizeCSSColor(color)\n  if (colorProcessed !== null) {\n    const { r, g, b, a } = rgba(colorProcessed)\n    return `rgba(${r},${g},${b},${a.toFixed(2)})`\n  }\n\n  if (isWeb) {\n    return color\n  } else {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn(`Unknown color value: ${color}`)\n    }\n  }\n}\n\nconst webColors = {\n  currentColor: true,\n  currentcolor: true,\n  inherit: true,\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,iCAAwC;AAExC,IAAAA,8BAAqB;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,UAAU,QAAQ,UAAU,QAAW;AACzC;AAAA,EACF;AACA,MAAI,UAAU,eAAe;AAC3B,WAAO;AAAA,EACT;AACA,MACE,MAAM,OAAO,OACZ,2BAAU,UAAU,UAAU,MAAM,OAAO,OAAO,MAAM,WAAW,MAAM,IAC1E;AACA,WAAO;AAAA,EACT;AACA,QAAM,qBAAiB,2BAAAC,SAAkB,KAAK;AAC9C,MAAI,mBAAmB,MAAM;AAC3B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,QAAI,iCAAK,cAAc;AAC1C,WAAO,QAAQ,KAAK,KAAK,KAAK,EAAE,QAAQ,CAAC;AAAA,EAC3C;AAEA,MAAI,wBAAO;AACT,WAAO;AAAA,EACT,OAAO;AACL,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,wBAAwB,OAAO;AAAA,IAC9C;AAAA,EACF;AACF;AAEA,MAAM,YAAY;AAAA,EAChB,cAAc;AAAA,EACd,cAAc;AAAA,EACd,SAAS;AACX;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport normalizeCSSColor, { rgba } from '@tamagui/normalize-css-color'\n\nexport { rgba } from '@tamagui/normalize-css-color'\n\nexport const normalizeColor = (color?: string | null, opacity?: number) => {\n  if (color === null || color === undefined) {\n    return\n  }\n  if (color === 'transparent') {\n    return `rgba(0,0,0,0)`\n  }\n  if (\n    color[0] === '$' ||\n    (isWeb && (webColors[color] || color[0] === '_' || color.startsWith('var(')))\n  ) {\n    return color\n  }\n  const colorProcessed = normalizeCSSColor(color)\n  if (colorProcessed !== null) {\n    const { r, g, b, a } = rgba(colorProcessed)\n    return `rgba(${r},${g},${b},${(opacity ?? a).toFixed(2)})`\n  }\n\n  if (isWeb) {\n    return color\n  } else {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn(`Unknown color value: ${color}`)\n    }\n  }\n}\n\nconst webColors = {\n  currentColor: true,\n  currentcolor: true,\n  inherit: true,\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,iCAAwC;AAExC,IAAAA,8BAAqB;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,UAAU,QAAQ,UAAU,QAAW;AACzC;AAAA,EACF;AACA,MAAI,UAAU,eAAe;AAC3B,WAAO;AAAA,EACT;AACA,MACE,MAAM,OAAO,OACZ,2BAAU,UAAU,UAAU,MAAM,OAAO,OAAO,MAAM,WAAW,MAAM,IAC1E;AACA,WAAO;AAAA,EACT;AACA,QAAM,qBAAiB,2BAAAC,SAAkB,KAAK;AAC9C,MAAI,mBAAmB,MAAM;AAC3B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,QAAI,iCAAK,cAAc;AAC1C,WAAO,QAAQ,KAAK,KAAK,MAAM,WAAW,GAAG,QAAQ,CAAC;AAAA,EACxD;AAEA,MAAI,wBAAO;AACT,WAAO;AAAA,EACT,OAAO;AACL,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,wBAAwB,OAAO;AAAA,IAC9C;AAAA,EACF;AACF;AAEA,MAAM,YAAY;AAAA,EAChB,cAAc;AAAA,EACd,cAAc;AAAA,EACd,SAAS;AACX;",
   "names": ["import_normalize_css_color", "normalizeCSSColor"]
 }

package/dist/esm/helpers/insertStyleRule.js

@@ -22,7 +22,7 @@ function addTransform(identifier, css, rule) {
   return false;
 }
 const isClient = typeof document !== "undefined";
-const scannedNum = /* @__PURE__ */ new WeakMap();
+const scannedCache = /* @__PURE__ */ new WeakMap();
 const totalSheetSelectors = /* @__PURE__ */ new Map();
 function listenForSheetChanges() {
   if (!isClient)
@@ -63,20 +63,27 @@ function track(id, remove = false) {
   return next;
 }
 function updateSheetStyles(sheet2, remove = false) {
+  var _a, _b;
   let rules;
   try {
     rules = sheet2.cssRules;
   } catch {
     return;
   }
-  const len = rules.length;
-  const lastScanned = scannedNum.get(sheet2) || 0;
+  const firstSelector = (_a = getTamaguiSelector(rules[0])) == null ? void 0 : _a[0];
+  if (!firstSelector) {
+    return;
+  }
+  const lastSelector = (_b = getTamaguiSelector(rules[rules.length - 1])) == null ? void 0 : _b[0];
+  const cacheKey = `${rules.length}${firstSelector}${lastSelector}`;
+  const lastScanned = scannedCache.get(sheet2);
   if (!remove) {
-    if (lastScanned === len) {
+    if (lastScanned === cacheKey) {
       return;
     }
   }
-  for (let i = lastScanned; i < len; i++) {
+  const len = rules.length;
+  for (let i = 0; i < len; i++) {
     const rule = rules[i];
     const response = getTamaguiSelector(rule);
     if (!response) {
@@ -98,7 +105,7 @@ function updateSheetStyles(sheet2, remove = false) {
       }
     }
   }
-  scannedNum.set(sheet2, len);
+  scannedCache.set(sheet2, cacheKey);
 }
 function getTamaguiSelector(rule) {
   if (rule instanceof CSSStyleRule) {

package/dist/esm/helpers/insertStyleRule.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "sourcesContent": ["import type { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors: Record<string, string> = {}\nconst allRules: Record<string, string> = {}\nexport const insertedTransforms = {}\n\nexport const getAllSelectors = () => allSelectors\nexport const getAllRules = () => Object.values(allRules)\nexport const getAllTransforms = () => insertedTransforms\n\n// keep transforms in map for merging later\nfunction addTransform(identifier: string, css: string, rule?: CSSRule) {\n  const s = css.indexOf('transform:')\n  if (s === -1) {\n    if (process.env.NODE_ENV === 'development') {\n      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\n    }\n    return false\n  }\n  const startI = s + 'transform:'.length\n  const endI = css.indexOf(';')\n  const value = css.slice(startI, endI)\n  if (!insertedTransforms[identifier]) {\n    insertedTransforms[identifier] = value\n    return true\n  }\n  return false\n}\n\nconst isClient = typeof document !== 'undefined'\n\n// gets existing ones (client side)\n// takes ~0.1ms for a fairly large page\n// used now for three things:\n//   1. debugging at dev time\n//   2. avoid duplicate insert styles at runtime\n//   3. used now for merging transforms atomically\n\n// multiple sheets could have the same ids so we have to count\n\nconst scannedNum = new WeakMap<CSSStyleSheet, number>()\nconst totalSheetSelectors = new Map<string, number>()\n\nexport function listenForSheetChanges() {\n  if (!isClient) return\n  function handleNode(node: Node, remove = false) {\n    if (node instanceof HTMLStyleElement && node.sheet) {\n      updateSheetStyles(node.sheet, remove)\n    }\n  }\n  const mo = new MutationObserver((entries) => {\n    for (const entry of entries) {\n      entry.addedNodes.forEach((node) => handleNode(node))\n      entry.removedNodes.forEach((node) => handleNode(node, true))\n    }\n  })\n  mo.observe(document.head, {\n    childList: true,\n  })\n}\n\nexport function scanAllSheets() {\n  if (process.env.NODE_ENV === 'test') return\n  if (!isClient) return\n  const sheets = document.styleSheets\n  if (!sheets) return\n  for (let i = 0; i < sheets.length; i++) {\n    const sheet = sheets[i]\n    if (!sheet) continue\n    updateSheetStyles(sheet)\n  }\n}\n\nfunction track(id: string, remove = false) {\n  const next = (totalSheetSelectors.get(id) || 0) + (remove ? -1 : 1)\n  totalSheetSelectors.set(id, next)\n  return next\n}\n\nfunction updateSheetStyles(sheet: CSSStyleSheet, remove = false) {\n  // avoid errors on cross origin sheets\n  // https://stackoverflow.com/questions/49993633/uncaught-domexception-failed-to-read-the-cssrules-property\n  let rules: CSSRuleList\n  try {\n    rules = sheet.cssRules\n  } catch {\n    return\n  }\n\n  const len = rules.length\n  const lastScanned = scannedNum.get(sheet) || 0\n\n  if (!remove) {\n    // avoid work dumb but works\n    if (lastScanned === len) {\n      return\n    }\n  }\n\n  for (let i = lastScanned; i < len; i++) {\n    const rule = rules[i]\n    const response = getTamaguiSelector(rule)\n    if (!response) {\n      return\n    }\n\n    const [identifier, cssRule] = response\n\n    // track references\n    const total = track(identifier, remove)\n\n    if (remove) {\n      if (total === 0) {\n        delete allSelectors[identifier]\n      }\n    } else {\n      if (!(identifier in allSelectors)) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform\n          ? addTransform(identifier, cssRule.cssText, cssRule)\n          : true\n        if (shouldInsert) {\n          allSelectors[identifier] = cssRule.cssText\n        }\n      }\n    }\n  }\n\n  scannedNum.set(sheet, len)\n}\n\nfunction getTamaguiSelector(\n  rule: CSSRule | null\n): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    const text = rule.selectorText\n    if (text[0] === '.' && text[1] === '_') {\n      return [text.slice(1), rule]\n    }\n    if (text.startsWith(':root') && text.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(text), rule]\n    }\n  } else if (rule instanceof CSSMediaRule) {\n    // tamagui only ever inserts 1 rule per media\n    if (rule.cssRules.length > 1) return null\n    return getTamaguiSelector(rule.cssRules[0])\n  }\n  return null\n}\n\nconst getIdentifierFromTamaguiSelector = (selector: string) =>\n  selector\n    .replace(/(:root)+\\s+/, '')\n    .replace(/:[a-z]+$/, '')\n    .slice(1)\n\nconst sheet = isClient\n  ? document.head.appendChild(document.createElement('style')).sheet\n  : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules.join(' ')\n  if (identifier.startsWith('_transform')) {\n    return addTransform(identifier, rules[0])\n  }\n  return true\n}\n\n// [property, identifier, rules]\nexport type PartialStyleObject = Pick<StyleObject, 'identifier' | 'property' | 'rules'>\nexport type RulesToInsert = PartialStyleObject[]\n\nexport function insertStyleRules(rulesToInsert: RulesToInsert) {\n  if (!rulesToInsert.length) return\n  if (isClient && !sheet) {\n    if (process.env.NODE_ENV === 'development') throw 'impossible'\n    return\n  }\n  for (const { identifier, rules } of rulesToInsert) {\n    if (identifier in allSelectors) continue\n    allSelectors[identifier] =\n      process.env.NODE_ENV === 'development' ? rules.join('\\n') : ' '\n    updateRules(identifier, rules)\n    if (sheet) {\n      for (const rule of rules) {\n        try {\n          sheet.insertRule(rule, sheet.cssRules.length)\n        } catch (err) {\n          if (process.env.NODE_ENV !== 'production') {\n            console.groupCollapsed(\n              `Error inserting rule into CSSStyleSheet: ${String(err)}`\n            )\n            console.log({ rule, rulesToInsert })\n            console.trace()\n            console.groupEnd()\n          }\n        }\n      }\n    }\n  }\n}\n\nconst IS_STATIC = process.env.IS_STATIC === 'is_static'\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  if (IS_STATIC) {\n    return true\n  }\n  return !(styleObject.identifier in allSelectors)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors: Record<string, string> = {}\nconst allRules: Record<string, string> = {}\nexport const insertedTransforms = {}\n\nexport const getAllSelectors = () => allSelectors\nexport const getAllRules = () => Object.values(allRules)\nexport const getAllTransforms = () => insertedTransforms\n\n// keep transforms in map for merging later\nfunction addTransform(identifier: string, css: string, rule?: CSSRule) {\n  const s = css.indexOf('transform:')\n  if (s === -1) {\n    if (process.env.NODE_ENV === 'development') {\n      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\n    }\n    return false\n  }\n  const startI = s + 'transform:'.length\n  const endI = css.indexOf(';')\n  const value = css.slice(startI, endI)\n  if (!insertedTransforms[identifier]) {\n    insertedTransforms[identifier] = value\n    return true\n  }\n  return false\n}\n\nconst isClient = typeof document !== 'undefined'\n\n// gets existing ones (client side)\n// takes ~0.1ms for a fairly large page\n// used now for three things:\n//   1. debugging at dev time\n//   2. avoid duplicate insert styles at runtime\n//   3. used now for merging transforms atomically\n\n// multiple sheets could have the same ids so we have to count\n\n// only cache tamagui styles\nconst scannedCache = new WeakMap<CSSStyleSheet, string>()\nconst totalSheetSelectors = new Map<string, number>()\n\nexport function listenForSheetChanges() {\n  if (!isClient) return\n  function handleNode(node: Node, remove = false) {\n    if (node instanceof HTMLStyleElement && node.sheet) {\n      updateSheetStyles(node.sheet, remove)\n    }\n  }\n  const mo = new MutationObserver((entries) => {\n    for (const entry of entries) {\n      entry.addedNodes.forEach((node) => handleNode(node))\n      entry.removedNodes.forEach((node) => handleNode(node, true))\n    }\n  })\n  mo.observe(document.head, {\n    childList: true,\n  })\n}\n\nexport function scanAllSheets() {\n  if (process.env.NODE_ENV === 'test') return\n  if (!isClient) return\n  const sheets = document.styleSheets\n  if (!sheets) return\n  for (let i = 0; i < sheets.length; i++) {\n    const sheet = sheets[i]\n    if (!sheet) continue\n    updateSheetStyles(sheet)\n  }\n}\n\nfunction track(id: string, remove = false) {\n  const next = (totalSheetSelectors.get(id) || 0) + (remove ? -1 : 1)\n  totalSheetSelectors.set(id, next)\n  return next\n}\n\nfunction updateSheetStyles(sheet: CSSStyleSheet, remove = false) {\n  // avoid errors on cross origin sheets\n  // https://stackoverflow.com/questions/49993633/uncaught-domexception-failed-to-read-the-cssrules-property\n  let rules: CSSRuleList\n  try {\n    rules = sheet.cssRules\n  } catch {\n    return\n  }\n\n  // not tamagui stylesheet\n  const firstSelector = getTamaguiSelector(rules[0])?.[0]\n  if (!firstSelector) {\n    return\n  }\n\n  const lastSelector = getTamaguiSelector(rules[rules.length - 1])?.[0]\n\n  const cacheKey = `${rules.length}${firstSelector}${lastSelector}`\n  const lastScanned = scannedCache.get(sheet)\n  if (!remove) {\n    // avoid re-scanning\n    if (lastScanned === cacheKey) {\n      return\n    }\n  }\n\n  const len = rules.length\n  for (let i = 0; i < len; i++) {\n    const rule = rules[i]\n    const response = getTamaguiSelector(rule)\n    if (!response) {\n      return\n    }\n\n    const [identifier, cssRule] = response\n\n    // track references\n    const total = track(identifier, remove)\n\n    if (remove) {\n      if (total === 0) {\n        delete allSelectors[identifier]\n      }\n    } else {\n      if (!(identifier in allSelectors)) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform\n          ? addTransform(identifier, cssRule.cssText, cssRule)\n          : true\n        if (shouldInsert) {\n          allSelectors[identifier] = cssRule.cssText\n        }\n      }\n    }\n  }\n\n  scannedCache.set(sheet, cacheKey)\n}\n\nfunction getTamaguiSelector(\n  rule: CSSRule | null\n): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    const text = rule.selectorText\n    if (text[0] === '.' && text[1] === '_') {\n      return [text.slice(1), rule]\n    }\n    if (text.startsWith(':root') && text.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(text), rule]\n    }\n  } else if (rule instanceof CSSMediaRule) {\n    // tamagui only ever inserts 1 rule per media\n    if (rule.cssRules.length > 1) return null\n    return getTamaguiSelector(rule.cssRules[0])\n  }\n  return null\n}\n\nconst getIdentifierFromTamaguiSelector = (selector: string) =>\n  selector\n    .replace(/(:root)+\\s+/, '')\n    .replace(/:[a-z]+$/, '')\n    .slice(1)\n\nconst sheet = isClient\n  ? document.head.appendChild(document.createElement('style')).sheet\n  : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules.join(' ')\n  if (identifier.startsWith('_transform')) {\n    return addTransform(identifier, rules[0])\n  }\n  return true\n}\n\n// [property, identifier, rules]\nexport type PartialStyleObject = Pick<StyleObject, 'identifier' | 'property' | 'rules'>\nexport type RulesToInsert = PartialStyleObject[]\n\nexport function insertStyleRules(rulesToInsert: RulesToInsert) {\n  if (!rulesToInsert.length) return\n  if (isClient && !sheet) {\n    if (process.env.NODE_ENV === 'development') throw 'impossible'\n    return\n  }\n  for (const { identifier, rules } of rulesToInsert) {\n    if (identifier in allSelectors) continue\n    allSelectors[identifier] =\n      process.env.NODE_ENV === 'development' ? rules.join('\\n') : ' '\n    updateRules(identifier, rules)\n    if (sheet) {\n      for (const rule of rules) {\n        try {\n          sheet.insertRule(rule, sheet.cssRules.length)\n        } catch (err) {\n          if (process.env.NODE_ENV !== 'production') {\n            console.groupCollapsed(\n              `Error inserting rule into CSSStyleSheet: ${String(err)}`\n            )\n            console.log({ rule, rulesToInsert })\n            console.trace()\n            console.groupEnd()\n          }\n        }\n      }\n    }\n  }\n}\n\nconst IS_STATIC = process.env.IS_STATIC === 'is_static'\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  if (IS_STATIC) {\n    return true\n  }\n  return !(styleObject.identifier in allSelectors)\n}\n"],
+  "mappings": "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",
   "names": ["sheet"]
 }

package/dist/esm/helpers/normalizeColor.js

@@ -14,7 +14,7 @@ const normalizeColor = (color, opacity) => {
   const colorProcessed = normalizeCSSColor(color);
   if (colorProcessed !== null) {
     const { r, g, b, a } = rgba(colorProcessed);
-    return `rgba(${r},${g},${b},${a.toFixed(2)})`;
+    return `rgba(${r},${g},${b},${(opacity ?? a).toFixed(2)})`;
   }
   if (isWeb) {
     return color;

package/dist/esm/helpers/normalizeColor.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeColor.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport normalizeCSSColor, { rgba } from '@tamagui/normalize-css-color'\n\nexport { rgba } from '@tamagui/normalize-css-color'\n\nexport const normalizeColor = (color?: string | null, opacity?: number) => {\n  if (color === null || color === undefined) {\n    return\n  }\n  if (color === 'transparent') {\n    return `rgba(0,0,0,0)`\n  }\n  if (\n    color[0] === '$' ||\n    (isWeb && (webColors[color] || color[0] === '_' || color.startsWith('var(')))\n  ) {\n    return color\n  }\n  const colorProcessed = normalizeCSSColor(color)\n  if (colorProcessed !== null) {\n    const { r, g, b, a } = rgba(colorProcessed)\n    return `rgba(${r},${g},${b},${a.toFixed(2)})`\n  }\n\n  if (isWeb) {\n    return color\n  } else {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn(`Unknown color value: ${color}`)\n    }\n  }\n}\n\nconst webColors = {\n  currentColor: true,\n  currentcolor: true,\n  inherit: true,\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,OAAO,qBAAqB,YAAY;AAExC,SAAS,QAAAA,aAAY;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,UAAU,QAAQ,UAAU,QAAW;AACzC;AAAA,EACF;AACA,MAAI,UAAU,eAAe;AAC3B,WAAO;AAAA,EACT;AACA,MACE,MAAM,OAAO,OACZ,UAAU,UAAU,UAAU,MAAM,OAAO,OAAO,MAAM,WAAW,MAAM,IAC1E;AACA,WAAO;AAAA,EACT;AACA,QAAM,iBAAiB,kBAAkB,KAAK;AAC9C,MAAI,mBAAmB,MAAM;AAC3B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,cAAc;AAC1C,WAAO,QAAQ,KAAK,KAAK,KAAK,EAAE,QAAQ,CAAC;AAAA,EAC3C;AAEA,MAAI,OAAO;AACT,WAAO;AAAA,EACT,OAAO;AACL,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,wBAAwB,OAAO;AAAA,IAC9C;AAAA,EACF;AACF;AAEA,MAAM,YAAY;AAAA,EAChB,cAAc;AAAA,EACd,cAAc;AAAA,EACd,SAAS;AACX;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport normalizeCSSColor, { rgba } from '@tamagui/normalize-css-color'\n\nexport { rgba } from '@tamagui/normalize-css-color'\n\nexport const normalizeColor = (color?: string | null, opacity?: number) => {\n  if (color === null || color === undefined) {\n    return\n  }\n  if (color === 'transparent') {\n    return `rgba(0,0,0,0)`\n  }\n  if (\n    color[0] === '$' ||\n    (isWeb && (webColors[color] || color[0] === '_' || color.startsWith('var(')))\n  ) {\n    return color\n  }\n  const colorProcessed = normalizeCSSColor(color)\n  if (colorProcessed !== null) {\n    const { r, g, b, a } = rgba(colorProcessed)\n    return `rgba(${r},${g},${b},${(opacity ?? a).toFixed(2)})`\n  }\n\n  if (isWeb) {\n    return color\n  } else {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn(`Unknown color value: ${color}`)\n    }\n  }\n}\n\nconst webColors = {\n  currentColor: true,\n  currentcolor: true,\n  inherit: true,\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AACtB,OAAO,qBAAqB,YAAY;AAExC,SAAS,QAAAA,aAAY;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,UAAU,QAAQ,UAAU,QAAW;AACzC;AAAA,EACF;AACA,MAAI,UAAU,eAAe;AAC3B,WAAO;AAAA,EACT;AACA,MACE,MAAM,OAAO,OACZ,UAAU,UAAU,UAAU,MAAM,OAAO,OAAO,MAAM,WAAW,MAAM,IAC1E;AACA,WAAO;AAAA,EACT;AACA,QAAM,iBAAiB,kBAAkB,KAAK;AAC9C,MAAI,mBAAmB,MAAM;AAC3B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,cAAc;AAC1C,WAAO,QAAQ,KAAK,KAAK,MAAM,WAAW,GAAG,QAAQ,CAAC;AAAA,EACxD;AAEA,MAAI,OAAO;AACT,WAAO;AAAA,EACT,OAAO;AACL,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,wBAAwB,OAAO;AAAA,IAC9C;AAAA,EACF;AACF;AAEA,MAAM,YAAY;AAAA,EAChB,cAAc;AAAA,EACd,cAAc;AAAA,EACd,SAAS;AACX;",
   "names": ["rgba"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -28,22 +28,22 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "^1.0.11",
-    "@tamagui/constants": "^1.0.11",
-    "@tamagui/helpers": "^1.0.11",
-    "@tamagui/normalize-css-color": "^1.0.11",
-    "@tamagui/react-native-use-pressable": "^1.0.11",
-    "@tamagui/react-native-use-responder-events": "^1.0.11",
-    "@tamagui/use-did-finish-ssr": "^1.0.11",
-    "@tamagui/use-event": "^1.0.11",
-    "@tamagui/use-force-update": "^1.0.11"
+    "@tamagui/compose-refs": "^1.0.12",
+    "@tamagui/constants": "^1.0.12",
+    "@tamagui/helpers": "^1.0.12",
+    "@tamagui/normalize-css-color": "^1.0.12",
+    "@tamagui/react-native-use-pressable": "^1.0.12",
+    "@tamagui/react-native-use-responder-events": "^1.0.12",
+    "@tamagui/use-did-finish-ssr": "^1.0.12",
+    "@tamagui/use-event": "^1.0.12",
+    "@tamagui/use-force-update": "^1.0.12"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.11",
+    "@tamagui/build": "^1.0.12",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/helpers/insertStyleRule.tsx

@@ -38,7 +38,8 @@ const isClient = typeof document !== 'undefined'
 
 // multiple sheets could have the same ids so we have to count
 
-const scannedNum = new WeakMap<CSSStyleSheet, number>()
+// only cache tamagui styles
+const scannedCache = new WeakMap<CSSStyleSheet, string>()
 const totalSheetSelectors = new Map<string, number>()
 
 export function listenForSheetChanges() {
@@ -87,17 +88,25 @@ function updateSheetStyles(sheet: CSSStyleSheet, remove = false) {
     return
   }
 
-  const len = rules.length
-  const lastScanned = scannedNum.get(sheet) || 0
+  // not tamagui stylesheet
+  const firstSelector = getTamaguiSelector(rules[0])?.[0]
+  if (!firstSelector) {
+    return
+  }
 
+  const lastSelector = getTamaguiSelector(rules[rules.length - 1])?.[0]
+
+  const cacheKey = `${rules.length}${firstSelector}${lastSelector}`
+  const lastScanned = scannedCache.get(sheet)
   if (!remove) {
-    // avoid work dumb but works
-    if (lastScanned === len) {
+    // avoid re-scanning
+    if (lastScanned === cacheKey) {
       return
     }
   }
 
-  for (let i = lastScanned; i < len; i++) {
+  const len = rules.length
+  for (let i = 0; i < len; i++) {
     const rule = rules[i]
     const response = getTamaguiSelector(rule)
     if (!response) {
@@ -126,7 +135,7 @@ function updateSheetStyles(sheet: CSSStyleSheet, remove = false) {
     }
   }
 
-  scannedNum.set(sheet, len)
+  scannedCache.set(sheet, cacheKey)
 }
 
 function getTamaguiSelector(

package/src/helpers/normalizeColor.ts

@@ -19,7 +19,7 @@ export const normalizeColor = (color?: string | null, opacity?: number) => {
   const colorProcessed = normalizeCSSColor(color)
   if (colorProcessed !== null) {
     const { r, g, b, a } = rgba(colorProcessed)
-    return `rgba(${r},${g},${b},${a.toFixed(2)})`
+    return `rgba(${r},${g},${b},${(opacity ?? a).toFixed(2)})`
   }
 
   if (isWeb) {

package/types/helpers/cache.d.ts

@@ -1,10 +0,0 @@
-type Value = Object | Array<any> | string | number;
-export type Style = {
-    [key: string]: Value;
-};
-export declare const cache: {
-    get: (key: string, valStr: string) => any;
-    set: (key: string, valStr: string, object: any) => void;
-};
-export {};
-//# sourceMappingURL=cache.d.ts.map

package/types/helpers/getSize.d.ts

@@ -1,4 +0,0 @@
-import { SizeTokens, SpaceTokens } from '../types';
-export declare const getSize: (size?: SizeTokens | undefined, shift?: number, bounds?: number[]) => any;
-export declare const stepTokenUpOrDown: (tokens: Object, current?: SizeTokens | SpaceTokens | string, shift?: number, bounds?: number[]) => any;
-//# sourceMappingURL=getSize.d.ts.map