@furystack/shades 11.1.0 → 12.0.1

package/CHANGELOG.md

@@ -1,5 +1,317 @@
 # Changelog
 
+## [12.0.1] - 2026-02-11
+
+### 🐛 Bug Fixes
+
+- Fixed `Router` and `NestedRouter` not abandoning stale navigations when routes change rapidly. Previously, a semaphore-based lock serialized navigations, allowing intermediate `onVisit`/`onLeave` callbacks to complete even after a newer navigation had been triggered. Now a version counter detects when a newer navigation has started and aborts the stale one, ensuring only the latest destination's lifecycle callbacks execute.
+- Fixed `useState` setter throwing `ObservableAlreadyDisposedError` when called after component unmount (e.g. from async callbacks like image `onerror` or `fetch` responses that resolve after the component is removed from the DOM)
+
+### 🧪 Tests
+
+- Added tests for `Router` verifying that rapid navigation (e.g. clicking route B then immediately route C) skips intermediate route callbacks
+- Added tests for `NestedRouter` verifying that rapid navigation abandons stale `onVisit` callbacks
+- Added test verifying `useState` setter silently ignores calls after disposal
+
+### ⬆️ Dependencies
+
+- Bump `jsdom` from `^27.4.0` to `^28.0.0`
+- Bump `vitest` from `^4.0.17` to `^4.0.18`
+- Bump `@types/node` from `^25.0.10` to `^25.2.3`
+- Removed `semaphore-async-await` dependency
+- Updated internal dependencies
+
+## [12.0.0] - 2026-02-09
+
+### 📝 Documentation
+
+### ScreenService API Documentation
+
+Improved JSDoc documentation for `ScreenService` with usage examples for responsive UI development.
+
+**Documented APIs:**
+
+- `screenSize.atLeast[size]` - Observable breakpoint detection
+- `orientation` - Observable screen orientation tracking
+- `breakpoints` - Breakpoint threshold definitions
+
+**Breakpoint Thresholds:**
+
+- `xs`: 0px+ (all sizes)
+- `sm`: 600px+ (small tablets and up)
+- `md`: 960px+ (tablets and up)
+- `lg`: 1280px+ (desktops and up)
+- `xl`: 1920px+ (large desktops)
+
+### useObservable Documentation
+
+Enhanced `useObservable` JSDoc with examples for the `onChange` callback option.
+
+### 🧪 Tests
+
+- Added integration tests for Shade resource management (`useObservable`, `useDisposable`)
+- Added tests for `ScreenService` breakpoints, observables, and disposal
+- Updated unit and integration tests to use `updateComponent()` instead of the removed `callConstructed()`
+- Replaced `constructed` callback test with `useDisposable` cleanup test
+- Updated integration tests to use `flushUpdates()` for asserting DOM state after microtask-based rendering
+- Added test for batching multiple synchronous observable changes into a single render
+- Added test for coalescing multiple `updateComponent()` calls into a single render pass
+- Added tests for `NestedRouter` covering route matching, nested layouts, lifecycle hooks, `notFound` fallback, and URL parameter extraction
+- Added tests for `NestedRouteLink` covering SPA navigation, parameterized route compilation, and `createNestedRouteLink` type constraints
+- Refactored existing `Router`, `LazyLoad`, `LinkToRoute`, `RouteLink`, and integration tests to use `usingAsync` for proper `Injector` disposal
+- Added `vnode.spec.ts` with unit tests for VNode creation, flattening, mounting, patching, prop diffing, and unmounting
+- Added `vnode.integration.spec.tsx` with integration tests covering VNode reconciliation within Shade components
+- Added `shade-host-props-ref.integration.spec.tsx` with tests for `useHostProps` and `useRef` behaviors
+- Added tests for `ResourceManager.useObservable` observable switching behavior when a different observable reference is passed for the same key
+- Updated existing integration tests to use `flushUpdates()` and the new API
+
+### 💥 Breaking Changes
+
+### Removed `constructed` callback from `Shade()`
+
+The `constructed` option has been removed from the `Shade()` component definition. The `callConstructed()` method has also been removed from the `JSX.Element` interface. Any cleanup function returned by `constructed` is no longer supported.
+
+**Migration:** Move initialization logic into `render` using `useDisposable()` for one-time setup that needs cleanup.
+
+```typescript
+// ❌ Before
+const MyComponent = Shade({
+  shadowDomName: 'my-component',
+  constructed: ({ element }) => {
+    const listener = () => { /* ... */ }
+    window.addEventListener('click', listener)
+    return () => window.removeEventListener('click', listener)
+  },
+  render: () => <div>Hello</div>,
+})
+
+// ✅ After
+const MyComponent = Shade({
+  shadowDomName: 'my-component',
+  render: ({ element, useDisposable }) => {
+    useDisposable('click-handler', () => {
+      const listener = () => { /* ... */ }
+      window.addEventListener('click', listener)
+      return { [Symbol.dispose]: () => window.removeEventListener('click', listener) }
+    })
+    return <div>Hello</div>
+  },
+})
+```
+
+**Impact:** All components using the `constructed` callback must be updated.
+
+### Rendering Engine Replaced with VNode-Based Reconciliation
+
+The rendering engine has been replaced with a lightweight VNode-based reconciler. Instead of creating real DOM elements during each render and diffing them, the JSX factory now produces VNode descriptors during render mode. A reconciler diffs the previous VNode tree against the new one and applies surgical DOM updates using tracked element references.
+
+**Impact:** All components using the `element` parameter from `RenderOptions` need to be updated. Components using `onAttach` or `onDetach` lifecycle hooks need to migrate to `useDisposable`.
+
+### `element` Removed from `RenderOptions`
+
+The `element` property (direct reference to the host custom element) has been removed from `RenderOptions`. Components should no longer imperatively mutate the host element.
+
+**Migration:** Use the new `useHostProps` hook to declaratively set attributes and styles on the host element.
+
+```typescript
+// ❌ Before
+render: ({ element, props }) => {
+  element.setAttribute('data-variant', props.variant)
+  element.style.setProperty('--color', colors.main)
+  // ...
+}
+
+// ✅ After
+render: ({ useHostProps, props }) => {
+  useHostProps({
+    'data-variant': props.variant,
+    style: { '--color': colors.main },
+  })
+  // ...
+}
+```
+
+### `onAttach` and `onDetach` Lifecycle Hooks Removed
+
+The `onAttach` and `onDetach` component lifecycle hooks have been removed. Use `useDisposable` or `connectedCallback`/`disconnectedCallback` for setup and teardown logic.
+
+```typescript
+// ❌ Before
+Shade({
+  shadowDomName: 'my-component',
+  onAttach: ({ element }) => {
+    /* setup */
+  },
+  onDetach: ({ element }) => {
+    /* cleanup */
+  },
+  render: ({ props }) => {
+    /* ... */
+  },
+})
+
+// ✅ After
+Shade({
+  shadowDomName: 'my-component',
+  render: ({ props, useDisposable }) => {
+    useDisposable('setup', () => {
+      /* setup */
+      return {
+        [Symbol.dispose]: () => {
+          /* cleanup */
+        },
+      }
+    })
+    // ...
+  },
+})
+```
+
+### 📚 Documentation
+
+- Updated README to remove references to `constructed` and `initialState`, and to recommend `useDisposable` for one-time setup with cleanup
+- Removed outdated note from README about DOM morphing behavior
+
+### ⚠️ Changed
+
+### Behavioral change: `updateComponent()` is now asynchronous
+
+`updateComponent()` no longer renders synchronously. Any code that calls `updateComponent()` (or triggers it via observable changes) and immediately inspects the DOM will now see stale state. Use `await flushUpdates()` to wait for pending renders to complete before reading the DOM.
+
+### ⚡ Performance
+
+### Microtask-based batched component updates
+
+`updateComponent()` now schedules renders via `queueMicrotask()` instead of executing them synchronously. Multiple calls to `updateComponent()` within the same synchronous block (e.g. several observable changes) are coalesced into a single render pass, reducing unnecessary DOM updates.
+
+- Component updates are batched via `queueMicrotask`, coalescing multiple `updateComponent()` calls into a single render pass
+- VNode props are shallow-compared to skip unnecessary DOM updates
+- Style diffing patches only changed properties instead of replacing the entire style
+
+### ✨ Features
+
+### New `NestedRouter` component
+
+Added a `NestedRouter` component that supports hierarchical route definitions with parent/child relationships. Parent routes receive an `outlet` prop containing the rendered child route, enabling layout composition patterns (e.g. a shared layout wrapping page-specific content).
+
+Routes are defined as a nested `Record` where keys are URL patterns (using `path-to-regexp`). The matching algorithm builds a chain from outermost to innermost route, then renders inside-out so each parent wraps its child.
+
+**Usage:**
+
+```typescript
+import { NestedRouter, createComponent } from '@furystack/shades'
+
+const routes = {
+  '/': {
+    component: ({ outlet }) => (
+      <div>
+        <nav>Shared Navigation</nav>
+        {outlet}
+      </div>
+    ),
+    children: {
+      '/': { component: () => <div>Home</div> },
+      '/about': { component: () => <div>About</div> },
+    },
+  },
+}
+
+<NestedRouter routes={routes} notFound={<div>404</div>} />
+```
+
+Key features:
+
+- Hierarchical route matching with `buildMatchChain()` - matches from outermost to innermost route
+- Lifecycle hooks (`onVisit`/`onLeave`) scoped per route level, only triggered for routes that actually change
+- `findDivergenceIndex()` for efficient diffing - sibling navigation only triggers leave/visit for the changed subtree
+- `notFound` fallback when no routes match
+
+### New `NestedRouteLink` and `createNestedRouteLink` components
+
+Added `NestedRouteLink` for SPA navigation with type-safe parameterized routes. It intercepts clicks to use `history.pushState` and compiles URL parameters (e.g. `/users/:id`) automatically.
+
+`createNestedRouteLink()` creates a narrowed version of `NestedRouteLink` constrained to a specific route tree, so TypeScript only accepts valid paths and requires `params` when the route has parameters.
+
+**Usage:**
+
+```typescript
+import { NestedRouteLink, createNestedRouteLink } from '@furystack/shades'
+
+// Basic usage — params are inferred from the href pattern
+<NestedRouteLink href="/users/:id" params={{ id: '123' }}>User</NestedRouteLink>
+
+// Type-safe usage — constrained to a route tree
+const AppLink = createNestedRouteLink<typeof appRoutes>()
+<AppLink href="/buttons">Buttons</AppLink>
+```
+
+### Route type utilities
+
+Added type-level utilities for working with nested route trees:
+
+- `ExtractRoutePaths<T>` - recursively extracts all valid full URL paths from a nested route tree
+- `ExtractRouteParams<T>` - extracts parameter names from a URL pattern into a typed record
+- `ConcatPaths<Parent, Child>` - concatenates parent and child paths handling the `/` root
+- `UrlTree<TPaths>` - validates URL constant objects against a set of valid paths
+
+### VNode-Based Reconciliation Engine
+
+Introduced a new `vnode.ts` module that implements a VNode-based virtual DOM reconciler. The JSX factory produces lightweight VNode descriptors during component renders, which are then diffed against the previous tree to apply minimal DOM updates. This eliminates the overhead of creating and diffing real DOM elements on every render cycle.
+
+### `useHostProps` Hook
+
+Added `useHostProps` to `RenderOptions`, enabling components to declaratively set attributes, data attributes, ARIA attributes, event handlers, and styles (including CSS custom properties) on the host custom element. It can be called multiple times per render; calls are merged and diffed against the previous render.
+
+### `useRef` Hook
+
+Added `useRef` to `RenderOptions`, allowing components to create mutable ref objects that capture references to child DOM elements. Refs are cached by key and persist across renders. The ref's `current` property is set to the DOM element after mount and `null` on unmount.
+
+```typescript
+const inputRef = useRef<HTMLInputElement>('input')
+// In JSX:
+<input ref={inputRef} />
+// Later:
+inputRef.current?.focus()
+```
+
+### `ref` Prop Support on Intrinsic Elements
+
+Added a `ref` property to `PartialElement<T>`, enabling `ref` objects to be passed to any intrinsic JSX element (e.g., `<div ref={myRef} />`). The VNode reconciler handles mounting and unmounting refs automatically.
+
+### Native SVG Element Support
+
+Added first-class SVG support with proper namespace handling. SVG elements are now created with `createElementNS` using the correct SVG namespace, and attributes are applied via `setAttribute` instead of property assignment. This includes:
+
+- A new `svg.ts` module with SVG tag detection and namespace constants
+- A new `svg-types.ts` module with typed SVG attribute interfaces for all standard SVG elements (shapes, gradients, filters, animations, etc.)
+- Updated `IntrinsicElements` with proper typed SVG element definitions
+
+### `flushUpdates` Utility
+
+Added `flushUpdates()` — a test utility that returns a promise resolving after the current microtask queue has been processed, enabling tests to await batched component updates before asserting DOM state.
+
+- Exported `flushUpdates()` utility that returns a promise resolving after the current microtask queue is processed, allowing tests to reliably wait for batched renders to complete
+- Extended `attachDataAttributes` to forward `aria-*` attributes from component props to the DOM element, enabling accessible components built with Shades
+
+### 🗑️ Deprecated
+
+- Deprecated `Router`, `Route`, `RouterProps`, and `RouterState` in favor of `NestedRouter` and its types
+- Deprecated `RouteLink` and `RouteLinkProps` in favor of `NestedRouteLink`
+- Deprecated `LinkToRoute` and `LinkToRouteProps` in favor of `NestedRouteLink`
+
+### 🐛 Bug Fixes
+
+- Fixed `onLeave` lifecycle hooks not firing correctly when navigating between nested routes
+
+### ♻️ Refactoring
+
+- `appendChild` in `shade-component.ts` now accepts `Element | DocumentFragment` instead of `HTMLElement | DocumentFragment` for broader compatibility
+- `createComponent` now acts as a render-mode switch: when in render mode it produces VNode descriptors, otherwise it creates real DOM elements as before
+
+### ⬆️ Dependencies
+
+- Peer dependency on `@furystack/shades` updated to the new major version for downstream packages
+
 ## [11.1.0] - 2026-02-01
 
 ### ✨ Features

