@tamagui/web 1.51.0 → 1.52.0

package/dist/cjs/helpers/getThemeCSSRules.js

@@ -55,11 +55,8 @@ function getThemeCSSRules(props) {
           continue;
         }
         const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`;
-        const [altLightDark, altSubTheme] = [
-          isDark ? ["dark", "light"] : ["light", "dark"],
-          isDark ? ["dark", "sub_theme"] : ["light", "sub_theme"]
-        ];
-        for (const order of [altLightDark, altSubTheme]) {
+        const [altLightDark] = [isDark ? ["dark", "light"] : ["light", "dark"]];
+        for (const order of [altLightDark]) {
           if (isDarkOrLightBase) {
             order.reverse();
           }
@@ -82,7 +79,7 @@ function getThemeCSSRules(props) {
             const nextChildSelector = childSelector === lastParentSelector ? "" : childSelector;
             selectorsSet.add(`${parentSelectors.join(" ")} ${nextChildSelector}`.trim());
             selectorsSet.add(
-              `${parentSelectors.join(" ")} ${nextChildSelector}.t_sub_theme`.trim()
+              `${parentSelectors.join(" ")} ${nextChildSelector}.is_inversed`.trim()
             );
           }
         }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getThemeCSSRules.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA2B;AAE3B,uBAAuC;AACvC,4BAA2C;AAE3C,iCAAsC;AAE/B,SAAS,iBAAiB,OAK9B;AACD,QAAM,cAAwB,CAAC;AAE/B,MAAI,QAAQ,IAAI,yBAAyB,QAAQ;AAC/C,UAAM,EAAE,QAAQ,WAAW,OAAO,MAAM,IAAI;AAG5C,UAAM,eAAe,WAAW,OAAO,UAAU,UAAU,OAAO;AAClE,UAAM,MAAM,IAAI;AAChB,QAAI,OAAO;AAIX,eAAW,YAAY,OAAO;AAC5B,YAAM,WAAW,MAAM,QAAQ;AAC/B,UAAI,QAAa;AAEjB,UAAI,CAAC,iDAAsB,IAAI,SAAS,GAAG,GAAG;AAC5C,gBAAQ,SAAS;AAAA,MACnB,OAAO;AACL,gBAAQ,iDAAsB,IAAI,SAAS,GAAG,EAAG;AAAA,MACnD;AAEA,cAAQ,SAAK,2BAAW,UAAU,EAAE,KAAK;AAAA,IAC3C;AAEA,UAAM,oBAAoB,cAAc,UAAU,cAAc;AAChE,UAAM,gBAAgB,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,MAAM;AACzD,UAAM,eAAe,IAAI,IAAI,aAAa;AAI1C,QAAI,cAAc;AAChB,iBAAW,WAAW,OAAO;AAC3B,cAAM,SAAS,cAAc,UAAU,QAAQ,WAAW,OAAO;AACjE,cAAM,UAAU,cAAc,WAAW,UAAU,WAAW,QAAQ;AACtE,cAAM,WAAW,OAAO,uBAAuB;AAE/C,YAAI,EAAE,UAAU,UAAU;AAGxB,uBAAa,IAAI,cAAc,MAAM,SAAS;AAC9C;AAAA,QACF;AAEA,cAAM,gBAAgB,GAAG,MAAM,QAAQ,QAAQ,kBAAkB,EAAE;AAEnE,cAAM,CAAC,cAAc,WAAW,IAAI;AAAA,UAClC,SAAS,CAAC,QAAQ,OAAO,IAAI,CAAC,SAAS,MAAM;AAAA,UAC7C,SAAS,CAAC,QAAQ,WAAW,IAAI,CAAC,SAAS,WAAW;AAAA,QACxD;AAEA,mBAAW,SAAS,CAAC,cAAc,WAAW,GAAG;AAC/C,cAAI,mBAAmB;AACrB,kBAAM,QAAQ;AAAA,UAChB;AACA,gBAAM,CAAC,UAAU,MAAM,IAAI;AAC3B,gBAAM,eAAe,KAAK,MAAM,WAAW,GAAG;AAE9C,mBAAS,QAAQ,GAAG,QAAQ,cAAc,SAAS;AACjD,kBAAM,QAAQ,QAAQ,MAAM;AAG5B,gBAAI,SAAS,QAAQ,GAAG;AACtB;AAAA,YACF;AAEA,kBAAM,UAAU,IAAI,MAAM,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,QAAQ;AAC3D,qBAAO,GAAG,MAAM,MAAM,MAAM,IAAI,WAAW;AAAA,YAC7C,CAAC;AAED,gBAAI,kBAAkB,QAAQ,SAAS,IAAI,QAAQ,MAAM,CAAC,IAAI;AAE9D,gBAAI,OAAO;AACT,oBAAM,CAAC,QAAQ,QAAQ,GAAG,IAAI,IAAI;AAClC,gCAAkB,CAAC,QAAQ,GAAG,MAAM,MAAM;AAAA,YAC5C;AAEA,kBAAM,qBAAqB,gBAAgB,gBAAgB,SAAS,CAAC;AACrE,kBAAM,oBACJ,kBAAkB,qBAAqB,KAAK;AAG9C,yBAAa,IAAI,GAAG,gBAAgB,KAAK,GAAG,KAAK,oBAAoB,KAAK,CAAC;AAC3E,yBAAa;AAAA,cACX,GAAG,gBAAgB,KAAK,GAAG,KAAK,gCAAgC,KAAK;AAAA,YACvE;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,YAAY,CAAC,GAAG,YAAY,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC;AAIrE,UAAM,kBAAkB,UACrB,IAAI,CAAC,MAAM;AACV,YAAM,UAAU,YAAY,CAAC,KAAK,OAAO,uBAAuB,KAAK;AACrE,aAAO,QAAQ,UAAU;AAAA,IAC3B,CAAC,EACA,KAAK,IAAI;AAEZ,UAAM,MAAM,GAAG,oBAAoB;AACnC,gBAAY,KAAK,GAAG;AAEpB,QAAI,OAAO,6BAA6B;AACtC,YAAM,WAAW,MAAM,aACnB,kBAAc,wCAAiB,MAAM,UAAU,OAC/C;AACJ,YAAM,WAAW,MAAM,QAAQ,aAAS,wCAAiB,MAAM,KAAK,MAAM;AAE1E,YAAM,YAAY,QAAQ,WAAW;AACrC,YAAM,SAAS,UAAU,WAAW,MAAM;AAC1C,YAAM,WAAW,SAAS,SAAS;AACnC,YAAM,wBAAwB,UAC3B,IAAI,CAAC,MAAM;AACV,YAAI,KAAK,gBAAgB,MAAM;AAAe,iBAAO;AACrD,YACG,UAAU,EAAE,WAAW,aAAa,KACpC,CAAC,UAAU,EAAE,WAAW,YAAY,GACrC;AACA;AAAA,QACF;AACA,eAAO,EAAE,QAAQ,sBAAsB,EAAE,EAAE,KAAK;AAAA,MAClD,CAAC,EACA,OAAO,OAAO,EACd,KAAK,IAAI;AAEZ,YAAM,aAAa,GAAG,0BAA0B;AAChD,YAAM,wBAAwB,+BAA+B;AAAA,MAC7D;AAAA,MACA;AAAA;AAEA,kBAAY,KAAK,qBAAqB;AAAA,IACxC;AAEA,QAAI,OAAO,iBAAiB;AAC1B,YAAM,qBAAqB,cAAc,IAAI,CAAC,MAAM,GAAG,eAAe,EAAE,KAAK,IAAI;AACjF,YAAM,QAAQ,OAAO,gBAAgB,KAAK;AAC1C,UAAI,OAAO;AACT,cAAM,SAAS,OAAO,QAAQ,KAAK,EAChC;AAAA,UAAQ,CAAC,CAAC,GAAG,CAAC,MACb,IACI,GAAG,MAAM,oBAAoB,eAAe,SAAK,wCAAiB,CAAC,MACnE,CAAC;AAAA,QACP,EACC,KAAK,GAAG;AACX,cAAMA,OAAM,GAAG,uBAAuB;AACtC,oBAAY,KAAKA,IAAG;AAAA,MACtB;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,eAAe;AACrB,MAAM,gBAAgB;AACtB,MAAM,cAAc,CAAC,MACnB,MAAM,gBACN,MAAM,iBACN,EAAE,WAAW,UAAU,KACvB,EAAE,WAAW,WAAW;",
+  "mappings": "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",
   "names": ["css"]
 }

package/dist/cjs/views/Theme.js

@@ -45,23 +45,27 @@ const Theme = (0, import_react.forwardRef)(function Theme2(props, ref) {
     return props.children;
   }
   const isRoot = !!props["_isRoot"];
+  const disableDirectChildTheme = props["disable-child-theme"];
   const themeState = (0, import_useTheme.useChangeThemeEffect)(props, isRoot);
-  let children = props["disable-child-theme"] ? import_react.Children.map(
-    props.children,
-    (child) => (0, import_react.cloneElement)(child, { ["data-disable-theme"]: true })
-  ) : props.children;
-  if (ref) {
-    try {
-      import_react.default.Children.only(children);
-      children = (0, import_react.cloneElement)(children, { ref });
-    } catch {
+  const children = (0, import_react.useMemo)(() => {
+    let children2 = disableDirectChildTheme ? import_react.Children.map(
+      props.children,
+      (child) => (0, import_react.cloneElement)(child, { ["data-disable-theme"]: true })
+    ) : props.children;
+    if (ref) {
+      try {
+        import_react.default.Children.only(children2);
+        children2 = (0, import_react.cloneElement)(children2, { ref });
+      } catch {
+      }
     }
-  }
-  if (process.env.NODE_ENV === "development") {
-    if (props.debug === "visualize") {
-      children = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ThemeDebug.ThemeDebug, { themeState, themeProps: props, children });
+    if (process.env.NODE_ENV === "development") {
+      if (props.debug === "visualize") {
+        children2 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ThemeDebug.ThemeDebug, { themeState, themeProps: props, children: children2 });
+      }
     }
-  }
+    return children2;
+  }, [props.children, disableDirectChildTheme]);
   return useThemedChildren(themeState, children, props, isRoot);
 });
 Theme["avoidForwardRef"] = true;

package/dist/cjs/views/Theme.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "mappings": "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",
-  "names": ["Theme", "React"]
+  "mappings": "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",
+  "names": ["Theme", "children", "React"]
 }

package/dist/esm/helpers/getThemeCSSRules.js

@@ -32,11 +32,8 @@ function getThemeCSSRules(props) {
           continue;
         }
         const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`;
