@askrjs/askr 0.2.2 → 0.2.4

package/dist/{interactions-B-7vkBgx.js → interactions-D102JxBR.js}

@@ -1,4 +1,5 @@
-import { o as mergeProps, r as ariaDisabled, s as composeHandlers, t as composeRefs } from "./compose-ref-1Fhs7mbF.js";
+import { t as composeRefs } from "./compose-ref-Bfaf4kUC.js";
+import { a as composeHandlers, i as mergeProps, t as ariaDisabled } from "./aria-hKjThHcp.js";
 //#region src/foundations/interactions/pressable.ts
 /** Produce click/keyboard props implementing 'press' semantics for an element. */
 function pressable({ disabled, onPress, isNativeButton = false }) {
@@ -121,8 +122,9 @@ function rovingFocus(options) {
 		const { key } = e;
 		let direction;
 		if (orientation === "horizontal" || orientation === "both") {
-			if (key === "ArrowRight") direction = 1;
-			if (key === "ArrowLeft") direction = -1;
+			const textDirection = resolveTextDirection(e);
+			if (key === "ArrowRight") direction = textDirection === "rtl" ? -1 : 1;
+			if (key === "ArrowLeft") direction = textDirection === "rtl" ? 1 : -1;
 		}
 		if (orientation === "vertical" || orientation === "both") {
 			if (key === "ArrowDown") direction = 1;
@@ -143,6 +145,11 @@ function rovingFocus(options) {
 		})
 	};
 }