package/README.md

@@ -18,12 +18,8 @@ You can check the [@furystack/boilerplate](https://github.com/furystack/boilerpl
 
 A shade (component) can be constructed from the following properties:
 
-- `render:(options: RenderOptions)=>JSX.Element` – A required method that will be executed on each render.
-- `initialState` – A default state that can be updated during the component lifecycle.
-- `shadowDomName` – Can be specified as the custom element's name in the DOM.
-- `constructed: (options: RenderOptions)=>void` – Optional callback executed after component construction. It can return a cleanup method (e.g., free up resources, dispose value observers, etc.).
-- `onAttach: (options: RenderOptions)=>void` – Executed when the component is attached to the DOM.
-- `onDetach: (options: RenderOptions)=>void` – Executed when the component is detached from the DOM.
+- `render:(options: RenderOptions)=>JSX.Element` – A required method that will be executed on each render. Use `useDisposable` within render for one-time setup that needs cleanup.
+- `shadowDomName` – The custom element tag name. Must follow Custom Elements naming convention (lowercase, must contain a hyphen).
 - `style` – Optional inline styles applied to each component instance. Use for per-instance overrides.
 - `css` – Optional CSS styles injected as a stylesheet during component registration. Supports pseudo-selectors and nested selectors.
 
@@ -113,15 +109,19 @@ Both properties can be used together. Inline `style` will override `css` due to
 
 ### Render Options
 
-The lifecycle methods receive the following options as a parameter:
+The `render` function receives a `RenderOptions` object with these hooks:
 
-- `props` – The current readonly props object for the element. As props are passed from the parent, it is read-only.
-- `getState()` – Returns the current state. The state object is also read-only and immutable and can be updated only with a corresponding method.
-- `updateState(newState: TState, skipRender?: boolean)` – Updates (patches) the component state. An optional flag can indicate that this state change shouldn't trigger a re-render (e.g., form input fields change, etc.).
-- `injector` – An injector instance. It can be retrieved from the closest parent or specified on the state or props.
+- `props` – The current readonly props object. Passed from the parent, treat as immutable.
+- `injector` – The injector instance, inherited from the closest parent or set explicitly.
 - `children` – The children element(s) of the component.
-- `element` – A reference to the current component's custom element (root).
-- `logger` – A specified logger instance with a pre-defined scope.
+- `renderCount` – How many times this component has rendered.
+- `useState(key, initialValue)` – Local state that triggers re-renders on change.
+- `useObservable(key, observable, options?)` – Subscribes to an `ObservableValue`; re-renders on change by default. Provide a custom `onChange` to skip re-renders.
+- `useSearchState(key, initialValue)` – State synced with URL search parameters.
+- `useStoredState(key, initialValue, storageArea?)` – State persisted to `localStorage` or `sessionStorage`.
+- `useDisposable(key, factory)` – Creates a resource that is automatically disposed when the component unmounts.
+- `useHostProps(hostProps)` – Declaratively sets attributes, styles, and CSS variables on the host element. Prefer this over direct DOM manipulation.
+- `useRef(key)` – Creates a ref object for imperative access to child DOM elements.
 
 ### Bundled Goodies
 

package/esm/component-factory.spec.js

@@ -2,7 +2,7 @@ import { Injector } from '@furystack/inject';
 import { describe, expect, it, vi } from 'vitest';
 import './jsx';
 import { createComponent } from './shade-component.js';
-import { Shade } from './shade.js';
+import { flushUpdates, Shade } from './shade.js';
 describe('Shades Component Factory', () => {
     describe('HTML Elements', () => {
         it('Should create a simple component', () => {
@@ -21,6 +21,12 @@ describe('Shades Component Factory', () => {
             expect(component).toBeInstanceOf(HTMLDivElement);
             expect(component.getAttribute('data-testid')).toBe('asd-123');
         });
+        it('Should apply aria attributes', () => {
+            const component = (createComponent("div", { "aria-label": "My label", "aria-hidden": "true" }, "a"));
+            expect(component).toBeInstanceOf(HTMLDivElement);
+            expect(component.getAttribute('aria-label')).toBe('My label');
+            expect(component.getAttribute('aria-hidden')).toBe('true');
+        });
         it('Should create a nested component', () => {
             const component = (createComponent("div", { style: { display: 'flex' } },
                 createComponent("h1", null, "Hi, I'm a header"),
@@ -47,7 +53,7 @@ describe('Shades Component Factory', () => {
             expect(shade.props).toEqual({});
             expect(shade.shadeChildren).toEqual([]);
         });
-        it('Should render a component with props', () => {
+        it('Should render a component with props', async () => {
             const Example = Shade({
                 shadowDomName: 'example-with-props',
                 render: ({ props }) => createComponent("div", null, props.foo),
@@ -55,12 +61,13 @@ describe('Shades Component Factory', () => {
             const component = (createComponent("div", null,
                 createComponent(Example, { foo: "example", injector: new Injector() })));
             const shade = component.firstElementChild;
-            shade.callConstructed();
+            shade.updateComponent();
+            await flushUpdates();
             expect(shade.props.foo).toEqual('example');
             expect(shade.shadeChildren).toEqual([]);
             expect(shade.innerHTML).toBe('<div>example</div>');
         });
-        it('Should render a component with state', () => {
+        it('Should render a component with state', async () => {
             const Example = Shade({
                 shadowDomName: 'example-with-state',
                 render: ({ useState }) => {
@@ -71,7 +78,8 @@ describe('Shades Component Factory', () => {
             const component = (createComponent("div", null,
                 createComponent(Example, null)));
             const shade = component.firstElementChild;
-            shade.callConstructed();
+            shade.updateComponent();
+            await flushUpdates();
             expect(shade.resourceManager.stateObservers.get('foo')?.getValue()).toEqual('example');
             expect(shade.shadeChildren).toEqual([]);
         });

package/esm/component-factory.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-factory.spec.js","sourceRoot":"","sources":["../src/component-factory.spec.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-factory.spec.js","sourceRoot":"","sources":["../src/component-factory.spec.tsx"],"names":[],"mappings":"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"}

package/esm/components/index.d.ts

@@ -1,5 +1,8 @@
 export * from './lazy-load.js';
 export * from './link-to-route.js';
-export * from './router.js';
+export * from './nested-route-link.js';
+export * from './nested-route-types.js';
+export * from './nested-router.js';
 export * from './route-link.js';
+export * from './router.js';
 //# sourceMappingURL=index.d.ts.map

package/esm/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA"}

package/esm/components/index.js

@@ -1,5 +1,8 @@
 export * from './lazy-load.js';
 export * from './link-to-route.js';
-export * from './router.js';
+export * from './nested-route-link.js';
+export * from './nested-route-types.js';
+export * from './nested-router.js';
 export * from './route-link.js';
+export * from './router.js';
 //# sourceMappingURL=index.js.map

package/esm/components/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA"}

package/esm/components/lazy-load.d.ts

@@ -3,11 +3,9 @@ export interface LazyLoadProps {
     error?: (error: unknown, retry: () => Promise<void>) => JSX.Element;
     component: () => Promise<JSX.Element>;
 }
-export interface LazyLoadState {
-    component?: JSX.Element;
-    error?: unknown;
-}
 export declare const LazyLoad: (props: LazyLoadProps & Omit<Partial<HTMLElement>, "style"> & {
     style?: Partial<CSSStyleDeclaration>;
+} & {
+    ref?: import("../index.js").RefObject<Element>;
 }, children?: import("../index.js").ChildrenList) => JSX.Element;
 //# sourceMappingURL=lazy-load.d.ts.map

package/esm/components/lazy-load.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-load.d.ts","sourceRoot":"","sources":["../../src/components/lazy-load.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,GAAG,CAAC,OAAO,CAAA;IACnB,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,OAAO,CAAA;IACnE,SAAS,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IACvB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,eAAO,MAAM,QAAQ;;gEAyCnB,CAAA"}
+{"version":3,"file":"lazy-load.d.ts","sourceRoot":"","sources":["../../src/components/lazy-load.tsx"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,GAAG,CAAC,OAAO,CAAA;IACnB,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,OAAO,CAAA;IACnE,SAAS,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,eAAO,MAAM,QAAQ;;;;gEAoEnB,CAAA"}

package/esm/components/lazy-load.js

@@ -1,39 +1,55 @@
 import { Shade } from '../shade.js';
 export const LazyLoad = Shade({
     shadowDomName: 'lazy-load',
-    constructed: async ({ props, useState, element }) => {
-        const [_component, setComponent] = useState('component', undefined);
-        const [_errorState, setErrorState] = useState('error', undefined);
-        try {
-            const loaded = await props.component();
-            if (element.isConnected) {
-                setComponent(loaded);
-            }
-        }
-        catch (error) {
-            if (props.error) {
-                if (element.isConnected) {
-                    setErrorState(error);
-                }
-            }
-            else {
-                throw error;
-            }
-        }
-    },
-    render: ({ props, useState }) => {
+    render: ({ props, useState, useDisposable }) => {
         const [error, setError] = useState('error', undefined);
         const [component, setComponent] = useState('component', undefined);
+        const tracker = useDisposable('loadTracker', () => {
+            const state = {
+                factory: null,
+                active: true,
+                [Symbol.dispose]() {
+                    state.active = false;
+                },
+            };
+            return state;
+        });
+        const isNewFactory = tracker.factory !== props.component;
+        if (isNewFactory) {
+            tracker.factory = props.component;
+            const factory = props.component;
+            factory()
+                .then((loaded) => {
+                if (tracker.active && tracker.factory === factory) {
+                    setError(undefined);
+                    setComponent(loaded);
+                }
+            })
+                .catch((err) => {
+                if (tracker.active && tracker.factory === factory) {
+                    setComponent(undefined);
+                    if (props.error) {
+                        setError(err);
+                    }
+                }
+            });
+            return props.loader;
+        }
         if (error && props.error) {
             return props.error(error, async () => {
+                const factory = props.component;
                 try {
                     setError(undefined);
                     setComponent(undefined);
-                    const loaded = await props.component();
-                    setComponent(loaded);
+                    const loaded = await factory();
+                    if (tracker.active && tracker.factory === factory) {
+                        setComponent(loaded);
+                    }
                 }
                 catch (e) {
-                    setError(e);
+                    if (tracker.active && tracker.factory === factory) {
+                        setError(e);
+                    }
                 }
             });
         }

package/esm/components/lazy-load.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-load.js","sourceRoot":"","sources":["../../src/components/lazy-load.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAanC,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAgB;IAC3C,aAAa,EAAE,WAAW;IAC1B,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QAClD,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA0B,WAAW,EAAE,SAAS,CAAC,CAAA;QAC5F,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAU,OAAO,EAAE,SAAS,CAAC,CAAA;QAC1E,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAA;YACtC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;gBACxB,YAAY,CAAC,MAAM,CAAC,CAAA;YACtB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;oBACxB,aAAa,CAAC,KAAK,CAAC,CAAA;gBACtB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAU,OAAO,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA0B,WAAW,EAAE,SAAS,CAAC,CAAA;QAE3F,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;gBACnC,IAAI,CAAC;oBACH,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,YAAY,CAAC,SAAS,CAAC,CAAA;oBACvB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAA;oBACtC,YAAY,CAAC,MAAM,CAAC,CAAA;gBACtB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACb,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAA;IACrB,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"lazy-load.js","sourceRoot":"","sources":["../../src/components/lazy-load.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAQnC,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAgB;IAC3C,aAAa,EAAE,WAAW;IAC1B,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAU,OAAO,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA0B,WAAW,EAAE,SAAS,CAAC,CAAA;QAE3F,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,EAAE,GAAG,EAAE;YAChD,MAAM,KAAK,GAIP;gBACF,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI;gBACZ,CAAC,MAAM,CAAC,OAAO,CAAC;oBACd,KAAK,CAAC,MAAM,GAAG,KAAK,CAAA;gBACtB,CAAC;aACF,CAAA;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;QAExD,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,SAAS,CAAA;YACjC,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAA;YAE/B,OAAO,EAAE;iBACN,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBAClD,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,YAAY,CAAC,MAAM,CAAC,CAAA;gBACtB,CAAC;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;gBACtB,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBAClD,YAAY,CAAC,SAAS,CAAC,CAAA;oBACvB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;wBAChB,QAAQ,CAAC,GAAG,CAAC,CAAA;oBACf,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAA;YAEJ,OAAO,KAAK,CAAC,MAAM,CAAA;QACrB,CAAC;QAED,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;gBACnC,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAA;gBAC/B,IAAI,CAAC;oBACH,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,YAAY,CAAC,SAAS,CAAC,CAAA;oBACvB,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAA;oBAC9B,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;wBAClD,YAAY,CAAC,MAAM,CAAC,CAAA;oBACtB,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;wBAClD,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACb,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAA;IACrB,CAAC;CACF,CAAC,CAAA"}