@atscript/vue-table 0.1.111 → 0.1.113

package/dist/{use-table-state-152Ejpyo.cjs → use-table-state-CElgF_iy.cjs}

@@ -1,4 +1,4 @@
-require("@atscript/ui");
+let _atscript_ui = require("@atscript/ui");
 let vue = require("vue");
 let _atscript_ui_table = require("@atscript/ui-table");
 let _atscript_db_client = require("@atscript/db-client");
@@ -180,6 +180,75 @@ function intentClass(prefix, action) {
 	return action.intent ? `${prefix}-intent-${action.intent}` : void 0;
 }
 /**
+* `true` for an unmodified main-button click — the only click an anchor-mode
+* navigate action intercepts (preventDefault + SPA invoke path). Modified /
+* middle / right clicks fall through to native anchor behaviour. Mirrors
+* vue-router's `guardEvent`, including the bail on an already-handled event.
+*/
+function isPlainLeftClick(e) {
+	return !e.defaultPrevented && e.button === 0 && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey;
+}
+/** `true` for the "open in new tab" chord on a button: cmd/ctrl + main-button click. */
+function isModClick(e) {
+	return e.button === 0 && (e.ctrlKey || e.metaKey);
+}
+/**
+* Render-time href for a `processor: 'navigate'` action, mapped through
+* `state.resolveHref`. Returns `undefined` when no link is possible —
+* non-navigate processors, actions with an `inputForm` (the dialog IS the
+* interaction), or a row-level action without a computable identifier — so
+* callers keep the plain button + invoke path. Actions WITH `promptText`
+* still get their href (the button's mod/middle-click new-tab path needs
+* it); whether to render an anchor is the call site's `promptText` check.
+*/
+function actionHref(state, action, id) {
+	if (action.processor !== "navigate" || action.inputForm) return void 0;
+	const href = (0, _atscript_ui.navigateHrefFor)(action, id, state.tableDef.value?.preferredId ?? []);
+	return href === void 0 ? void 0 : state.resolveHref(href);
+}
+/**
+* "Open in new tab" path for navigate actions: run the action's confirmation
+* (immediate accept when it declares no `promptText`), then hand the already
+* `resolveHref`-mapped `href` to the browser via `window.open`. Never touches
+* `state.actions.invoke` and never reaches the `@action` emit — the browser
+* owns the navigation.
+*/
+async function openNavigateInNewTab(state, action, ctx, href) {
+	if (!await confirmAction(state, action, ctx)) return;
+	window.open(href, "_blank", "noopener,noreferrer");
+}
+/**
+* Gesture handler set for the primary trigger (single CTA anchor/button)
+* shared by `<AsRowActions>` and `<AsTableActions>`. Parameterized only by
+* the surface's prompt-context getter and href resolver so the click-dispatch
+* policy — plain left → SPA invoke, cmd/ctrl or middle on a promptText
+* navigate button → confirm → new tab — has a single home.
+*/
+function createNavigateGestures(state, promptCtx, hrefFor) {
+	return {
+		onTriggerClick(action, href, asLink, event) {
+			if (asLink) {
+				if (!isPlainLeftClick(event)) return;
+				event.preventDefault();
+			} else if (href !== void 0 && isModClick(event)) {
+				openNavigateInNewTab(state, action, promptCtx(), href);
+				return;
+			}
+			triggerAction(state, action, promptCtx(), event);
+		},
+		onTriggerAuxClick(action, href, asLink, event) {
+			if (asLink || href === void 0 || event.button !== 1) return;
+			event.preventDefault();
+			openNavigateInNewTab(state, action, promptCtx(), href);
+		},
+		openNewTab(action) {
+			const href = hrefFor(action);
+			if (href === void 0) return;
+			openNavigateInNewTab(state, action, promptCtx(), href);
+		}
+	};
+}
+/**
 * Run `state.prompt()` if the action declares a `promptText`. Resolves
 * `true` on accept, or `true` immediately when no prompt is needed.
 *
@@ -1264,6 +1333,19 @@ function createTableState(opts) {
 	}
 	const mustRefresh = (0, vue.ref)(false);
 	const searchTerm = (0, vue.ref)("");
+	const ignoreSortersDefault = modelOpts?.ignoreSortersWhenSearched?.value ?? queryOpts?.ignoreSortersWhenSearched ?? false;
+	const ignoreSortersWhenSearched = modelOpts?.ignoreSortersWhenSearched ?? (0, vue.ref)(ignoreSortersDefault);
+	let internalIgnoreSortersWrite = false;
+	function setIgnoreSortersInternal(v) {
+		if (ignoreSortersWhenSearched.value === v) return;
+		if (!internalIgnoreSortersWrite) {
+			internalIgnoreSortersWrite = true;
+			(0, vue.nextTick)(() => {
+				internalIgnoreSortersWrite = false;
+			});
+		}
+		ignoreSortersWhenSearched.value = v;
+	}
 	const configDialogOpen = (0, vue.ref)(false);
 	const configTab = (0, vue.ref)("columns");
 	const filterDialogColumn = (0, vue.ref)(null);
@@ -1325,6 +1407,7 @@ function createTableState(opts) {
 			filters: filters.value,
 			forceFilters: queryOpts?.forceFilters,
 			search: searchTerm.value || void 0,
+			ignoreSorters: ignoreSortersWhenSearched.value && !!searchTerm.value,
 			includeActions: includeActions.value
 		});
 	}
@@ -1510,12 +1593,14 @@ function createTableState(opts) {
 		lastError,
 		mustRefresh,
 		searchTerm,
+		ignoreSortersWhenSearched,
 		configDialogOpen,
 		configTab,
 		filterDialogColumn,
 		selectedRows,
 		selectedCount,
 		rowValueFn,
+		resolveHref: opts.actions?.resolveHref ?? ((url) => url),
 		isPkSelected,
 		rowDelete,
 		includeActions,
@@ -1603,9 +1688,11 @@ function createTableState(opts) {
 			sorters: sorters.value,
 			page: pagination.value.page,
 			itemsPerPage: pagination.value.itemsPerPage,
-			searchTerm: searchTerm.value
+			searchTerm: searchTerm.value,
+			ignoreSorters: ignoreSortersWhenSearched.value
 		}, {
 			defaultItemsPerPage: urlDefaultItemsPerPage,
+			defaultIgnoreSorters: ignoreSortersDefault,
 			sync: urlQuerySync
 		});
 	}
@@ -1644,15 +1731,25 @@ function createTableState(opts) {
 			for (const path in parsed.filters) next[path] = parsed.filters[path];
 			filters.value = next;
 		}
-		if ((0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.sorters) !== "none") {
+		const sortersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.sorters);
+		let urlSortersChanged = false;
+		if (sortersGate !== "none") {
 			const urlFields = /* @__PURE__ */ new Set();
 			for (const s of parsed.sorters) urlFields.add(s.field);
 			const merged = [...sorters.value.filter((s) => !urlFields.has(s.field)), ...parsed.sorters];