+function resolveTextDirection(event) {
+	const candidate = event.currentTarget ?? event.target;
+	if (typeof Element === "undefined" || !(candidate instanceof Element)) return "ltr";
+	return candidate.ownerDocument.defaultView?.getComputedStyle(candidate).direction === "rtl" ? "rtl" : "ltr";
+}
 /**
 * USAGE EXAMPLE:
 *

package/dist/jsx-dev-runtime.d.ts

@@ -1,5 +1,5 @@
-import { a as IntrinsicFallbackProps, i as JSXElementType, n as JSXComponent, o as KnownIntrinsicElementProps, r as JSXElement, s as Props, t as Fragment } from "./types-DkVJhVs9.js";
-import { t as EagerControlPrimitive } from "./control-DdFw-Caz.js";
+import { a as IntrinsicFallbackProps, i as JSXElementType, n as JSXComponent, o as KnownIntrinsicElementProps, r as JSXElement, s as Props, t as Fragment } from "./types-DWVrKn9N.js";
+import { t as EagerControlPrimitive } from "./control-Cxag1yqV.js";
 //#region src/jsx/jsx-dev-runtime.d.ts
 declare namespace JSX {
   type ElementType = string | symbol | ((props: never) => unknown);

package/dist/jsx-runtime-Cg7GqY1S.d.ts

@@ -0,0 +1,2 @@
+import "./types-DWVrKn9N.js";
+import "./jsx-runtime-gVIaTPw0.js";

package/dist/{jsx-runtime-Cdd6Gkb0.d.ts → jsx-runtime-gVIaTPw0.d.ts}

@@ -1,5 +1,5 @@
-import { a as IntrinsicFallbackProps, o as KnownIntrinsicElementProps, r as JSXElement, s as Props } from "./types-DkVJhVs9.js";
-import { t as EagerControlPrimitive } from "./control-DdFw-Caz.js";
+import { a as IntrinsicFallbackProps, o as KnownIntrinsicElementProps, r as JSXElement, s as Props } from "./types-DWVrKn9N.js";
+import { t as EagerControlPrimitive } from "./control-Cxag1yqV.js";
 //#region src/jsx/jsx-runtime.d.ts
 declare namespace JSX {
   type ElementType = string | symbol | ((props: never) => unknown);

package/dist/jsx-runtime.d.ts

@@ -1,3 +1,3 @@
-import { i as JSXElementType, n as JSXComponent, r as JSXElement, t as Fragment } from "./types-DkVJhVs9.js";
-import { i as jsxs, n as jsx, r as jsxDEV, t as JSX } from "./jsx-runtime-Cdd6Gkb0.js";
+import { i as JSXElementType, n as JSXComponent, r as JSXElement, t as Fragment } from "./types-DWVrKn9N.js";
+import { i as jsxs, n as jsx, r as jsxDEV, t as JSX } from "./jsx-runtime-gVIaTPw0.js";
 export { Fragment, JSX, type JSXComponent, type JSXElement, type JSXElementType, jsx, jsxDEV, jsxs };

package/dist/{lifecycle-batch-BYECQw8T.js → lifecycle-batch-63aXFf2S.js}

@@ -1,5 +1,5 @@
-import { y as logger } from "./access-d_DCdwqn.js";
-import { a as finalizeReadableSubscriptionsFromSnapshot } from "./readable-D-JIKCg2.js";
+import { y as logger } from "./access-BucjYZcX.js";
+import { a as finalizeReadableSubscriptionsFromSnapshot } from "./readable-Di1fzSwm.js";
 //#region src/common/promise.ts
 function isPromiseLike(value) {
 	return value !== null && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";

package/dist/{lifecycle-operations-DJk_5MrD.js → lifecycle-operations-Q0k3EFnG.js}

@@ -1,5 +1,6 @@
 import { f as getCurrentComponentInstance, i as claimHookIndex } from "./component-scope-4I3yEMkb.js";
-import { a as registerCommitOperation } from "./component-internal-xW_OnTmC.js";
+import { a as registerCommitOperation, u as routeComponentErrorToBoundary } from "./component-internal-C4hKKQBF.js";
+import { t as createFineGrainedEffect } from "./effect-CNwstBBD.js";
 import { t as isRouteActivityActive } from "./route-activity-CNJfpwx-.js";
 //#region src/runtime/lifecycle-operations.ts
 function normalizePredicates(predicates) {
@@ -177,6 +178,97 @@ function task(fn) {
 		});
 	}
 }
+function watchValuesEqual(previous, next) {
+	if (previous.length !== next.length) return false;
+	for (let index = 0; index < previous.length; index += 1) if (!Object.is(previous[index], next[index])) return false;
+	return true;
+}
+function stopWatchGeneration(slot) {
+	const controller = slot.controller;
+	slot.controller = null;
+	if (controller && !controller.signal.aborted) controller.abort();
+	const cleanup = slot.cleanup;
+	slot.cleanup = null;
+	cleanup?.();
+}
+function stopWatchSlot(slot) {
+	stopWatchGeneration(slot);
+	slot.effect?.cleanup();
+	slot.effect = null;
+}
+function reportWatchError(instance, error) {
+	if (!routeComponentErrorToBoundary(instance, error)) throw error;
+}
+function commitWatchSlot(instance, slot) {
+	slot.callback = slot.pendingCallback;
+	slot.sources = slot.pendingSources;
+	const compute = () => {
+		const values = slot.sources.map((source) => source());
+		return values.length === 1 ? values[0] : values;
+	};
+	const observe = (value, previous) => {
+		stopWatchGeneration(slot);
+		const controller = new AbortController();
+		slot.controller = controller;
+		const initial = !slot.hasObserved;
+		slot.hasObserved = true;
+		let result;
+		try {
+			result = slot.callback(value, {
+				initial,
+				previous,
+				signal: controller.signal
+			});
+		} catch (error) {
+			reportWatchError(instance, error);
+			return;
+		}
+		if (typeof result === "function") {
+			slot.cleanup = result;
+			return;
+		}
+		if (result && typeof result.then === "function") Promise.resolve(result).catch((error) => {
+			if (!controller.signal.aborted) reportWatchError(instance, error);
+		});
+	};
+	if (!slot.effect) slot.effect = createFineGrainedEffect({
+		lane: "post",
+		compute,
+		commit: observe,
+		equals: (previous, next) => Array.isArray(previous) && Array.isArray(next) ? watchValuesEqual(previous, next) : Object.is(previous, next),
+		onError: (error) => reportWatchError(instance, error)
+	});
+	else slot.effect.updateCompute(compute);
+	if (!slot.cleanupRegistered) {
+		slot.cleanupRegistered = true;
+		(instance.cleanupFns ??= []).push(() => {
+			stopWatchSlot(slot);
+			slot.cleanupRegistered = false;
+		});
+	}
+}
+function watch(sourceOrSources, callback) {
+	const instance = getCurrentComponentInstance();
+	if (!instance) return;
+	const index = claimHookIndex(instance, "watch");
+	const sources = Array.isArray(sourceOrSources) ? sourceOrSources : [sourceOrSources];
+	const slot = getLifecycleSlot(instance, index, "watch", () => ({
+		kind: "watch",
+		sources,
+		pendingSources: sources,
+		callback,
+		pendingCallback: callback,
+		effect: null,
+		controller: null,
+		cleanup: null,
+		cleanupRegistered: false,
+		hasObserved: false
+	}));
+	slot.pendingSources = sources;
+	slot.pendingCallback = callback;
+	if (instance.ssr) return;
+	registerCommitOperation(() => commitWatchSlot(instance, slot));
+}
 /**
 * Capture the result of a synchronous expression at call time and return a
 * thunk that returns the captured value later. This is a low-level helper for
@@ -192,4 +284,4 @@ function capture(fn) {
 	return () => value;
 }
 //#endregion
-export { task as a, routeActive as i, documentVisible as n, timer as o, on as r, windowFocused as s, capture as t };
+export { task as a, windowFocused as c, routeActive as i, documentVisible as n, timer as o, on as r, watch as s, capture as t };

package/dist/{navigate-wel1e6cU.d.ts → navigate-F4sHgWbw.d.ts}

@@ -1,4 +1,4 @@
-import "./index-DSqXWc77.js";
+import "./index-Dgjbo2gU.js";
 //#region src/router/navigation-scroll.d.ts
 /** Scroll behavior for programmatic navigations (`navigate()`). */
 type NavigationScrollBehavior = 'top' | 'preserve';
