@tamagui/web 1.115.4 → 1.115.5

package/dist/esm/helpers/isActiveTheme.mjs

@@ -0,0 +1,5 @@
+function isActiveTheme(key, activeThemeName) {
+  if (key.startsWith("$theme-")) return key.slice(7).startsWith(activeThemeName);
+}
+export { isActiveTheme };
+//# sourceMappingURL=isActiveTheme.mjs.map

package/dist/esm/helpers/isActiveTheme.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["isActiveTheme","key","activeThemeName","startsWith","slice"],"sources":["../../../src/helpers/isActiveTheme.ts"],"sourcesContent":[null],"mappings":"AAAO,SAASA,cAAcC,GAAA,EAAaC,eAAA,EAAyB;EAClE,IAAKD,GAAA,CAAIE,UAAA,CAAW,SAAS,GAC7B,OAAOF,GAAA,CAAIG,KAAA,CAAM,CAAC,EAAED,UAAA,CAAWD,eAAe;AAChD","ignoreList":[]}

package/dist/esm/helpers/isActiveTheme.native.js

@@ -0,0 +1,8 @@
+function isActiveTheme(key, activeThemeName) {
+  if (key.startsWith("$theme-"))
+    return key.slice(7).startsWith(activeThemeName);
+}
+export {
+  isActiveTheme
+};
+//# sourceMappingURL=isActiveTheme.js.map

package/dist/esm/helpers/isActiveTheme.native.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/isActiveTheme.ts"],
+  "mappings": "AAAO,SAASA,cAAcC,KAAaC,iBAAuB;AAChE,MAAKD,IAAIE,WAAW,SAAA;AACpB,WAAOF,IAAIG,MAAM,CAAA,EAAGD,WAAWD,eAAAA;AACjC;",
+  "names": ["isActiveTheme", "key", "activeThemeName", "startsWith", "slice"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.115.4",
+  "version": "1.115.5",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,18 +27,18 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.115.4",
-    "@tamagui/constants": "1.115.4",
-    "@tamagui/helpers": "1.115.4",
-    "@tamagui/normalize-css-color": "1.115.4",
-    "@tamagui/timer": "1.115.4",
-    "@tamagui/types": "1.115.4",
-    "@tamagui/use-did-finish-ssr": "1.115.4",
-    "@tamagui/use-event": "1.115.4",
-    "@tamagui/use-force-update": "1.115.4"
+    "@tamagui/compose-refs": "1.115.5",
+    "@tamagui/constants": "1.115.5",
+    "@tamagui/helpers": "1.115.5",
+    "@tamagui/normalize-css-color": "1.115.5",
+    "@tamagui/timer": "1.115.5",
+    "@tamagui/types": "1.115.5",
+    "@tamagui/use-did-finish-ssr": "1.115.5",
+    "@tamagui/use-event": "1.115.5",
+    "@tamagui/use-force-update": "1.115.5"
   },
   "devDependencies": {
-    "@tamagui/build": "1.115.4",
+    "@tamagui/build": "1.115.5",
     "@testing-library/react": "^16.0.1",
     "csstype": "^3.0.10",
     "typescript": "^5.5.2",

package/src/helpers/getSplitStyles.tsx

@@ -1,4 +1,3 @@
-import React from 'react'
 import {
   isAndroid,
   isClient,
@@ -17,6 +16,7 @@ import {
   validPseudoKeys,
   validStyles,
 } from '@tamagui/helpers'
+import React from 'react'
 
 import { getConfig, getFont } from '../config'
 import { accessibilityDirectMap } from '../constants/accessibilityDirectMap'
@@ -61,6 +61,8 @@ import {
   shouldInsertStyleRules,
   updateRules,
 } from './insertStyleRule'
+import { isActivePlatform } from './isActivePlatform'
+import { isActiveTheme } from './isActiveTheme'
 import { log } from './log'
 import {
   normalizeValueWithProperty,
@@ -69,9 +71,8 @@ import {
 import { getPropMappedFontFamily, propMapper } from './propMapper'
 import { pseudoDescriptors, pseudoPriorities } from './pseudoDescriptors'
 import { skipProps } from './skipProps'
-import { transformsToString } from './transformsToString'
-import { isActivePlatform } from './isActivePlatform'
 import { sortString } from './sortString'
+import { transformsToString } from './transformsToString'
 
 const consoleGroupCollapsed = isWeb ? console.groupCollapsed : console.info
 
@@ -874,10 +875,8 @@ export const getSplitStyles: StyleSplitter = (
             // for now we're doing weird stuff, getStylesAtomic will put the
             // $platform-web into property so we can check it here
             const property = style[0]
-            if (property[0] === '$') {
-              if (property.startsWith('$platform') && !isActivePlatform(property)) {
-                continue
-              }
+            if (property[0] === '$' && !isActivePlatform(property)) {
+              continue
             }
 
             const out = createMediaStyle(
@@ -930,8 +929,8 @@ export const getSplitStyles: StyleSplitter = (
           if (isThemeMedia) {
             // needed to get updates when theme changes
             dynamicThemeAccess = true
-            const mediaThemeName = mediaKeyShort.slice(6)
-            if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName))) {
+
+            if (!(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) {
               continue
             }
           } else if (isGroupMedia) {
@@ -1024,9 +1023,8 @@ export const getSplitStyles: StyleSplitter = (
               continue
             }
             if (subKey[0] === '$') {
-              if (!isActivePlatform(subKey)) {
-                continue
-              }
+              if (!isActivePlatform(subKey)) continue
+              if (!isActiveTheme(subKey, themeName)) continue
               for (const subSubKey in mediaStyle[subKey]) {
                 mergeMediaStyle(subSubKey, mediaStyle[subKey][subSubKey])
               }

package/src/helpers/isActivePlatform.ts

@@ -1,6 +1,9 @@
 import { currentPlatform } from '@tamagui/constants'
 
 export function isActivePlatform(key: string) {
+  if (!key.startsWith('$platform')) {
+    return true
+  }
   const platform = key.slice(10)
   return (
     // web, ios, android

package/src/helpers/isActiveTheme.ts

@@ -0,0 +1,4 @@
+export function isActiveTheme(key: string, activeThemeName: string) {
+  if (!key.startsWith('$theme-')) return
+  return key.slice(7).startsWith(activeThemeName)
+}

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

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AA0BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,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,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,aA6wC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,SAiCF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAa5B,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AA2BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,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,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,aA0wC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,SAiCF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAa5B,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"isActivePlatform.d.ts","sourceRoot":"","sources":["../../src/helpers/isActivePlatform.ts"],"names":[],"mappings":"AAEA,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,WAQ3C"}
+{"version":3,"file":"isActivePlatform.d.ts","sourceRoot":"","sources":["../../src/helpers/isActivePlatform.ts"],"names":[],"mappings":"AAEA,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,WAW3C"}

package/types/helpers/isActiveTheme.d.ts

@@ -0,0 +1,2 @@
+export declare function isActiveTheme(key: string, activeThemeName: string): boolean | undefined;
+//# sourceMappingURL=isActiveTheme.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isActiveTheme.d.ts","sourceRoot":"","sources":["../../src/helpers/isActiveTheme.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,uBAGjE"}