-        const [altLightDark, altSubTheme] = [
-          isDark ? ["dark", "light"] : ["light", "dark"],
-          isDark ? ["dark", "sub_theme"] : ["light", "sub_theme"]
-        ];
-        for (const order of [altLightDark, altSubTheme]) {
+        const [altLightDark] = [isDark ? ["dark", "light"] : ["light", "dark"]];
+        for (const order of [altLightDark]) {
           if (isDarkOrLightBase) {
             order.reverse();
           }
@@ -59,7 +56,7 @@ function getThemeCSSRules(props) {
             const nextChildSelector = childSelector === lastParentSelector ? "" : childSelector;
             selectorsSet.add(`${parentSelectors.join(" ")} ${nextChildSelector}`.trim());
             selectorsSet.add(
-              `${parentSelectors.join(" ")} ${nextChildSelector}.t_sub_theme`.trim()
+              `${parentSelectors.join(" ")} ${nextChildSelector}.is_inversed`.trim()
             );
           }
         }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getThemeCSSRules.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["css"]
 }

package/dist/esm/views/Theme.js

@@ -1,6 +1,13 @@
 import { jsx } from "react/jsx-runtime";
 import { isWeb } from "@tamagui/constants";
-import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from "react";
+import React, {
+  Children,
+  cloneElement,
+  forwardRef,
+  isValidElement,
+  useMemo,
+  useRef
+} from "react";
 import { variableToString } from "../createVariable";
 import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
 import { useChangeThemeEffect } from "../hooks/useTheme";
