@mantou/gem 1.6.17 → 1.6.19

package/dist/gem.es.js

@@ -1535,7 +1535,7 @@ var __privateSet$1 = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _renderRoot, _internals, _isAppendReason, _isAsync, _effectList, _momeList, _unmountCallback, _exec, _execEffect, _execMemo, _initEffect, _render, _shouldUpdate, _updateCallback, _update, _updated, _connectedCallback;
+var _renderRoot, _internals, _isAppendReason, _isMounted, _isAsync, _effectList, _memoList, _unmountCallback, _exec, _execEffect, _execMemo, _initEffect, _render, _shouldUpdate, _updateCallback, _update, _updated, _connectedCallback;
 function emptyFunction() {
 }
 function execCallback(fun) {
@@ -1552,6 +1552,7 @@ const tick = (timeStamp = performance.now()) => {
   }
 };
 asyncRenderTaskList.addEventListener("start", () => addMicrotask(tick));
+const constructorSymbol = Symbol("constructor");
 const initSymbol = Symbol("init");
 const updateSymbol = Symbol("update");
 class GemElement extends HTMLElement {
@@ -1560,9 +1561,10 @@ class GemElement extends HTMLElement {
     __privateAdd$1(this, _renderRoot, void 0);
     __privateAdd$1(this, _internals, void 0);
     __privateAdd$1(this, _isAppendReason, void 0);
+    __privateAdd$1(this, _isMounted, void 0);
     __privateAdd$1(this, _isAsync, void 0);
     __privateAdd$1(this, _effectList, void 0);
-    __privateAdd$1(this, _momeList, void 0);
+    __privateAdd$1(this, _memoList, void 0);
     __privateAdd$1(this, _unmountCallback, void 0);
     this.setState = (payload) => {
       if (!this.state)
@@ -1585,7 +1587,7 @@ class GemElement extends HTMLElement {
       __privateGet$1(this, _exec).call(this, __privateGet$1(this, _effectList));
     });
     __privateAdd$1(this, _execMemo, () => {
-      __privateGet$1(this, _exec).call(this, __privateGet$1(this, _momeList));
+      __privateGet$1(this, _exec).call(this, __privateGet$1(this, _memoList));
     });
     this.effect = (callback, getDep) => {
       if (!__privateGet$1(this, _effectList))
@@ -1594,22 +1596,23 @@ class GemElement extends HTMLElement {
         callback,
         getDep,
         values: void 0,
-        initialized: !!this.isConnected
+        initialized: __privateGet$1(this, _isMounted),
+        inConstructor: this[constructorSymbol]
       };
-      if (this.isConnected) {
+      if (__privateGet$1(this, _isMounted)) {
         effectItem.values = getDep == null ? void 0 : getDep();
         effectItem.preCallback = callback(effectItem.values);
       }
       __privateGet$1(this, _effectList).push(effectItem);
     };
     this.memo = (callback, getDep) => {
-      if (!__privateGet$1(this, _momeList))
-        __privateSet$1(this, _momeList, []);
-      __privateGet$1(this, _momeList).push({
+      if (!__privateGet$1(this, _memoList))
+        __privateSet$1(this, _memoList, []);
+      __privateGet$1(this, _memoList).push({
         callback,
         getDep,
         values: [Symbol()],
-        initialized: this.isConnected
+        inConstructor: this[constructorSymbol]
       });
     };
     __privateAdd$1(this, _initEffect, () => {
@@ -1641,7 +1644,7 @@ class GemElement extends HTMLElement {
       return this.shouldUpdate ? this.shouldUpdate() : true;
     });
     __privateAdd$1(this, _updateCallback, () => {
-      if (this.isConnected && __privateGet$1(this, _shouldUpdate).call(this)) {
+      if (__privateGet$1(this, _isMounted) && __privateGet$1(this, _shouldUpdate).call(this)) {
         const temp = __privateGet$1(this, _render).call(this);
         temp !== void 0 && render(temp, __privateGet$1(this, _renderRoot));
         addMicrotask(__privateGet$1(this, _updated));
@@ -1664,6 +1667,7 @@ class GemElement extends HTMLElement {
     });
     __privateAdd$1(this, _connectedCallback, () => {
       var _a2, _b, _c;
+      this[constructorSymbol] = false;
       if (__privateGet$1(this, _isAppendReason)) {
         __privateSet$1(this, _isAppendReason, false);
         return;
@@ -1675,16 +1679,18 @@ class GemElement extends HTMLElement {
       });
       const temp = __privateGet$1(this, _render).call(this);
       temp !== void 0 && render(temp, __privateGet$1(this, _renderRoot));
+      __privateSet$1(this, _isMounted, true);
       __privateSet$1(this, _unmountCallback, (_b = this.mounted) == null ? void 0 : _b.call(this));
       __privateGet$1(this, _initEffect).call(this);
       if (rootElement2 && ((_c = this.getRootNode().host) == null ? void 0 : _c.tagName) !== rootElement2.toUpperCase()) {
         throw new GemError(`not allow current root type`);
       }
     });
+    this[constructorSymbol] = true;
     addMicrotask(() => this[initSymbol] = false);
     this[initSymbol] = true;
     this[updateSymbol] = () => {
-      if (this.isConnected) {
+      if (__privateGet$1(this, _isMounted)) {
         addMicrotask(__privateGet$1(this, _update));
       }
     };
@@ -1755,7 +1761,7 @@ class GemElement extends HTMLElement {
     return __privateGet$1(this, _internals);
   }
   attributeChangedCallback() {
-    if (this.isConnected) {
+    if (__privateGet$1(this, _isMounted)) {
       addMicrotask(__privateGet$1(this, _update));
     }
   }
@@ -1785,11 +1791,12 @@ class GemElement extends HTMLElement {
     }
   }
   disconnectedCallback() {
-    var _a2, _b, _c;
+    var _a2, _b, _c, _d;
     if (this.isConnected) {
       __privateSet$1(this, _isAppendReason, true);
       return;
     }
+    __privateSet$1(this, _isMounted, false);
     const { observedStores } = this.constructor;
     observedStores == null ? void 0 : observedStores.forEach((store2) => {
       disconnect(store2, __privateGet$1(this, _update));
@@ -1799,15 +1806,17 @@ class GemElement extends HTMLElement {
     (_b = __privateGet$1(this, _effectList)) == null ? void 0 : _b.forEach((effectItem) => {
       execCallback(effectItem.preCallback);
     });
-    __privateSet$1(this, _momeList, (_c = __privateGet$1(this, _momeList)) == null ? void 0 : _c.filter(({ initialized }) => !initialized));
+    __privateSet$1(this, _effectList, (_c = __privateGet$1(this, _effectList)) == null ? void 0 : _c.filter(({ inConstructor }) => inConstructor));
+    __privateSet$1(this, _memoList, (_d = __privateGet$1(this, _memoList)) == null ? void 0 : _d.filter(({ inConstructor }) => inConstructor));
   }
 }
 _renderRoot = new WeakMap();
 _internals = new WeakMap();
 _isAppendReason = new WeakMap();
+_isMounted = new WeakMap();
 _isAsync = new WeakMap();
 _effectList = new WeakMap();
-_momeList = new WeakMap();
+_memoList = new WeakMap();
 _unmountCallback = new WeakMap();
 _exec = new WeakMap();
 _execEffect = new WeakMap();
@@ -2059,13 +2068,13 @@ function validData(data) {
   if ($hasShouldCloseHandle)
     throw new GemError("`$hasShouldCloseHandle` is not allowed");
 }
-function getUrlbarPath(internalPath) {
+function getUrlBarPath(internalPath) {
   return gemHistory.basePath ? gemHistory.basePath + internalPath : internalPath;
 }
-function getInternalPath(urlbarPath) {
-  if (urlbarPath === gemHistory.basePath)
+function getInternalPath(urlBarPath) {
+  if (urlBarPath === gemHistory.basePath)
     return "/";
-  return urlbarPath.replace(new RegExp(`^${gemHistory.basePath}/`), "/");
+  return urlBarPath.replace(new RegExp(`^${gemHistory.basePath}/`), "/");
 }
 function normalizeParams(params) {
   const current = paramsMap.get(store.$key) || {};
@@ -2089,7 +2098,7 @@ function updateHistory(p, native) {
   }, data);
   paramsMap.set(state2.$key, params);
   updateStore(cleanObject(store), state2);
-  const url = getUrlbarPath(path) + new QueryString(query) + hash;
+  const url = getUrlBarPath(path) + new QueryString(query) + hash;
   const prevHash = decodeURIComponent(location.hash);
   native(state2, title, url);
   if (prevHash !== hash)
@@ -2104,7 +2113,7 @@ function updateHistoryByNative(data, title, originUrl, native) {
   const params = normalizeParams({ path: pathname, query: new QueryString(search), hash, title, data });
   paramsMap.set(state2.$key, params);
   updateStore(cleanObject(store), state2);
-  const url = getUrlbarPath(pathname) + params.query + hash;
+  const url = getUrlBarPath(pathname) + params.query + hash;
   const prevHash = location.hash;
   native(state2, title, url);
   if (prevHash !== hash)
@@ -2218,7 +2227,8 @@ if (!window._GEMHISTORY) {
       });
     }
     const prevState = store;
-    if (parseFloat(newState.$key) > parseFloat(prevState.$key) && newState.$hasOpenHandle) {
+    const isForward = parseFloat(newState.$key) > parseFloat(prevState.$key);
+    if (isForward && newState.$hasOpenHandle) {
       (_b = (_a2 = paramsMap.get(newState.$key)) == null ? void 0 : _a2.open) == null ? void 0 : _b.call(_a2);
     } else if (prevState.$hasCloseHandle) {
       const prevParams = paramsMap.get(prevState.$key);
@@ -2335,9 +2345,17 @@ let GemRouteElement = class extends GemElement {
       __privateSet2(this, _lastLoader, void 0);
       this.currentRoute = route;
       this.currentParams = params;
-      this.setState({ content });
-      this.routechange(this.currentRoute);
-      __privateGet2(this, _updateLocationStore).call(this);
+      const changeContent = () => {
+        this.setState({ content });
+        this.routechange(this.currentRoute);
+        __privateGet2(this, _updateLocationStore).call(this);
+        return Promise.resolve();
+      };
+      if (this.transition && "startViewTransition" in document) {
+        document.startViewTransition(changeContent);
+      } else {
+        changeContent();
+      }
     });
     this.routes = routes;
   }
@@ -2423,6 +2441,9 @@ GemRouteElement.findRoute = (target = [], path) => {
   }
   return { route: defaultRoute };
 };
+__decorateClass$6([
+  boolattribute
+], GemRouteElement.prototype, "transition", 2);
 __decorateClass$6([
   property
 ], GemRouteElement.prototype, "routes", 2);
@@ -2949,7 +2970,7 @@ function replaceStyle(style, theme) {
   const themeStore = themeStoreMap.get(theme);
   const themeProp = themePropMap.get(theme);
   const rules = Object.keys(themeStore).reduce((prev, key2) => {
-    if (!themeStore[key2])
+    if (!themeStore[key2] || !themeProp[key2])
       return prev;
     return prev + `${themeProp[key2]}:${themeStore[key2]};`;
   }, "");
@@ -3269,7 +3290,7 @@ const mediaQuery = {
     return matche(this.DATA_REDUCE);
   }
 };
-const version = "1.6.17";
+const version = "1.6.19";
 if (window.__GEM_DEVTOOLS__HOOK__) {
   Object.assign(window.__GEM_DEVTOOLS__HOOK__, __spreadValues({}, Gem));
 }