@tamagui/web 1.122.7 → 1.122.8

package/dist/cjs/views/ThemeProvider.cjs

@@ -40,17 +40,21 @@ var import_react = __toESM(require("react")),
   import_Theme = require("./Theme.cjs"),
   import_config = require("../config.cjs"),
   import_jsx_runtime = require("react/jsx-runtime");
-const ThemeProvider = props => (import_constants.isClient && import_react.default.useLayoutEffect(() => {
-  if (props.disableRootThemeClass) return;
-  const cn = `${import_constants2.THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
-    target = props.themeClassNameOnRoot ?? (0, import_config.getSetting)("themeClassNameOnRoot") ? document.documentElement : document.body;
-  return target.classList.add(cn), () => {
-    target.classList.remove(cn);
-  };
-}, [props.defaultTheme, props.disableRootThemeClass, props.themeClassNameOnRoot]), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Theme.Theme, {
-  className: props.className,
-  name: props.defaultTheme,
-  forceClassName: !props.disableRootThemeClass,
-  _isRoot: !0,
-  children: props.children
-}));
+const ThemeProvider = props => {
+  const disableRootThemeClass = props.disableRootThemeClass ?? (0, import_config.getSetting)("disableRootThemeClass"),
+    themeClassNameOnRoot = props.themeClassNameOnRoot ?? (0, import_config.getSetting)("themeClassNameOnRoot");
+  return import_constants.isClient && import_react.default.useLayoutEffect(() => {
+    if (disableRootThemeClass) return;
+    const cn = `${import_constants2.THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
+      target = themeClassNameOnRoot ? document.documentElement : document.body;
+    return target.classList.add(cn), () => {
+      target.classList.remove(cn);
+    };
+  }, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot]), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Theme.Theme, {
+    className: props.className,
+    name: props.defaultTheme,
+    forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
+    _isRoot: !0,
+    children: props.children
+  });
+};

package/dist/cjs/views/ThemeProvider.js

@@ -26,20 +26,23 @@ __export(ThemeProvider_exports, {
 });
 module.exports = __toCommonJS(ThemeProvider_exports);
 var import_react = __toESM(require("react")), import_constants = require("@tamagui/constants"), import_constants2 = require("../constants/constants"), import_Theme = require("./Theme"), import_config = require("../config"), import_jsx_runtime = require("react/jsx-runtime");
