@mantou/gem 2.1.0 → 2.1.1

package/src/lib/element.ts

@@ -35,13 +35,13 @@ defineProperty(Symbol, 'metadata', { value: Symbol.for('Symbol.metadata') });
 
 const execCallback = (fun: any) => typeof fun === 'function' && fun();
 
-// 跨多个 gem 工作
+// 读取构造样式表，跨多个 gem 工作
 export const SheetToken = Symbol.for('gem@sheetToken');
-// proto prop
+// 更新元素，跨多个 gem 工作
 export const UpdateToken = Symbol.for('gem@update');
 
 const BoundaryCSSState = 'gem-style-boundary';
-export const RenderErrorEvent = 'gem@render-error';
+export const _RenderErrorEvent = 'gem@render-error';
 
 // fix modal-factory type error
 const updateTokenAlias = UpdateToken;
@@ -261,7 +261,7 @@ function clearEffect(list: EffectItem<any>[]) {
 type Render = () => TemplateResult | null | undefined;
 type RenderItem = { render: Render; condition?: () => boolean };
 
-export let createTemplate: (ele: GemElement, item: RenderItem) => void;
+export let _createTemplate: (ele: GemElement, item: RenderItem) => void;
 
 export type Metadata = Partial<ShadowRootInit> & {
   /** 内容可被外部样式化 */
@@ -341,7 +341,7 @@ export abstract class GemElement extends HTMLElement {
       return state;
     };
     createRef = () => new RefObject(currentConstructGemElement);
-    createTemplate = (ele, item) => ele.#renderList.push(item);
+    _createTemplate = (ele, item) => ele.#renderList.push(item);
   }
 
   constructor() {
@@ -385,7 +385,8 @@ export abstract class GemElement extends HTMLElement {
   }
 
   get #renderItem() {
-    return this.#renderList.find((e) => !e.condition || e.condition());
+    // 从末尾开始寻找，允许被覆盖
+    return this.#renderList.findLast((e) => !e.condition || e.condition());
   }
 
   get internals() {
@@ -419,7 +420,7 @@ export abstract class GemElement extends HTMLElement {
       if (temp === undefined) return;
       render(temp, this.#renderRoot);
     } catch (err) {
-      this.dispatchEvent(new CustomEvent(RenderErrorEvent, { bubbles: true, composed: true, detail: err }));
+      this.dispatchEvent(new CustomEvent(_RenderErrorEvent, { bubbles: true, composed: true, detail: err }));
     }
   };
 

package/src/lib/utils.ts

@@ -10,6 +10,7 @@ export function addMicrotask(func: () => void) {
   microtaskSet.add(func);
 }
 
+// 注意 typeof state === 'function' 但是没有 Function 的方法和属性
 export function createUpdater<T, Fn = (payload?: Partial<T>) => any>(initState: T, fn: Fn) {
   const state: any = fn;
   setPrototypeOf(state, null);

package/src/lib/version.ts

@@ -1,2 +1 @@
-// Do not modify manually
-export const version = '0.0.0';
+export const version = '2.1.1';

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021-present
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/helper/react-shim.d.ts

@@ -1,15 +0,0 @@
-import { ReactNode } from 'react';
-import { Store } from '../lib/store';
-/**
- * `<gem-route>.routes.getContent`
- */
-export declare function renderReactNode(ele: any, node: ReactNode): void;
-/**
- * Same as `@connectStore`
- */
-export declare function connectStore<T extends object>(store: Store<T>): void;
-/**
- * Warning: https://github.com/facebook/react/issues/25675
- */
-export declare function useReactNode(node: ReactNode): any;
-//# sourceMappingURL=react-shim.d.ts.map

package/helper/react-shim.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"react-shim.d.ts","sourceRoot":"","sources":["../src/helper/react-shim.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAA+B,MAAM,OAAO,CAAC;AAM/D,OAAO,EAAE,KAAK,EAAW,MAAM,cAAc,CAAC;AAE9C;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,QAgBxD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,QAG7D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,OAe3C"}

package/helper/react-shim.js

@@ -1,56 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-// eslint-disable-next-line import/no-unresolved
-import { useEffect, useRef, useState } from 'react';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-// eslint-disable-next-line import/no-unresolved
-import { createRoot } from 'react-dom/client';
-import { connect } from '../lib/store';
-/**
- * `<gem-route>.routes.getContent`
- */
-export function renderReactNode(ele, node) {
-    var _a;
-    (_a = ele.react) === null || _a === void 0 ? void 0 : _a.unmount();
-    ele.react = createRoot(ele);
-    // async
-    ele.react.render(node);
-    // override
-    const routeEle = ele instanceof HTMLElement ? ele : ele.host;
-    const originUnmounted = routeEle.unmounted;
-    if (!(originUnmounted === null || originUnmounted === void 0 ? void 0 : originUnmounted.react)) {
-        routeEle.unmounted = () => {
-            originUnmounted === null || originUnmounted === void 0 ? void 0 : originUnmounted.apply(routeEle);
-            ele.react.unmount();
-        };
-        routeEle.unmounted.react = true;
-    }
-}
-/**
- * Same as `@connectStore`
- */
-export function connectStore(store) {
-    const [_, update] = useState({});
-    useEffect(() => connect(store, () => update({})), []);
-}
-/**
- * Warning: https://github.com/facebook/react/issues/25675
- */
-export function useReactNode(node) {
-    const ref = useRef();
-    // Warning: Attempted to synchronously unmount a root while React was already rendering. React cannot finish unmounting the root until the current render has completed, which may lead to a race condition.
-    useEffect(() => () => { var _a; return (_a = ref.current) === null || _a === void 0 ? void 0 : _a.root.unmount(); }, []);
-    if (ref.current) {
-        ref.current.root.render(node);
-        return ref.current.container;
-    }
-    const container = document.createElement('div');
-    container.style.display = 'contents';
-    const root = createRoot(container);
-    ref.current = { root, container };
-    // Warning: Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.
-    root.render(node);
-    return container;
-}
-//# sourceMappingURL=react-shim.js.map

package/helper/react-shim.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"react-shim.js","sourceRoot":"","sources":["../src/helper/react-shim.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,aAAa;AACb,gDAAgD;AAChD,OAAO,EAAa,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC/D,6DAA6D;AAC7D,aAAa;AACb,gDAAgD;AAChD,OAAO,EAAQ,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAS,OAAO,EAAE,MAAM,cAAc,CAAC;AAE9C;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,GAAQ,EAAE,IAAe;;IACvD,MAAA,GAAG,CAAC,KAAK,0CAAE,OAAO,EAAE,CAAC;IACrB,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,QAAQ;IACR,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEvB,WAAW;IACX,MAAM,QAAQ,GAAG,GAAG,YAAY,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IAC7D,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC;IAC3C,IAAI,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,CAAA,EAAE,CAAC;QAC5B,QAAQ,CAAC,SAAS,GAAG,GAAG,EAAE;YACxB,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC,CAAC;QACF,QAAQ,CAAC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;IAClC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAmB,KAAe;IAC5D,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjC,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACxD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,IAAe;IAC1C,MAAM,GAAG,GAAG,MAAM,EAA0C,CAAC;IAC7D,4MAA4M;IAC5M,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,WAAC,OAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,IAAI,CAAC,OAAO,EAAE,CAAA,EAAA,EAAE,EAAE,CAAC,CAAC;IACvD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,UAAU,CAAC;IACrC,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IACnC,GAAG,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAClC,oMAAoM;IACpM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,SAAS,CAAC;AACnB,CAAC"}