@@ -16,6 +16,8 @@ type NavigateOptions = {
   history?: 'push' | 'replace';
   replace?: boolean;
   scroll?: NavigationScrollBehavior;
+  /** Entry-local browser history state. It is not serialized into the URL or sent to the server. */
+  state?: unknown;
 };
 //#endregion
 //#region src/router/navigate.d.ts

package/dist/{navigate-DvJvo--6.js → navigate-ZZu1IV0B.js}

@@ -1,14 +1,14 @@
-import { S as isProductionEnvironment, r as flushRuntimeScheduler, x as isDevelopmentEnvironment, y as logger } from "./access-d_DCdwqn.js";
+import { S as isProductionEnvironment, r as flushRuntimeScheduler, s as isRuntimeSchedulerExecuting, x as isDevelopmentEnvironment, y as logger } from "./access-BucjYZcX.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { r as executeComponent } from "./component-internal-xW_OnTmC.js";
-import { t as cleanupReadableSubscriptionSources } from "./readable-D-JIKCg2.js";
-import { n as cleanupComponentGeneration, t as cleanupComponent } from "./component-cleanup-DPe8claJ.js";
-import { i as drainLifecycleCommitErrors, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-BYECQw8T.js";
-import { _ as teardownNodeSubtree } from "./cleanup-DPtpXtA4.js";
-import { t as CspNonceScope } from "./csp-nonce-CCnMtOW-.js";
+import { r as executeComponent } from "./component-internal-C4hKKQBF.js";
+import { t as cleanupReadableSubscriptionSources } from "./readable-Di1fzSwm.js";
+import { n as cleanupComponentGeneration, t as cleanupComponent } from "./component-cleanup-jdbgjkT1.js";
+import { i as drainLifecycleCommitErrors, p as isPromiseLike, r as discardLifecycleCommitBatch, s as flushLifecycleCommitBatch, t as beginLifecycleCommitBatch } from "./lifecycle-batch-63aXFf2S.js";
+import { _ as teardownNodeSubtree } from "./cleanup-TXSsApEl.js";
+import { t as CspNonceScope } from "./csp-nonce-9NFUb7hJ.js";
 import { I as lockRouteRegistration, o as addRouteBasePath, r as computeRouteActivityMatches, y as getActiveRouteBasePath } from "./route-matching-Bo6UqG-5.js";
-import { a as resolveRouteRequest, i as hasRouteRenderData, n as getRouteRenderContext, r as getRouteRenderData, u as withoutRouteHydrationMetadata } from "./resolution-dVYwYXrI.js";
-import { a as clearStagedAppRenderRouteLocation, i as syncCurrentRouteSnapshot, o as createAppRenderRuntime, s as stageAppRenderRouteLocation } from "./activity-B2Yy7Wz9.js";
+import { a as resolveRouteRequest, i as hasRouteRenderData, n as getRouteRenderContext, r as getRouteRenderData, u as withoutRouteHydrationMetadata } from "./resolution-ClD-K7Lz.js";
+import { a as clearStagedAppRenderRouteLocation, i as syncCurrentRouteSnapshot, o as createAppRenderRuntime, s as stageAppRenderRouteLocation } from "./activity-FirwPXA_.js";
 import { r as getDefaultPortalHost, t as clearRegisteredDefaultPortalForInstance } from "./default-portal-runtime-DvMvWJVp.js";
 //#region src/router/navigation-registry.ts
 let currentInstance = null;
@@ -112,6 +112,58 @@ const DEFAULT_SCROLL_RESTORATION = {
 };
 let scrollRestorationOptions = { ...DEFAULT_SCROLL_RESTORATION };
 const scrollPositions = /* @__PURE__ */ new Map();
+let capturedActivationFocus;
+let pendingNavigationFocus;
+let focusAtHistoryNavigationStart = null;
+function readFocusDescriptor() {
+	if (typeof document === "undefined" || !(document.activeElement instanceof HTMLElement)) return;
+	const active = document.activeElement;
+	for (const attribute of [
+		"data-askr-focus-key",
+		"id",
+		"name",
+		"aria-label"
+	]) {
+		const value = active.getAttribute(attribute);
+		if (value) return {
+			attribute,
+			value
+		};
+	}
+	if ("labels" in active) {
+		const label = Array.from(active.labels ?? []).map((element) => element.textContent?.trim()).find(Boolean);
+		if (label) return {
+			attribute: "label",
+			value: label
+		};
+	}
+}
+function clearCapturedNavigationFocus() {
+	capturedActivationFocus = void 0;
+}
+function isPrimaryPointerActivation(event) {
+	if (event instanceof MouseEvent && (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)) return false;
+	return true;
+}
+/** Stage entry-owned focus for the duration of one primary pointer activation. */
+function captureNavigationFocus(event) {
+	clearCapturedNavigationFocus();
+	if (!isPrimaryPointerActivation(event)) return;
+	capturedActivationFocus = readFocusDescriptor();
+}
+/** Release pointer activation state after its click has finished dispatching. */
+function releaseNavigationFocusCapture() {
+	clearCapturedNavigationFocus();
+}
+/** Preserve the active control before route content can be replaced. */
+function prepareNavigationFocus() {
+	pendingNavigationFocus = capturedActivationFocus ?? readFocusDescriptor();
+	clearCapturedNavigationFocus();
+}
+/** Mark the active element so restoration can avoid overwriting focus moved during route commit. */
+function beginHistoryFocusRestoration() {
+	focusAtHistoryNavigationStart = typeof document === "undefined" ? null : document.activeElement;
+}
 function getWindowHref() {
 	if (typeof window === "undefined") return "/";
 	return `${window.location.pathname}${window.location.search}${window.location.hash}`;
@@ -146,8 +198,10 @@ function writeHistoryScrollPosition(href, position) {
 	window.history.replaceState({
 		...state,
 		path: href,
-		scroll: position
+		scroll: position,
+		focus: pendingNavigationFocus ?? readFocusDescriptor()
 	}, "", href);
+	pendingNavigationFocus = void 0;
 }
 function saveScrollPosition(href) {
 	if (!scrollRestorationOptions.enabled || typeof window === "undefined") return;
@@ -194,6 +248,12 @@ function applyHistoryScroll(href, state) {
 		x: 0,
 		y: 0
 	});
+	const focus = state && typeof state === "object" && state.focus && typeof state.focus === "object" ? state.focus : void 0;
+	if (focus && (focus.attribute === "data-askr-focus-key" || focus.attribute === "id" || focus.attribute === "name" || focus.attribute === "aria-label" || focus.attribute === "label") && typeof focus.value === "string" && typeof document !== "undefined" && (document.activeElement === document.body || document.activeElement === document.documentElement || document.activeElement === focusAtHistoryNavigationStart)) {
+		const target = focus.attribute === "label" ? Array.from(document.querySelectorAll("input,select,textarea,button")).find((element) => "labels" in element && Array.from(element.labels ?? []).some((label) => label.textContent?.trim() === focus.value)) : Array.from(document.querySelectorAll(`[${focus.attribute}]`)).find((element) => element.getAttribute(focus.attribute) === focus.value);
+		if (target?.isConnected && !target.hasAttribute("disabled") && target.getAttribute("aria-hidden") !== "true" && target.getClientRects().length > 0) target.focus({ preventScroll: true });
+	}
+	focusAtHistoryNavigationStart = null;
 }
 function configureScrollRestoration(options) {
 	scrollRestorationOptions = normalizeScrollRestorationOptions(options);
@@ -865,7 +925,11 @@ function applyNavigationTargets(requestId, path, options, redirectState, pathnam
 		if (isStaleRouteRequest(requestId)) return;
 		saveScrollPosition(previousHref);
 		const historyMethod = getNavigationHistoryMode(options) === "replace" ? "replaceState" : "pushState";
-		window.history[historyMethod]({ path: href }, "", href);
+		window.history[historyMethod]({
+			path: href,
+			askrHasState: Object.prototype.hasOwnProperty.call(options, "state"),
+			askrState: options.state
+		}, "", href);
 		setCurrentRouteLocation(pathname, href);
 		clearStagedRouteLocations(matchedTargets);
 		syncRegisteredRouteSnapshot();
@@ -998,12 +1062,20 @@ configureNavigationRegistryHost({ cancelRouteRequests });
 /** Navigate the client-side router to `path` using the History API. */
 function navigate(path, options = {}) {
 	if (typeof window === "undefined") return;
+	prepareNavigationFocus();
 	const targetPath = addRouteBasePath(path, getActiveRouteBasePath());
 	const initialTarget = parseTargetUrl(targetPath);
-	navigateWithRedirectState(targetPath, options, {
+	const redirectState = {
 		redirects: 0,
 		visited: /* @__PURE__ */ new Set([`${initialTarget.pathname}${initialTarget.search}${initialTarget.hash}`])
-	});
+	};
+	if (isRuntimeSchedulerExecuting()) {
+		queueMicrotask(() => {
+			navigateWithRedirectState(targetPath, options, redirectState);
+		});
+		return;
+	}
+	navigateWithRedirectState(targetPath, options, redirectState);
 }
 function navigateWithRedirectState(path, options, redirectState) {
 	if (typeof window === "undefined") return;
@@ -1028,6 +1100,7 @@ function navigateWithRedirectState(path, options, redirectState) {
 	applyNavigationTargets(request.id, path, options, redirectState, pathname, href, resolvedTargets, navigateWithRedirectState);
 }
 function handlePopState(event) {
+	beginHistoryFocusRestoration();
 	const request = beginRouteRequest();
 	const previousHref = getCurrentHref();
 	const pathname = window.location.pathname;
@@ -1055,6 +1128,8 @@ function initializeNavigation() {
 	if (typeof window === "undefined" || navigationInitialized) return;
 	navigationInitialized = true;
 	window.addEventListener("popstate", handlePopState);
+	document.addEventListener("pointerdown", captureNavigationFocus, true);
+	document.addEventListener("click", releaseNavigationFocusCapture);
 }
 //#endregion
 export { serializeRouteMeta as a, getCurrentHref as c, parseTargetUrl as d, registerAppInstance as f, unregisterAppInstance as g, syncRegisteredRouteSnapshot as h, resolveRouteMeta as i, getRegisteredAppsSnapshot as l, syncAppRegistrationLocation as m, navigate as n, configureScrollRestoration as o, setCurrentRouteLocation as p, reconcileRouteMeta as r, saveScrollPosition as s, initializeNavigation as t, getWindowHref$1 as u };

package/dist/{readable-D-JIKCg2.js → readable-Di1fzSwm.js}

@@ -1,4 +1,4 @@
-import { c as markRuntimeReactivePropsDirtySource, n as enqueueRuntimeTask, s as isRuntimeSchedulerExecuting } from "./access-d_DCdwqn.js";
+import { c as markRuntimeReactivePropsDirtySource, n as enqueueRuntimeTask, s as isRuntimeSchedulerExecuting } from "./access-BucjYZcX.js";
 import { p as getCurrentInstance } from "./component-scope-4I3yEMkb.js";
 //#region src/runtime/readable.ts
 const DEVELOPMENT_BUILD_ENABLED = false;