@ethlete/core 5.0.0-next.62 → 5.0.0-next.63

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @ethlete/core
 
+## 5.0.0-next.63
+
+### Patch Changes
+
+- Fix modal focus trap tab stops, overlay stacking order for Escape and outside clicks, focus restore to disabled openers, `afterOpened()` on early close, and scroll restoration under a base href.
+- Fix edge cases in `AnimatedLifecycleDirective` classes, `getScrollSnapTarget`, `[etClickOutside]`, `signalElementIntersection` order, `isElementVisible().intersectionRatio` and `createUnsavedChangesTracker` with a `null` default.
+- `htmlToMarkdown` drops empty headings and list items, and normalizes block alignment to `center`, `right` or `justify`; other values serialize as plain Markdown.
+- The modal focus trap treats a native radio group as one Tab stop, so Tab no longer escapes a dialog through it.
+
 ## 5.0.0-next.62
 
 ### Major Changes

package/fesm2022/ethlete-core.mjs

@@ -1755,8 +1755,17 @@ const breakpointTransformBase = (coerce, defaultValue) => {
         const bp = currentBp();
         const r = raw();
         if (!cachedSig) {
-            const instance = injector.get(BREAKPOINT_INSTANCE_TOKEN, null);
-            if (!instance) {
+            const instance = injector.get(BREAKPOINT_INSTANCE_TOKEN, null, { self: true });
+            if (instance) {
+                for (const key of Object.keys(instance)) {
+                    const val = instance[key];
+                    if (val && typeof val === 'function' && val[SIGNAL]?.transformFn === transformFn) {
+                        cachedSig = val;
+                        break;
+                    }
+                }
+            }
+            if (!cachedSig) {
                 if (ngDevMode && r !== undefined && !warnedMissingInstance) {
                     warnedMissingInstance = true;
                     console.warn('[ethlete] A breakpoint map was bound to an input, but its component does not call ' +
@@ -1764,13 +1773,6 @@ const breakpointTransformBase = (coerce, defaultValue) => {
                 }
                 return;
             }
-            for (const key of Object.keys(instance)) {
-                const val = instance[key];
-                if (val && typeof val === 'function' && val[SIGNAL]?.transformFn === transformFn) {
-                    cachedSig = val;
-                    break;
-                }
-            }
         }
         if (!cachedSig || r === undefined)
             return;
@@ -2213,7 +2215,7 @@ const isElementVisible = (options) => {
         containerRect,
         elementRect,
         // Round the intersection ratio to the nearest 0.01 to avoid floating point errors and system scaling issues.
-        intersectionRatio: Math.round(Math.min(inlineIntersectionPercentage, blockIntersectionPercentage) * 100) / 100,
+        intersectionRatio: Math.round(inlineIntersectionPercentage * blockIntersectionPercentage * 100) / 100,
     };
 };
 const nearestAlignment = (elStart, elEnd, conStart, conEnd) => {
@@ -2331,6 +2333,8 @@ const getScrollSnapTarget = (items, container, direction, origin, margin = 0) =>
     };
     for (const item of items) {
         const itemRect = item.getBoundingClientRect();
+        if (!itemRect.width && !itemRect.height)
+            continue;
         const itemSize = direction === 'horizontal' ? itemRect.width : itemRect.height;
         const relativeStart = direction === 'horizontal' ? itemRect.left - containerRect.left : itemRect.top - containerRect.top;
         const relativeEnd = relativeStart + itemSize;
@@ -2512,6 +2516,12 @@ const signalElementIntersection = (el, options) => {
                 currentValues = [...currentValues, intersectionEntry];
             }
         }
+        const domOrder = untracked(elements).currentElements;
+        const orderOf = (target) => {
+            const index = domOrder.indexOf(target);
+            return index === -1 ? domOrder.length : index;
+        };
+        currentValues.sort((a, b) => orderOf(a.target) - orderOf(b.target));
         zone.run(() => elementIntersectionSignal.set(currentValues));
     };
     const updateIntersectionObserver = (rendered, enabled, rootEl, margin, thresholdValue) => {
@@ -2954,7 +2964,10 @@ const createInitialRoute = () => {
     if (!isBrowser) {
         return router.url;
     }
-    const path = inject(Location).path(true);
+    return readLocationPath(inject(Location));
+};
+const readLocationPath = (location) => {
+    const path = location.path(true);
     return path.startsWith('/') ? path : `/${path}`;
 };
 /** Inject the current router event */
@@ -3040,14 +3053,20 @@ const createRouterState = (router) => {
 /**
  * Read the current route (the committed url without query params and fragment) straight from the router.
  * Unlike the `injectRoute` signal this reads synchronously, so it can be used inside a `router.events` handler
- * where `router.url` is already committed. Falls back to the browser location before the first navigation commits.
+ * where `router.url` is already committed. Before the first navigation commits it falls back to `location`
+ * (without the base href) when given, else to the browser location.
  */
-const createRoute = (router) => {
-    const browserUrl = typeof window === 'undefined'
+const createRoute = (router, location) => {
+    const url = router.navigated ? router.url : readUncommittedUrl(router, location);
+    return url.split('?')[0]?.split('#')[0] ?? '';
+};
+const readUncommittedUrl = (router, location) => {
+    if (location) {
+        return readLocationPath(location);
+    }
+    return typeof window === 'undefined'
         ? router.url
         : window.location.pathname + window.location.search + window.location.hash;
-    const url = router.navigated ? router.url : browserUrl;
-    return url.split('?')[0]?.split('#')[0] ?? '';
 };
 /**
  * Inject the complete router state. This includes the current route data, path params, query params, title and fragment.
@@ -3306,6 +3325,7 @@ const setupScrollRestoration = (config = {}) => {
         return;
     }
     const router = inject(Router);
+    const location = inject(Location);
     const document = inject(DOCUMENT);
     const injector = inject(Injector);
     const destroyRef = inject(DestroyRef);
@@ -3334,7 +3354,7 @@ const setupScrollRestoration = (config = {}) => {
     let wantsRestore = false;
     let prev = {
         state: createRouterState(router),
-        route: createRoute(router),
+        route: createRoute(router, location),
         routeConfig: getDeepestRouteConfig(router),
     };
     let pendingRestore = null;
@@ -3452,7 +3472,7 @@ const setupScrollRestoration = (config = {}) => {
     const onNavigationEnd = (event) => {
         const curr = {
             state: createRouterState(router),
-            route: createRoute(router),
+            route: createRoute(router, location),
             routeConfig: getDeepestRouteConfig(router),
         };
         const prevState = prev.state;
@@ -3613,7 +3633,13 @@ const parseSeparatorAligns = (line) => parseTableRow(line).map((cell) => {
 const separatorFor = (align) => align === 'center' ? ':---:' : align === 'right' ? '---:' : align === 'left' ? ':---' : '---';
 const alignClass = (align) => (align ? ` class="et-rte-align-${align}"` : '');
 const alignOf = (attrs) => (/\bclass\s*=\s*["'][^"']*\bet-rte-align-([a-z]+)/i.exec(attrs)?.[1] ??
-    /\bstyle\s*=\s*["'][^"']*text-align:\s*([a-z]+)/i.exec(attrs)?.[1])?.toLowerCase() ?? null;
+    /\bstyle\s*=\s*["'][^"']*text-align:\s*(?:-[a-z]+-)?([a-z]+)/i.exec(attrs)?.[1])?.toLowerCase() ?? null;
+const BLOCK_ALIGNS = /* @__PURE__ */ new Set(['center', 'right', 'justify']);
+const blockAlignOf = (attrs) => {
+    const align = alignOf(attrs);
+    return align && BLOCK_ALIGNS.has(align) ? align : null;
+};
+const isBlankHtml = (html) => !/<img\b/i.test(html) && !stripTags(html.replace(/&nbsp;/gi, ' ')).trim();
 /** Wraps `content` in an emphasis `marker`, hoisting boundary whitespace outside the delimiters -
  *  CommonMark emphasis must not face whitespace on the inside (`** fett**` doesn't parse), and
  *  `&nbsp;` counts as whitespace there too. Whitespace-only content stays unwrapped. */
@@ -3816,16 +3842,20 @@ const listToMarkdown = (inner, ordered, startNumber, depth) => {
     const indent = '  '.repeat(depth);
     let n = startNumber;
     return findListItems(inner)
-        .map((itemInner) => {
+        .flatMap((itemInner) => {
         let content = itemInner;
         let nestedMarkdown = '';
         for (let nested = findList(content); nested; nested = findList(content)) {
-            nestedMarkdown += `\n${listToMarkdown(nested.inner, nested.ordered, nested.startNumber, depth + 1)}`;
+            const nestedItems = listToMarkdown(nested.inner, nested.ordered, nested.startNumber, depth + 1);
+            if (nestedItems)
+                nestedMarkdown += `\n${nestedItems}`;
             content = content.slice(0, nested.start) + content.slice(nested.end);
         }
+        if (!nestedMarkdown && isBlankHtml(content))
+            return [];
         const marker = ordered ? `${n++}. ` : '- ';
         // list items are single-line in this serializer, so a <br> degrades to a space
-        return `${indent}${marker}${stripTags(content.replace(/<br\s*\/?>/gi, ' ')).trim()}${nestedMarkdown}`;
+        return [`${indent}${marker}${stripTags(content.replace(/<br\s*\/?>/gi, ' ')).trim()}${nestedMarkdown}`];
     })
         .join('\n');
 };
@@ -3934,7 +3964,7 @@ const markdownToHtml = (markdown, options = {}) => {
         const align = aligned ? alignOf(aligned[2] ?? '') : null;
         if (aligned && align) {
             const tag = (aligned[1] ?? 'p').toLowerCase();
-            return `<${tag}${alignClass(align)}>${sanitizeInlineHtml(aligned[3] ?? '')}</${tag}>`;
+            return `<${tag}${alignClass(BLOCK_ALIGNS.has(align) ? align : null)}>${sanitizeInlineHtml(aligned[3] ?? '')}</${tag}>`;
         }
         // Heading
         const headingMatch = trimmed.match(/^(#{1,6})\s+(.+)$/);
@@ -4004,9 +4034,12 @@ const htmlToMarkdown = (html) => {
     // stays HTML) and round-trip via a placeholder - extracted before the block passes below rewrite
     // them, restored after the final tag-strip.
     const alignedBlocks = [];
-    md = md.replace(/<(p|h[1-6]|div)\b([^>]*\b(?:style="[^"]*text-align|class="[^"]*\bet-rte-align-)[^>]*)>([\s\S]*?)<\/\1>/gi, (_, tag, attrs, inner) => {
+    md = md.replace(/<(p|h[1-6]|div)\b([^>]*\b(?:style="[^"]*text-align|class="[^"]*\bet-rte-align-)[^>]*)>([\s\S]*?)<\/\1>/gi, (block, tag, attrs, inner) => {
+        const align = blockAlignOf(attrs);
+        if (!align)
+            return block.replace(/^<[a-z0-9]+\b[^>]*>/i, `<${tag}>`);
         const name = tag.toLowerCase();
-        return makePlaceholder('ALIGN', alignedBlocks.push(`<${name}${alignClass(alignOf(attrs))}>${inner}</${name}>`) - 1);
+        return makePlaceholder('ALIGN', alignedBlocks.push(`<${name}${alignClass(align)}>${inner}</${name}>`) - 1);
     });
     md = escapeTextNodes(md);
     // Code blocks - process before inline code
@@ -4016,7 +4049,7 @@ const htmlToMarkdown = (html) => {
     // Headings - keep the inner markup so the inline passes below turn any nested
     // bold/italic/link/code into markdown; leftover tags are stripped at the end.
     for (let i = 6; i >= 1; i--) {
-        md = md.replace(new RegExp(`<h${i}[^>]*>([\\s\\S]*?)<\\/h${i}>`, 'gi'), (_, content) => `\n${'#'.repeat(i)} ${content.trim()}\n`);
+        md = md.replace(new RegExp(`<h${i}[^>]*>([\\s\\S]*?)<\\/h${i}>`, 'gi'), (_, content) => isBlankHtml(content) ? '\n' : `\n${'#'.repeat(i)} ${content.trim()}\n`);
     }
     // Bold + italic (combined before individual). Boundary whitespace is hoisted out of the
     // delimiters (emphasize) - `<strong> x</strong>` must become ` **x**`, not the invalid `** x**`.
@@ -4856,6 +4889,7 @@ const ANIMATION_CLASSES = {
     leaveDone: 'et-animation-leave-done',
     leaveInterrupt: 'et-animation-leave-interrupt',
 };
+const ALL_ANIMATION_CLASSES = /* @__PURE__ */ Object.values(ANIMATION_CLASSES);
 const FORCE_INVISIBLE_CLASS = 'et-force-invisible';
 class AnimatedLifecycleDirective {
     constructor() {
@@ -4902,9 +4936,9 @@ class AnimatedLifecycleDirective {
             return;
         if ((currentState === 'init' && !this.isConstructed) || this.skipNextEnter()) {
             this.debugLog('enter: instant (not constructed or skipNextEnter)', { currentState });
-            this.updateState('entered');
+            this.cancelCurrentAnimation$.next();
+            this.settleInstantly('entered');
             this.skipNextEnter.set(false);
-            this.addClass(ANIMATION_CLASSES.enterDone);
             this.forcedThisFrame = false;
             return;
         }
@@ -4922,9 +4956,7 @@ class AnimatedLifecycleDirective {
             transitionId,
         });
         if (skipAnimation) {
-            this.removeClasses(ANIMATION_CLASSES.leaveFrom, ANIMATION_CLASSES.leaveActive, ANIMATION_CLASSES.leaveTo, ANIMATION_CLASSES.leaveInterrupt);
-            this.updateState('entered');
-            this.addClass(ANIMATION_CLASSES.enterDone);
+            this.settleInstantly('entered');
             previousCancel$.next();
             previousCancel$.complete();
             return;
@@ -4972,8 +5004,7 @@ class AnimatedLifecycleDirective {
             return;
         if (currentState === 'init') {
             this.debugLog('leave: instant (state is init, enter never ran)');
-            this.updateState('left');
-            this.addClass(ANIMATION_CLASSES.leaveDone);
+            this.settleInstantly('left');
             this.forcedThisFrame = false;
             return;
         }
@@ -4991,9 +5022,7 @@ class AnimatedLifecycleDirective {
             transitionId,
         });
         if (skipAnimation) {
-            this.removeClasses(ANIMATION_CLASSES.enterFrom, ANIMATION_CLASSES.enterActive, ANIMATION_CLASSES.enterTo, ANIMATION_CLASSES.enterInterrupt);
-            this.updateState('left');
-            this.addClass(ANIMATION_CLASSES.leaveDone);
+            this.settleInstantly('left');
             previousCancel$.next();
             previousCancel$.complete();
             return;
@@ -5037,18 +5066,20 @@ class AnimatedLifecycleDirective {
     }
     forceEnteredState() {
         this.cancelCurrentAnimation$.next();
-        this.updateState('entered');
-        this.removeClasses(ANIMATION_CLASSES.enterFrom, ANIMATION_CLASSES.enterActive, ANIMATION_CLASSES.enterTo, ANIMATION_CLASSES.leaveFrom, ANIMATION_CLASSES.leaveActive, ANIMATION_CLASSES.leaveTo);
-        this.addClass(ANIMATION_CLASSES.enterDone);
+        this.settleInstantly('entered');
         this.markForcedThisFrame();
     }
     forceLeftState() {
         this.cancelCurrentAnimation$.next();
-        this.updateState('left');
-        this.removeClasses(ANIMATION_CLASSES.enterFrom, ANIMATION_CLASSES.enterActive, ANIMATION_CLASSES.enterTo, ANIMATION_CLASSES.leaveFrom, ANIMATION_CLASSES.leaveActive, ANIMATION_CLASSES.leaveTo);
-        this.addClass(ANIMATION_CLASSES.leaveDone);
+        this.settleInstantly('left');
         this.markForcedThisFrame();
     }
+    settleInstantly(state) {
+        const doneClass = state === 'entered' ? ANIMATION_CLASSES.enterDone : ANIMATION_CLASSES.leaveDone;
+        this.updateState(state);
+        this.removeClasses(...ALL_ANIMATION_CLASSES.filter((cls) => cls !== doneClass));
+        this.addClass(doneClass);
+    }
     markForcedThisFrame() {
         this.forcedThisFrame = true;
         if (typeof requestAnimationFrame === 'undefined')
@@ -6703,12 +6734,9 @@ const createUnsavedChangesTracker = (config) => {
         throw new RuntimeError(UNSAVED_CHANGES_ERROR_CODES.MISSING_CONFIRM, '[createUnsavedChangesTracker] No confirm: pass `confirm` or call `provideUnsavedChangesConfirm()` in a parent injector.');
     }
     const normalized = normalizeUnsavedChangesSource(config.source);
-    const hasExplicitDefault = config.defaultValue !== undefined;
-    const initialDefault = hasExplicitDefault
-        ? typeof config.defaultValue === 'function'
-            ? config.defaultValue()
-            : config.defaultValue
-        : untracked(normalized.value);
+    const explicitDefault = typeof config.defaultValue === 'function' ? config.defaultValue() : config.defaultValue;
+    const hasExplicitDefault = explicitDefault !== undefined && explicitDefault !== null;
+    const initialDefault = hasExplicitDefault ? explicitDefault : untracked(normalized.value);
     const _defaultValue = signal(initialDefault, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "_defaultValue" }] : /* istanbul ignore next */ []));
     // No explicit default → capture the first non-null value the source produces as the baseline.
@@ -7073,6 +7101,9 @@ class ClickOutsideDirective {
             this.pressStartedInside = event.composedPath().includes(this.elementRef.nativeElement);
         }), takeUntilDestroyed())
             .subscribe();
+        fromEvent(this.document.documentElement, 'pointercancel', { capture: true })
+            .pipe(tap(() => (this.pressStartedInside = false)), takeUntilDestroyed())
+            .subscribe();
         fromEvent(this.document.documentElement, 'click')
             .pipe(tap((event) => {
             const hostElement = this.elementRef.nativeElement;
@@ -7639,8 +7670,11 @@ const FOCUSABLE_SELECTOR = /* @__PURE__ */ [
     'select:not([disabled])',
     'textarea:not([disabled])',
     'iframe',
+    'audio[controls]',
+    'video[controls]',
+    'details > summary:first-of-type',
     '[tabindex]:not([tabindex="-1"])',
-    '[contenteditable="true"]',
+    '[contenteditable]:not([contenteditable="false"])',
 ].join(',');
 const isHTMLElement = (value) => {
     // `instanceof` is realm-bound: an element adopted by a same-origin pop-up (the `document` mount
@@ -7670,10 +7704,24 @@ const isFocusable = (element, document) => {
     const view = document.defaultView;
     const style = view?.getComputedStyle(element);
     const isVisible = style?.display !== 'none' && style?.visibility !== 'hidden' && element.getClientRects().length > 0;
-    return isVisible && !element.hasAttribute('disabled') && element.tabIndex >= 0;
-};
+    return (isVisible &&
+        !element.hasAttribute('disabled') &&
+        !element.matches(':disabled') &&
+        !element.closest('[inert]') &&
+        element.tabIndex >= 0);
+};
+const isNamedRadio = (element) => element.tagName === 'INPUT' && element.type === 'radio' && !!element.name;
+const isSameTabStop = (a, b) => a === b || (isNamedRadio(a) && isNamedRadio(b) && a.name === b.name && a.form === b.form);
+/** The elements Tab stops on inside `container`, with each named radio group collapsed to its checked (else first) radio. */
 const getFocusableElements = (container, document) => {
-    return Array.from(container.querySelectorAll(FOCUSABLE_SELECTOR)).filter((el) => isFocusable(el, document));
+    const elements = Array.from(container.querySelectorAll(FOCUSABLE_SELECTOR)).filter((el) => isFocusable(el, document));
+    return elements.filter((element) => {
+        if (!isNamedRadio(element)) {
+            return true;
+        }
+        const group = elements.filter((other) => isSameTabStop(element, other));
+        return (group.find((radio) => radio.checked) ?? group[0]) === element;
+    });
 };
 const getHeadingElement = (container) => {
     return container.querySelector('h1, h2, h3, h4, h5, h6, [role="heading"]');
@@ -7729,12 +7777,12 @@ const setupFocusTrap = (paneElement, overlayRef, enabled, isTopMost, document) =
             focusElement(event.shiftKey ? (lastElement ?? null) : (firstElement ?? null));
             return;
         }
-        if (event.shiftKey && activeElement === firstElement) {
+        if (event.shiftKey && firstElement && isSameTabStop(activeElement, firstElement)) {
             event.preventDefault();
             focusElement(lastElement ?? null);
             return;
         }
-        if (!event.shiftKey && activeElement === lastElement) {
+        if (!event.shiftKey && lastElement && isSameTabStop(activeElement, lastElement)) {
             event.preventDefault();
             focusElement(firstElement ?? null);
         }
@@ -8364,6 +8412,7 @@ const createOverlayRuntimeRef = (id, config, elements, requestClose) => {
             }
             _state.set('closed');
             _componentInstance.set(null);
+            afterOpenedSubject.complete();
             afterClosedSubject.next(closeEvent);
             afterClosedSubject.complete();
         },
@@ -8443,14 +8492,18 @@ const OVERLAY_RUNTIME_DEF = /* @__PURE__ */ defineRootProvider(() => {
         }
     };
     const isTopMost = (overlayRef) => {
-        const entries = openEntriesState();
-        for (let index = entries.length - 1; index >= 0; index--) {
-            const entry = entries[index];
-            if (!entry || entry.config.passive || entry.state() === 'closing' || entry.state() === 'closed')
+        let topMost = null;
+        let topMostLayer = -Infinity;
+        for (const entry of openEntriesState()) {
+            if (entry.config.passive || entry.state() === 'closing' || entry.state() === 'closed')
                 continue;
-            return entry === overlayRef;
+            const entryLayer = entry.config.zIndex ?? DEFAULT_OVERLAY_LAYER;
+            if (entryLayer >= topMostLayer) {
+                topMost = entry;
+                topMostLayer = entryLayer;
+            }
         }
-        return false;
+        return topMost === overlayRef;
     };
     const getAnimatedLifecycle = (componentRef) => {
         const componentLifecycle = componentRef.instance.animatedLifecycle?.();
@@ -8601,7 +8654,13 @@ const OVERLAY_RUNTIME_DEF = /* @__PURE__ */ defineRootProvider(() => {
             openEntriesState.update((entries) => entries.filter((entry) => entry !== overlayRef));
             maybeDestroyRootElements(targetDocument);
             if (config.restoreFocus !== false && overlayStillOwnsFocus) {
-                focusRestoreChain.find((element) => element.isConnected)?.focus({ preventScroll: true });
+                for (const element of focusRestoreChain) {
+                    if (!element.isConnected)
+                        continue;
+                    element.focus({ preventScroll: true });
+                    if (element.contains(targetDocument.activeElement))
+                        break;
+                }
             }
             overlayRef.finishClose(closeEvent);
         };
@@ -8725,12 +8784,13 @@ const OVERLAY_RUNTIME_DEF = /* @__PURE__ */ defineRootProvider(() => {
             else {
                 lifecycle.enter();
             }
-            lifecycle.state$
+            const enteredSubscription = lifecycle.state$
                 .pipe(filter((state) => state === 'entered'), take(1), tap(() => {
                 applyInitialFocus(paneElement, autoFocus, targetDocument);
                 overlayRef.markOpened();
             }))
                 .subscribe();
+            cleanupFns.push(() => enteredSubscription.unsubscribe());
         });
         return overlayRef;
     };
@@ -10519,7 +10579,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImpor
 
 // Generated from package.json by tools/scripts/generate-version.js - do not edit.
 /** The version of `@ethlete/core` this build was cut from. */
-const CORE_VERSION = '5.0.0-next.62';
+const CORE_VERSION = '5.0.0-next.63';
 
 /**
  * Generated bundle index. Do not edit.