@adobe/data-lit 0.10.31 → 0.10.33

package/README.md

@@ -30,19 +30,17 @@ Inline callbacks do not cause the observer to disconnect and reattach.
 
 ## Hooks and the disconnect lifecycle
 
-Hooks (`useState`, `useEffect`, `useObservable`, `useObservableValues`, `useMemo`, `useRef`, ...) follow
-React's unmount semantics. When a hook-using element is disconnected from the DOM, **all of its hook state is
-reset**:
-
-- every `useEffect` cleanup runs, so observable subscriptions and event listeners are torn down, and
-- all stored values (`useState`, `useMemo`, `useRef`) are discarded.
-
-On the next connect the element renders fresh from its initial hook state.
-
-> **Footgun:** because a disconnect is a full reset, a DOM *move* (`el.remove()` then re-appending it, or
-> reparenting the element) is treated as a full unmount followed by a remount. Any local UI state held in
-> hooks is silently lost across the move: toggle positions, uncontrolled input values, scroll offsets. If a
-> piece of state must survive a reparent, keep it in the `@adobe/data` database/service rather than in element
-> hook state.
+A hook-using element has two kinds of hook state with different lifetimes.
+
+**Values and subscriptions** (`useState`, `useMemo`, `useRef`, `useEffect`, `useObservable`,
+`useObservableValues`, ...) belong to the element's mount. They survive a DOM *move*: removing the element
+and re-inserting it in the same task, as a `repeat` reorder or a reparent does, keeps every value and
+subscription, and the element renders once more. They are finalized only when the element is still
+disconnected at the next microtask: every `useEffect` cleanup runs, stored values are discarded, and a
+later connect renders fresh from initial hook state.
+
+**Connectedness** (`useConnected`) follows every connect and disconnect synchronously, including both
+edges of a move. Use it for window or document listeners, portals, and drag sessions that must detach while
+the element is out of the DOM.
 
 See the `data-lit-todo` sample in this repository for a full example.

package/dist/elements/application-host.d.ts

@@ -1,16 +1,20 @@
 import { LitElement, nothing, TemplateResult } from 'lit';
 import { Service } from '@adobe/data/service';
-import { ApplicationElement } from './application-element.js';
 declare global {
     interface HTMLElementTagNameMap {
-        'application-element': ApplicationElement<Service>;
+        'application-host': ApplicationHost;
     }
 }
 export declare class ApplicationHost<MainService extends Service = Service> extends LitElement {
+    #private;
     static styles: import("lit").CSSResult;
     createService: () => Promise<MainService>;
     renderElement: () => TemplateResult;
     service: MainService;
+    /**
+     * Creates the service once per host: reconnecting, including a DOM move, reuses the
+     * service or the in-flight creation. A failed creation is retried on the next connect.
+     */
     connectedCallback(): Promise<void>;
     render(): TemplateResult | typeof nothing;
 }

package/dist/elements/application-host.js

