@tamagui/core 1.0.1-beta.19 → 1.0.1-beta.190

package/dist/cjs/createVariable.js

@@ -1,8 +1,8 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -18,60 +18,84 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createVariable_exports = {};
 __export(createVariable_exports, {
-  IS_VARIABLE_SYMBOL: () => IS_VARIABLE_SYMBOL,
-  Variable: () => Variable,
   createCSSVariable: () => createCSSVariable,
   createVariable: () => createVariable,
+  getVariable: () => getVariable,
   getVariableName: () => getVariableName,
   getVariableValue: () => getVariableValue,
-  isVariable: () => isVariable
+  getVariableVariable: () => getVariableVariable,
+  isVariable: () => isVariable,
+  variableToString: () => variableToString
 });
 module.exports = __toCommonJS(createVariable_exports);
-var import_platform = require("./constants/platform");
-var _a;
-const IS_VARIABLE_SYMBOL = "__isVariable__";
-class Variable {
-  constructor({ val, name }) {
-    this[_a] = true;
-    this.val = isVariable(val) ? val.val : val;
-    this.name = name;
-    this.variable = import_platform.isWeb ? createCSSVariable(name) : this.val;
+var import_constants = require("@tamagui/constants");
+var import_helpers = require("@tamagui/helpers");
+var import_config = require("./config");
+const IS_VAR = "__isVar__";
+const createVariable = (props) => {
+  if (isVariable(props)) {
+    return props;
   }
-  toString() {
-    return `${import_platform.isWeb ? this.variable : this.val}`;
+  return {
+    [IS_VAR]: true,
+    ...props,
+    variable: import_constants.isWeb ? createCSSVariable(props.name) : ""
+  };
+};
+function variableToString(vrble, getValue = false) {
+  if (!vrble)
+    return "";
+  if (isVariable(vrble)) {
+    if (getValue)
+      return `${vrble.val}`;
+    return `${import_constants.isWeb ? vrble.variable : vrble.val}`;
   }
+  return `${vrble}`;
 }
-__name(Variable, "Variable");
-_a = IS_VARIABLE_SYMBOL;
-const createVariable = /* @__PURE__ */ __name((props) => new Variable(props), "createVariable");
 function isVariable(v) {
-  return v instanceof Variable || v && v[IS_VARIABLE_SYMBOL];
+  return !!(v && v[IS_VAR]);
+}
+function getVariable(nameOrVariable) {
+  if (isVariable(nameOrVariable)) {
+    return variableToString(nameOrVariable);
+  }
+  const tokens = (0, import_config.getConfig)().tokensParsed;
+  return variableToString(tokens[nameOrVariable] ?? nameOrVariable);
 }
-__name(isVariable, "isVariable");
 function getVariableValue(v) {
   if (isVariable(v))
     return v.val;
   return v;
 }
-__name(getVariableValue, "getVariableValue");
 function getVariableName(v) {
   if (isVariable(v))
     return v.name;
   return v;
 }
-__name(getVariableName, "getVariableName");
-const createCSSVariable = /* @__PURE__ */ __name((val, includeVar = true) => {
-  const name = val.replace(/[^a-z0-9\_\-]+/i, "_");
+function getVariableVariable(v) {
+  if (isVariable(v))
+    return v.variable;
+  return v;
+}
+const createCSSVariable = (nameProp, includeVar = true) => {
+  if (process.env.NODE_ENV === "development") {
+    if (!nameProp || typeof nameProp !== "string") {
+      console.trace("createCSSVariable invalid name", nameProp);
+      return ``;
+    }
+  }
+  const name = (0, import_helpers.simpleHash)(nameProp, 60);
   return includeVar ? `var(--${name})` : name;
-}, "createCSSVariable");
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  IS_VARIABLE_SYMBOL,
-  Variable,
   createCSSVariable,
   createVariable,
+  getVariable,
   getVariableName,
   getVariableValue,
-  isVariable
+  getVariableVariable,
+  isVariable,
+  variableToString
 });
 //# sourceMappingURL=createVariable.js.map

package/dist/cjs/createVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariable.ts"],
-  "sourcesContent": ["import { isWeb } from './constants/platform'\n\nexport const IS_VARIABLE_SYMBOL = '__isVariable__'\n\nexport class Variable {\n  // because we have a separate node runtime we can't do instanceof\n  // ran into issues with this and it's potentially fixable but for now\n  // lets just do this\n  [IS_VARIABLE_SYMBOL] = true\n\n  name: string\n  val: string | number\n  variable: string | number\n\n  constructor({ val, name }: VariableIn) {\n    // converting to px breaks rn\n    this.val = isVariable(val) ? val.val : val\n    this.name = name\n    this.variable = isWeb ? createCSSVariable(name) : this.val\n  }\n\n  toString() {\n    return `${isWeb ? this.variable : this.val}`\n  }\n}\n\ntype VariableIn = { val: string | number | Variable; name: string }\n\nexport const createVariable = (props: VariableIn) => new Variable(props)\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v instanceof Variable || (v && v[IS_VARIABLE_SYMBOL])\n}\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) return v.val\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (val: string, includeVar = true) => {\n  const name = val.replace(/[^a-z0-9\\_\\-]+/i, '_')\n  return includeVar ? `var(--${name})` : name\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAsB;AAAtB;AAEO,MAAM,qBAAqB;AAE3B,MAAM,SAAS;AAAA,EAUpB,YAAY,EAAE,KAAK,QAAoB;AANtC,eAAsB;AAQrB,SAAK,MAAM,WAAW,GAAG,IAAI,IAAI,MAAM;AACvC,SAAK,OAAO;AACZ,SAAK,WAAW,wBAAQ,kBAAkB,IAAI,IAAI,KAAK;AAAA,EACzD;AAAA,EAEA,WAAW;AACT,WAAO,GAAG,wBAAQ,KAAK,WAAW,KAAK;AAAA,EACzC;AACF;AApBO;AAJP,AAQG;AAoBI,MAAM,iBAAiB,wBAAC,UAAsB,IAAI,SAAS,KAAK,GAAzC;AAEvB,oBAAoB,GAAkC;AAC3D,SAAO,aAAa,YAAa,KAAK,EAAE;AAC1C;AAFgB;AAIT,0BAA0B,GAAmB;AAClD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAHgB;AAKT,yBAAyB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAHgB;AAMT,MAAM,oBAAoB,wBAAC,KAAa,aAAa,SAAS;AACnE,QAAM,OAAO,IAAI,QAAQ,mBAAmB,GAAG;AAC/C,SAAO,aAAa,SAAS,UAAU;AACzC,GAHiC;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = '__isVar__'\n\ntype VariableIn<A = any> = {\n  val: A\n  name: string\n  key: string\n  isFloating?: boolean\n}\n\nexport type Variable<A = any> = VariableIn<A> & {\n  [IS_VAR]?: true\n  variable?: string\n}\n\nexport const createVariable = <A extends string | number = any>(props: VariableIn<A>) => {\n  if (isVariable(props)) {\n    return props\n  }\n  return {\n    [IS_VAR]: true,\n    // @ts-ignore\n    ...props,\n    variable: isWeb ? createCSSVariable(props.name) : '',\n  }\n}\n\n// on the client maybe we can change the prototype of variable object toString to keep backwards compat\nexport function variableToString(vrble?: any, getValue = false) {\n  if (!vrble) return ''\n  if (isVariable(vrble)) {\n    if (getValue) return `${vrble.val}`\n    return `${isWeb ? vrble.variable : vrble.val}`\n  }\n  return `${vrble}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return !!(v && v[IS_VAR])\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) return v.val\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      // eslint-disable-next-line no-console\n      console.trace('createCSSVariable invalid name', nameProp)\n      return ``\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,qBAA2B;AAE3B,oBAA0B;AAO1B,MAAM,SAAS;AAcR,MAAM,iBAAiB,CAAkC,UAAyB;AACvF,MAAI,WAAW,KAAK,GAAG;AACrB,WAAO;AAAA,EACT;AACA,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IAEV,GAAG;AAAA,IACH,UAAU,yBAAQ,kBAAkB,MAAM,IAAI,IAAI;AAAA,EACpD;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,CAAC;AAAO,WAAO;AACnB,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI;AAAU,aAAO,GAAG,MAAM;AAC9B,WAAO,GAAG,yBAAQ,MAAM,WAAW,MAAM;AAAA,EAC3C;AACA,SAAO,GAAG;AACZ;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,CAAC,EAAE,KAAK,EAAE;AACnB;AAEO,SAAS,YAAY,gBAAmC;AAC7D,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,aAAS,yBAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEO,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAE7C,cAAQ,MAAM,kCAAkC,QAAQ;AACxD,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,WAAO,2BAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
   "names": []
 }

package/dist/cjs/createVariables.js

@@ -0,0 +1,52 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var createVariables_exports = {};
+__export(createVariables_exports, {
+  createVariables: () => createVariables
+});
+module.exports = __toCommonJS(createVariables_exports);
+var import_createVariable = require("./createVariable");
+const createVariables = (tokens, parentPath = "", isFont = false) => {
+  const res = {};
+  let i = 0;
+  for (const key in tokens) {
+    i++;
+    const variableName = isFont ? key.slice(0, 2) : i;
+    const val = tokens[key];
+    if ((0, import_createVariable.isVariable)(val)) {
+      res[key] = val;
+      continue;
+    }
+    let name = parentPath ? `${parentPath}-${variableName}` : key;
+    if (isFont && name.includes("_")) {
+      name = name.replace(/_[a-z0-9]+/i, "");
+    }
+    if (val && typeof val === "object") {
+      res[key] = createVariables(tokens[key], `${name}`);
+      continue;
+    }
+    res[key] = (0, import_createVariable.isVariable)(val) ? val : (0, import_createVariable.createVariable)({ val, name, key });
+  }
+  return res;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createVariables
+});
+//# sourceMappingURL=createVariables.js.map

package/dist/cjs/createVariables.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/createVariables.ts"],
+  "sourcesContent": ["import { Variable, createVariable, isVariable } from './createVariable'\n\ntype DeepTokenObject<Val extends string | number = any> = {\n  [key: string]: Val | DeepTokenObject<Val>\n}\n\nexport type DeepVariableObject<A extends DeepTokenObject> = {\n  [Key in keyof A]: A[Key] extends string | number\n    ? Variable<A[Key]>\n    : A[Key] extends DeepTokenObject\n    ? DeepVariableObject<A[Key]>\n    : never\n}\n\nexport const createVariables = <A extends DeepTokenObject>(\n  tokens: A,\n  parentPath = '',\n  isFont = false\n): DeepVariableObject<A> => {\n  const res: any = {}\n  let i = 0\n  for (const key in tokens) {\n    i++\n    const variableName = isFont ? key.slice(0, 2) : i\n    const val = tokens[key]\n    if (isVariable(val)) {\n      res[key] = val\n      continue\n    }\n    let name = parentPath ? `${parentPath}-${variableName}` : key\n    if (isFont && name.includes('_')) {\n      name = name.replace(/_[a-z0-9]+/i, '')\n    }\n    if (val && typeof val === 'object') {\n      // recurse\n      res[key] = createVariables(tokens[key] as any, `${name}`)\n      continue\n    }\n    res[key] = isVariable(val) ? val : createVariable({ val, name, key })\n  }\n  return res\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAqD;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,aAAW,OAAO,QAAQ;AACxB;AACA,UAAM,eAAe,SAAS,IAAI,MAAM,GAAG,CAAC,IAAI;AAChD,UAAM,MAAM,OAAO;AACnB,YAAI,kCAAW,GAAG,GAAG;AACnB,UAAI,OAAO;AACX;AAAA,IACF;AACA,QAAI,OAAO,aAAa,GAAG,cAAc,iBAAiB;AAC1D,QAAI,UAAU,KAAK,SAAS,GAAG,GAAG;AAChC,aAAO,KAAK,QAAQ,eAAe,EAAE;AAAA,IACvC;AACA,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,OAAO,gBAAgB,OAAO,MAAa,GAAG,MAAM;AACxD;AAAA,IACF;AACA,QAAI,WAAO,kCAAW,GAAG,IAAI,UAAM,sCAAe,EAAE,KAAK,MAAM,IAAI,CAAC;AAAA,EACtE;AACA,SAAO;AACT;",
+  "names": []
+}

package/dist/cjs/helpers/RNComponents.js

@@ -1,8 +1,7 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,21 +15,23 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var RNComponents_exports = {};
 __export(RNComponents_exports, {
   RNComponents: () => RNComponents
 });
 module.exports = __toCommonJS(RNComponents_exports);
-var ReactNative = __toESM(require("react-native"));
-const RNComponents = /* @__PURE__ */ new WeakMap();
-for (const key of ["Image", "TextInput", "Text", "View"]) {
-  const val = ReactNative[key];
-  if (val && typeof val === "object") {
-    RNComponents.set(val, true);
-  }
-}
+var import_react_native = require("react-native");
+const RNComponents = /* @__PURE__ */ new Set([
+  import_react_native.Image,
+  import_react_native.TextInput,
+  import_react_native.Text,
+  import_react_native.View,
+  "Image",
+  "TextInput",
+  "Text",
+  "View"
+]);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RNComponents

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/RNComponents.tsx"],
-  "sourcesContent": ["import * as ReactNative from 'react-native'\n\n// bye bye tree shaking... but only way to properly detect react-native components...\n// also neither rnw nor react support tree shaking atm\nexport const RNComponents = new WeakMap()\n\n// I was looping over all of them, but casuses deprecation warnings and there's only a few\n// we realistically support - lets whitelist rather than blacklist\nfor (const key of ['Image', 'TextInput', 'Text', 'View']) {\n  const val = ReactNative[key]\n  if (val && typeof val === 'object') {\n    RNComponents.set(val, true)\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA6B;AAItB,MAAM,eAAe,oBAAI,QAAQ;AAIxC,WAAW,OAAO,CAAC,SAAS,aAAa,QAAQ,MAAM,GAAG;AACxD,QAAM,MAAM,YAAY;AACxB,MAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,iBAAa,IAAI,KAAK,IAAI;AAAA,EAC5B;AACF;",
+  "sourcesContent": ["import { Image, Text, TextInput, View } from 'react-native'\n\n// limited support\nexport const RNComponents = new Set<any>([\n  Image,\n  TextInput,\n  Text,\n  View,\n  // see fake-react-native + styled() check\n  'Image',\n  'TextInput',\n  'Text',\n  'View',\n])\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA6C;AAGtC,MAAM,eAAe,oBAAI,IAAS;AAAA,EACvC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;",
   "names": []
 }

package/dist/cjs/{ThemeManager.js → helpers/ThemeManager.js}

@@ -1,8 +1,8 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,19 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateMethod = (obj, member, method) => {
-  __accessCheck(obj, member, "access private method");
-  return method;
-};
 var ThemeManager_exports = {};
 __export(ThemeManager_exports, {
   ThemeManager: () => ThemeManager,
@@ -37,19 +24,19 @@ __export(ThemeManager_exports, {
 });
 module.exports = __toCommonJS(ThemeManager_exports);
 var import_react = require("react");
-var import_conf = require("./conf");
-var import_constants = require("./constants/constants");
-var _getClassName, getClassName_fn;
+var import_config = require("../config");
+var import_constants = require("../constants/constants");
+var import_getThemeUnwrapped = require("../hooks/getThemeUnwrapped");
 class ThemeManager {
-  constructor(name = "", theme = null, parentManager = null) {
+  constructor(name = "", className = "", theme = null, parentManager = null, reset = false) {
     this.name = name;
+    this.className = className;
     this.theme = theme;
     this.parentManager = parentManager;
-    __privateAdd(this, _getClassName);
+    this.reset = reset;
     this.keys = /* @__PURE__ */ new Map();
     this.listeners = /* @__PURE__ */ new Map();
     this.themeListeners = /* @__PURE__ */ new Set();
-    this.className = null;
     let parent = parentManager;
     let tries = 0;
     while (true) {
@@ -67,6 +54,9 @@ class ThemeManager {
       }
     }
   }
+  get didChangeTheme() {
+    return this.parentManager && this.name !== this.parentManager.fullName;
+  }
   get parentName() {
     var _a;
     return ((_a = this.parentManager) == null ? void 0 : _a.name) || null;
@@ -84,28 +74,42 @@ class ThemeManager {
         return theme[key];
       }
       manager = this.parentManager;
-      if (!manager) {
-        return;
-      }
-      if (manager.theme === theme) {
+      if (!manager || manager.theme === theme) {
         return;
       }
       theme = manager.theme;
     }
   }
-  update({ name, theme, className } = {}) {
-    const sameNameOrClassName = this.className ? className == this.className : name === this.name;
-    if (sameNameOrClassName) {
-      return false;
+  isTracking(uuid) {
+    var _a;
+    return Boolean((_a = this.keys.get(uuid)) == null ? void 0 : _a.size);
+  }
+  update({ name, theme, className } = {}, force = false, notify = true) {
+    if (!force) {
+      const nameChanged = name !== this.name;
+      if (!nameChanged) {
+        return false;
+      }
     }
-    this.className = className || null;
+    this.className = className || "";
     this.name = name || "";
     this.theme = theme;
-    this.notifyListeners();
+    if (notify) {
+      this.notifyListeners();
+    }
     return true;
   }
-  getNextTheme(opts = {}, props) {
-    const { themes = (0, import_conf.getThemes)(), name, componentName } = opts;
+  getNextTheme(props = {}, debug) {
+    var _a;
+    const { themes = (0, import_config.getThemes)(), name, componentName } = props;
+    if (props.reset && name) {
+      return {
+        name,
+        theme: themes[name],
+        className: this.getClassName(name)
+      };
+    }
+    const parentIsReset = (_a = this.parentManager) == null ? void 0 : _a.reset;
     if (!name) {
       if (componentName) {
         const names = [
@@ -114,29 +118,27 @@ class ThemeManager {
         ];
         for (const name2 of names) {
           if (name2 in themes) {
-            return { name: name2, theme: themes[name2], className: __privateMethod(this, _getClassName, getClassName_fn).call(this, name2) };
+            const className = this.getClassName(name2);
+            return { name: name2, theme: themes[name2], className };
           }
         }
       }
       return {
         name: this.name,
-        theme: this.theme
+        theme: this.theme,
+        className: this.className
       };
     }
     let nextName = name || this.name || "";
-    let parentName = this.fullName;
+    let parentName = parentIsReset ? this.parentName || this.fullName : this.fullName;
     while (true) {
-      if (nextName in themes) {
+      if (nextName in themes)
         break;
-      }
       nextName = `${parentName}_${name}`;
-      if (nextName in themes) {
+      if (nextName in themes)
         break;
-      }
-      if (!parentName.includes(import_constants.THEME_NAME_SEPARATOR)) {
-        console.warn("theme not found", name);
+      if (!parentName.includes(import_constants.THEME_NAME_SEPARATOR))
         break;
-      }
       parentName = parentName.slice(0, parentName.lastIndexOf(import_constants.THEME_NAME_SEPARATOR));
     }
     if (componentName) {
@@ -154,15 +156,20 @@ class ThemeManager {
     if (!theme) {
       theme = themes[`light_${nextName}`];
     }
-    if (process.env.NODE_ENV === "development" && props && props["debug"]) {
-      console.log("getNextTheme", { name: opts.name, nextName, parentName });
+    if (process.env.NODE_ENV === "development") {
+      if (debug) {
+        console.log("getNextTheme", this.getClassName(nextName), { props, nextName, parentName });
+      }
     }
     return {
       name: nextName,
-      theme,
-      className: __privateMethod(this, _getClassName, getClassName_fn).call(this, nextName)
+      theme: (0, import_getThemeUnwrapped.getThemeUnwrapped)(theme),
+      className: this.getClassName(nextName)
     };
   }
+  getClassName(name) {
+    return `${import_constants.THEME_CLASSNAME_PREFIX}${name} t_Theme`.replace("light_", "").replace("dark_", "");
+  }
   track(uuid, keys) {
     if (!this.name)
       return;
@@ -194,14 +201,9 @@ class ThemeManager {
     };
   }
 }
-__name(ThemeManager, "ThemeManager");
-_getClassName = new WeakSet();
-getClassName_fn = /* @__PURE__ */ __name(function(name) {
-  return `${import_constants.THEME_CLASSNAME_PREFIX}${name} tui_theme`.replace("light_", "").replace("dark_", "");
-}, "#getClassName");
 const ThemeManagerContext = (0, import_react.createContext)(null);
 const emptyManager = new ThemeManager();
-const withoutComponentName = /* @__PURE__ */ __name((name) => name.replace(/\_[A-Z][a-z]+$/, ""), "withoutComponentName");
+const withoutComponentName = (name) => name.replace(/(\_[A-Z][a-zA-Z]+)+$/g, "");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ThemeManager,

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/ThemeManager.tsx"],
+  "sourcesContent": ["import { createContext } from 'react'\n\nimport { getThemes } from '../config'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from '../constants/constants'\nimport { getThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { ThemeParsed, Themes } from '../types'\n\ntype ThemeListener = (name: string | null, themeManager: ThemeManager) => void\n\nexport type SetActiveThemeProps = {\n  className?: string\n  parentManager?: ThemeManager | null\n  name?: string | null\n  theme?: any\n}\n\nexport type GetNextThemeProps = {\n  themes?: Themes\n  name?: string | null\n  componentName?: string | null\n  reset?: boolean\n}\n\nexport class ThemeManager {\n  keys = new Map<any, Set<string>>()\n  listeners = new Map<any, Function>()\n  themeListeners = new Set<ThemeListener>()\n\n  constructor(\n    public name: string = '',\n    public className: string = '',\n    public theme: ThemeParsed | null = null,\n    public parentManager: ThemeManager | null = null,\n    public reset: boolean = false\n  ) {\n    // find the nearest different parentManager\n    let parent = parentManager\n    let tries = 0\n    while (true) {\n      tries++\n      if (tries > 10) {\n        throw new Error(`Nested 10 of the same theme in a row, likely error`)\n      }\n      if (!parent) break\n      if (parent.name === name) {\n        // go up if same\n        parent = parent.parentManager\n      } else {\n        this.parentManager = parent\n        break\n      }\n    }\n  }\n\n  get didChangeTheme() {\n    return this.parentManager && this.name !== this.parentManager.fullName\n  }\n\n  get parentName() {\n    return this.parentManager?.name || null\n  }\n\n  get fullName(): string {\n    return this.getNextTheme().name || this.name || ''\n    // const parentName = this.parentManager?.fullName || ''\n    // const name = this.name || ''\n    // const parts = [...new Set([...`${parentName}_${name}`.split('_')])].filter(Boolean)\n    // return parts.join('_')\n  }\n\n  // gets value going up to parents\n  getValue(key: string) {\n    let theme = this.theme\n    let manager = this as ThemeManager | null\n    while (true) {\n      if (!theme) return\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = this.parentManager\n      if (!manager || manager.theme === theme) {\n        return\n      }\n      theme = manager.theme\n    }\n  }\n\n  isTracking(uuid: Object) {\n    return Boolean(this.keys.get(uuid)?.size)\n  }\n\n  update({ name, theme, className }: SetActiveThemeProps = {}, force = false, notify = true) {\n    if (!force) {\n      // className compare on web, avoids light/dark re-renders\n      const nameChanged = name !== this.name\n      if (!nameChanged) {\n        return false\n      }\n    }\n    this.className = className || ''\n    this.name = name || ''\n    this.theme = theme\n    if (notify) {\n      this.notifyListeners()\n    }\n    return true\n  }\n\n  getNextTheme(\n    props: GetNextThemeProps = {},\n    debug?: any\n  ): {\n    name: string\n    theme: ThemeParsed | null\n    className: string | undefined\n  } {\n    const { themes = getThemes(), name, componentName } = props\n\n    if (props.reset && name) {\n      return {\n        name: name,\n        theme: themes[name] as ThemeParsed,\n        className: this.getClassName(name),\n      }\n    }\n\n    const parentIsReset = this.parentManager?.reset\n\n    if (!name) {\n      if (componentName) {\n        // allow for _Card_Button or just _Button\n        const names = [\n          `${this.name}_${componentName}`,\n          `${withoutComponentName(this.name)}_${componentName}`,\n        ]\n        for (const name of names) {\n          if (name in themes) {\n            const className = this.getClassName(name)\n            return { name, theme: themes[name], className }\n          }\n        }\n      }\n      return {\n        name: this.name,\n        theme: this.theme,\n        className: this.className,\n      }\n    }\n\n    let nextName = name || this.name || ''\n    let parentName = parentIsReset ? this.parentName || this.fullName : this.fullName\n\n    while (true) {\n      if (nextName in themes) break\n      nextName = `${parentName}_${name}`\n      if (nextName in themes) break\n      // this is fine - some themes can not have parents\n      if (!parentName.includes(THEME_NAME_SEPARATOR)) break\n      // go up one\n      parentName = parentName.slice(0, parentName.lastIndexOf(THEME_NAME_SEPARATOR))\n    }\n\n    if (componentName) {\n      // allow for _Card_Button or just _Button\n      const names = [\n        `${nextName}_${componentName}`,\n        `${withoutComponentName(nextName)}_${componentName}`,\n      ]\n      for (const name of names) {\n        if (name in themes) {\n          nextName = name\n        }\n      }\n    }\n\n    let theme = themes[nextName]\n    if (!theme) {\n      theme = themes[`light_${nextName}`]\n    }\n\n    if (process.env.NODE_ENV === 'development') {\n      if (debug) {\n        // eslint-disable-next-line no-console\n        console.log('getNextTheme', this.getClassName(nextName), { props, nextName, parentName })\n      }\n    }\n\n    return {\n      name: nextName,\n      theme: getThemeUnwrapped(theme),\n      className: this.getClassName(nextName),\n    }\n  }\n\n  getClassName(name: string) {\n    return `${THEME_CLASSNAME_PREFIX}${name} t_Theme`.replace('light_', '').replace('dark_', '')\n  }\n\n  track(uuid: any, keys: Set<string>) {\n    if (!this.name) return\n    this.keys.set(uuid, keys)\n  }\n\n  notifyListeners() {\n    if (!this.name) {\n      this.keys.clear()\n    }\n    for (const [uuid, keys] of this.keys.entries()) {\n      if (keys.size) {\n        this.listeners.get(uuid)?.()\n      }\n    }\n    this.themeListeners.forEach((cb) => cb(this.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n\n  onUpdate(uuid: any, cb: Function) {\n    this.listeners.set(uuid, cb)\n    return () => {\n      this.listeners.delete(uuid)\n      this.keys.delete(uuid)\n    }\n  }\n}\n\nexport const ThemeManagerContext = createContext<ThemeManager | null>(null)\nexport const emptyManager = new ThemeManager()\n\nconst withoutComponentName = (name: string) => name.replace(/(\\_[A-Z][a-zA-Z]+)+$/g, '')\n"],
+  "mappings": "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",
+  "names": ["name"]
+}

package/dist/cjs/helpers/areEqualSets.js

@@ -1,8 +1,8 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,7 +21,7 @@ __export(areEqualSets_exports, {
   areEqualSets: () => areEqualSets
 });
 module.exports = __toCommonJS(areEqualSets_exports);
-const areEqualSets = /* @__PURE__ */ __name((a, b) => {
+const areEqualSets = (a, b) => {
   if (a.size !== b.size)
     return false;
   for (const val in a) {
@@ -30,7 +30,7 @@ const areEqualSets = /* @__PURE__ */ __name((a, b) => {
     }
   }
   return true;
-}, "areEqualSets");
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   areEqualSets

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/helpers/areEqualSets.tsx"],
   "sourcesContent": ["export const areEqualSets = (a: Set<string>, b: Set<string>) => {\n  if (a.size !== b.size) return false\n  for (const val in a) {\n    if (!b.has(val)) {\n      return false\n    }\n  }\n  return true\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,eAAe,wBAAC,GAAgB,MAAmB;AAC9D,MAAI,EAAE,SAAS,EAAE;AAAM,WAAO;AAC9B,aAAW,OAAO,GAAG;AACnB,QAAI,CAAC,EAAE,IAAI,GAAG,GAAG;AACf,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT,GAR4B;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,eAAe,CAAC,GAAgB,MAAmB;AAC9D,MAAI,EAAE,SAAS,EAAE;AAAM,WAAO;AAC9B,aAAW,OAAO,GAAG;AACnB,QAAI,CAAC,EAAE,IAAI,GAAG,GAAG;AACf,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;",
   "names": []
 }