@tamagui/web 3.0.0-beta.653.1 → 3.0.0-beta.655.1

package/src/helpers/getSplitStyles.tsx

@@ -1,10 +1,8 @@
 import { isAndroid, isClient, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
 import {
   StyleObjectIdentifier,
-  StyleObjectProperty,
   StyleObjectPseudo,
   StyleObjectRules,
-  nonAnimatableStyleProps,
   stylePropsAll,
   stylePropsText,
   stylePropsTransform,
@@ -41,7 +39,7 @@ import type {
   ViewStyleObject,
 } from '../types'
 import { fixStyles } from './expandStyles'
-import { getCSSStyleAtomic, styleToCSS } from './getCSSStylesAtomic'
+import { styleToCSS } from './getCSSStylesAtomic'
 import { getDefaultProps } from './getDefaultProps'
 import { insertStyleRules, shouldInsertStyleRules, updateRules } from './insertStyleRule'
 import { isPlainObject } from './isObj'
@@ -53,7 +51,6 @@ import {
   contributeStyleValue,
   contributeStyleString,
   contributeVariantClauseValue,
-  directStyleSignature,
   flushDirectStyles,
   getDirectDynamicThemeAccess,
 } from './directStyle'
@@ -1171,40 +1168,6 @@ export const getSplitStyles: StyleSplitter = (
 
   if (process.env.TAMAGUI_TARGET === 'web') {
     flushDirectStyles(styleState)
-
-    // when noClass is true (inline animation driver) extract non-animatable
-    // base styles to atomic CSS classNames so the driver doesn't manage them
-    // skip for RNW animation drivers since their AnimatedView doesn't forward classNames
-    if (
-      !styleProps.noMergeStyle &&
-      styleState.style &&
-      !shouldDoClasses &&
-      styleProps.isAnimated &&
-      !driver?.isReactNative
-    ) {
-      if (!styleState.style['$$css']) {
-        for (const key in styleState.style) {
-          if (key in nonAnimatableStyleProps) {
-            // reproduce the direct-emission identity so the surviving class
-            // matches its server-rendered counterpart exactly
-            const atomicStyle = getCSSStyleAtomic(
-              key,
-              styleState.style[key],
-              '',
-              undefined,
-              directStyleSignature(key, styleState.style[key]),
-              true
-            )
-            delete styleState.style[key]
-            if (atomicStyle) {
-              addStyleToInsertRules(rulesToInsert, atomicStyle)
-              classNames[atomicStyle[StyleObjectProperty]] =
-                atomicStyle[StyleObjectIdentifier]
-            }
-          }
-        }
-      }
-    }
   }
 
   // native: swap out the right family based on weight/style

package/src/helpers/registerCSSVariable.ts

@@ -1,26 +1,6 @@
-import { normalizeCSSColor } from '@tamagui/normalize-css-color'
 import { createCSSVariable, getVariableValue } from '../createVariable'
 import type { Variable, VariableVal } from '../types'
 
-/**
- * The dedupe key for a declared value. Equivalent color spellings are one
- * declaration, so `#333`, `hsl(0, 0%, 20%)` and `hsla(0, 0%, 20%, 1)` share a
- * variable and the artifact carries the color once. Non-colors key on
- * themselves, and a canonical key is written as `#rrggbbaa`, which is itself a
- * color spelling and therefore can never be a non-color raw value.
- *
- * Only the key is canonical. The emitted declaration keeps the spelling the
- * config author wrote, so nothing here rewrites bytes into a longer form.
- *
- * This runs where CSS is generated, so a build that owns its CSS artifact
- * drops it with the rest of the generator.
- */
-const variableKey = (val: Variable | VariableVal) => {
-  if (typeof val !== 'string') return val
-  const color = normalizeCSSColor(val)
-  return color == null ? val : `#${color.toString(16).padStart(8, '0')}`
-}
-
 /**
  * Bumped whenever anything the emitted CSS derives from the shared value map
  * changes: a token registering (which can re-point a value another config
@@ -32,7 +12,7 @@ export const getVariableGeneration = () => variableGeneration
 
 export const registerCSSVariable = (v: Variable | VariableVal) => {
   if (!process.env.TAMAGUI_DID_OUTPUT_CSS) {
-    const key = variableKey(getVariableValue(v))
+    const key = getVariableValue(v)
     if (tokensValueToVariable.has(key) || tokensValueToVariable.size < 10_000) {
       tokensValueToVariable.set(key, v)
       variableGeneration++
@@ -64,9 +44,8 @@ const serializeVariables = (variables: Variable[]) =>
 export const getAutoVariableCSS = () => serializeVariables(autoVariables)
 
 export const getOrCreateVariable = (val: any): Variable => {
-  const key = variableKey(val)
-  if (tokensValueToVariable.has(key)) {
-    return tokensValueToVariable.get(key)!
+  if (tokensValueToVariable.has(val)) {
+    return tokensValueToVariable.get(val)!
   }
   if (tokensValueToVariable.size >= 10_000) {
     return { val, name: '', variable: String(val) } as Variable
@@ -74,7 +53,7 @@ export const getOrCreateVariable = (val: any): Variable => {
   const name = `t${autoVarId++}`
   const variable = `var(--${name})`
   const v = { val, name, variable } as Variable
-  tokensValueToVariable.set(key, v)
+  tokensValueToVariable.set(val, v)
   autoVariables.push(v)
   variableGeneration++
   return v
@@ -89,9 +68,8 @@ const mutatedTokensValueToVariable = new Map<any, any>()
 export const getMutatedAutoVariableCSS = () => serializeVariables(mutatedAutoVariables)
 
 export const getOrCreateMutatedVariable = (val: any): Variable => {
-  const key = variableKey(val)
-  if (mutatedTokensValueToVariable.has(key)) {
-    return mutatedTokensValueToVariable.get(key)!
+  if (mutatedTokensValueToVariable.has(val)) {
+    return mutatedTokensValueToVariable.get(val)!
   }
   if (mutatedTokensValueToVariable.size >= 10_000) {
     return { val, name: '', variable: String(val) } as Variable
@@ -99,7 +77,7 @@ export const getOrCreateMutatedVariable = (val: any): Variable => {
   const name = `t${mutatedVarId++}`
   const variable = `var(--${name})`
   const v = { val, name, variable } as Variable
-  mutatedTokensValueToVariable.set(key, v)
+  mutatedTokensValueToVariable.set(val, v)
   mutatedAutoVariables.push(v)
   return v
 }

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

@@ -1 +1 @@
-{"version":3,"file":"directStyle.d.ts","sourceRoot":"","sources":["../../src/helpers/directStyle.ts"],"names":[],"mappings":"AAaA,OAAO,EASL,KAAK,mBAAmB,EAGxB,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAA;AAIvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAiB7C,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,UAAU,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AAET,KAAK,SAAS,GAAG;IACf,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,mBAAmB,CAAA;IAC/B,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AA6KD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQrD;AAuCD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAkHnF;AA6ND,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,YAAY,SAAK,UAGlB;AA0JD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,UAAQ,QAapE;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,aAAa,uBAE/D;AAgqBD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,GAAG,EACnB,WAAW,UAAQ,WAyJpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,UAAU,EACjB,WAAW,UAAQ,WAwBpB;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,GAAG,EACnB,WAAW,UAAQ,QAiBpB;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,GAAG,EACnB,WAAW,UAAQ,WA2BpB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,QAatE"}
+{"version":3,"file":"directStyle.d.ts","sourceRoot":"","sources":["../../src/helpers/directStyle.ts"],"names":[],"mappings":"AAcA,OAAO,EASL,KAAK,mBAAmB,EAGxB,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAA;AAIvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAiB7C,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,UAAU,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AAET,KAAK,SAAS,GAAG;IACf,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,mBAAmB,CAAA;IAC/B,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AA6KD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQrD;AAuCD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAkHnF;AA2ND,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,YAAY,SAAK,UAGlB;AA0JD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,UAAQ,QAapE;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,aAAa,uBAE/D;AAyqBD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,GAAG,EACnB,WAAW,UAAQ,WAyJpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,UAAU,EACjB,WAAW,UAAQ,WAwBpB;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,GAAG,EACnB,WAAW,UAAQ,QAiBpB;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,GAAG,EACnB,WAAW,UAAQ,WA2BpB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,QAatE"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAIb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,SAAS,EACT,WAAW,EAGZ,MAAM,UAAU,CAAA;AAqBjB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAQ3D,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAC9B,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAO3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,KACzC,IAAI,GAAG,cAAc,CAAA;AA6K1B,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,WAY7B;AAED,eAAO,MAAM,cAAc,EAAE,aA+lC5B,CAAA;AAyID,eAAO,MAAM,WAAW,eACV,aAAa,WAChB,MAAM,WACN,MAAM,wBACO,OAAO,KAC5B,SAqGF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAc5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAIb,eAAe,EACf,YAAY,EAEZ,qBAAqB,EAErB,SAAS,EACT,WAAW,EAGZ,MAAM,UAAU,CAAA;AAoBjB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAQ3D,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAC9B,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAO3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,KACzC,IAAI,GAAG,cAAc,CAAA;AA6K1B,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,WAY7B;AAED,eAAO,MAAM,cAAc,EAAE,aA6jC5B,CAAA;AAyID,eAAO,MAAM,WAAW,eACV,aAAa,WAChB,MAAM,WACN,MAAM,wBACO,OAAO,KAC5B,SAqGF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAc5B,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"registerCSSVariable.d.ts","sourceRoot":"","sources":["../../src/helpers/registerCSSVariable.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AA4BrD,eAAO,MAAM,qBAAqB,cAA2B,CAAA;AAE7D,eAAO,MAAM,mBAAmB,MAAO,QAAQ,GAAG,WAAW,SAQ5D,CAAA;AAED,eAAO,MAAM,aAAa,MAAO,QAAQ,+BAQxC,CAAA;AAED,eAAO,MAAM,qBAAqB,eAAsB,CAAA;AAMxD,eAAO,MAAM,aAAa,EAAE,QAAQ,EAAO,CAAA;AAK3C,eAAO,MAAM,kBAAkB,cAA0C,CAAA;AAEzE,eAAO,MAAM,mBAAmB,QAAS,GAAG,KAAG,QAe9C,CAAA;AAKD,eAAO,MAAM,oBAAoB,EAAE,QAAQ,EAAO,CAAA;AAGlD,eAAO,MAAM,yBAAyB,cAAiD,CAAA;AAEvF,eAAO,MAAM,0BAA0B,QAAS,GAAG,KAAG,QAcrD,CAAA;AAED,6EAA6E;AAC7E,eAAO,MAAM,wBAAwB;IACnC,IAAI;IACJ,gBAAgB;IAChB,OAAO;IACP,mBAAmB;IACnB,iBAAiB;IAUjB,YAAY;CACZ,CAAA"}
+{"version":3,"file":"registerCSSVariable.d.ts","sourceRoot":"","sources":["../../src/helpers/registerCSSVariable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AASrD,eAAO,MAAM,qBAAqB,cAA2B,CAAA;AAE7D,eAAO,MAAM,mBAAmB,MAAO,QAAQ,GAAG,WAAW,SAQ5D,CAAA;AAED,eAAO,MAAM,aAAa,MAAO,QAAQ,+BAQxC,CAAA;AAED,eAAO,MAAM,qBAAqB,eAAsB,CAAA;AAMxD,eAAO,MAAM,aAAa,EAAE,QAAQ,EAAO,CAAA;AAK3C,eAAO,MAAM,kBAAkB,cAA0C,CAAA;AAEzE,eAAO,MAAM,mBAAmB,QAAS,GAAG,KAAG,QAc9C,CAAA;AAKD,eAAO,MAAM,oBAAoB,EAAE,QAAQ,EAAO,CAAA;AAGlD,eAAO,MAAM,yBAAyB,cAAiD,CAAA;AAEvF,eAAO,MAAM,0BAA0B,QAAS,GAAG,KAAG,QAarD,CAAA;AAED,6EAA6E;AAC7E,eAAO,MAAM,wBAAwB;IACnC,IAAI;IACJ,gBAAgB;IAChB,OAAO;IACP,mBAAmB;IACnB,iBAAiB;IAUjB,YAAY;CACZ,CAAA"}