godown 3.0.0-canary.8 → 3.0.0

package/src/components/range.ts

@@ -1,10 +1,5 @@
-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 { classList } from "@godown/element/directives/class-list.js";
-import { joinProperties } from "@godown/element/tools/css.js";
-import { isNil } from "@godown/element/tools/lib.js";
-import { css, html } from "lit";
+import { attr, classList, godown, isNil, joinProperties, part, styles } from "@godown/element";
+import { css, html, type TemplateResult } from "lit";
 import { property, queryAll, state } from "lit/decorators.js";
 
 import { cssGlobalVars, scopePrefix } from "../core/global-style.js";
@@ -20,42 +15,50 @@ const cssScope = scopePrefix(protoName);
  *
  * Number has 1 handle, the array has the number of its elements and the minimum is 2.
  *
+ * @fires input - Fires when the input value changes.
+ * @fires change - Fires when the input value changes.
+ * @fires range - Fires when the value changes.
+ * @fires focus - Fires when the handle is focused.
+ * @fires blur - Fires when the handle is blurred.
  * @category input
  */
 @godown(protoName)
 @styles(
   css`
     :host {
-      ${cssScope}-handle-active: var(${cssGlobalVars._colors.blue[7]});
-      ${cssScope}-track-width: .5em;
+      ${cssScope}--handle-active: var(${cssGlobalVars.active});
+      ${cssScope}--track-width: .5em;
+      ${cssScope}--length: var(${cssGlobalVars.input}-width);
       background: var(${cssGlobalVars.input}-background);
-      width: var(${cssGlobalVars.input}-width);
-      display: inline-block;
-      margin: 0.25em 0;
+      width: var(${cssScope}--length);
+      display: block;
+    }
+
+    :host([contents]) [part=root] {
+      width: inherit;
     }
 
     :host([vertical]) {
-      height: var(${cssGlobalVars.input}-width);
+      height: var(${cssScope}--length);
       width: fit-content;
     }
 
     :host(:not([disabled])) .last-focus {
-      z-index: 1;
-      ${cssScope}-handle-scale:1.05;
-      background: var(${cssScope}-handle-active);
+      ${cssScope}--handle-scale: 1.05;
+      background: var(${cssScope}--handle-active);
     }
 
-    [part="root"] {
-      min-height:inherit;
+    [part=root] {
+      min-height: inherit;
       position: relative;
       border-radius: inherit;
       width: 100%;
       --from: 0%;
       --to: 50%;
-      height: var(${cssScope}-track-width);
+      height: var(${cssScope}--track-width);
     }
 
-    [part="track"] {
+    [part=track] {
       height: 100%;
       min-height:inherit;
       display: flex;
@@ -68,7 +71,7 @@ const cssScope = scopePrefix(protoName);
       width: max(calc(var(--to) - var(--from)), calc(var(--from) - var(--to)));
     }
 
-    [part="handle"] {
+    [part=handle] {
       width: 1em;
       height: 1em;
       display: flex;
@@ -79,22 +82,22 @@ const cssScope = scopePrefix(protoName);
       border: 0.1em solid;
       border-radius: 50%;
       transform-origin: 0% 25%;
-      transform: scale(var(${cssScope}-handle-scale, 1)) translate(-50%, -25%);
+      transform: scale(var(${cssScope}--handle-scale, 1)) translate(-50%, -25%);
       background: var(${cssGlobalVars.active});
       border-color: var(${cssGlobalVars.input}-control);
     }
   `,
   css`
-    .vertical {
-      height: 100%;
-      width: var(${cssScope}-track-width);
+    [vertical] {
+      height: inherit;
+      width: var(${cssScope}--track-width);
     }
 
-    .vertical i {
+    [vertical] i {
       transform: translate(-25%, -50%);
     }
 
-    .vertical [part="track"] {
+    [vertical] [part=track] {
       width: 100%;
       height: max(calc(var(--to) - var(--from)), calc(var(--from) - var(--to)));
       top: min(var(--from), var(--to));
@@ -102,12 +105,12 @@ const cssScope = scopePrefix(protoName);
     }
   `,
   css`
-    [part="handle"] {
+    [part=handle] {
       left: var(--handle);
       top: 0;
     }
 
-    .vertical [part="handle"] {
+    [vertical] [part=handle] {
       top: var(--handle);
       left: 0;
     }
@@ -133,35 +136,40 @@ class Range extends SuperInput {
   step: number;
 
   /**
-   * Display vertically
+   * Display vertically.
    */
   @property({ type: Boolean, reflect: true })
-  vertical: boolean;
+  vertical = false;
 
   /**
-   * When `this.range` is true, it should be [number, number], otherwise number.
+   * Value, or each of values, will render a handle.
+   *
+   * Accepts number or array of numbers.
    */
   @property({ type: Array })
   value: number | number[];
+
   /**
-   * The default of `this.value`.
+   * The default of `{@linkcode this.value}`.
    */
   @property({ type: Array })
   default: typeof this.value;
 
   @part("root")
-  _root: HTMLElement;
+  protected _root: HTMLElement;
 
   @queryAll("[part=handle]")
-  _handles: NodeListOf<HTMLElement>;
+  protected _handles: NodeListOf<HTMLElement>;
 
   @state()
   lastFocus?: number;
 
+  protected _focusStack: number[] = [];
+
   /**
-   * Returns true when the second number is greater than the first number
+   * Returns true when the second number is greater than the first number.
    */
-  get reverse() {
+  get reverse(): boolean {
     return this.range ? this.value[0] > this.value[1] : false;
   }
 
@@ -193,7 +201,7 @@ class Range extends SuperInput {
     return rangeValue;
   }
 
-  protected render() {
+  protected render(): TemplateResult<1> {
     const rangeValue = this.padValue(2);
     const from = Math.min(...rangeValue);
     const to = Math.max(...rangeValue);
@@ -201,13 +209,7 @@ class Range extends SuperInput {
 
     return html`<div
       part="root"
-      class="${
-      classList({
-        vertical: this.vertical,
-        range: this.range,
-        reverse: this.reverse,
-      })
-    }"
+      ${attr(this.observedRecord)}
       @mousedown="${this.disabled ? null : this._handleMousedownRoot}"
       style="${
       joinProperties({
@@ -215,23 +217,18 @@ class Range extends SuperInput {
         "--to": `${((to - this.min) / gap) * 100}%`,
         ...(this.range
           ? Object.fromEntries(
-            rangeValue.map((value, index) => [
-              `--handle-${index}`,
-              `${((value - this.min) / gap) * 100}%`,
-            ]),
+            rangeValue.map((value, index) => [`--handle-${index}`, `${((value - this.min) / gap) * 100}%`]),
           )
           : {}),
       })
-    }"><div part="track"></div>
-      ${
-      this.range
-        ? (this.value as number[]).map((_, index) => this.renderHandle(index))
-        : this.renderHandle(0)
-    }
+    }"
+    >
+      <div part="track"></div>
+      ${this.range ? (this.value as number[]).map((_, index) => this.renderHandle(index)) : this.renderHandle(0)}
     </div>`;
   }
 
-  protected renderHandle(index: number) {
+  protected renderHandle(index: number): TemplateResult<1> {
     const { range } = this;
     const end = !range || index === (this.value as number[]).length - 1;
     return html`<i
