@mantou/gem 1.6.3 → 1.6.9

package/src/index.ts

@@ -1,10 +1,9 @@
-import { updateStore } from './lib/store';
+/**
+ * 不支持多个 gem
+ */
 import * as Gem from './';
 
-export interface DevToolsHook {
-  updateStore: typeof updateStore;
-}
-
+export type DevToolsHook = typeof Gem;
 declare global {
   interface Window {
     __GEM_DEVTOOLS__HOOK__?: DevToolsHook;
@@ -12,7 +11,6 @@ declare global {
 }
 
 if (window.__GEM_DEVTOOLS__HOOK__) {
-  // 不支持多个 gem
   Object.assign(window.__GEM_DEVTOOLS__HOOK__, { ...Gem });
 }
 

package/src/lib/element.ts

@@ -1,6 +1,7 @@
+import { html, render, TemplateResult } from 'lit-html';
+
 import type { GemReflectElement } from '../elements/reflect';
 
-import { html, render, TemplateResult } from 'lit-html';
 import { connect, disconnect, Store } from './store';
 import {
   LinkedList,

package/src/lib/history.ts

@@ -89,7 +89,7 @@ function initParams(params: UpdateHistoryParams): HistoryParams {
   const query = new QueryString(params.query || (params.path ? '' : location.search));
   const pathChanged =
     (params.path && params.path !== current.path) || (params.query && String(params.query) !== String(current.query));
-  const title = params.title || '';
+  const title = params.title || (pathChanged ? '' : document.title);
   const statusChanged = params.close || params.data || params.open || params.shouldClose;
   // 没提供 hash 又没有改变路径又不是状态更新时使用当前 hash
   const hash = params.hash || (!pathChanged && statusChanged ? decodeURIComponent(location.hash) : '');

package/src/lib/utils.ts

@@ -355,6 +355,7 @@ export class GemError extends Error {
 
 export function isArrayChange(newValues: any[], oldValues: any[]) {
   const length = newValues.length;
+  if (oldValues.length !== length) return true;
   for (let i = 0; i < length; i++) {
     if (newValues[i] !== oldValues[i]) return true;
   }
@@ -372,11 +373,16 @@ export function removeItems(target: any[], items: any[]) {
   });
 }
 
-export function styleMap(obj: Partial<CSSStyleDeclaration>) {
+type StyleProp = keyof CSSStyleDeclaration | `--${string}`;
+
+export type StyleObject = Partial<Record<StyleProp, string | number | undefined>>;
+
+// 不支持 webkit 属性
+export function styleMap(object: StyleObject) {
   let styleString = '';
-  for (const key in obj) {
-    if (obj[key]) {
-      styleString += `${camelToKebabCase(key)}:${obj[key]};`;
+  for (const key in object) {
+    if (object[key as StyleProp] !== undefined) {
+      styleString += `${camelToKebabCase(key)}:${object[key as StyleProp]};`;
     }
   }
   return styleString;

package/src/lib/version.ts

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

package/src/test/gem-element/advance.test.ts

@@ -1,4 +1,5 @@
 import { fixture, expect, nextFrame } from '@open-wc/testing';
+
 import { GemElement, html } from '../../lib/element';
 import { createStore, updateStore } from '../../lib/store';
 import { attribute, property, customElement, emitter, adoptedStyle } from '../../lib/decorators';

package/src/test/gem-element/basic.test.ts

@@ -1,4 +1,5 @@
 import { fixture, expect, nextFrame } from '@open-wc/testing';
+
 import { GemElement, html } from '../../lib/element';
 import { createStore, updateStore } from '../../lib/store';
 import { createCSSSheet, css } from '../../lib/utils';

package/src/test/gem-element/decorators.test.ts

@@ -1,4 +1,5 @@
 import { fixture, expect } from '@open-wc/testing';
+
 import { GemElement, html } from '../../lib/element';
 import { createStore, updateStore } from '../../lib/store';
 import { createCSSSheet, css } from '../../lib/utils';

package/src/test/gem-element/multi.test.ts

@@ -1,4 +1,5 @@
 import { expect, fixture } from '@open-wc/testing';
+
 import { customElement, property, RefObject, refobject } from '../../lib/decorators';
 import { GemElement, html } from '../../lib/element';
 

package/src/test/history.test.ts

@@ -1,4 +1,5 @@
 import { expect, aTimeout } from '@open-wc/testing';
+
 import { history } from '../lib/history';
 
 describe('history 测试', () => {

package/src/test/store.test.ts

@@ -1,4 +1,5 @@
 import { expect, aTimeout } from '@open-wc/testing';
+
 import { StoreListenerMap, createStore, createStoreSet, updateStore, connect, disconnect } from '../lib/store';
 
 describe('store 测试', () => {

package/src/test/utils.test.ts

@@ -1,4 +1,5 @@
 import { expect } from '@open-wc/testing';
+
 import {
   LinkedList,
   QueryString,

package/src/examples/base-path/index.ts

@@ -1,44 +0,0 @@
-import { GemElement, html, history, render, customElement } from '../../';
-import '../../elements/link';
-
-import '../elements/layout';
-
-@customElement('app-root')
-export class App extends GemElement {
-  state = {
-    count: 5,
-  };
-  constructor() {
-    super();
-    this.onclick = () => {
-      this.setState({ count: this.state.count - 1 });
-      if (!this.state.count) {
-        history.basePath = '/base-path';
-      }
-    };
-  }
-  render() {
-    return html`
-      <main>
-        ${this.state.count > 0
-          ? html`<div>${this.state.count} 次后将改变 \`basePath\`</div>`
-          : html`<div>\`basePath\` 为 ${history.basePath}</div>`}
-        <gem-link href="/a">href="/a"</gem-link>
-        <button @click=${() => history.push({ path: '/b' })}>push({ path: '/b' })</button>
-        <button @click=${() => history.push({ hash: '#b' })}>push({ hash: '#b' })</button>
-        <button @click=${() => history.pushIgnoreCloseHandle({ path: '/c' })}>
-          push({ pushIgnoreCloseHandle: '/c' })
-        </button>
-      </main>
-    `;
-  }
-}
-
-render(
-  html`
-    <gem-examples-layout>
-      <app-root slot="main"></app-root>
-    </gem-examples-layout>
-  `,
-  document.body,
-);

package/src/examples/controlled/index.ts

@@ -1,75 +0,0 @@
-import { html, customElement, GemElement, render, attribute, emitter, Emitter, refobject, RefObject } from '../../';
-
-import '../elements/layout';
-
-@customElement('app-form-text')
-export class FormText extends GemElement {
-  @refobject inputRef: RefObject<HTMLInputElement>;
-  @attribute value: string;
-  @emitter change: Emitter<string>;
-
-  nextState = {
-    value: '',
-    selectionStart: 0,
-    selectionEnd: 0,
-  };
-
-  mounted() {
-    this.effect(
-      () => {
-        const { element } = this.inputRef;
-        if (!element) return;
-        if (this.value === this.nextState.value) {
-          element.value = this.nextState.value;
-          element.selectionStart = this.nextState.selectionStart;
-          element.selectionEnd = this.nextState.selectionEnd;
-        } else {
-          element.value = this.value;
-        }
-      },
-      () => [this.value],
-    );
-  }
-
-  inputHandle = (e: InputEvent) => {
-    if (!e.isComposing) {
-      const { element } = this.inputRef;
-      if (!element) return;
-      const { value, selectionStart, selectionEnd } = element;
-      this.nextState = {
-        value,
-        selectionStart: selectionStart || 0,
-        selectionEnd: selectionEnd || 0,
-      };
-      element.value = this.value;
-      this.change(value);
-    }
-  };
-
-  render() {
-    return html`<input ref=${this.inputRef.ref} @input=${this.inputHandle} />`;
-  }
-}
-
-@customElement('app-root')
-export class Root extends GemElement {
-  state = { value: '' };
-
-  changeHandle = (e: CustomEvent<string>) => this.setState({ value: e.detail });
-
-  render() {
-    return html`
-      Controlled input:
-      <app-form-text @change=${this.changeHandle} value=${this.state.value}></app-form-text>
-    `;
-  }
-}
-
-render(
-  html`
-    <gem-examples-layout>
-      <app-root slot="main"></app-root>
-    </gem-examples-layout>
-  `,
-  document.body,
-);

package/src/examples/decorator/chidren.ts

@@ -1,77 +0,0 @@
-import {
-  GemElement,
-  html,
-  property,
-  attribute,
-  slot,
-  part,
-  state,
-  emitter,
-  Emitter,
-  customElement,
-  numattribute,
-  boolattribute,
-  rootElement,
-} from '../../';
-
-export type Message = number[];
-
-/**
- * @attr first-name
- * @attr last-name
- * @attr count
- * @attr disabled
- * @fires say-hi
- * @fires load
- * @state odd
- * @slot light
- * @part paragraph
- */
-@customElement('app-children')
-@rootElement('app-root')
-export class Children extends GemElement {
-  @slot static light: string;
-  @part static paragraph: string;
-
-  @attribute firstName: string;
-  @attribute lastName: string;
-  @numattribute count: number;
-  @boolattribute disabled: boolean;
-  @property message: Message | undefined;
-  @emitter sayHi: Emitter;
-  @emitter load: Emitter;
-  @state odd: boolean;
-
-  constructor() {
-    super();
-    console.log('child cons');
-  }
-
-  mounted = () => {
-    console.log('child mounted');
-    setTimeout(() => this.load(new Date()), 1000);
-    this.addEventListener('click', () => {
-      this.odd = !this.odd;
-    });
-  };
-
-  updated = () => {
-    console.log('child updated');
-  };
-
-  render() {
-    console.log('child render');
-    return html`
-      <p>
-        attributes:
-        <span>${this.firstName},</span>
-        <span>${this.lastName},</span>
-        <span>${this.disabled},</span>
-        <span>${this.count}.</span>
-      </p>
-      <p part=${Children.paragraph}>properties: ${JSON.stringify(this.message)}</p>
-      <slot name=${Children.light}></slot>
-      <button @click=${() => this.sayHi({}, { bubbles: true, composed: true })}>say hi</button>
-    `;
-  }
-}

package/src/examples/decorator/index.ts

@@ -1,110 +0,0 @@
-import {
-  createStore,
-  updateStore,
-  createCSSSheet,
-  GemElement,
-  html,
-  refobject,
-  RefObject,
-  attribute,
-  connectStore,
-  customElement,
-  adoptedStyle,
-  css,
-  render,
-} from '../../';
-
-import '../elements/layout';
-
-import { Message, Children } from './chidren';
-import './chidren';
-
-interface GlobalState {
-  msg: Message;
-  now: Date;
-}
-
-const store = createStore<GlobalState>({
-  msg: [1, 2],
-  now: new Date(),
-});
-
-const styles = createCSSSheet(css`
-  h1 {
-    text-decoration: underline;
-  }
-`);
-
-@connectStore(store)
-@adoptedStyle(styles)
-@customElement('app-root')
-export class App extends GemElement {
-  @refobject childRef: RefObject<Children>;
-  @attribute appTitle: string;
-
-  constructor(title: string) {
-    super();
-    this.appTitle = title;
-    console.log('parent cons');
-  }
-
-  mounted = () => {
-    console.log('parent mounted');
-  };
-
-  updated = () => {
-    console.log('parent updated');
-  };
-
-  onSayHi = () => {
-    const [foo, bar] = store.msg;
-    updateStore(store, {
-      msg: [bar, foo],
-      now: new Date(),
-    });
-  };
-
-  loadHandle = () => {
-    const { element } = this.childRef;
-    if (!element) return;
-    const { firstName, lastName, disabled, count } = element;
-    console.log({ firstName, lastName, disabled, count });
-  };
-
-  render() {
-    console.log('parent render');
-    return html`
-      <style>
-        app-children:where(:--odd, [data-odd])::part(${Children.paragraph}) {
-          color: red;
-        }
-      </style>
-      <h1>${this.appTitle}</h1>
-      <app-children
-        ref=${this.childRef.ref}
-        @load=${this.loadHandle}
-        @say-hi=${this.onSayHi}
-        .message=${store.msg}
-        first-name="hello"
-        last-name="world"
-        count=${1}
-        disabled
-      >
-        <p slot=${Children.light}>now: ${store.now}</p>
-      </app-children>
-    `;
-  }
-}
-
-document.addEventListener('say-hi', (e: CustomEvent) => {
-  console.log('`sayhi` target', e.composedPath()[0]);
-});
-
-render(
-  html`
-    <gem-examples-layout>
-      <app-root app-title="I'm Title" slot="main"></app-root>
-    </gem-examples-layout>
-  `,
-  document.body,
-);

package/src/examples/dialog/index.ts

@@ -1,148 +0,0 @@
-import { GemElement, html, customElement, refobject, RefObject, render } from '../../';
-import { createModalClass } from '../../elements/modal-base';
-import { DialogBaseElement } from '../../elements/dialog-base';
-import '../../elements/link';
-
-import '../elements/layout';
-
-@customElement('app-confirm')
-class Confirm extends createModalClass({
-  content: html``,
-  confirmHandle: () => {
-    /** */
-  },
-}) {
-  label = 'confirm title';
-
-  confirm = () => {
-    Confirm.close();
-    Confirm.store.confirmHandle();
-  };
-
-  render() {
-    return html`
-      <style>
-        .root {
-          position: fixed;
-          z-index: 3;
-          top: 0;
-          left: 0;
-          width: 100%;
-          height: 100%;
-          background: rgba(0, 0, 0, 0.5);
-        }
-        .body {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          width: 200px;
-          height: 100px;
-          background: white;
-        }
-      </style>
-      <div class="root" ?hidden=${!Confirm.isOpen}>
-        <div class="body">
-          <h2>${Confirm.store.content}</h2>
-          <button @click=${this.confirm}>close dialog</button>
-        </div>
-      </div>
-    `;
-  }
-}
-
-@customElement('app-dialog')
-class Dialog extends DialogBaseElement {
-  shouldClose = () => {
-    if (this.opened) {
-      Confirm.open({
-        content: html`Confirm?`,
-        confirmHandle: this.forceClose, // 不能使用 `close` 方法
-      });
-      return false;
-    } else {
-      return true;
-    }
-  };
-
-  render() {
-    return html`
-      <style>
-        :host {
-          display: none;
-        }
-        :host(:where(:--opened, [data-opened])) {
-          display: block;
-        }
-        .root {
-          position: fixed;
-          z-index: 2;
-          top: 0;
-          left: 0;
-          width: 100%;
-          height: 100%;
-          background: rgba(0, 0, 0, 0.5);
-          backdrop-filter: blur(5px);
-        }
-        .body {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          width: 300px;
-          height: 200px;
-          background: white;
-        }
-      </style>
-      <div class="root">
-        <div class="body">
-          <h2>Dialog Title</h2>
-          <slot></slot>
-          <button @click=${this.close}>x</button>
-        </div>
-      </div>
-    `;
-  }
-}
-
-@customElement('app-root')
-export class Root extends GemElement {
-  @refobject dialog: RefObject<Dialog>;
-
-  state = {
-    modal: false,
-  };
-
-  clickHandle = () => {
-    this.dialog.element?.open();
-  };
-
-  render() {
-    return html`
-      <style>
-        :host {
-          font-size: x-large;
-        }
-      </style>
-      <button ?inert=${this.state.modal} @click="${this.clickHandle}">open dialog</button>
-      <app-dialog
-        label="dialog title"
-        ref=${this.dialog.ref}
-        @open=${() => this.setState({ modal: true })}
-        @close=${() => this.setState({ modal: false })}
-      >
-        <div>dialog body</div>
-        <gem-link path="/hi" style="cursor: pointer; color: blue">replace route</gem-link>
-      </app-dialog>
-    `;
-  }
-}
-
-render(
-  html`
-    <gem-examples-layout>
-      <app-root slot="main"></app-root>
-    </gem-examples-layout>
-  `,
-  document.body,
-);

package/src/examples/effect/index.ts

@@ -1,45 +0,0 @@
-import { GemElement, html, customElement, RefObject, refobject, render } from '../../';
-
-import '../elements/layout';
-
-function effect([textareaElement, callback]: [HTMLTextAreaElement | undefined, (height: number) => void]) {
-  if (!textareaElement) return callback(0);
-  const ro = new ResizeObserver(([entry]: [any]) => {
-    callback(entry.contentRect.height);
-  });
-  ro.observe(textareaElement, {});
-  return () => ro.disconnect();
-}
-
-@customElement('app-root')
-export class App extends GemElement {
-  @refobject textAreaRef: RefObject<HTMLTextAreaElement>;
-  state = {
-    height: 0,
-    hidden: false,
-  };
-
-  #updateHeight = (height: number) => {
-    this.setState({ height });
-  };
-
-  render() {
-    return html`
-      <div><button @click=${() => this.setState({ hidden: !this.state.hidden })}>switch</button></div>
-      ${this.state.hidden ? null : html`<textarea ref=${this.textAreaRef.ref}></textarea>`}
-      <div>${this.state.height}</div>
-    `;
-  }
-  mounted() {
-    this.effect(effect, () => [this.textAreaRef.element, this.#updateHeight]);
-  }
-}
-
-render(
-  html`
-    <gem-examples-layout>
-      <app-root slot="main"></app-root>
-    </gem-examples-layout>
-  `,
-  document.body,
-);

package/src/examples/elements/env.ts

@@ -1,7 +0,0 @@
-type Manifest = typeof import('../index/manifest.json');
-
-export const MATADATA = process.env.METADATA as unknown as Record<string, Partial<Manifest>>;
-export const EXAMPLES = process.env.EXAMPLES as unknown as string[];
-export const EXAMPLE = process.env.EXAMPLE as string;
-export const FILES = process.env.FILES as unknown as string[];
-export const PATH = process.env.TAEGET === 'pages' && EXAMPLE !== 'index' ? EXAMPLE : '';

package/src/examples/elements/layout.ts

@@ -1,53 +0,0 @@
-import { GemElement, html } from '../../lib/element';
-import { customElement, slot } from '../../lib/decorators';
-import '../../elements/reflect';
-import '../../elements/title';
-
-import { MATADATA, EXAMPLE } from './env';
-import './nav';
-import './source';
-
-@customElement('gem-examples-layout')
-export class Layout extends GemElement {
-  @slot main: string;
-
-  render() {
-    return html`
-      <gem-title suffix=" - Gem Examples" hidden>${MATADATA[EXAMPLE].name || EXAMPLE}</gem-title>
-      <gem-reflect>
-        <style>
-          body {
-            margin: 0;
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans',
-              sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-          }
-        </style>
-      </gem-reflect>
-      <style>
-        :host {
-          display: grid;
-          grid-template-areas: 'nav main' 'nav source';
-          grid-template-columns: 260px 1fr;
-          grid-template-rows: 1fr 400px;
-          height: 100vh;
-        }
-        ::slotted(*) {
-          overflow: auto;
-          padding: 2em;
-        }
-        @media (max-width: 480px) {
-          :host {
-            display: block;
-          }
-          gem-examples-nav,
-          gem-examples-source {
-            display: none;
-          }
-        }
-      </style>
-      <gem-examples-nav></gem-examples-nav>
-      <slot name=${this.main}></slot>
-      <gem-examples-source></gem-examples-source>
-    `;
-  }
-}