@tamagui/web 1.89.24 → 1.89.25

package/src/helpers/getStylesAtomic.ts

@@ -17,64 +17,69 @@ import { transformsToString } from './transformsToString'
 
 // refactor this file away next...
 
-export function getStylesAtomic(stylesIn: ViewStyleWithPseudos, debug?: DebugProp) {
-  const res: StyleObject[] = []
-  for (const pseudoName in pseudoDescriptorsBase) {
-    const pseudoStyle = stylesIn[pseudoName]
-    if (pseudoStyle) {
-      res.push(...generateAtomicStyles(pseudoStyle, pseudoDescriptorsBase[pseudoName]))
+export function getStylesAtomic(style: ViewStyleWithPseudos) {
+  styleToCSS(style)
+  const out: StyleObject[] = []
+  for (const key in style) {
+    const val = style[key]
+    if (key in pseudoDescriptors) {
+      if (val) {
+        out.push(...getStyleAtomic(val, pseudoDescriptors[key]))
+      }
+    } else {
+      const so = getStyleObject(style, key)
+      if (so) {
+        out.push(so)
+      }
     }
   }
-  res.push(...generateAtomicStyles(stylesIn))
-
-  if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
-    console.info(` 🪮 getStylesAtomic`, { stylesIn, res })
-  }
-  return res
+  return out
 }
 
-let conf: TamaguiInternalConfig
-
-export const generateAtomicStyles = (
+export const getStyleAtomic = (
   style: ViewStyleWithPseudos,
   pseudo?: PseudoDescriptor
 ): StyleObject[] => {
-  if (!style) return []
-
-  conf = conf || getConfig()
-
   styleToCSS(style)
-
   const out: StyleObject[] = []
   for (const key in style) {
-    if (key in pseudoDescriptors) continue
-    let val = style[key]
-    if (val == null) continue
-
-    // transform
-    if (key === 'transform' && Array.isArray(style.transform)) {
-      val = transformsToString(val)
-    }
-
-    const value = normalizeValueWithProperty(val, key)
-    const hash = simpleHash(`${value}`)
-    const pseudoPrefix = pseudo ? `0${pseudo.name}-` : ''
-    const shortProp = conf.inverseShorthands[key] || key
-    const identifier = `_${shortProp}-${pseudoPrefix}${hash}`
-    const rules = createAtomicRules(identifier, key, value, pseudo)
-    const styleObject: StyleObject = {
-      property: key,
-      pseudo: pseudo?.name as any,
-      identifier,
-      rules,
-      value,
+    const so = getStyleObject(style, key, pseudo)
+    if (so) {
+      out.push(so)
     }
-    out.push(styleObject)
   }
-
   return out
 }
 
+let conf: TamaguiInternalConfig
+
+const getStyleObject = (
+  style: ViewStyleWithPseudos,
+  key: string,
+  pseudo?: PseudoDescriptor
+): StyleObject | undefined => {
+  let val = style[key]
+  if (val == null) return
+  // transform
+  if (key === 'transform' && Array.isArray(style.transform)) {
+    val = transformsToString(val)
+  }
+  const value = normalizeValueWithProperty(val, key)
+  const hash = simpleHash(`${value}`)
+  const pseudoPrefix = pseudo ? `0${pseudo.name}-` : ''
+  conf ||= getConfig()
+  const shortProp = conf.inverseShorthands[key] || key
+  const identifier = `_${shortProp}-${pseudoPrefix}${hash}`
+  const rules = createAtomicRules(identifier, key, value, pseudo)
+  return {
+    property: key,
+    pseudo: pseudo?.name as any,
+    identifier,
+    rules,
+    value,
+  }
+}
+
 export function styleToCSS(style: Record<string, any>) {
   // box-shadow
   const { shadowOffset, shadowRadius, shadowColor, shadowOpacity } = style
@@ -216,7 +221,7 @@ function createAtomicRules(
   // WEIRD SYNTAX, SEE:
   //   https://stackoverflow.com/questions/40532204/media-query-for-devices-supporting-hover
   if (pseudo?.name === 'hover') {
-    rules = rules.map((r) => `@media (hover) { ${r} }`)
+    rules = rules.map((r) => `@media (hover) {${r}}`)
   }
 
   return rules

package/src/helpers/getThemeCSSRules.ts

@@ -162,7 +162,7 @@ export function getThemeCSSRules(props: {
               : []
           )
           .join(';')
-        const css = `${selectionSelectors} {${styles}}`
+        const css = `${selectionSelectors}{${styles}}`
         cssRuleSets.push(css)
       }
     }

package/types/createTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA0Q1B"}
+{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAwQ1B"}

package/types/helpers/getStylesAtomic.d.ts

@@ -3,9 +3,9 @@
  * Copyright (c) Nicolas Gallagher licensed under the MIT license.
  */
 import type { StyleObject } from '@tamagui/helpers';
-import type { DebugProp, ViewStyleWithPseudos } from '../types';
+import type { ViewStyleWithPseudos } from '../types';
 import type { PseudoDescriptor } from './pseudoDescriptors';
-export declare function getStylesAtomic(stylesIn: ViewStyleWithPseudos, debug?: DebugProp): StyleObject[];
-export declare const generateAtomicStyles: (style: ViewStyleWithPseudos, pseudo?: PseudoDescriptor) => StyleObject[];
+export declare function getStylesAtomic(style: ViewStyleWithPseudos): StyleObject[];
+export declare const getStyleAtomic: (style: ViewStyleWithPseudos, pseudo?: PseudoDescriptor) => StyleObject[];
 export declare function styleToCSS(style: Record<string, any>): void;
 //# 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;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,OAAO,KAAK,EAAE,SAAS,EAAyB,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAGtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAO3D,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,SAAS,iBAchF;AAID,eAAO,MAAM,oBAAoB,UACxB,oBAAoB,WAClB,gBAAgB,KACxB,WAAW,EAmCb,CAAA;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAiCpD"}
+{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,OAAO,KAAK,EAAoC,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAGtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAO3D,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,iBAiB1D;AAED,eAAO,MAAM,cAAc,UAClB,oBAAoB,WAClB,gBAAgB,KACxB,WAAW,EAUb,CAAA;AA+BD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAiCpD"}

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

@@ -1,5 +1,4 @@
 export declare const getStylesAtomic: () => void;
-export declare const generateAtomicStyles: () => void;
-export declare const getAtomicStyle: () => void;
+export declare const getStyleAtomic: () => void;
 export declare const styleToCSS: () => void;
 //# sourceMappingURL=getStylesAtomic.native.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getStylesAtomic.native.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.native.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,YAAQ,CAAA;AACpC,eAAO,MAAM,oBAAoB,YAAQ,CAAA;AACzC,eAAO,MAAM,cAAc,YAAQ,CAAA;AACnC,eAAO,MAAM,UAAU,YAAQ,CAAA"}
+{"version":3,"file":"getStylesAtomic.native.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.native.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,YAAQ,CAAA;AACpC,eAAO,MAAM,cAAc,YAAQ,CAAA;AACnC,eAAO,MAAM,UAAU,YAAQ,CAAA"}