@@ -241,34 +238,41 @@ class Range extends SuperInput {
       @mousedown="${this.disabled ? null : this.createMouseDown(index)}"
       @focus="${this.disabled ? null : () => this.focusHandle(index)}"
       @blur="${this.disabled ? null : this.blurHandle}"
-      style="--handle:var(--${
+      style="z-index:${this._focusStack.indexOf(index) + 1};--handle:var(--${
       /* In single-handle mod or end, it is max value */
-      (!range && end) ? `to` : `handle-${index}`})"
+      (!range && end) ? "to" : `handle-${index}`})"
       ></i>
       `;
   }
 
   private _keydownEvent: EventListenerOrEventListenerObject;
 
-  focusHandle(index: number) {
+  focusHandle(index: number): void {
     this.lastFocus = index;
+    const indexOfFocusStack = this._focusStack.indexOf(index);
+    if (indexOfFocusStack !== -1) {
+      this._focusStack.splice(indexOfFocusStack, 1);
+    }
+    this._focusStack.push(index);
     const handleItem = this._handles.item(index);
     handleItem?.focus();
     if (!this._keydownEvent) {
       this._keydownEvent = this.events.add(document, "keydown", this.createKeydownEvent(index));
     }
+    this.dispatchEvent(new CustomEvent("focus", { detail: index }));
   }
 
-  blurHandle() {
+  blurHandle(): void {
     this.lastFocus = undefined;
     this._keydownEvent = this.events.remove(document, "keydown", this._keydownEvent);
+    this.dispatchEvent(new CustomEvent("blur"));
   }
 
   protected createKeydownEvent(index: number) {
     if (!this.range) {
       index = 0;
     }
-    return (e: KeyboardEvent) => {
+    return (e: KeyboardEvent): void => {
       if (e.key === "ArrowLeft" || e.key === "ArrowDown") {
         e.preventDefault();
         this.createSetValue(index)(old => old - this.step);
@@ -279,21 +283,15 @@ class Range extends SuperInput {
     };
   }
 
-  createMouseDown(index) {
-    return (e) => {
+  createMouseDown(index: number) {
+    return (e: MouseEvent): void => {
       this.focusHandle(index);
       this.createMousedownListener(this.createSetValue(index))(e);
     };
   }
 
-  protected _handleMousedownEnd(e: MouseEvent) {
-    this.lastFocus = 0;
-    this.createMousedownListener(this.setEnd)(e);
-    this.focusHandle(0);
-  }
-
-  createSetValue(index?: number) {
-    return (numberOrModifier: number | ((value: number) => number)) => {
+  createSetValue(index: number) {
+    return (numberOrModifier: number | ((value: number) => number)): void => {
       const number = typeof numberOrModifier === "number"
         ? this.normalizeValue(numberOrModifier)
         : numberOrModifier(this.rangeValue[index]);
@@ -303,17 +301,14 @@ class Range extends SuperInput {
         newValue[index] = number;
       }
       this.value = newValue;
+      this.dispatchEvent(new CustomEvent("range", { detail: this.value }));
     };
   }
 
-  setEnd(value: number) {
-    this.createSetValue((this.value as any)?.length - 1 || 0)(value);
-  }
-
   /**
    * Compute value from event.
    */
-  protected _computeValue(e: MouseEvent) {
+  protected _computeValue(e: MouseEvent): number {
     const rect = this._root.getBoundingClientRect();
     const div = this.vertical ? (e.clientY - rect.top) / rect.height : (e.clientX - rect.left) / rect.width;
     const value = Math.round((div * (this.max - this.min)) / this.step) * this.step;
@@ -323,13 +318,13 @@ class Range extends SuperInput {
   /**
    * Ensure that the values do not exceed the range of max and min.
    */
-  protected normalizeValue(value: number) {
+  protected normalizeValue(value: number): number {
     if (value > this.max) { value -= this.step; }
     else if (value < this.min) { value += this.step; }
     return value;
   }
 
-  protected _handleMousedownRoot(e: MouseEvent) {
+  protected _handleMousedownRoot(e: MouseEvent): void {
     const value = this._computeValue(e);
     const index = this.range
       ? this.rangeValue.reduce((acc, item, index) => {
@@ -346,7 +341,7 @@ class Range extends SuperInput {
   }
 
   protected createMousedownListener(mouseMoveCallback: (arg0: number) => void) {
-    return (e: MouseEvent) => {
+    return (e: MouseEvent): void => {
       e.preventDefault();
       e.stopPropagation();
       const move = this.createMousemoveListener(mouseMoveCallback);
@@ -360,7 +355,7 @@ class Range extends SuperInput {
   }
 
   protected createMousemoveListener(callback: (arg0: number) => void) {
-    return (e: MouseEvent) => {
+    return (e: MouseEvent): void => {
       const value = this._computeValue(e);
       if (value > this.max || value < this.min) {
         return;
@@ -369,7 +364,7 @@ class Range extends SuperInput {
     };
   }
 
-  protected _connectedInit() {
+  protected _connectedInit(): void {
     const gap = this.max - this.min;
     this.step ||= gap / 100;
     if (isNil(this.value)) {
@@ -382,28 +377,21 @@ class Range extends SuperInput {
     this.default ??= this.value;
   }
 
-  reset() {
+  reset(): void {
     this.value = this.default;
   }
 
-  swap() {
-    if (this.range) {
-      const [a, b] = this.value as [number, number];
-      this.value = [b, a];
-    }
-  }
-
-  sort() {
-    this.value = this.toSorted();
+  sort(): number | number[] {
+    return this.value = this.toSorted();
   }
 
-  toSorted(): typeof this.value {
+  toSorted(): number | number[] {
     if (this.range) {
-      const [a, b] = this.value as [number, number];
-      return a > b ? [b, a] : [a, b];
+      return [...this.value as number[]].sort((a, b) => a - b);
     }
     return this.value;
   }
 }
 
 export default Range;
+export { Range };

package/src/components/rotate.ts

@@ -1,8 +1,5 @@
-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 { css, html } from "lit";
+import { godown, htmlSlot, part, styles } from "@godown/element";
+import { css, html, type TemplateResult } from "lit";
 
 import { GlobalStyle, scopePrefix } from "../core/global-style.js";
 
@@ -42,28 +39,28 @@ const cssScope = scopePrefix(protoName);
     margin: calc(-1 * var(${cssScope}--offset));
   }
 
-  [part="slot"]{
+  [part=slot] {
     z-index: 2;
   }
 `,
 )
 class Rotate extends GlobalStyle {
   @part("root")
-  _root: HTMLElement;
+  protected _root: HTMLElement;
 
-  protected render() {
+  protected render(): TemplateResult<1> {
     return html`<div part="root">
       <div part="slot" @mousemove="${this._handleRotate}">${htmlSlot()}</div>
       <i @mouseleave="${this.reset}"></i>
     </div>`;
   }
 
-  reset() {
+  reset(): void {
     this._root.style.removeProperty("transform");
     this._root.style.removeProperty("transition");
   }
 
-  protected _handleRotate(e: MouseEvent) {
+  protected _handleRotate(e: MouseEvent): void {
     const { rotateX, rotateY } = this._computeOffset(e);
     this._root.style.setProperty("transform", `rotateX(${rotateX}rad) rotateY(${rotateY}rad)`);
     this._root.style.setProperty("transition", "0s");
@@ -77,7 +74,10 @@ class Rotate extends GlobalStyle {
    * @param e Mouse move event.
    * @returns rotateX, rotateY
    */
-  _computeOffset(e: MouseEvent) {
+  _computeOffset(e: MouseEvent): {
+    rotateX: number;
+    rotateY: number;
+  } {
     const { left, top, width, height } = this._root.getBoundingClientRect();
     const { clientX, clientY } = e;
     const offsetX = clientX - left;
@@ -90,3 +90,4 @@ class Rotate extends GlobalStyle {
 }
 
 export default Rotate;
+export { Rotate };