godown 3.0.0-canary.8 → 3.0.0

package/src/components/router.ts

@@ -1,7 +1,4 @@
-import { godown } from "@godown/element/decorators/godown.js";
-import { styles } from "@godown/element/decorators/styles.js";
-import { htmlSlot } from "@godown/element/directives/html-slot.js";
-import { RouteTree } from "@godown/element/tools/route-tree.js";
+import { godown, htmlSlot, RouteTree, styles } from "@godown/element";
 import { css, type PropertyValueMap, type TemplateResult } from "lit";
 import { property, state } from "lit/decorators.js";
 
@@ -27,12 +24,14 @@ const protoName = "router";
  *
  * If no routes are matched, the default value (no named slot) will be rendered.
  *
+ * @slot - Display slot when there is no match.
+ * @slot * - Matching slot will be displayed.
  * @category navigation
  */
 @godown(protoName)
 @styles(css`:host{display:contents;}`)
-class Router<C = unknown> extends GlobalStyle {
-  static routerInstances = new Set<Router>();
+class Router extends GlobalStyle {
+  static routerInstances: Set<Router> = new Set<Router>();
 
   private __fieldRouteTree: RouteTree = new RouteTree();
   private __slottedRouteTree: RouteTree = new RouteTree();
@@ -41,7 +40,7 @@ class Router<C = unknown> extends GlobalStyle {
     & Record<string, any>
     & {
       path: string;
-      component?: C;
+      component?: unknown;
     }
   )[];
 
@@ -49,32 +48,32 @@ class Router<C = unknown> extends GlobalStyle {
    * Render result.
    */
   @state()
-  component: C | TemplateResult = null;
+  component: unknown | TemplateResult = null;
+
   /**
    * Dynamic parameters record.
    */
   @state()
   params: Record<string, string> = {};
+
   /**
    * Value of matched path in routes.
    */
   @state()
   path: string;
+
   /**
    * Current pathname (equals to location.pathname).
    */
   @property()
-  pathname = "";
-  /**
-   * Path prefix.
-   */
-  @property()
-  baseURL = "";
+  pathname: string;
+
   /**
    * Rendered content when there is no match.
    */
   @state()
   default: TemplateResult = htmlSlot();
+
   /**
    * The type of routing sources.
    *
@@ -84,6 +83,7 @@ class Router<C = unknown> extends GlobalStyle {
    */
   @property()
   type: "united" | "slotted" | "field" = "united";
+
   /**
    * Cache accessed records.
    *
@@ -97,15 +97,20 @@ class Router<C = unknown> extends GlobalStyle {
     this.__routes = value;
     this.collectFieldRoutes(value);
   }
-  get routes() {
+
+  get routes(): (Record<string, any> & {
+    path: string;
+    render?: (ur: ReturnType<Router["useRouter"]>) => unknown;
+    component?: unknown;
+  })[] {
     return this.__routes;
   }
 
-  clear() {
+  clear(): void {
     this.__cacheRecord.clear();
   }
 
-  protected render() {
+  protected render(): unknown {
     this.params = {};
     if (this.cache) {
       const cached = this.__cacheRecord.get(this.pathname);
@@ -127,7 +132,7 @@ class Router<C = unknown> extends GlobalStyle {
     return this.component ?? this.default ?? null;
   }
 
-  connectedCallback() {
+  connectedCallback(): void {
     super.connectedCallback();
     Router.routerInstances.add(this);
     this.pathname ??= location.pathname;
@@ -143,12 +148,17 @@ class Router<C = unknown> extends GlobalStyle {
     }
   }
 
-  disconnectedCallback() {
+  disconnectedCallback(): void {
     super.disconnectedCallback();
     Router.routerInstances.delete(this);
   }
 
-  useRouter() {
+  useRouter(): {
+    pathname: string;
+    params: Record<string, string>;
+    path: string;
+    component: unknown;
+  } {
     return {
       pathname: this.pathname,
       params: this.params,
@@ -158,17 +168,16 @@ class Router<C = unknown> extends GlobalStyle {
   }
 
   /**
-   * @param params value of useRouter()
-   * @param first whether this path is loaded for the first time.
+   * Callback function when the route changes.
    */
   routeChangeCallback: (params: {
     pathname: string;
     params: Record<string, string>;
     path: string;
-    component: C | TemplateResult;
+    component: unknown | TemplateResult;
   }, first: boolean) => void = null;
 
-  protected updated(changedProperties: PropertyValueMap<this>) {
+  protected updated(changedProperties: PropertyValueMap<this>): void {
     const shouldDispatch = changedProperties.has("pathname") || changedProperties.has("path");
     if (shouldDispatch) {
       const ur = this.useRouter();
@@ -182,12 +191,10 @@ class Router<C = unknown> extends GlobalStyle {
   }
 
   /**
-   * Find components from {@linkcode __fieldRouteTree} matching query.
-   * @param query Query string.
-   * @returns Components or null.
+   * Get component from {@linkcode routes} by query.
    */
-  fieldComponent(query?: string) {
-    query ||= this.useWhich(this.pathname);
+  fieldComponent(query?: string): unknown {
+    query ||= this.__fieldRouteTree.search(this.pathname)?.pattern;
     this.path = query;
 
     if (!query) {
@@ -199,35 +206,38 @@ class Router<C = unknown> extends GlobalStyle {
     if (!route) {
       return null;
     }
+
+    if ("render" in route) {
+      return route.render?.(this.useRouter()) || null;
+    }
+
     return route.component;
   }
 
   /**
-   * Find components from {@linkcode __slottedRouteTree} matching query.
-   * @param query Query string.
-   * @returns Named slot element template result or null.
+   * Get component from slotted elements by query.
    */
-  slottedComponent(usedRouteTemplate?: string) {
+  slottedComponent(query?: string): TemplateResult<1> {
     const slottedPaths = this._slottedNames;
-    usedRouteTemplate ||= this.__slottedRouteTree.useWhich(this.pathname);
-    this.path = usedRouteTemplate;
+    query ||= this.__slottedRouteTree.search(this.pathname)?.pattern;
+    this.path = query;
 
-    if (!usedRouteTemplate) {
+    if (!query) {
       return null;
     }
 
-    this.path = slottedPaths.find((s) => s === usedRouteTemplate);
+    this.path = slottedPaths.find((s) => s === query);
     if (!this.path) {
       return null;
     }
-    this.params = this.parseParams(usedRouteTemplate, this.pathname);
+    this.params = this.parseParams(query, this.pathname);
     return htmlSlot(this.path);
   }
 
   /**
    * Reset the route tree, clear cache, collect routes from child elements.
    */
-  collectSlottedRoutes() {
+  collectSlottedRoutes(): void {
     this.__slottedRouteTree = new RouteTree();
     this.clear();
     this._slottedNames.forEach(slotName => {
@@ -238,7 +248,7 @@ class Router<C = unknown> extends GlobalStyle {
   /**
    * Reset the route tree, clear cache, collect routes from value.
    */
-  collectFieldRoutes(value: typeof this.routes) {
+  collectFieldRoutes(value: typeof this.routes): void {
     this.__fieldRouteTree = new RouteTree();
     this.clear();
     value.forEach(({ path }) => {
@@ -246,19 +256,20 @@ class Router<C = unknown> extends GlobalStyle {
     });
   }
 
-  useWhich(path: string) {
-    return this.__fieldRouteTree.useWhich(this.baseURL + path);
+  parseParams(routeTemplate: string, path: string = this.pathname): Record<string, string> {
+    return RouteTree.parseParams(path, routeTemplate);
   }
 
-  parseParams(routeTemplate: string, path: string) {
-    return this.__fieldRouteTree.parseParams(path, routeTemplate);
-  }
-
-  static updateAll() {
+  static updateAll(): void {
     this.routerInstances.forEach((i) => {
-      i.pathname = window.location.pathname;
+      i.handlePopstate();
     });
   }
+
+  handlePopstate = this.events.add(window, "popstate", () => {
+    this.pathname = location.pathname;
+  }) as () => void;
 }
 
 export default Router;
+export { Router };

package/src/components/select.ts

@@ -1,12 +1,7 @@
-import { HandlerEvent } from "@godown/element";
-import { godown } from "@godown/element/decorators/godown.js";
-import { part } from "@godown/element/decorators/part.js";
-import { styles } from "@godown/element/decorators/styles.js";
-import { htmlSlot } from "@godown/element/directives/html-slot.js";
+import { attr, godown, type HandlerEvent, htmlSlot, part, styles } from "@godown/element";
 import svgCaretDown from "@godown/f7-icon/icons/chevron-down.js";
-import { css, html, nothing } from "lit";
+import { css, html, nothing, type TemplateResult } from "lit";
 import { property, state } from "lit/decorators.js";
-import { ifDefined } from "lit/directives/if-defined.js";
 
 import Input from "./input.js";
 
@@ -44,32 +39,39 @@ const protoName = "select";
  *
  * Input will filter the element.
  *
+ * @fires input - Fires when the input value changes.
+ * @fires change - Fires when the input value changes.
+ * @fires select - Fires when select an option.
  * @slot - Options.
  * @category input
  */
 @godown(protoName)
 @styles(
   css`
-    [part="input"] {
+    [part=input] {
       text-overflow: ellipsis;
     }
 
-    [part="content"] {
+    [part=content] {
       position: absolute;
       width: 100%;
+      visibility: hidden;
     }
 
-    [direction="bottom"] {
+    [direction=bottom] [part=content] {
       top: 100%;
     }
 
-    [direction="top"] {
+    [direction=top] [part=content] {
       bottom: 100%;
     }
+
+    [visible] [part=content] {
+      visibility: visible
+    }
   `,
 )
 class Select extends Input {
-  _cache = new WeakMap<HTMLElement, boolean>();
   // @ts-ignore
   value: string | string[];
 
@@ -80,53 +82,61 @@ class Select extends Input {
   text: string;
 
   @part("content")
-  _content: HTMLElement;
+  protected _content: HTMLElement;
 
   @property()
   direction: "top" | "bottom" | undefined;
 
   @property({ type: Boolean })
-  multiple: boolean;
+  multiple = false;
 
   @property({ type: Boolean })
-  visible: boolean;
+  visible = false;
 
   @state()
   protected autoDirection: "top" | "bottom" = "bottom";
+
   protected lastChecked: HTMLElement;
   protected defaultText: string;
   protected defaultChecked: HTMLElement[];
   private _store: { value: string; text: string; }[] = [];
 
-  protected render() {
-    return html`<div part="root" class="input-field"> 
-    ${[
+  protected render(): TemplateResult<1> {
+    return html`<div
+      part="root"
+      ${
+      attr({
+        ...this.observedRecord,
+        direction: this.direction || this.autoDirection,
+      })
+    }
+      class="input-field"
+    >
+      ${[
       this._renderPrefix(),
       html`<input
-        part="input"
-        dir="${ifDefined(this.dir)}"
-        id="${this.makeId}"
-        .value="${this.text}"
-        type="${this.type}"
-        placeholder="${this.placeholder || nothing}"
-        ?autofocus="${this.autofocus}"
-        autocapitalize="${this.autocapitalize || nothing}"
-        autocomplete="${this.autocomplete || nothing}"
-        ?disabled="${this.disabled}"
-        @focus="${this._handleFocus}"
-        @input="${this._handleInput}"
-      >`,
+          part="input"
+          dir="${this.dir || nothing}"
+          id="${this.makeId}"
+          .value="${this.text}"
+          type="${this.type}"
+          placeholder="${this.placeholder || nothing}"
+          ?autofocus="${this.autofocus}"
+          autocapitalize="${this.autocapitalize || nothing}"
+          autocomplete="${this.autocomplete || nothing}"
+          ?disabled="${this.disabled}"
+          @focus="${this._handleFocus}"
+          @input="${this._handleInput}"
+        >`,
       html`<label for="${this.makeId}" part="suffix">
-        <i part="space"></i><i part="icon">${svgCaretDown()}</i><i part="space"></i>
-      </label>`,
-      html`<label for="${this.makeId}" part="content" 
-      style="visibility:${this.visible ? "visible" : "hidden"}"
-      direction="${this.direction || this.autoDirection}">${htmlSlot()}</label>`,
+          <i part="icon">${svgCaretDown()}</i>
+        </label>`,
+      html`<label for="${this.makeId}" part="content"> ${htmlSlot()} </label>`,
     ]}
     </div>`;
   }
 
-  protected _handleFocus() {
+  protected _handleFocus(): void {
     if (!this.direction) {
       const { top, bottom } = this.getBoundingClientRect();
       if (window.innerHeight - bottom < this._content.clientHeight && top > this._content.clientHeight) {
@@ -138,7 +148,7 @@ class Select extends Input {
     this.visible = true;
   }
 
-  protected firstUpdated() {
+  protected firstUpdated(): void {
     this.events.add(this._content, "click", (e: HandlerEvent) => {
       e.preventDefault();
       e.stopPropagation();
@@ -164,7 +174,7 @@ class Select extends Input {
     });
   }
 
-  protected _connectedInit() {
+  protected _connectedInit(): void {
     if (!this.value) {
       const checked = [...this.querySelectorAll<HTMLElement>("[checked]")];
       const list = this.multiple
@@ -193,7 +203,7 @@ class Select extends Input {
     this.defaultChecked.forEach(element => updateChecked(element, 1));
   }
 
-  select(value: string, text?: string) {
+  select(value: string, text?: string): 0 | 1 {
     text ||= value;
     let operation: 0 | 1 = 0;
     if (this.multiple) {
@@ -216,12 +226,12 @@ class Select extends Input {
         operation = 1;
       }
     }
-    this.dispatchEvent(new CustomEvent("change", { detail: this.namevalue() }));
+    this.dispatchEvent(new CustomEvent("select", { detail: this.value, composed: true }));
     this.filter();
     return operation;
   }
 
-  filter(query?: string) {
+  filter(query?: string): void {
     query = query?.trim();
     [...this.children].forEach((element: HTMLElement) => {
       this.filterCallback(
@@ -235,26 +245,27 @@ class Select extends Input {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  filterCallback(element: HTMLElement, match: boolean, query: string) {
+  filterCallback(element: HTMLElement, match: boolean, query: string): void {
     element.style.display = match ? "" : "none";
   }
 
-  protected _handleInput(e: HandlerEvent<HTMLInputElement>) {
+  protected _handleInput(e: HandlerEvent<HTMLInputElement>): void {
     e.stopPropagation();
     if (this.compositing) {
       return;
     }
     const s = this._input.value;
     this.filter(this.multiple ? betweenAt(this._input.selectionStart, s, ",") : s);
-    this.dispatchEvent(new CustomEvent("input", { detail: this.namevalue() }));
+    this.dispatchEvent(new CustomEvent("input", { detail: this.value, composed: true, bubbles: true }));
+    this.dispatchEvent(new CustomEvent("change", { detail: this.value, composed: true }));
   }
 
-  focus(options?: FocusOptions) {
+  focus(options?: FocusOptions): void {
     this._input.focus(options);
     this.visible = true;
   }
 
-  blur() {
+  blur(): void {
     this._input.blur();
     this.visible = false;
     super.blur();
@@ -266,3 +277,4 @@ class Select extends Input {
 }
 
 export default Select;
+export { Select };

package/src/components/skeleton.ts

@@ -1,8 +1,6 @@
-import { godown } from "@godown/element/decorators/godown.js";
-import { styles } from "@godown/element/decorators/styles.js";
-import { htmlSlot } from "@godown/element/directives/html-slot.js";
+import { attr, godown, htmlSlot, styles } from "@godown/element";
 import iconPhoto from "@godown/f7-icon/icons/photo.js";
-import { css, html } from "lit";
+import { css, html, type TemplateResult } from "lit";
 import { property, state } from "lit/decorators.js";
 
 import { cssGlobalVars, GlobalStyle, scopePrefix } from "../core/global-style.js";
@@ -36,7 +34,7 @@ const cssScope = scopePrefix(protoName);
       overflow: hidden;
     }
 
-    [part="root"] {
+    [part=root] {
       height: 100%;
       min-height: inherit;
       text-align: center;
@@ -49,7 +47,7 @@ const cssScope = scopePrefix(protoName);
       margin: calc(var(--size) * 0.05);
     }
 
-    .position {
+    [animation=position] {
       background-image: linear-gradient(
         var(${cssScope}--deg),
         var(${cssScope}--from) 36%,
@@ -70,7 +68,7 @@ const cssScope = scopePrefix(protoName);
       }
     }
 
-    .opacity {
+    [animation=opacity] {
       animation-name: op;
       animation-direction: alternate;
     }
@@ -91,26 +89,30 @@ class Skeleton extends GlobalStyle {
    */
   @property()
   type: "text" | "image";
+
   /**
    * Animation type.
    * opacity animation only effect on slotted element and image icon.
    */
   @property()
   animation: "position" | "opacity" = "position";
+
   /**
    * If false, render slot only.
    */
   @state()
   loading = true;
 
-  protected render() {
+  protected render(): TemplateResult<1> {
     if (!this.loading) {
       return htmlSlot();
     }
-    return html`<div part="root" class="${this.animation}">
-    ${this.type === "image" ? iconPhoto() : ""}
-    ${htmlSlot("loading")}</div>`;
+    return html`<div part="root" ${attr(this.observedRecord)}>
+      ${this.type === "image" ? iconPhoto() : ""}
+      ${htmlSlot("loading")}
+    </div>`;
   }
 }
 
 export default Skeleton;
+export { Skeleton };