@@ -10,23 +17,27 @@ const Theme = forwardRef(function Theme2(props, ref) {
     return props.children;
   }
   const isRoot = !!props["_isRoot"];
+  const disableDirectChildTheme = props["disable-child-theme"];
   const themeState = useChangeThemeEffect(props, isRoot);
-  let children = props["disable-child-theme"] ? Children.map(
-    props.children,
-    (child) => cloneElement(child, { ["data-disable-theme"]: true })
-  ) : props.children;
-  if (ref) {
-    try {
-      React.Children.only(children);
-      children = cloneElement(children, { ref });
-    } catch {
+  const children = useMemo(() => {
+    let children2 = disableDirectChildTheme ? Children.map(
+      props.children,
+      (child) => cloneElement(child, { ["data-disable-theme"]: true })
+    ) : props.children;
+    if (ref) {
+      try {
+        React.Children.only(children2);
+        children2 = cloneElement(children2, { ref });
+      } catch {
+      }
     }
-  }
-  if (process.env.NODE_ENV === "development") {
-    if (props.debug === "visualize") {
-      children = /* @__PURE__ */ jsx(ThemeDebug, { themeState, themeProps: props, children });
+    if (process.env.NODE_ENV === "development") {
+      if (props.debug === "visualize") {
+        children2 = /* @__PURE__ */ jsx(ThemeDebug, { themeState, themeProps: props, children: children2 });
+      }
     }
-  }
+    return children2;
+  }, [props.children, disableDirectChildTheme]);
   return useThemedChildren(themeState, children, props, isRoot);
 });
 Theme["avoidForwardRef"] = true;

package/dist/esm/views/Theme.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "mappings": "AAoCQ;AApCR,SAAS,aAAa;AACtB,OAAO,SAAS,UAAU,cAAc,YAAY,gBAAgB,cAAc;AAElF,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAA+B,4BAA4B;AAE3D,SAAS,kBAAkB;AAEpB,MAAM,QAAQ,WAAW,SAASA,OAAM,OAAmB,KAAK;AAErE,MAAI,MAAM,SAAS;AACjB,WAAO,MAAM;AAAA,EACf;AAEA,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AAErD,MAAI,WAAW,MAAM,qBAAqB,IACtC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,oBAAoB,GAAG,KAAK,CAAC;AAAA,EACtD,IACA,MAAM;AAEV,MAAI,KAAK;AACP,QAAI;AACF,YAAM,SAAS,KAAK,QAAQ;AAC5B,iBAAW,aAAa,UAAU,EAAE,IAAI,CAAC;AAAA,IAC3C,QAAE;AAAA,IAEF;AAAA,EACF;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,MAAM,UAAU,aAAa;AAC/B,iBACE,oBAAC,cAAW,YAAwB,YAAY,OAC7C,UACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D,CAAC;AAED,MAAM,iBAAiB,IAAI;AAEpB,SAAS,kBACd,YACA,UACA,OACA,SAAS,OACT;AACA,QAAM,EAAE,cAAc,WAAW,IAAI;AACrC,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,OAAO,KAAK;AAClC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,QAAM,gCACJ,cAAc,MAAM,WAAW,cAAc,WAAW,kBAAkB;AAE5E,MAAI,CAAC,+BAA+B;AAClC,WAAO;AAAA,EACT;AAKA,MAAI,WAAW,cAAc;AAC3B,QAAI,OAAO,SAAS,QAAQ,QAAQ;AACpC,WAAO,KAAK,IAAI,CAAC,UAAU;AACzB,aAAO,eAAe,KAAK,IACvB;AAAA,QACE;AAAA,QACA;AAAA,QACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,MACF,IACA;AAAA,IACN,CAAC;AAAA,EACH;AAEA,QAAM,sBACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,UACH;AAGF,MAAI,mBAAmB,OAAO;AAC5B,WAAO;AAAA,EACT;AAEA,MAAI,OAAO;AACT,WAAO,kBAAkB;AAAA,MACvB,UAAU;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO;AACT;AAEO,SAAS,kBAAkB;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAKG;AACD,MAAI,UAAU,mBAAmB,OAAO;AACtC,WAAO;AAAA,EACT;AAEA,QAAM,UAAU,WAAW,MAAM;AAEjC,MAAI,CAAC,WAAW,cAAc,CAAC,WAAW,CAAC,gBAAgB;AACzD,WAAO,oBAAC,UAAK,WAAU,0BAA0B,UAAS;AAAA,EAC5D;AAGA,QAAM,aACJ,WAAW,MAAM,SAAS,WAAW,aACjC,iBAAiB,WAAW,MAAM,MAAM,KAAK,IAC7C;AACN,QAAM,aAAa,aACf;AAAA,IACE,OAAO;AAAA,EACT,IACA;AAEJ,MAAI,YAAY,WAAW,MAAM,aAAa;AAE9C,MAAI,QAAQ;AACV,gBAAY,UAAU,QAAQ,eAAe,EAAE;AAAA,EACjD;AAEA,MAAI,iBACF,oBAAC,UAAK,WAAW,GAAG,oCAAoC,OAAO,YAC5D,UACH;AAIF,MAAI,WAAW,MAAM;AACnB,qBACE;AAAA,MAAC;AAAA;AAAA,QACC,WACE,UACI,GACE,WAAW,MAAM,KAAK,WAAW,OAAO,IACpC,YACA,WAAW,MAAM,KAAK,WAAW,MAAM,IACvC,WACA,iCAEN;AAAA,QAGL;AAAA;AAAA,IACH;AAAA,EAEJ;AAEA,SAAO;AACT;",
-  "names": ["Theme"]
+  "mappings": "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",
+  "names": ["Theme", "children"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.51.0",
+  "version": "1.52.0",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,20 +27,20 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.51.0",
-    "@tamagui/constants": "1.51.0",
-    "@tamagui/helpers": "1.51.0",
-    "@tamagui/normalize-css-color": "1.51.0",
-    "@tamagui/timer": "1.51.0",
-    "@tamagui/use-did-finish-ssr": "1.51.0",
-    "@tamagui/use-event": "1.51.0",
-    "@tamagui/use-force-update": "1.51.0"
+    "@tamagui/compose-refs": "1.52.0",
+    "@tamagui/constants": "1.52.0",
+    "@tamagui/helpers": "1.52.0",
+    "@tamagui/normalize-css-color": "1.52.0",
+    "@tamagui/timer": "1.52.0",
+    "@tamagui/use-did-finish-ssr": "1.52.0",
+    "@tamagui/use-event": "1.52.0",
+    "@tamagui/use-force-update": "1.52.0"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.51.0",
+    "@tamagui/build": "1.52.0",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/helpers/getThemeCSSRules.ts

@@ -57,12 +57,9 @@ export function getThemeCSSRules(props: {
 
         const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, '')}`
 
-        const [altLightDark, altSubTheme] = [
-          isDark ? ['dark', 'light'] : ['light', 'dark'],
-          isDark ? ['dark', 'sub_theme'] : ['light', 'sub_theme'],
-        ]
+        const [altLightDark] = [isDark ? ['dark', 'light'] : ['light', 'dark']]
 
-        for (const order of [altLightDark, altSubTheme]) {
+        for (const order of [altLightDark]) {
           if (isDarkOrLightBase) {
             order.reverse()
           }
@@ -95,7 +92,7 @@ export function getThemeCSSRules(props: {
             // for light/dark/light:
             selectorsSet.add(`${parentSelectors.join(' ')} ${nextChildSelector}`.trim())
             selectorsSet.add(
-              `${parentSelectors.join(' ')} ${nextChildSelector}.t_sub_theme`.trim()
+              `${parentSelectors.join(' ')} ${nextChildSelector}.is_inversed`.trim()
             )
           }
         }

package/src/views/Theme.tsx

@@ -1,10 +1,17 @@
 import { isWeb } from '@tamagui/constants'
-import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from 'react'
+import React, {
+  Children,
+  cloneElement,
+  forwardRef,
+  isValidElement,
+  useMemo,
+  useRef,
+} from 'react'
 
 import { variableToString } from '../createVariable'
 import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
 import { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme'
-import type { DebugProp, ThemeProps } from '../types'
+import type { ThemeProps } from '../types'
 import { ThemeDebug } from './ThemeDebug'
 
 export const Theme = forwardRef(function Theme(props: ThemeProps, ref) {
@@ -14,32 +21,37 @@ export const Theme = forwardRef(function Theme(props: ThemeProps, ref) {
   }
 
   const isRoot = !!props['_isRoot']
+  const disableDirectChildTheme = props['disable-child-theme']
   const themeState = useChangeThemeEffect(props, isRoot)
 
-  let children = props['disable-child-theme']
-    ? Children.map(props.children, (child) =>
-        cloneElement(child, { ['data-disable-theme']: true })
-      )
-    : props.children
-
-  if (ref) {
-    try {
-      React.Children.only(children)
-      children = cloneElement(children, { ref })
-    } catch {
-      //ok
+  const children = useMemo(() => {
+    let children = disableDirectChildTheme
+      ? Children.map(props.children, (child) =>
+          cloneElement(child, { ['data-disable-theme']: true })
+        )
+      : props.children
+
+    if (ref) {
+      try {
+        React.Children.only(children)
+        children = cloneElement(children, { ref })
+      } catch {
+        //ok
+      }
     }
-  }
 
-  if (process.env.NODE_ENV === 'development') {
-    if (props.debug === 'visualize') {
-      children = (
-        <ThemeDebug themeState={themeState} themeProps={props}>
-          {children}
-        </ThemeDebug>
-      )
+    if (process.env.NODE_ENV === 'development') {
+      if (props.debug === 'visualize') {
+        children = (
+          <ThemeDebug themeState={themeState} themeProps={props}>
+            {children}
+          </ThemeDebug>
+        )
+      }
     }
-  }
+
+    return children
+  }, [props.children, disableDirectChildTheme])
 
   return useThemedChildren(themeState, children, props, isRoot)
 })

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

@@ -1 +1 @@
-{"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAG/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB,YA2JA"}
+{"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAG/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB,YAwJA"}

package/types/views/Theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AACA,OAAO,KAAqE,MAAM,OAAO,CAAA;AAIzF,OAAO,EAAE,oBAAoB,EAAwB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAa,UAAU,EAAE,MAAM,UAAU,CAAA;AAGrD,eAAO,MAAM,KAAK,4EAmChB,CAAA;AAIF,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,UAAU,EACjB,MAAM,UAAQ,OAsDf;AAED,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,UAAU,EACV,cAAc,EACd,MAAM,GACP,EAAE;IACD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,UAAU,EAAE,oBAAoB,CAAA;IAChC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,oFAwDA"}
+{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AACA,OAAO,KAON,MAAM,OAAO,CAAA;AAId,OAAO,EAAE,oBAAoB,EAAwB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAG1C,eAAO,MAAM,KAAK,4EAwChB,CAAA;AAIF,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,UAAU,EACjB,MAAM,UAAQ,OAsDf;AAED,wBAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,UAAU,EACV,cAAc,EACd,MAAM,GACP,EAAE;IACD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,UAAU,EAAE,oBAAoB,CAAA;IAChC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,oFAwDA"}