-			if (!(0, _atscript_ui_table.sortersEqual)(sorters.value, merged)) sorters.value = merged;
+			if (!(0, _atscript_ui_table.sortersEqual)(sorters.value, merged)) {
+				sorters.value = merged;
+				urlSortersChanged = true;
+			}
 		}
+		const searchWasActive = !!searchTerm.value;
 		if (urlQuerySync?.search !== false) {
 			if (searchTerm.value !== parsed.searchTerm) searchTerm.value = parsed.searchTerm;
 		}
+		const searchNowActive = !!searchTerm.value;
+		if (!searchWasActive && searchNowActive) setIgnoreSortersInternal(ignoreSortersDefault);
+		else if (urlSortersChanged && searchWasActive && searchNowActive) setIgnoreSortersInternal(false);
+		if (parsed.ignoreSorters !== void 0) setIgnoreSortersInternal(parsed.ignoreSorters);
 		if (urlQuerySync?.pagination !== false) {
 			if (pagination.value.page !== nextPage) pagination.value = {
 				...pagination.value,
@@ -1688,9 +1785,21 @@ function createTableState(opts) {
 	(0, vue.watch)(() => sorters.value, (next, prev) => {
 		if (hydratingFromUrl) return;
 		if ((0, _atscript_ui_table.sortersEqual)(prev, next)) return;
+		if (searchTerm.value) setIgnoreSortersInternal(false);
 		if (!queryDetected) return;
 		requestRefresh();
 	}, { immediate: false });
+	(0, vue.watch)(() => searchTerm.value, (next, prev) => {
+		if (hydratingFromUrl) return;
+		if (!prev && next) setIgnoreSortersInternal(ignoreSortersDefault);
+	});
+	(0, vue.watch)(() => ignoreSortersWhenSearched.value, () => {
+		if (internalIgnoreSortersWrite) return;
+		if (hydratingFromUrl) return;
+		if (!queryDetected) return;
+		if (!searchTerm.value) return;
+		requestRefresh();
+	});
 	(0, vue.watch)(() => columnNames.value, (next, prev) => {
 		if (!queryDetected) return;
 		if ((0, _atscript_ui_table.sameColumnSet)(prev, next)) return;
@@ -1710,7 +1819,8 @@ function createTableState(opts) {
 		() => filters.value,
 		() => sorters.value,
 		() => searchTerm.value,
-		() => pagination.value
+		() => pagination.value,
+		() => ignoreSortersWhenSearched.value
 	], () => emitUrlIfChanged());
 	(0, vue.watch)(() => includeActions.value, () => {
 		if (!queryDetected) return;
@@ -1894,6 +2004,12 @@ Object.defineProperty(exports, "ROW_ACTIONS_TYPE", {
 		return ROW_ACTIONS_TYPE;
 	}
 });
+Object.defineProperty(exports, "actionHref", {
+	enumerable: true,
+	get: function() {
+		return actionHref;
+	}
+});
 Object.defineProperty(exports, "applyRowGate", {
 	enumerable: true,
 	get: function() {
@@ -1918,6 +2034,12 @@ Object.defineProperty(exports, "collectIdentifiers", {
 		return collectIdentifiers;
 	}
 });
+Object.defineProperty(exports, "createNavigateGestures", {
+	enumerable: true,
+	get: function() {
+		return createNavigateGestures;
+	}
+});
 Object.defineProperty(exports, "createStaticTableState", {
 	enumerable: true,
 	get: function() {
@@ -1948,6 +2070,18 @@ Object.defineProperty(exports, "intentToScope", {
 		return intentToScope;
 	}
 });
+Object.defineProperty(exports, "isModClick", {
+	enumerable: true,
+	get: function() {
+		return isModClick;
+	}
+});
+Object.defineProperty(exports, "isPlainLeftClick", {
+	enumerable: true,
+	get: function() {
+		return isPlainLeftClick;
+	}
+});
 Object.defineProperty(exports, "provideTableContext", {
 	enumerable: true,
 	get: function() {

package/dist/{use-table-state-BHAwfUKw.mjs → use-table-state-Dju5bxt8.mjs}

@@ -1,4 +1,4 @@
-import "@atscript/ui";
+import { navigateHrefFor } from "@atscript/ui";
 import { computed, inject, nextTick, onBeforeUnmount, onScopeDispose, provide, ref, shallowRef, toValue, watch } from "vue";
 import { STANDARD_PRESET_ID, blockStartFor, buildTableQuery, debounce, fromWireSnapshot, isDirtyAgainst, isFilled, isSystemPresetId, pageAlignedBlocksFor, planFetch, reconcileColumnWidthDefaults, resolveAspectGate, resolveSystemPresets, sameColumnSet, sortersEqual, stateToUrlQueryString, togglePk, urlQueryStringToState, walkBackwardAbsorb, walkForwardAbsorb } from "@atscript/ui-table";
 import { formatIdentifier } from "@atscript/db-client";
@@ -180,6 +180,75 @@ function intentClass(prefix, action) {
 	return action.intent ? `${prefix}-intent-${action.intent}` : void 0;
 }
 /**
+* `true` for an unmodified main-button click — the only click an anchor-mode
+* navigate action intercepts (preventDefault + SPA invoke path). Modified /
+* middle / right clicks fall through to native anchor behaviour. Mirrors
+* vue-router's `guardEvent`, including the bail on an already-handled event.
+*/
+function isPlainLeftClick(e) {
+	return !e.defaultPrevented && e.button === 0 && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey;
+}
+/** `true` for the "open in new tab" chord on a button: cmd/ctrl + main-button click. */
+function isModClick(e) {
+	return e.button === 0 && (e.ctrlKey || e.metaKey);
+}
+/**
+* Render-time href for a `processor: 'navigate'` action, mapped through
+* `state.resolveHref`. Returns `undefined` when no link is possible —
+* non-navigate processors, actions with an `inputForm` (the dialog IS the
+* interaction), or a row-level action without a computable identifier — so
+* callers keep the plain button + invoke path. Actions WITH `promptText`
+* still get their href (the button's mod/middle-click new-tab path needs
+* it); whether to render an anchor is the call site's `promptText` check.
+*/
+function actionHref(state, action, id) {
+	if (action.processor !== "navigate" || action.inputForm) return void 0;
+	const href = navigateHrefFor(action, id, state.tableDef.value?.preferredId ?? []);
+	return href === void 0 ? void 0 : state.resolveHref(href);
+}
+/**
+* "Open in new tab" path for navigate actions: run the action's confirmation
+* (immediate accept when it declares no `promptText`), then hand the already
+* `resolveHref`-mapped `href` to the browser via `window.open`. Never touches
+* `state.actions.invoke` and never reaches the `@action` emit — the browser
+* owns the navigation.
+*/
+async function openNavigateInNewTab(state, action, ctx, href) {
+	if (!await confirmAction(state, action, ctx)) return;
+	window.open(href, "_blank", "noopener,noreferrer");
+}
+/**
+* Gesture handler set for the primary trigger (single CTA anchor/button)
+* shared by `<AsRowActions>` and `<AsTableActions>`. Parameterized only by
+* the surface's prompt-context getter and href resolver so the click-dispatch
+* policy — plain left → SPA invoke, cmd/ctrl or middle on a promptText
+* navigate button → confirm → new tab — has a single home.
+*/
+function createNavigateGestures(state, promptCtx, hrefFor) {
+	return {
+		onTriggerClick(action, href, asLink, event) {
+			if (asLink) {
+				if (!isPlainLeftClick(event)) return;
+				event.preventDefault();
+			} else if (href !== void 0 && isModClick(event)) {
+				openNavigateInNewTab(state, action, promptCtx(), href);
+				return;
+			}
+			triggerAction(state, action, promptCtx(), event);
+		},
+		onTriggerAuxClick(action, href, asLink, event) {
+			if (asLink || href === void 0 || event.button !== 1) return;
+			event.preventDefault();
+			openNavigateInNewTab(state, action, promptCtx(), href);
+		},
+		openNewTab(action) {
+			const href = hrefFor(action);
+			if (href === void 0) return;
+			openNavigateInNewTab(state, action, promptCtx(), href);
+		}
+	};
+}
+/**
 * Run `state.prompt()` if the action declares a `promptText`. Resolves
 * `true` on accept, or `true` immediately when no prompt is needed.
 *
@@ -1264,6 +1333,19 @@ function createTableState(opts) {
 	}
 	const mustRefresh = ref(false);
 	const searchTerm = ref("");
+	const ignoreSortersDefault = modelOpts?.ignoreSortersWhenSearched?.value ?? queryOpts?.ignoreSortersWhenSearched ?? false;
+	const ignoreSortersWhenSearched = modelOpts?.ignoreSortersWhenSearched ?? ref(ignoreSortersDefault);
+	let internalIgnoreSortersWrite = false;
+	function setIgnoreSortersInternal(v) {
+		if (ignoreSortersWhenSearched.value === v) return;
+		if (!internalIgnoreSortersWrite) {
+			internalIgnoreSortersWrite = true;
+			nextTick(() => {
+				internalIgnoreSortersWrite = false;
+			});
+		}
+		ignoreSortersWhenSearched.value = v;
+	}
 	const configDialogOpen = ref(false);
 	const configTab = ref("columns");
 	const filterDialogColumn = ref(null);
@@ -1325,6 +1407,7 @@ function createTableState(opts) {
 			filters: filters.value,
 			forceFilters: queryOpts?.forceFilters,
 			search: searchTerm.value || void 0,
+			ignoreSorters: ignoreSortersWhenSearched.value && !!searchTerm.value,
 			includeActions: includeActions.value
 		});
 	}
@@ -1510,12 +1593,14 @@ function createTableState(opts) {
 		lastError,
 		mustRefresh,
 		searchTerm,
+		ignoreSortersWhenSearched,
 		configDialogOpen,
 		configTab,
 		filterDialogColumn,
 		selectedRows,
 		selectedCount,
 		rowValueFn,
+		resolveHref: opts.actions?.resolveHref ?? ((url) => url),
 		isPkSelected,
 		rowDelete,
 		includeActions,
@@ -1603,9 +1688,11 @@ function createTableState(opts) {
 			sorters: sorters.value,
 			page: pagination.value.page,
 			itemsPerPage: pagination.value.itemsPerPage,
-			searchTerm: searchTerm.value
+			searchTerm: searchTerm.value,
+			ignoreSorters: ignoreSortersWhenSearched.value
 		}, {
 			defaultItemsPerPage: urlDefaultItemsPerPage,
+			defaultIgnoreSorters: ignoreSortersDefault,
 			sync: urlQuerySync
 		});
 	}
@@ -1644,15 +1731,25 @@ function createTableState(opts) {
 			for (const path in parsed.filters) next[path] = parsed.filters[path];
 			filters.value = next;
 		}
-		if (resolveAspectGate(urlQuerySync?.sorters) !== "none") {
+		const sortersGate = resolveAspectGate(urlQuerySync?.sorters);
+		let urlSortersChanged = false;
+		if (sortersGate !== "none") {
 			const urlFields = /* @__PURE__ */ new Set();
 			for (const s of parsed.sorters) urlFields.add(s.field);
 			const merged = [...sorters.value.filter((s) => !urlFields.has(s.field)), ...parsed.sorters];
-			if (!sortersEqual(sorters.value, merged)) sorters.value = merged;
+			if (!sortersEqual(sorters.value, merged)) {
+				sorters.value = merged;
+				urlSortersChanged = true;
+			}
 		}
+		const searchWasActive = !!searchTerm.value;
 		if (urlQuerySync?.search !== false) {
 			if (searchTerm.value !== parsed.searchTerm) searchTerm.value = parsed.searchTerm;
 		}
+		const searchNowActive = !!searchTerm.value;
+		if (!searchWasActive && searchNowActive) setIgnoreSortersInternal(ignoreSortersDefault);
+		else if (urlSortersChanged && searchWasActive && searchNowActive) setIgnoreSortersInternal(false);
+		if (parsed.ignoreSorters !== void 0) setIgnoreSortersInternal(parsed.ignoreSorters);
 		if (urlQuerySync?.pagination !== false) {
 			if (pagination.value.page !== nextPage) pagination.value = {
 				...pagination.value,
@@ -1688,9 +1785,21 @@ function createTableState(opts) {
 	watch(() => sorters.value, (next, prev) => {
 		if (hydratingFromUrl) return;
 		if (sortersEqual(prev, next)) return;
+		if (searchTerm.value) setIgnoreSortersInternal(false);
 		if (!queryDetected) return;
 		requestRefresh();
 	}, { immediate: false });
+	watch(() => searchTerm.value, (next, prev) => {
+		if (hydratingFromUrl) return;
+		if (!prev && next) setIgnoreSortersInternal(ignoreSortersDefault);
+	});
+	watch(() => ignoreSortersWhenSearched.value, () => {
+		if (internalIgnoreSortersWrite) return;
+		if (hydratingFromUrl) return;
+		if (!queryDetected) return;
+		if (!searchTerm.value) return;
+		requestRefresh();
+	});
 	watch(() => columnNames.value, (next, prev) => {
 		if (!queryDetected) return;
 		if (sameColumnSet(prev, next)) return;
@@ -1710,7 +1819,8 @@ function createTableState(opts) {
 		() => filters.value,
 		() => sorters.value,
 		() => searchTerm.value,
-		() => pagination.value
+		() => pagination.value,
+		() => ignoreSortersWhenSearched.value
 	], () => emitUrlIfChanged());
 	watch(() => includeActions.value, () => {
 		if (!queryDetected) return;
@@ -1876,4 +1986,4 @@ function useRegisterMainActionListener(state, listener, enabled) {
 	});
 }
 //#endregion
-export { ROW_ACTIONS_TYPE as _, useTableContext as a, applyRowGate as c, collectIdentifiers as d, extractIdentifier as f, ROW_ACTIONS_PATH as g, triggerAction as h, useRegisterMainActionListener as i, applyRowsGate as l, intentToScope as m, createTableState as n, useTableContextOptional as o, intentClass as p, provideTableContext as r, DEFAULT_AVAILABLE_ASPECTS as s, createStaticTableState as t, ariaLabelFor as u };
+export { isModClick as _, useTableContext as a, ROW_ACTIONS_PATH as b, actionHref as c, ariaLabelFor as d, collectIdentifiers as f, intentToScope as g, intentClass as h, useRegisterMainActionListener as i, applyRowGate as l, extractIdentifier as m, createTableState as n, useTableContextOptional as o, createNavigateGestures as p, provideTableContext as r, DEFAULT_AVAILABLE_ASPECTS as s, createStaticTableState as t, applyRowsGate as u, isPlainLeftClick as v, ROW_ACTIONS_TYPE as x, triggerAction as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/vue-table",
-  "version": "0.1.111",
+  "version": "0.1.113",
   "description": "Type-driven table components for Atscript with Vue 3",
   "keywords": [
     "atscript",
@@ -162,9 +162,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@atscript/ui": "^0.1.111",
-    "@atscript/vue-form": "^0.1.111",
-    "@atscript/ui-table": "^0.1.111"
+    "@atscript/ui": "^0.1.113",
+    "@atscript/vue-form": "^0.1.113",
+    "@atscript/ui-table": "^0.1.113"
   },
   "devDependencies": {
     "@atscript/db-client": "^0.1.111",