@@ -15,9 +15,25 @@ let ApplicationHost = class ApplicationHost extends LitElement {
             flex: 1 1 auto;
         }
     `; }
+    #pendingService;
+    /**
+     * Creates the service once per host: reconnecting, including a DOM move, reuses the
+     * service or the in-flight creation. A failed creation is retried on the next connect.
+     */
     async connectedCallback() {
         super.connectedCallback();
-        this.service = await this.createService();
+        if (this.service)
+            return;
+        const pending = this.#pendingService ??= this.createService();
+        try {
+            const service = await pending;
+            this.service ??= service;
+        }
+        catch (error) {
+            if (this.#pendingService === pending)
+                this.#pendingService = undefined;
+            throw error;
+        }
     }
     render() {
         return this.service ? this.renderElement() : nothing;

package/dist/elements/application-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"application-host.js","sourceRoot":"","sources":["../../src/elements/application-host.ts"],"names":[],"mappings":"AAAA,uDAAuD;;;;;;;AAEvD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAkB,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI5D,MAAM,OAAO,GAAG,kBAAkB,CAAC;AAS5B,IAAM,eAAe,GAArB,MAAM,eAAuD,SAAQ,UAAU;aAC5E,WAAM,GAAG,GAAG,CAAA;;;;;KAKjB,AALW,CAKV;IAWM,KAAK,CAAC,iBAAiB;QAC7B,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC7C,CAAC;IAEQ,MAAM;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACxD,CAAC;;AAfD;IADC,QAAQ,EAAE;sDACgC;AAG3C;IADC,QAAQ,CAAC,EAAE,CAAC;sDACwB;AAG9B;IADN,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;gDACF;AAfnB,eAAe;IAD3B,aAAa,CAAC,OAAO,CAAC;GACV,eAAe,CA0B3B"}
+{"version":3,"file":"application-host.js","sourceRoot":"","sources":["../../src/elements/application-host.ts"],"names":[],"mappings":"AAAA,uDAAuD;;;;;;;AAEvD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAkB,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG5D,MAAM,OAAO,GAAG,kBAAkB,CAAC;AAS5B,IAAM,eAAe,GAArB,MAAM,eAAuD,SAAQ,UAAU;aAC5E,WAAM,GAAG,GAAG,CAAA;;;;;KAKjB,AALW,CAKV;IAWH,eAAe,CAAwB;IAEvC;;;OAGG;IACM,KAAK,CAAC,iBAAiB;QAC7B,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9D,IAAI,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;YAC9B,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACd,IAAI,IAAI,CAAC,eAAe,KAAK,OAAO;gBAAE,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;YACvE,MAAM,KAAK,CAAC;QACf,CAAC;IACJ,CAAC;IAEQ,MAAM;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACxD,CAAC;;AA7BD;IADC,QAAQ,EAAE;sDACgC;AAG3C;IADC,QAAQ,CAAC,EAAE,CAAC;sDACwB;AAG9B;IADN,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;gDACF;AAfnB,eAAe;IAD3B,aAAa,CAAC,OAAO,CAAC;GACV,eAAe,CAwC3B"}

package/dist/functions/iterate-self-and-ancestors.d.ts

@@ -1 +1,2 @@
+/** Yields `element` and its ancestors along the composed tree: assigned slots, parents, then shadow hosts. */
 export declare function iterateSelfAndAncestors(element: Element): IterableIterator<Element>;

package/dist/functions/iterate-self-and-ancestors.js

@@ -1,10 +1,10 @@
 // © 2026 Adobe. MIT License. See /LICENSE for details.
+/** Yields `element` and its ancestors along the composed tree: assigned slots, parents, then shadow hosts. */
 export function* iterateSelfAndAncestors(element) {
     let current = element;
     while (current) {
         yield current;
-        if (current instanceof HTMLSlotElement && current.assignedSlot) {
-            // Move to the slot's parent if the current element is assigned to a slot
+        if (current.assignedSlot) {
             current = current.assignedSlot;
         }
         else if (current.parentNode instanceof Element) {

package/dist/functions/iterate-self-and-ancestors.js.map

@@ -1 +1 @@
-{"version":3,"file":"iterate-self-and-ancestors.js","sourceRoot":"","sources":["../../src/functions/iterate-self-and-ancestors.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,MAAM,SAAS,CAAC,CAAC,uBAAuB,CAAC,OAAgB;IACrD,IAAI,OAAO,GAAmB,OAAO,CAAC;IAEtC,OAAO,OAAO,EAAE,CAAC;QACb,MAAM,OAAO,CAAC;QAEd,IAAI,OAAO,YAAY,eAAe,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YAC7D,yEAAyE;YACzE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;QACnC,CAAC;aAAM,IAAI,OAAO,CAAC,UAAU,YAAY,OAAO,EAAE,CAAC;YAC/C,iDAAiD;YACjD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;QACjC,CAAC;aAAM,IAAK,OAAO,CAAC,WAAW,EAAiB,CAAC,IAAI,EAAE,CAAC;YACpD,qDAAqD;YACrD,OAAO,GAAI,OAAO,CAAC,WAAW,EAAiB,CAAC,IAAI,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,2CAA2C;YAC3C,OAAO,GAAG,IAAI,CAAC;QACnB,CAAC;IACL,CAAC;AACL,CAAC"}
+{"version":3,"file":"iterate-self-and-ancestors.js","sourceRoot":"","sources":["../../src/functions/iterate-self-and-ancestors.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,8GAA8G;AAC9G,MAAM,SAAS,CAAC,CAAC,uBAAuB,CAAC,OAAgB;IACrD,IAAI,OAAO,GAAmB,OAAO,CAAC;IAEtC,OAAO,OAAO,EAAE,CAAC;QACb,MAAM,OAAO,CAAC;QAEd,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;QACnC,CAAC;aAAM,IAAI,OAAO,CAAC,UAAU,YAAY,OAAO,EAAE,CAAC;YAC/C,iDAAiD;YACjD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;QACjC,CAAC;aAAM,IAAK,OAAO,CAAC,WAAW,EAAiB,CAAC,IAAI,EAAE,CAAC;YACpD,qDAAqD;YACrD,OAAO,GAAI,OAAO,CAAC,WAAW,EAAiB,CAAC,IAAI,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,2CAA2C;YAC3C,OAAO,GAAG,IAAI,CAAC;QACnB,CAAC;IACL,CAAC;AACL,CAAC"}

package/dist/hooks/component/hooks-controller.js

@@ -12,17 +12,28 @@ function isReactiveHost(host) {
  * Finalize a host: dispose every hook slot's cleanup and clear the slots so the
  * next render re-initializes from scratch. Only slots that expose a `dispose`
  * function (effects, subscriptions) are torn down; value slots (state, memo,
- * ref) are simply dropped.
+ * ref) are simply dropped. Every disposer runs even if an earlier one throws;
+ * the failures are rethrown afterwards.
  */
 function finalizeHooks(host) {
     const { hooks } = host;
-    if (hooks) {
-        for (const hook of hooks) {
+    host.hooks = [];
+    host.hookIndex = 0;
+    const errors = [];
+    for (const hook of hooks ?? []) {
+        try {
             hook?.dispose?.();
         }
+        catch (error) {
+            errors.push(error);
+        }
+    }
+    if (errors.length === 1) {
+        throw errors[0];
+    }
+    if (errors.length > 1) {
+        throw new AggregateError(errors, "Hook cleanup failed");
     }
-    host.hooks = [];
-    host.hookIndex = 0;
 }
 /**
  * Give a hook host a correct lifecycle by separating two concerns that the DOM

package/dist/hooks/component/hooks-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks-controller.js","sourceRoot":"","sources":["../../../src/hooks/component/hooks-controller.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAKvD;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAI5D,SAAS,cAAc,CAAC,IAAe;IACnC,OAAO,eAAe,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,UAAU,CAAC;AAC/E,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,IAAe;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACvB,IAAI,KAAK,EAAE,CAAC;QACR,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACtB,IAA6C,EAAE,OAAO,EAAE,EAAE,CAAC;QAChE,CAAC;IACL,CAAC;IACD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;AACvB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAe;IAClD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClD,OAAO;IACX,CAAC;IACD,0EAA0E;IAC1E,8EAA8E;IAC9E,2EAA2E;IAC3E,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAE9B,gFAAgF;IAChF,4BAA4B;IAC5B,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,oEAAoE;IACpE,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,MAAM,UAAU,GAAuB;QACnC,aAAa;YACT,uEAAuE;YACvE,2EAA2E;YAC3E,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;YAC3C,IAAI,aAAa,EAAE,CAAC;gBAChB,sEAAsE;gBACtE,sEAAsE;gBACtE,uEAAuE;gBACvE,mEAAmE;gBACnE,oEAAoE;gBACpE,uEAAuE;gBACvE,uEAAuE;gBACvE,mEAAmE;gBACnE,mDAAmD;gBACnD,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;YACD,aAAa,GAAG,IAAI,CAAC;QACzB,CAAC;QACD,gBAAgB;YACZ,wEAAwE;YACxE,+CAA+C;YAC/C,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YAC9C,yEAAyE;YACzE,wEAAwE;YACxE,sEAAsE;YACtE,yEAAyE;YACzE,0CAA0C;YAC1C,IAAI,kBAAkB,EAAE,CAAC;gBACrB,OAAO;YACX,CAAC;YACD,kBAAkB,GAAG,IAAI,CAAC;YAC1B,cAAc,CAAC,GAAG,EAAE;gBAChB,kBAAkB,GAAG,KAAK,CAAC;gBAC3B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnB,+DAA+D;oBAC/D,OAAO;gBACX,CAAC;gBACD,aAAa,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,CAAC;IACF,IAAI,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,4EAA4E;QAC5E,2EAA2E;QAC3E,IAAI,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC;QACnC,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC"}
+{"version":3,"file":"hooks-controller.js","sourceRoot":"","sources":["../../../src/hooks/component/hooks-controller.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-drag-observe.js

@@ -1,6 +1,7 @@
 // © 2026 Adobe. MIT License. See /LICENSE for details.
 import { useDraggable } from './use-draggable.js';
 import { useElement } from './use-element.js';
+import { useMemo } from './use-memo.js';
 import { Observe } from '@adobe/data/observe';
 /**
  * This hook creates a drag observe function that can be used to observe the drag state of an element.
@@ -9,7 +10,7 @@ import { Observe } from '@adobe/data/observe';
  * @returns
  */
 export function useDragObserve(props, dependencies) {
-    const [dragState, setDragState] = Observe.createEvent();
+    const [dragState, setDragState] = useMemo(() => Observe.createEvent(), dependencies);
     const element = useElement();
     useDraggable(element, {
         ...props,

package/dist/hooks/use-drag-observe.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-drag-observe.js","sourceRoot":"","sources":["../../src/hooks/use-drag-observe.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA4B9C;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,KAAuB,EAAE,YAAuB;IAC3E,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,WAAW,EAAa,CAAC;IACnE,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,YAAY,CAAC,OAAO,EAChB;QACI,GAAG,KAAK;QACR,WAAW,EAAE,CAAC,CAAC,EAAE;YACb,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC5B,YAAY,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,QAAQ;gBACR,KAAK;aACR,CAAC,CAAC;QACP,CAAC;QACD,SAAS,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC/B,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,YAAY,EAAE,GAAG,EAAE;YACf,YAAY,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;KACJ,EACD,YAAY,CACf,CAAC;IACF,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"use-drag-observe.js","sourceRoot":"","sources":["../../src/hooks/use-drag-observe.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA4B9C;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,KAAuB,EAAE,YAAuB;IAC3E,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,EAAa,EAAE,YAAY,CAAC,CAAC;IAChG,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,YAAY,CAAC,OAAO,EAChB;QACI,GAAG,KAAK;QACR,WAAW,EAAE,CAAC,CAAC,EAAE;YACb,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC5B,YAAY,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,QAAQ;gBACR,KAAK;aACR,CAAC,CAAC;QACP,CAAC;QACD,SAAS,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC/B,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,YAAY,EAAE,GAAG,EAAE;YACf,YAAY,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;KACJ,EACD,YAAY,CACf,CAAC;IACF,OAAO,SAAS,CAAC;AACrB,CAAC"}

package/dist/hooks/use-drag-transaction.d.ts

@@ -4,4 +4,9 @@ export type DragTransactionProps<T extends {} | null> = DragObserveProps & {
     transaction: (asyncArgs: AsyncArgsProvider<T>) => void;
     update: (drag: DragMove | DragEnd) => T | void;
 };
+/**
+ * Drives `transaction` with one argument generator per drag: each move or end
+ * yields `update(drag)` as intermediate arguments, the end commits the last
+ * arguments, and a cancellation (including unmount mid-drag) discards them.
+ */
 export declare function useDragTransaction<T extends {} | null>(props: DragTransactionProps<T>, dependencies: unknown[]): void;

package/dist/hooks/use-drag-transaction.js

@@ -2,34 +2,54 @@
 import { useDragObserve } from './use-drag-observe.js';
 import { useEffect } from "./use-effect.js";
 import { Observe } from '@adobe/data/observe';
+// Thrown into a drag's argument generator so the transaction discards its transient state.
+const dragCancelled = new Error('Drag cancelled');
+async function* toTransactionArgs(drags, update) {
+    for await (const drag of drags) {
+        if (drag.type === 'move' || drag.type === 'end') {
+            const args = update(drag);
+            if (args !== undefined) {
+                yield args;
+            }
+        }
+    }
+}
+/**
+ * Drives `transaction` with one argument generator per drag: each move or end
+ * yields `update(drag)` as intermediate arguments, the end commits the last
+ * arguments, and a cancellation (including unmount mid-drag) discards them.
+ */
 export function useDragTransaction(props, dependencies) {
-    const { transaction, update } = props;
     const dragObserve = useDragObserve(props, dependencies);
-    const startDragTransaction = () => {
-        let done = false;
-        // we start the transaction by calling it with an async generator that will yield the args asynchronously
-        transaction(
-        // we create the async generator by mapping the dragObserve state changes to transaction args
-        () => Observe.toAsyncGenerator(
-        // this uses the withMap function and the provided update and finish functions
-        // any type 'start' will just be ignored and filtered out
-        Observe.withFilter(dragObserve, value => {
-            if (value.type === 'end') {
-                done = true;
-                return update(value);
-            }
-            if (value.type === 'move') {
-                return update(value);
-            }
-        }), _value => done));
-    };
-    // now we will observe the drag state and start a new transaction whenever a drag starts
     useEffect(() => {
-        return dragObserve(value => {
+        const { transaction, update } = props;
+        let active;
+        const cancel = () => {
+            const drags = active;
+            active = undefined;
+            drags?.throw(dragCancelled).catch(() => undefined);
+        };
+        const unobserve = dragObserve(value => {
             if (value.type === 'start') {
-                startDragTransaction();
+                cancel();
+                const drags = active = Observe.toAsyncGenerator(dragObserve, v => v.type === 'end' || v.type === 'cancel');
+                const result = transaction(() => toTransactionArgs(drags, update));
+                Promise.resolve(result).catch(error => {
+                    if (error !== dragCancelled)
+                        throw error;
+                });
+            }
+            else if (value.type === 'end') {
+                active = undefined;
+            }
+            else if (value.type === 'cancel') {
+                cancel();
             }
         });
+        return () => {
+            unobserve();
+            cancel();
+        };
     }, dependencies);
 }
 //# sourceMappingURL=use-drag-transaction.js.map

package/dist/hooks/use-drag-transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-drag-transaction.js","sourceRoot":"","sources":["../../src/hooks/use-drag-transaction.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAuC,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,MAAM,UAAU,kBAAkB,CAAsB,KAA8B,EAAE,YAAuB;IAC3G,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACxD,MAAM,oBAAoB,GAAG,GAAG,EAAE;QAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,yGAAyG;QACzG,WAAW;QACP,6FAA6F;QAC7F,GAAG,EAAE,CACD,OAAO,CAAC,gBAAgB;QACpB,8EAA8E;QAC9E,yDAAyD;QACzD,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;YACpC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBACvB,IAAI,GAAG,IAAI,CAAC;gBACZ,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,EACF,MAAM,CAAC,EAAE,CAAC,IAAI,CACjB,CACR,CAAC;IACN,CAAC,CAAC;IACF,wFAAwF;IACxF,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,WAAW,CAAC,KAAK,CAAC,EAAE;YACvB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACzB,oBAAoB,EAAE,CAAC;YAC3B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,YAAY,CAAC,CAAC;AACrB,CAAC"}
+{"version":3,"file":"use-drag-transaction.js","sourceRoot":"","sources":["../../src/hooks/use-drag-transaction.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAkD,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvG,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,2FAA2F;AAC3F,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAElD,KAAK,SAAS,CAAC,CAAC,iBAAiB,CAC7B,KAAgC,EAChC,MAAyC;IAEzC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACrB,MAAM,IAAI,CAAC;YACf,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAsB,KAA8B,EAAE,YAAuB;IAC3G,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACxD,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACtC,IAAI,MAA6C,CAAC;QAClD,MAAM,MAAM,GAAG,GAAG,EAAE;YAChB,MAAM,KAAK,GAAG,MAAM,CAAC;YACrB,MAAM,GAAG,SAAS,CAAC;YACnB,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE;YAClC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACzB,MAAM,EAAE,CAAC;gBACT,MAAM,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAC3C,WAAW,EACX,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAC/C,CAAC;gBACF,MAAM,MAAM,GAAY,WAAW,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC5E,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBAClC,IAAI,KAAK,KAAK,aAAa;wBAAE,MAAM,KAAK,CAAC;gBAC7C,CAAC,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC9B,MAAM,GAAG,SAAS,CAAC;YACvB,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACjC,MAAM,EAAE,CAAC;YACb,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,CAAC;QACb,CAAC,CAAC;IACN,CAAC,EAAE,YAAY,CAAC,CAAC;AACrB,CAAC"}

package/dist/hooks/use-draggable.js

@@ -7,87 +7,109 @@ function toCssUnitString(value) {
 export function useDraggable(element, props, dependencies) {
     const { minDragDistance = 10, dragCursor = 'grab', addPlaceholder = false, stopPropagation = false } = props;
     useEffect(() => {
-        let downPosition = null;
-        // the bounds of the element when the pointer was first pressed down.
+        const minDragDistanceSquared = minDragDistance * minDragDistance;
+        // The pointer that started the session; other pointers are ignored until it ends.
+        let pointerId = null;
+        let downPosition = [0, 0];
+        // The element position when the drag started, or null before the threshold is crossed.
         let dragStartOffset = null;
         let originalCursor = '';
         let placeholder = null;
-        let movePosition = [0, 0];
-        function notify(e, dragListener) {
-            const delta = Vec2.subtract(movePosition, downPosition);
-            dragListener(e, Vec2.add(dragStartOffset, delta), delta);
+        function notify(e, start, dragListener) {
+            const delta = [e.clientX - downPosition[0], e.clientY - downPosition[1]];
+            dragListener(e, Vec2.add(start, delta), delta);
+        }
+        function startDrag(e) {
+            const offset = [element.offsetLeft, element.offsetTop];
+            const start = props.onDragStart(e) ?? offset;
+            dragStartOffset = start;
+            if (dragCursor) {
+                originalCursor = element.style.cursor;
+                element.style.cursor = dragCursor;
+            }
+            // add a placeholder so the parent element doesn't change size when the element is dragged.
+            if (addPlaceholder) {
+                placeholder = document.createElement('div');
+                Object.assign(placeholder.style, {
+                    position: 'absolute',
+                    backgroundColor: 'pink',
+                    left: toCssUnitString(element.offsetLeft),
+                    top: toCssUnitString(element.offsetTop),
+                    width: toCssUnitString(element.offsetWidth),
+                    height: toCssUnitString(element.offsetHeight),
+                    visibility: 'hidden',
+                });
+                element.parentElement?.appendChild(placeholder);
+            }
+            return start;
         }
         function onPointerMove(e) {
-            movePosition = [e.clientX, e.clientY];
-            if (Vec2.length(Vec2.subtract(movePosition, downPosition)) >= minDragDistance) {
-                if (!dragStartOffset) {
-                    dragStartOffset = [element.offsetLeft, element.offsetTop];
-                    props.onDragStart(e);
-                    if (dragCursor) {
-                        originalCursor = element.style.cursor;
-                        element.style.cursor = dragCursor;
-                    }
-                    // add a placeholder so the parent element doesn't change size when the element is dragged.
-                    if (addPlaceholder) {
-                        placeholder = document.createElement('div');
-                        Object.assign(placeholder.style, {
-                            position: 'absolute',
-                            backgroundColor: 'pink',
-                            left: toCssUnitString(element.offsetLeft),
-                            top: toCssUnitString(element.offsetTop),
-                            width: toCssUnitString(element.offsetWidth),
-                            height: toCssUnitString(element.offsetHeight),
-                            visibility: 'hidden',
-                        });
-                        element.parentElement?.appendChild(placeholder);
-                    }
+            if (e.pointerId !== pointerId)
+                return;
+            let start = dragStartOffset;
+            if (!start) {
+                const dx = e.clientX - downPosition[0];
+                const dy = e.clientY - downPosition[1];
+                if (dx * dx + dy * dy >= minDragDistanceSquared) {
+                    start = startDrag(e);
                 }
             }
-            if (dragStartOffset) {
-                notify(e, props.onDrag);
+            if (start) {
+                notify(e, start, props.onDrag);
             }
             if (stopPropagation)
                 e.stopPropagation();
         }
-        function cleanup() {
+        /** Ends the session and restores the element; returns the drag start if a drag had started. */
+        function release() {
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
             window.removeEventListener('pointerup', onPointerUp);
+            // eslint-disable-next-line @typescript-eslint/no-use-before-define
+            window.removeEventListener('pointercancel', onPointerCancel);
             window.removeEventListener('pointermove', onPointerMove);
-            if (dragCursor) {
+            const start = dragStartOffset;
+            if (start && dragCursor) {
                 element.style.cursor = originalCursor;
             }
-            if (placeholder) {
-                placeholder.remove();
-                placeholder = null;
-            }
+            placeholder?.remove();
+            placeholder = null;
+            pointerId = null;
+            dragStartOffset = null;
+            return start;
         }
         function onPointerUp(e) {
-            cleanup();
-            if (dragStartOffset && props.onDragEnd) {
-                notify(e, props.onDragEnd);
+            if (e.pointerId !== pointerId)
+                return;
+            const start = release();
+            if (start && props.onDragEnd) {
+                notify(e, start, props.onDragEnd);
             }
             if (stopPropagation)
                 e.stopPropagation();
-            downPosition = null;
-            dragStartOffset = null;
+        }
+        function onPointerCancel(e) {
+            if (e.pointerId !== pointerId)
+                return;
+            if (release()) {
+                props.onDragCancel?.();
+            }
         }
         function onPointerDown(e) {
             // Only start drag transaction for left mouse button clicks
-            if (e.button !== 0)
+            if (e.button !== 0 || pointerId !== null)
                 return;
+            pointerId = e.pointerId;
+            downPosition = [e.clientX, e.clientY];
             window.addEventListener('pointermove', onPointerMove);
             window.addEventListener('pointerup', onPointerUp);
-            downPosition = [e.clientX, e.clientY];
+            window.addEventListener('pointercancel', onPointerCancel);
             if (stopPropagation)
                 e.stopPropagation();
         }
         element?.addEventListener('pointerdown', onPointerDown);
         return () => {
             element?.removeEventListener('pointerdown', onPointerDown);
-            if (downPosition) {
-                cleanup();
-            }
-            if (dragStartOffset) {
+            if (pointerId !== null && release()) {
                 props.onDragCancel?.();
             }
         };

package/dist/hooks/use-draggable.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-draggable.js","sourceRoot":"","sources":["../../src/hooks/use-draggable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-draggable.js","sourceRoot":"","sources":["../../src/hooks/use-draggable.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,SAAS,eAAe,CAAC,KAAa;IAClC,OAAO,GAAG,KAAK,IAAI,CAAC;AACxB,CAAC;AAiBD,MAAM,UAAU,YAAY,CAAC,OAAoB,EAAE,KAAqB,EAAE,YAAuB;IAC7F,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,UAAU,GAAG,MAAM,EAAE,cAAc,GAAG,KAAK,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IAC7G,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,sBAAsB,GAAG,eAAe,GAAG,eAAe,CAAC;QACjE,kFAAkF;QAClF,IAAI,SAAS,GAAkB,IAAI,CAAC;QACpC,IAAI,YAAY,GAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChC,uFAAuF;QACvF,IAAI,eAAe,GAAgB,IAAI,CAAC;QACxC,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,IAAI,WAAW,GAAuB,IAAI,CAAC;QAE3C,SAAS,MAAM,CAAC,CAAe,EAAE,KAAW,EAAE,YAAsC;YAChF,MAAM,KAAK,GAAS,CAAC,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/E,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;QAED,SAAS,SAAS,CAAC,CAAe;YAC9B,MAAM,MAAM,GAAS,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YAC7D,MAAM,KAAK,GAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAsB,IAAI,MAAM,CAAC;YACnE,eAAe,GAAG,KAAK,CAAC;YACxB,IAAI,UAAU,EAAE,CAAC;gBACb,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;gBACtC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC;YACtC,CAAC;YACD,2FAA2F;YAC3F,IAAI,cAAc,EAAE,CAAC;gBACjB,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC5C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE;oBAC7B,QAAQ,EAAE,UAAU;oBACpB,eAAe,EAAE,MAAM;oBACvB,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC;oBACzC,GAAG,EAAE,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;oBACvC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC;oBAC3C,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC;oBAC7C,UAAU,EAAE,QAAQ;iBACvB,CAAC,CAAC;gBACH,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;YACpD,CAAC;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,SAAS,aAAa,CAAC,CAAe;YAClC,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS;gBAAE,OAAO;YACtC,IAAI,KAAK,GAAG,eAAe,CAAC;YAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;gBACvC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,sBAAsB,EAAE,CAAC;oBAC9C,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;YACL,CAAC;YACD,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;YACD,IAAI,eAAe;gBAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QAC7C,CAAC;QAED,+FAA+F;QAC/F,SAAS,OAAO;YACZ,mEAAmE;YACnE,MAAM,CAAC,mBAAmB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACrD,mEAAmE;YACnE,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YAC7D,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACzD,MAAM,KAAK,GAAG,eAAe,CAAC;YAC9B,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC;YAC1C,CAAC;YACD,WAAW,EAAE,MAAM,EAAE,CAAC;YACtB,WAAW,GAAG,IAAI,CAAC;YACnB,SAAS,GAAG,IAAI,CAAC;YACjB,eAAe,GAAG,IAAI,CAAC;YACvB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,SAAS,WAAW,CAAC,CAAe;YAChC,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS;gBAAE,OAAO;YACtC,MAAM,KAAK,GAAG,OAAO,EAAE,CAAC;YACxB,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YACtC,CAAC;YACD,IAAI,eAAe;gBAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QAC7C,CAAC;QAED,SAAS,eAAe,CAAC,CAAe;YACpC,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS;gBAAE,OAAO;YACtC,IAAI,OAAO,EAAE,EAAE,CAAC;gBACZ,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC;YAC3B,CAAC;QACL,CAAC;QAED,SAAS,aAAa,CAAC,CAAe;YAClC,2DAA2D;YAC3D,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,KAAK,IAAI;gBAAE,OAAO;YAEjD,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;YACxB,YAAY,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACtD,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAClD,MAAM,CAAC,gBAAgB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YAC1D,IAAI,eAAe;gBAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QAC7C,CAAC;QAED,OAAO,EAAE,gBAAgB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACxD,OAAO,GAAG,EAAE;YACR,OAAO,EAAE,mBAAmB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YAC3D,IAAI,SAAS,KAAK,IAAI,IAAI,OAAO,EAAE,EAAE,CAAC;gBAClC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC;YAC3B,CAAC;QACL,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC3C,CAAC"}

package/dist/hooks/use-effect.js

@@ -7,8 +7,12 @@ export function useEffect(callback, dependencies = []) {
     const oldHookState = component.hooks[hookIndex];
     const rerunEffect = !oldHookState || !equalsShallow(dependencies, oldHookState.dependencies);
     if (rerunEffect) {
-        oldHookState?.dispose?.();
-        component.hooks[hookIndex] = { dispose: callback.call(component) ?? undefined, dependencies };
+        try {
+            oldHookState?.dispose?.();
+        }
+        finally {
+            component.hooks[hookIndex] = { dispose: callback.call(component) ?? undefined, dependencies };
+        }
     }
 }
 //# sourceMappingURL=use-effect.js.map

package/dist/hooks/use-effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-effect.js","sourceRoot":"","sources":["../../src/hooks/use-effect.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAKvD,MAAM,UAAU,SAAS,CAAsB,QAAwB,EAAE,eAA0B,EAAE;IACjG,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAO,CAAC;IAChD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IACxC,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAgC,CAAC;IAC/E,MAAM,WAAW,GAAG,CAAC,YAAY,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IAC7F,IAAI,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;QAC1B,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,EAAE,YAAY,EAAE,CAAC;IAClG,CAAC;AACL,CAAC"}
+{"version":3,"file":"use-effect.js","sourceRoot":"","sources":["../../src/hooks/use-effect.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAKvD,MAAM,UAAU,SAAS,CAAsB,QAAwB,EAAE,eAA0B,EAAE;IACjG,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAO,CAAC;IAChD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IACxC,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAgC,CAAC;IAC/E,MAAM,WAAW,GAAG,CAAC,YAAY,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IAC7F,IAAI,WAAW,EAAE,CAAC;QACd,IAAI,CAAC;YACD,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;QAC9B,CAAC;gBAAS,CAAC;YACP,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,EAAE,YAAY,EAAE,CAAC;QAClG,CAAC;IACL,CAAC;AACL,CAAC"}

package/dist/hooks/use-element.d.ts

@@ -1,7 +1,9 @@
 /**
  * Hook that returns the currently active component.
- * If a querySelector is provided, it dynamically observes for child elements
- * matching the selector and triggers rerender when found.
+ * If a querySelector is provided, it returns the first match in the component's
+ * shadow root, then its light DOM. The match is re-queried on every render and
+ * whenever either tree's children change; a changed match requests a render.
  */
 export declare function useElement<K extends keyof HTMLElementTagNameMap>(querySelector: K): HTMLElementTagNameMap[K] | null;
+export declare function useElement<T extends Element = HTMLElement>(querySelector: string): T | null;
 export declare function useElement<T = HTMLElement>(): T;

package/dist/hooks/use-element.js

@@ -4,63 +4,22 @@ import { useEffect } from "./use-effect.js";
 import { useState } from "./use-state.js";
 export function useElement(querySelector) {
     const component = Component_stack.active();
-    // If no querySelector provided, return the active component
     if (!querySelector) {
         return component;
     }
-    // Use state to track the found element
-    const [foundElement, setFoundElement] = useState(null);
+    const host = component;
+    const find = () => (host.shadowRoot?.querySelector(querySelector) ?? host.querySelector(querySelector));
+    const [, setFoundElement] = useState(null);
+    const foundElement = find();
+    setFoundElement(foundElement);
     useEffect(() => {
-        const element = component;
-        // Check if element already exists
-        const existingElement = element.querySelector(querySelector);
-        if (existingElement) {
-            setFoundElement(existingElement);
-            return;
-        }
-        // Set up MutationObserver to watch for new child elements
-        const observer = new MutationObserver((mutations) => {
-            for (const mutation of mutations) {
-                if (mutation.type === 'childList') {
-                    // Check if any added nodes match the selector
-                    for (const node of mutation.addedNodes) {
-                        if (node.nodeType === Node.ELEMENT_NODE) {
-                            const element = node;
-                            // Check if the added node itself matches
-                            if (element.matches(querySelector)) {
-                                setFoundElement(element);
-                                observer.disconnect();
-                                return;
-                            }
-                            // Check if any descendant matches
-                            const descendant = element.querySelector(querySelector);
-                            if (descendant) {
-                                setFoundElement(descendant);
-                                observer.disconnect();
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        });
-        // Start observing both element and shadowRoot
-        for (const observe of [element.shadowRoot, element]) {
-            if (observe) {
-                observer.observe(observe, {
-                    childList: true,
-                    subtree: true
-                });
+        const observer = new MutationObserver(() => setFoundElement(find()));
+        for (const root of [host.shadowRoot, host]) {
+            if (root) {
+                observer.observe(root, { childList: true, subtree: true });
             }
         }
-        observer.observe(element.shadowRoot ?? element, {
-            childList: true,
-            subtree: true
-        });
-        // Cleanup function
-        return () => {
-            observer.disconnect();
-        };
+        return () => observer.disconnect();
     }, [querySelector]);
     return foundElement;
 }

package/dist/hooks/use-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-element.js","sourceRoot":"","sources":["../../src/hooks/use-element.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS1C,MAAM,UAAU,UAAU,CAAkB,aAAsB;IAC9D,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;IAE3C,4DAA4D;IAC5D,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,SAAyB,CAAC;IACrC,CAAC;IAED,uCAAuC;IACvC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAW,IAAI,CAAC,CAAC;IAEjE,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,OAAO,GAAG,SAAmC,CAAC;QAEpD,kCAAkC;QAClC,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAa,CAAC;QACzE,IAAI,eAAe,EAAE,CAAC;YAClB,eAAe,CAAC,eAAe,CAAC,CAAC;YACjC,OAAO;QACX,CAAC;QAED,0DAA0D;QAC1D,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,CAAC,SAAS,EAAE,EAAE;YAChD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBAC/B,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAChC,8CAA8C;oBAC9C,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;wBACrC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;4BACtC,MAAM,OAAO,GAAG,IAAe,CAAC;4BAChC,yCAAyC;4BACzC,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gCACjC,eAAe,CAAC,OAAY,CAAC,CAAC;gCAC9B,QAAQ,CAAC,UAAU,EAAE,CAAC;gCACtB,OAAO;4BACX,CAAC;4BACD,kCAAkC;4BAClC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAa,CAAC;4BACpE,IAAI,UAAU,EAAE,CAAC;gCACb,eAAe,CAAC,UAAU,CAAC,CAAC;gCAC5B,QAAQ,CAAC,UAAU,EAAE,CAAC;gCACtB,OAAO;4BACX,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,8CAA8C;QAC9C,KAAK,MAAM,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;YAClD,IAAI,OAAO,EAAE,CAAC;gBACV,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;oBACtB,SAAS,EAAE,IAAI;oBACf,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,EAAE;YAC5C,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,mBAAmB;QACnB,OAAO,GAAG,EAAE;YACR,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,OAAO,YAAY,CAAC;AACxB,CAAC"}
+{"version":3,"file":"use-element.js","sourceRoot":"","sources":["../../src/hooks/use-element.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAW1C,MAAM,UAAU,UAAU,CAAkB,aAAsB;IAC9D,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;IAE3C,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,SAAyB,CAAC;IACrC,CAAC;IAED,MAAM,IAAI,GAAG,SAAmC,CAAC;IACjD,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAa,CAAC;IACpH,MAAM,CAAC,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAW,IAAI,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAI,EAAE,CAAC;IAC5B,eAAe,CAAC,YAAY,CAAC,CAAC;IAE9B,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACrE,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC;YACzC,IAAI,IAAI,EAAE,CAAC;gBACP,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;QACD,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;IACvC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,OAAO,YAAY,CAAC;AACxB,CAAC"}