-const ThemeProvider = (props) => (import_constants.isClient && import_react.default.useLayoutEffect(() => {
-  if (props.disableRootThemeClass) return;
-  const cn = `${import_constants2.THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = props.themeClassNameOnRoot ?? (0, import_config.getSetting)("themeClassNameOnRoot") ? document.documentElement : document.body;
-  return target.classList.add(cn), () => {
-    target.classList.remove(cn);
-  };
-}, [props.defaultTheme, props.disableRootThemeClass, props.themeClassNameOnRoot]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-  import_Theme.Theme,
-  {
-    className: props.className,
-    name: props.defaultTheme,
-    forceClassName: !props.disableRootThemeClass,
-    _isRoot: !0,
-    children: props.children
-  }
-));
+const ThemeProvider = (props) => {
+  const disableRootThemeClass = props.disableRootThemeClass ?? (0, import_config.getSetting)("disableRootThemeClass"), themeClassNameOnRoot = props.themeClassNameOnRoot ?? (0, import_config.getSetting)("themeClassNameOnRoot");
+  return import_constants.isClient && import_react.default.useLayoutEffect(() => {
+    if (disableRootThemeClass) return;
+    const cn = `${import_constants2.THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = themeClassNameOnRoot ? document.documentElement : document.body;
+    return target.classList.add(cn), () => {
+      target.classList.remove(cn);
+    };
+  }, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_Theme.Theme,
+    {
+      className: props.className,
+      name: props.defaultTheme,
+      forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
+      _isRoot: !0,
+      children: props.children
+    }
+  );
+};
 //# sourceMappingURL=ThemeProvider.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/ThemeProvider.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAClB,mBAAyB,+BAEzBA,oBAAuC,mCACvC,eAAsB,oBACtB,gBAA2B,sBA+BvB;AAlBG,MAAM,gBAAgB,CAAC,WAExB,6BACF,aAAAC,QAAM,gBAAgB,MAAM;AAC1B,MAAI,MAAM,sBAAuB;AACjC,QAAM,KAAK,GAAG,wCAAsB,GAAG,MAAM,YAAY,IACnD,SACH,MAAM,4BAAwB,0BAAW,sBAAsB,IAC5D,SAAS,kBACT,SAAS;AACf,gBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,WAAO,UAAU,OAAO,EAAE;AAAA,EAC5B;AACF,GAAG,CAAC,MAAM,cAAc,MAAM,uBAAuB,MAAM,oBAAoB,CAAC,GAIhF;AAAA,EAAC;AAAA;AAAA,IACC,WAAW,MAAM;AAAA,IACjB,MAAM,MAAM;AAAA,IAEZ,gBAAgB,CAAC,MAAM;AAAA,IAEvB,SAAO;AAAA,IAEN,gBAAM;AAAA;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB,2BAClB,mBAAyB,+BAEzBA,oBAAuC,mCACvC,eAAsB,oBACtB,gBAA2B,sBAiCvB;AApBG,MAAM,gBAAgB,CAAC,UAA8B;AAC1D,QAAM,wBACJ,MAAM,6BAAyB,0BAAW,uBAAuB,GAC7D,uBACJ,MAAM,4BAAwB,0BAAW,sBAAsB;AAGjE,SAAI,6BACF,aAAAC,QAAM,gBAAgB,MAAM;AAC1B,QAAI,sBAAuB;AAC3B,UAAM,KAAK,GAAG,wCAAsB,GAAG,MAAM,YAAY,IACnD,SAAS,uBAAuB,SAAS,kBAAkB,SAAS;AAC1E,kBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,aAAO,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,MAAM,cAAc,uBAAuB,oBAAoB,CAAC,GAIpE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,MAAM;AAAA,MACjB,MAAM,MAAM;AAAA,MAEZ,gBAAgB,CAAC,yBAAyB,CAAC;AAAA,MAE3C,SAAO;AAAA,MAEN,gBAAM;AAAA;AAAA,EACT;AAEJ;",
   "names": ["import_constants", "React"]
 }

package/dist/cjs/views/ThemeProvider.native.js

