tamagui 1.85.9-1705340264375 → 1.85.11

package/dist/native.js

@@ -1366,9 +1366,7 @@ var require_insertStyleRule_native = __commonJS({
         theme: values
       };
       for (let selector of selectors) {
-        let scheme = selector.includes("t_dark") ? "dark" : selector.includes("t_light") ? "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
-        name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
-        let themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
+        let matches = selector.match(/(.t_(light|dark))?[\s]?(.t_([a-z0-9_]+))[\s]*$/i) || [], [_0, _1, scheme, _2, name] = matches, themeName = name && scheme && scheme !== name ? `${scheme}_${name}` : name || scheme;
         dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
       }
       return dedupedEntry;
@@ -1815,7 +1813,7 @@ var require_ThemeManager_native = __commonJS({
           return this.updateState(nextState, shouldNotify), nextState;
       }
       updateState(nextState, shouldNotify = !0) {
-        this.state = nextState, this._allKeys = null, process.env.NODE_ENV !== "production" && (this._numChangeEventsSent ??= 0, this._numChangeEventsSent++), shouldNotify && this.notify();
+        this.state = nextState, this._allKeys = null, shouldNotify && this.notify();
       }
       getStateIfChanged(props = this.props, state = this.state, parentManager = this.parentManager) {
         let _ = this.getState(props, parentManager);
@@ -1838,7 +1836,7 @@ var require_ThemeManager_native = __commonJS({
         ]), this._allKeys;
       }
       notify(forced = !1) {
-        this.themeListeners.forEach((cb) => cb(this.state.name, this, forced));
+        this.themeListeners.forEach((cb) => cb(this.state.name, this, forced)), process.env.NODE_ENV !== "production" && (this._numChangeEventsSent ??= 0, this._numChangeEventsSent++);
       }
       onChangeTheme(cb, debugId) {
         return process.env.NODE_ENV !== "production" && debugId && (this._listeningIds ??= /* @__PURE__ */ new Set(), this._listeningIds.add(debugId)), this.themeListeners.add(cb), () => {
@@ -2074,11 +2072,11 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       }
       return !1;
     }
-    var activeThemeManagers = /* @__PURE__ */ new Set(), _idToManager = /* @__PURE__ */ new Map(), getThemeManager = (id) => {
-      var _a;
-      return (_a = _idToManager.get(id)) == null ? void 0 : _a.deref();
-    }, registerThemeManager = (t) => {
-      _idToManager.set(t.id, new WeakRef(t));
+    var activeThemeManagers = /* @__PURE__ */ new Set(), _uidToManager = /* @__PURE__ */ new WeakMap(), _idToUID = {}, getId = (id) => _idToUID[id], getThemeManager = (id) => _uidToManager.get(getId(id)), registerThemeManager = (t) => {
+      if (!_idToUID[t.id]) {
+        let id = _idToUID[t.id] = {};
+        _uidToManager.set(id, t);
+      }
     }, useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
       let { disable } = props, parentManagerId = (0, import_react2.useContext)(import_ThemeManagerContext.ThemeManagerIDContext), parentManager = getThemeManager(parentManagerId);
       if (!isRoot && !parentManager || disable)