@@ -27,22 +27,23 @@ __export(ThemeProvider_exports, {
 });
 module.exports = __toCommonJS(ThemeProvider_exports);
 var import_jsx_runtime = require("react/jsx-runtime"), import_react = __toESM(require("react")), import_constants = require("@tamagui/constants"), import_constants2 = require("../constants/constants"), import_Theme = require("./Theme"), import_config = require("../config"), ThemeProvider = function(props) {
+  var _props_disableRootThemeClass, disableRootThemeClass = (_props_disableRootThemeClass = props.disableRootThemeClass) !== null && _props_disableRootThemeClass !== void 0 ? _props_disableRootThemeClass : (0, import_config.getSetting)("disableRootThemeClass"), _props_themeClassNameOnRoot, themeClassNameOnRoot = (_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : (0, import_config.getSetting)("themeClassNameOnRoot");
   return import_constants.isClient && import_react.default.useLayoutEffect(function() {
-    if (!props.disableRootThemeClass) {
-      var cn = `${import_constants2.THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, _props_themeClassNameOnRoot, target = ((_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : (0, import_config.getSetting)("themeClassNameOnRoot")) ? document.documentElement : document.body;
+    if (!disableRootThemeClass) {
+      var cn = `${import_constants2.THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = themeClassNameOnRoot ? document.documentElement : document.body;
       return target.classList.add(cn), function() {
         target.classList.remove(cn);
       };
     }
   }, [
     props.defaultTheme,
-    props.disableRootThemeClass,
-    props.themeClassNameOnRoot
+    disableRootThemeClass,
+    themeClassNameOnRoot
   ]), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Theme.Theme, {
     className: props.className,
     name: props.defaultTheme,
     // if root class disabled, force class here
-    forceClassName: !props.disableRootThemeClass,
+    forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
     // @ts-expect-error
     _isRoot: !0,
     children: props.children

package/dist/cjs/views/ThemeProvider.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/ThemeProvider.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,eAAkB,2BAClB,mBAAyB,+BAEzBA,oBAAuC,mCACvC,eAAsB,oBACtB,gBAA2B,sBAadC,gBAAgB,SAACC,OAAAA;AAE5B,SAAIC,6BACFC,aAAAA,QAAMC,gBAAgB,WAAA;AACpB,QAAIH,OAAMI,uBACV;UAAMC,KAAK,GAAGC,wCAAAA,GAAyBN,MAAMO,YAAY,IAEtDP,6BADGQ,WACHR,8BAAAA,MAAMS,0BAAoB,QAA1BT,gCAAAA,SAAAA,kCAA8BU,0BAAW,sBAAA,KACtCC,SAASC,kBACTD,SAASE;AACfL,oBAAOM,UAAUC,IAAIV,EAAAA,GACd,WAAA;AACLG,eAAOM,UAAUE,OAAOX,EAAAA;MAC1B;;EACF,GAAG;IAACL,MAAMO;IAAcP,MAAMI;IAAuBJ,MAAMS;GAAqB,GAIhF,uCAAAQ,KAACC,oBAAAA;IACCC,WAAWnB,MAAMmB;IACjBC,MAAMpB,MAAMO;;IAEZc,gBAAgB,CAACrB,MAAMI;;IAEvBkB,SAAO;cAENtB,MAAMuB;;AAGb;",
-  "names": ["import_constants", "ThemeProvider", "props", "isClient", "React", "useLayoutEffect", "disableRootThemeClass", "cn", "THEME_CLASSNAME_PREFIX", "defaultTheme", "target", "themeClassNameOnRoot", "getSetting", "document", "documentElement", "body", "classList", "add", "remove", "_jsx", "Theme", "className", "name", "forceClassName", "_isRoot", "children"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,eAAkB,2BAClB,mBAAyB,+BAEzBA,oBAAuC,mCACvC,eAAsB,oBACtB,gBAA2B,sBAadC,gBAAgB,SAACC,OAAAA;MAE1BA,8BADIC,yBACJD,+BAAAA,MAAMC,2BAAqB,QAA3BD,iCAAAA,SAAAA,mCAA+BE,0BAAW,uBAAA,GAE1CF,6BADIG,wBACJH,8BAAAA,MAAMG,0BAAoB,QAA1BH,gCAAAA,SAAAA,kCAA8BE,0BAAW,sBAAA;AAG3C,SAAIE,6BACFC,aAAAA,QAAMC,gBAAgB,WAAA;AACpB,QAAIL,wBACJ;UAAMM,KAAK,GAAGC,wCAAAA,GAAyBR,MAAMS,YAAY,IACnDC,SAASP,uBAAuBQ,SAASC,kBAAkBD,SAASE;AAC1EH,oBAAOI,UAAUC,IAAIR,EAAAA,GACd,WAAA;AACLG,eAAOI,UAAUE,OAAOT,EAAAA;MAC1B;;EACF,GAAG;IAACP,MAAMS;IAAcR;IAAuBE;GAAqB,GAIpE,uCAAAc,KAACC,oBAAAA;IACCC,WAAWnB,MAAMmB;IACjBC,MAAMpB,MAAMS;;IAEZY,gBAAgB,CAACpB,yBAAyB,CAACE;;IAE3CmB,SAAO;cAENtB,MAAMuB;;AAGb;",
+  "names": ["import_constants", "ThemeProvider", "props", "disableRootThemeClass", "getSetting", "themeClassNameOnRoot", "isClient", "React", "useLayoutEffect", "cn", "THEME_CLASSNAME_PREFIX", "defaultTheme", "target", "document", "documentElement", "body", "classList", "add", "remove", "_jsx", "Theme", "className", "name", "forceClassName", "_isRoot", "children"]
 }

package/dist/esm/views/ThemeProvider.js

@@ -4,22 +4,25 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
 import { Theme } from "./Theme";
 import { getSetting } from "../config";
 import { jsx } from "react/jsx-runtime";
-const ThemeProvider = (props) => (isClient && React.useLayoutEffect(() => {
-  if (props.disableRootThemeClass) return;
-  const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = props.themeClassNameOnRoot ?? getSetting("themeClassNameOnRoot") ? document.documentElement : document.body;
-  return target.classList.add(cn), () => {
-    target.classList.remove(cn);
-  };
-}, [props.defaultTheme, props.disableRootThemeClass, props.themeClassNameOnRoot]), /* @__PURE__ */ jsx(
-  Theme,
-  {
-    className: props.className,
-    name: props.defaultTheme,
-    forceClassName: !props.disableRootThemeClass,
-    _isRoot: !0,
-    children: props.children
-  }
-));
+const ThemeProvider = (props) => {
+  const disableRootThemeClass = props.disableRootThemeClass ?? getSetting("disableRootThemeClass"), themeClassNameOnRoot = props.themeClassNameOnRoot ?? getSetting("themeClassNameOnRoot");
+  return isClient && React.useLayoutEffect(() => {
+    if (disableRootThemeClass) return;
+    const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = themeClassNameOnRoot ? document.documentElement : document.body;
+    return target.classList.add(cn), () => {
+      target.classList.remove(cn);
+    };
+  }, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot]), /* @__PURE__ */ jsx(
+    Theme,
+    {
+      className: props.className,
+      name: props.defaultTheme,
+      forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
+      _isRoot: !0,
+      children: props.children
+    }
+  );
+};
 export {
   ThemeProvider
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/ThemeProvider.tsx"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,8BAA8B;AACvC,SAAS,aAAa;AACtB,SAAS,kBAAkB;AA+BvB;AAlBG,MAAM,gBAAgB,CAAC,WAExB,YACF,MAAM,gBAAgB,MAAM;AAC1B,MAAI,MAAM,sBAAuB;AACjC,QAAM,KAAK,GAAG,sBAAsB,GAAG,MAAM,YAAY,IACnD,SACH,MAAM,wBAAwB,WAAW,sBAAsB,IAC5D,SAAS,kBACT,SAAS;AACf,gBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,WAAO,UAAU,OAAO,EAAE;AAAA,EAC5B;AACF,GAAG,CAAC,MAAM,cAAc,MAAM,uBAAuB,MAAM,oBAAoB,CAAC,GAIhF;AAAA,EAAC;AAAA;AAAA,IACC,WAAW,MAAM;AAAA,IACjB,MAAM,MAAM;AAAA,IAEZ,gBAAgB,CAAC,MAAM;AAAA,IAEvB,SAAO;AAAA,IAEN,gBAAM;AAAA;AACT;",
+  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,8BAA8B;AACvC,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAiCvB;AApBG,MAAM,gBAAgB,CAAC,UAA8B;AAC1D,QAAM,wBACJ,MAAM,yBAAyB,WAAW,uBAAuB,GAC7D,uBACJ,MAAM,wBAAwB,WAAW,sBAAsB;AAGjE,SAAI,YACF,MAAM,gBAAgB,MAAM;AAC1B,QAAI,sBAAuB;AAC3B,UAAM,KAAK,GAAG,sBAAsB,GAAG,MAAM,YAAY,IACnD,SAAS,uBAAuB,SAAS,kBAAkB,SAAS;AAC1E,kBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,aAAO,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,MAAM,cAAc,uBAAuB,oBAAoB,CAAC,GAIpE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,MAAM;AAAA,MACjB,MAAM,MAAM;AAAA,MAEZ,gBAAgB,CAAC,yBAAyB,CAAC;AAAA,MAE3C,SAAO;AAAA,MAEN,gBAAM;AAAA;AAAA,EACT;AAEJ;",
   "names": []
 }

package/dist/esm/views/ThemeProvider.mjs

@@ -4,19 +4,23 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants.mjs";
 import { Theme } from "./Theme.mjs";
 import { getSetting } from "../config.mjs";
 import { jsx } from "react/jsx-runtime";
-const ThemeProvider = props => (isClient && React.useLayoutEffect(() => {
-  if (props.disableRootThemeClass) return;
-  const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
-    target = props.themeClassNameOnRoot ?? getSetting("themeClassNameOnRoot") ? document.documentElement : document.body;
-  return target.classList.add(cn), () => {
-    target.classList.remove(cn);
-  };
-}, [props.defaultTheme, props.disableRootThemeClass, props.themeClassNameOnRoot]), /* @__PURE__ */jsx(Theme, {
-  className: props.className,
-  name: props.defaultTheme,
-  forceClassName: !props.disableRootThemeClass,
-  _isRoot: !0,
-  children: props.children
-}));
+const ThemeProvider = props => {
+  const disableRootThemeClass = props.disableRootThemeClass ?? getSetting("disableRootThemeClass"),
+    themeClassNameOnRoot = props.themeClassNameOnRoot ?? getSetting("themeClassNameOnRoot");
+  return isClient && React.useLayoutEffect(() => {
+    if (disableRootThemeClass) return;
+    const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
+      target = themeClassNameOnRoot ? document.documentElement : document.body;
+    return target.classList.add(cn), () => {
+      target.classList.remove(cn);
+    };
+  }, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot]), /* @__PURE__ */jsx(Theme, {
+    className: props.className,
+    name: props.defaultTheme,
+    forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
+    _isRoot: !0,
+    children: props.children
+  });
+};
 export { ThemeProvider };
 //# sourceMappingURL=ThemeProvider.mjs.map

package/dist/esm/views/ThemeProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","isClient","THEME_CLASSNAME_PREFIX","Theme","getSetting","jsx","ThemeProvider","props","useLayoutEffect","disableRootThemeClass","cn","defaultTheme","target","themeClassNameOnRoot","document","documentElement","body","classList","add","remove","className","name","forceClassName","_isRoot","children"],"sources":["../../../src/views/ThemeProvider.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,QAAA,QAAgB;AAEzB,SAASC,sBAAA,QAA8B;AACvC,SAASC,KAAA,QAAa;AACtB,SAASC,UAAA,QAAkB;AA+BvB,SAAAC,GAAA;AAlBG,MAAMC,aAAA,GAAiBC,KAAA,KAExBN,QAAA,IACFD,KAAA,CAAMQ,eAAA,CAAgB,MAAM;EAC1B,IAAID,KAAA,CAAME,qBAAA,EAAuB;EACjC,MAAMC,EAAA,GAAK,GAAGR,sBAAsB,GAAGK,KAAA,CAAMI,YAAY;IACnDC,MAAA,GACHL,KAAA,CAAMM,oBAAA,IAAwBT,UAAA,CAAW,sBAAsB,IAC5DU,QAAA,CAASC,eAAA,GACTD,QAAA,CAASE,IAAA;EACf,OAAAJ,MAAA,CAAOK,SAAA,CAAUC,GAAA,CAAIR,EAAE,GAChB,MAAM;IACXE,MAAA,CAAOK,SAAA,CAAUE,MAAA,CAAOT,EAAE;EAC5B;AACF,GAAG,CAACH,KAAA,CAAMI,YAAA,EAAcJ,KAAA,CAAME,qBAAA,EAAuBF,KAAA,CAAMM,oBAAoB,CAAC,GAIhF,eAAAR,GAAA,CAACF,KAAA;EACCiB,SAAA,EAAWb,KAAA,CAAMa,SAAA;EACjBC,IAAA,EAAMd,KAAA,CAAMI,YAAA;EAEZW,cAAA,EAAgB,CAACf,KAAA,CAAME,qBAAA;EAEvBc,OAAA,EAAO;EAENC,QAAA,EAAAjB,KAAA,CAAMiB;AAAA,CACT","ignoreList":[]}
+{"version":3,"names":["React","isClient","THEME_CLASSNAME_PREFIX","Theme","getSetting","jsx","ThemeProvider","props","disableRootThemeClass","themeClassNameOnRoot","useLayoutEffect","cn","defaultTheme","target","document","documentElement","body","classList","add","remove","className","name","forceClassName","_isRoot","children"],"sources":["../../../src/views/ThemeProvider.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,QAAA,QAAgB;AAEzB,SAASC,sBAAA,QAA8B;AACvC,SAASC,KAAA,QAAa;AACtB,SAASC,UAAA,QAAkB;AAiCvB,SAAAC,GAAA;AApBG,MAAMC,aAAA,GAAiBC,KAAA,IAA8B;EAC1D,MAAMC,qBAAA,GACJD,KAAA,CAAMC,qBAAA,IAAyBJ,UAAA,CAAW,uBAAuB;IAC7DK,oBAAA,GACJF,KAAA,CAAME,oBAAA,IAAwBL,UAAA,CAAW,sBAAsB;EAGjE,OAAIH,QAAA,IACFD,KAAA,CAAMU,eAAA,CAAgB,MAAM;IAC1B,IAAIF,qBAAA,EAAuB;IAC3B,MAAMG,EAAA,GAAK,GAAGT,sBAAsB,GAAGK,KAAA,CAAMK,YAAY;MACnDC,MAAA,GAASJ,oBAAA,GAAuBK,QAAA,CAASC,eAAA,GAAkBD,QAAA,CAASE,IAAA;IAC1E,OAAAH,MAAA,CAAOI,SAAA,CAAUC,GAAA,CAAIP,EAAE,GAChB,MAAM;MACXE,MAAA,CAAOI,SAAA,CAAUE,MAAA,CAAOR,EAAE;IAC5B;EACF,GAAG,CAACJ,KAAA,CAAMK,YAAA,EAAcJ,qBAAA,EAAuBC,oBAAoB,CAAC,GAIpE,eAAAJ,GAAA,CAACF,KAAA;IACCiB,SAAA,EAAWb,KAAA,CAAMa,SAAA;IACjBC,IAAA,EAAMd,KAAA,CAAMK,YAAA;IAEZU,cAAA,EAAgB,CAACd,qBAAA,IAAyB,CAACC,oBAAA;IAE3Cc,OAAA,EAAO;IAENC,QAAA,EAAAjB,KAAA,CAAMiB;EAAA,CACT;AAEJ","ignoreList":[]}

package/dist/esm/views/ThemeProvider.native.js

@@ -5,22 +5,23 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
 import { Theme } from "./Theme";
 import { getSetting } from "../config";
 var ThemeProvider = function(props) {
+  var _props_disableRootThemeClass, disableRootThemeClass = (_props_disableRootThemeClass = props.disableRootThemeClass) !== null && _props_disableRootThemeClass !== void 0 ? _props_disableRootThemeClass : getSetting("disableRootThemeClass"), _props_themeClassNameOnRoot, themeClassNameOnRoot = (_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : getSetting("themeClassNameOnRoot");
   return isClient && React.useLayoutEffect(function() {
-    if (!props.disableRootThemeClass) {
-      var cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, _props_themeClassNameOnRoot, target = ((_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : getSetting("themeClassNameOnRoot")) ? document.documentElement : document.body;
+    if (!disableRootThemeClass) {
+      var cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = themeClassNameOnRoot ? document.documentElement : document.body;
       return target.classList.add(cn), function() {
         target.classList.remove(cn);
       };
     }
   }, [
     props.defaultTheme,
-    props.disableRootThemeClass,
-    props.themeClassNameOnRoot
+    disableRootThemeClass,
+    themeClassNameOnRoot
   ]), /* @__PURE__ */ _jsx(Theme, {
     className: props.className,
     name: props.defaultTheme,
     // if root class disabled, force class here
-    forceClassName: !props.disableRootThemeClass,
+    forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
     // @ts-expect-error
     _isRoot: !0,
     children: props.children

package/dist/esm/views/ThemeProvider.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/ThemeProvider.tsx"],
-  "mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAapB,IAAMC,gBAAgB,SAACC,OAAAA;AAE5B,SAAIL,YACFD,MAAMO,gBAAgB,WAAA;AACpB,QAAID,OAAME,uBACV;UAAMC,KAAK,GAAGP,sBAAAA,GAAyBI,MAAMI,YAAY,IAEtDJ,6BADGK,WACHL,8BAAAA,MAAMM,0BAAoB,QAA1BN,gCAAAA,SAAAA,8BAA8BF,WAAW,sBAAA,KACtCS,SAASC,kBACTD,SAASE;AACfJ,oBAAOK,UAAUC,IAAIR,EAAAA,GACd,WAAA;AACLE,eAAOK,UAAUE,OAAOT,EAAAA;MAC1B;;EACF,GAAG;IAACH,MAAMI;IAAcJ,MAAME;IAAuBF,MAAMM;GAAqB,GAIhF,qBAACT,OAAAA;IACCgB,WAAWb,MAAMa;IACjBC,MAAMd,MAAMI;;IAEZW,gBAAgB,CAACf,MAAME;;IAEvBc,SAAO;cAENhB,MAAMiB;;AAGb;",
-  "names": ["React", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "useLayoutEffect", "disableRootThemeClass", "cn", "defaultTheme", "target", "themeClassNameOnRoot", "document", "documentElement", "body", "classList", "add", "remove", "className", "name", "forceClassName", "_isRoot", "children"]
+  "mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAapB,IAAMC,gBAAgB,SAACC,OAAAA;MAE1BA,8BADIC,yBACJD,+BAAAA,MAAMC,2BAAqB,QAA3BD,iCAAAA,SAAAA,+BAA+BF,WAAW,uBAAA,GAE1CE,6BADIE,wBACJF,8BAAAA,MAAME,0BAAoB,QAA1BF,gCAAAA,SAAAA,8BAA8BF,WAAW,sBAAA;AAG3C,SAAIH,YACFD,MAAMS,gBAAgB,WAAA;AACpB,QAAIF,wBACJ;UAAMG,KAAK,GAAGR,sBAAAA,GAAyBI,MAAMK,YAAY,IACnDC,SAASJ,uBAAuBK,SAASC,kBAAkBD,SAASE;AAC1EH,oBAAOI,UAAUC,IAAIP,EAAAA,GACd,WAAA;AACLE,eAAOI,UAAUE,OAAOR,EAAAA;MAC1B;;EACF,GAAG;IAACJ,MAAMK;IAAcJ;IAAuBC;GAAqB,GAIpE,qBAACL,OAAAA;IACCgB,WAAWb,MAAMa;IACjBC,MAAMd,MAAMK;;IAEZU,gBAAgB,CAACd,yBAAyB,CAACC;;IAE3Cc,SAAO;cAENhB,MAAMiB;;AAGb;",
+  "names": ["React", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "disableRootThemeClass", "themeClassNameOnRoot", "useLayoutEffect", "cn", "defaultTheme", "target", "document", "documentElement", "body", "classList", "add", "remove", "className", "name", "forceClassName", "_isRoot", "children"]
 }

package/package.json

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

package/src/views/ThemeProvider.tsx

@@ -17,20 +17,22 @@ export type ThemeProviderProps = {
 }
 
 export const ThemeProvider = (props: ThemeProviderProps) => {
+  const disableRootThemeClass =
+    props.disableRootThemeClass ?? getSetting('disableRootThemeClass')
+  const themeClassNameOnRoot =
+    props.themeClassNameOnRoot ?? getSetting('themeClassNameOnRoot')
+
   // ensure theme is attached to root body node as well to work with modals by default
   if (isClient) {
     React.useLayoutEffect(() => {
-      if (props.disableRootThemeClass) return
+      if (disableRootThemeClass) return
       const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`
-      const target =
-        (props.themeClassNameOnRoot ?? getSetting('themeClassNameOnRoot'))
-          ? document.documentElement
-          : document.body
+      const target = themeClassNameOnRoot ? document.documentElement : document.body
       target.classList.add(cn)
       return () => {
         target.classList.remove(cn)
       }
-    }, [props.defaultTheme, props.disableRootThemeClass, props.themeClassNameOnRoot])
+    }, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot])
   }
 
   return (
@@ -38,7 +40,7 @@ export const ThemeProvider = (props: ThemeProviderProps) => {
       className={props.className}
       name={props.defaultTheme}
       // if root class disabled, force class here
-      forceClassName={!props.disableRootThemeClass}
+      forceClassName={!disableRootThemeClass && !themeClassNameOnRoot}
       // @ts-expect-error
       _isRoot
     >

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

@@ -1 +1 @@
-{"version":3,"file":"ThemeProvider.d.ts","sourceRoot":"","sources":["../../src/views/ThemeProvider.tsx"],"names":[],"mappings":"AAOA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,iFAAiF;IACjF,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,kBAAkB,4CA6BtD,CAAA"}
+{"version":3,"file":"ThemeProvider.d.ts","sourceRoot":"","sources":["../../src/views/ThemeProvider.tsx"],"names":[],"mappings":"AAOA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,iFAAiF;IACjF,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,kBAAkB,4CA+BtD,CAAA"}