@ishibashi0112/spreadsheet-grid-core 0.40.0 → 0.41.0

package/dist/controllers/pointerInteractionsController.js

@@ -1,21 +1,21 @@
-import { isSyntheticColumnKey as e } from "../logic/detailRow.js";
-import { gridActions as t } from "../model/gridActions.js";
-import { clamp as n, findLogicalIndexFromPaneOffset as r } from "../logic/geometry.js";
-import { computeNextScrollPosition as i, hasPointerLeftActivationRadius as a, resolveAutoScrollAxisDirection as o, resolveScrollContentBox as s } from "../logic/autoScrollGeometry.js";
-import { nextSortEntries as c } from "../logic/sorting.js";
+import { nextSortEntries as e } from "../logic/sorting.js";
+import { isSyntheticColumnKey as t } from "../logic/detailRow.js";
+import { gridActions as n } from "../model/gridActions.js";
+import { clamp as r, findLogicalIndexFromPaneOffset as i } from "../logic/geometry.js";
+import { computeNextScrollPosition as a, hasPointerLeftActivationRadius as o, resolveAutoScrollAxisDirection as s, resolveScrollContentBox as c } from "../logic/autoScrollGeometry.js";
 import { clientYToRowIndex as l } from "../logic/verticalGeometry.js";
 //#region src/controllers/pointerInteractionsController.ts
 var u = 10, d = 300, f = () => {
 	let u = null, d = !1, f = !1, p = null, m = null, h = "mouse", g = null, _ = null, v = !1, y = !1, b = () => u?.uiState.dragState ?? null, x = (e, t) => {
 		if (u === null) return null;
-		let { bodyScrollRef: i, scrollContainerRef: a, leftPaneScrollRef: o, rightPaneScrollRef: s, filteredRowsLength: c, visibleColumnsLength: d, paneLayout: f, leftLeadingWidth: p, centerLeadingWidth: m, rightLeadingWidth: h, headerHeight: g, rowMetrics: _, verticalScaleFactor: v } = u, y = i.current;
+		let { bodyScrollRef: n, scrollContainerRef: a, leftPaneScrollRef: o, rightPaneScrollRef: s, filteredRowsLength: c, visibleColumnsLength: d, paneLayout: f, leftLeadingWidth: p, centerLeadingWidth: m, rightLeadingWidth: h, headerHeight: g, rowMetrics: _, verticalScaleFactor: v } = u, y = n.current;
 		if (!y || c === 0 || d === 0) return null;
 		let b = y.getBoundingClientRect(), x = l(y.scrollTop + t - b.top - g, a.current?.scrollTop ?? 0, v, _), S = null, C = o.current;
 		if (S === null && C && f.left.entries.length > 0) {
 			let t = C.getBoundingClientRect();
 			if (e < t.right) {
 				let n = e - t.left - p;
-				S = r(f.left, n);
+				S = i(f.left, n);
 			}
 		}
 		let w = s.current;
@@ -23,47 +23,47 @@ var u = 10, d = 300, f = () => {
 			let t = w.getBoundingClientRect();
 			if (e >= t.left) {
 				let n = e - t.left - h;
-				S = r(f.right, n);
+				S = i(f.right, n);
 			}
 		}
 		if (S === null && f.center.entries.length > 0) {
 			let t = y.scrollLeft + e - b.left - m;
-			S = r(f.center, Math.max(t, 0));
+			S = i(f.center, Math.max(t, 0));
 		}
 		return S === null ? null : {
 			row: x,
-			col: n(S, 0, d - 1)
+			col: r(S, 0, d - 1)
 		};
-	}, S = (e, n) => {
+	}, S = (e, t) => {
 		let r = b();
 		if (u === null || !r || r.type !== "selection") return;
-		let i = x(e, n);
+		let i = x(e, t);
 		if (i) {
 			if (r.selectionKind === "cell") {
-				u.dispatch(t.updateSelection(i));
+				u.dispatch(n.updateSelection(i));
 				return;
 			}
 			if (r.selectionKind === "row") {
-				u.dispatch(t.updateRowSelection(i.row));
+				u.dispatch(n.updateRowSelection(i.row));
 				return;
 			}
-			r.selectionKind === "col" && u.dispatch(t.updateColumnSelection(i.col));
+			r.selectionKind === "col" && u.dispatch(n.updateColumnSelection(i.col));
 		}
-	}, C = (e, n) => {
+	}, C = (e, t) => {
 		if (u === null) return;
 		let { gridRootRef: r, dispatch: i, enableRangeSelection: a, enableRowSelection: o, onGutterRowSelect: s, onCellDoubleClickRef: c } = u;
 		r.current?.focus({ preventScroll: !0 });
 		let { target: l } = e;
 		if (l.kind === "cell") {
 			let e = m;
-			if (e && e.cell.row === l.cell.row && e.cell.col === l.cell.col && n - e.time < 300) {
+			if (e && e.cell.row === l.cell.row && e.cell.col === l.cell.col && t - e.time < 300) {
 				m = null, c.current(l.cell);
 				return;
 			}
 			m = {
 				cell: l.cell,
-				time: n
-			}, i(t.activateCell(l.cell)), a && (i(t.startSelection(l.cell)), i(t.endSelection()));
+				time: t
+			}, i(n.activateCell(l.cell)), a && (i(n.startSelection(l.cell)), i(n.endSelection()));
 			return;
 		}
 		if (m = null, l.kind === "row") {
@@ -71,17 +71,17 @@ var u = 10, d = 300, f = () => {
 				s(l.rowIndex, { shiftKey: !1 });
 				return;
 			}
-			i(t.startRowSelection(l.rowIndex)), i(t.endSelection());
+			i(n.startRowSelection(l.rowIndex)), i(n.endSelection());
 			return;
 		}
-		i(t.startColumnSelection(l.colIndex)), i(t.endSelection());
+		i(n.startColumnSelection(l.colIndex)), i(n.endSelection());
 	}, w = () => {
-		u !== null && (f = !1, u.dispatch(t.endSelection()), u.dispatch(t.endColumnResize()));
+		u !== null && (f = !1, u.dispatch(n.endSelection()), u.dispatch(n.endColumnResize()));
 	}, T = (e) => {
 		u !== null && (u.pointerClientRef.current = {
 			x: e.clientX,
 			y: e.clientY
-		}, b()?.type === "columnResize" && u.dispatch(t.updateColumnResize(e.clientX)));
+		}, b()?.type === "columnResize" && u.dispatch(n.updateColumnResize(e.clientX)));
 	}, E = (e) => {
 		let t = p;
 		t && (p = null, e.pointerId === t.pointerId && Math.abs(e.clientX - t.x) < 10 && Math.abs(e.clientY - t.y) < 10 && C(t, e.timeStamp)), w();
@@ -95,32 +95,32 @@ var u = 10, d = 300, f = () => {
 		y = !1, u !== null && u.autoScrollFrameRef.current !== null && (cancelAnimationFrame(u.autoScrollFrameRef.current), u.autoScrollFrameRef.current = null);
 	}, j = () => {
 		if (u === null || !y) return;
-		let { scrollContainerRef: e, pointerClientRef: t, autoScrollFrameRef: n } = u, r = e.current, c = t.current;
-		if (!r || !c) {
+		let { scrollContainerRef: e, pointerClientRef: t, autoScrollFrameRef: n } = u, r = e.current, i = t.current;
+		if (!r || !i) {
 			n.current = requestAnimationFrame(j);
 			return;
 		}
 		if (!v) {
 			let e = _;
-			if (e && !a(e, c, 6)) {
+			if (e && !o(e, i, 6)) {
 				n.current = requestAnimationFrame(j);
 				return;
 			}
 			v = !0;
 		}
-		let l = r.getBoundingClientRect(), d = s({
+		let l = r.getBoundingClientRect(), d = c({
 			rectLeft: l.left,
 			rectTop: l.top,
 			clientLeft: r.clientLeft,
 			clientTop: r.clientTop,
 			clientWidth: r.clientWidth,
 			clientHeight: r.clientHeight
-		}), f = b(), p = f?.type === "selection" && f.selectionKind === "col", m = f?.type === "selection" && f.selectionKind === "row", h = p ? 0 : o(c.y, d.top, d.bottom, 24), g = m ? 0 : o(c.x, d.left, d.right, 24), x = i(r.scrollTop, h, 18, r.scrollHeight - r.clientHeight), C = i(r.scrollLeft, g, 18, r.scrollWidth - r.clientWidth);
+		}), f = b(), p = f?.type === "selection" && f.selectionKind === "col", m = f?.type === "selection" && f.selectionKind === "row", h = p ? 0 : s(i.y, d.top, d.bottom, 24), g = m ? 0 : s(i.x, d.left, d.right, 24), x = a(r.scrollTop, h, 18, r.scrollHeight - r.clientHeight), C = a(r.scrollLeft, g, 18, r.scrollWidth - r.clientWidth);
 		(x !== r.scrollTop || C !== r.scrollLeft) && (r.scrollTo({
 			top: x,
 			left: C,
 			behavior: "auto"
-		}), S(c.x, c.y)), n.current = requestAnimationFrame(j);
+		}), S(i.x, i.y)), n.current = requestAnimationFrame(j);
 	}, M = () => {
 		let e = b()?.type === "selection";
 		e && !y ? (y = !0, u !== null && (u.autoScrollFrameRef.current = requestAnimationFrame(j))) : !e && y && A();
@@ -131,31 +131,31 @@ var u = 10, d = 300, f = () => {
 				g = null;
 				return;
 			}
-			let { scrollContainerRef: t, pointerClientRef: n, onGutterRowSelectDrag: r } = u, c = t.current, l = n.current;
-			if (!c || !l) {
+			let { scrollContainerRef: t, pointerClientRef: n, onGutterRowSelectDrag: r } = u, i = t.current, l = n.current;
+			if (!i || !l) {
 				g = requestAnimationFrame(e);
 				return;
 			}
 			if (!v) {
 				let t = _;
-				if (t && !a(t, l, 6)) {
+				if (t && !o(t, l, 6)) {
 					g = requestAnimationFrame(e);
 					return;
 				}
 				v = !0;
 			}
-			let d = c.getBoundingClientRect(), p = s({
+			let d = i.getBoundingClientRect(), p = c({
 				rectLeft: d.left,
 				rectTop: d.top,
-				clientLeft: c.clientLeft,
-				clientTop: c.clientTop,
-				clientWidth: c.clientWidth,
-				clientHeight: c.clientHeight
-			}), m = o(l.y, p.top, p.bottom, 24), h = i(c.scrollTop, m, 18, c.scrollHeight - c.clientHeight);
-			if (h !== c.scrollTop) {
-				c.scrollTo({
+				clientLeft: i.clientLeft,
+				clientTop: i.clientTop,
+				clientWidth: i.clientWidth,
+				clientHeight: i.clientHeight
+			}), m = s(l.y, p.top, p.bottom, 24), h = a(i.scrollTop, m, 18, i.scrollHeight - i.clientHeight);
+			if (h !== i.scrollTop) {
+				i.scrollTo({
 					top: h,
-					left: c.scrollLeft,
+					left: i.scrollLeft,
 					behavior: "auto"
 				});
 				let e = x(l.x, l.y);
@@ -181,77 +181,77 @@ var u = 10, d = 300, f = () => {
 			u = e, O(), M();
 		},
 		updateSelectionFromPointer: S,
-		handleCellPointerDown: (e, n) => {
-			!P(n, {
+		handleCellPointerDown: (e, t) => {
+			!P(t, {
 				kind: "cell",
 				cell: e
-			}) || u === null || (u.dispatch(t.activateCell(e)), u.enableRangeSelection && u.dispatch(t.startSelection(e)));
+			}) || u === null || (u.dispatch(n.activateCell(e)), u.enableRangeSelection && u.dispatch(n.startSelection(e)));
 		},
 		handleCellDoubleClick: (e) => {
 			h === "touch" || u === null || u.onCellDoubleClickRef.current(e);
 		},
-		handleCellPointerEnter: (e, n) => {
+		handleCellPointerEnter: (e, t) => {
 			if (u === null || (u.enableRowHover && u.setHoveredRowIndex(e.row), !u.enableRangeSelection)) return;
 			let r = b();
 			r?.type !== "selection" || r.selectionKind !== "cell" || (u.pointerClientRef.current = {
-				x: n.clientX,
-				y: n.clientY
-			}, u.dispatch(t.updateSelection(e)));
+				x: t.clientX,
+				y: t.clientY
+			}, u.dispatch(n.updateSelection(e)));
 		},
 		handleNativeDragStart: (e) => {
 			e.preventDefault();
 		},
-		handleRowHeaderPointerDown: (e, n) => {
-			if (!(!P(n, {
+		handleRowHeaderPointerDown: (e, t) => {
+			if (!(!P(t, {
 				kind: "row",
 				rowIndex: e
 			}) || u === null)) {
 				if (u.enableRowSelection) {
-					f = !0, u.onGutterRowSelect(e, { shiftKey: n.shiftKey }), N();
+					f = !0, u.onGutterRowSelect(e, { shiftKey: t.shiftKey }), N();
 					return;
 				}
-				u.dispatch(t.startRowSelection(e));
+				u.dispatch(n.startRowSelection(e));
 			}
 		},
-		handleRowHeaderPointerEnter: (e, n) => {
+		handleRowHeaderPointerEnter: (e, t) => {
 			if (u === null) return;
 			if (u.enableRowHover && u.setHoveredRowIndex(e), f) {
 				u.pointerClientRef.current = {
-					x: n.clientX,
-					y: n.clientY
+					x: t.clientX,
+					y: t.clientY
 				}, u.onGutterRowSelectDrag(e);
 				return;
 			}
 			let r = b();
 			r?.type !== "selection" || r.selectionKind !== "row" || (u.pointerClientRef.current = {
-				x: n.clientX,
-				y: n.clientY
-			}, u.dispatch(t.updateRowSelection(e)));
+				x: t.clientX,
+				y: t.clientY
+			}, u.dispatch(n.updateRowSelection(e)));
 		},
-		handleColumnHeaderPointerDown: (n, r) => {
-			if (!(!P(r, {
+		handleColumnHeaderPointerDown: (r, i) => {
+			if (!(!P(i, {
 				kind: "col",
-				colIndex: n
+				colIndex: r
 			}) || u === null)) {
-				if (r.shiftKey && u.enableSorting) {
-					let r = u.orderedColumns[n];
-					if (r && !e(r.key)) {
-						let e = u.uiState.sort, n = e.find((e) => e.columnKey === r.key)?.direction ? "desc" : "asc", i = c(e, r.key, n, !0);
-						u.dispatch(i.length === 0 ? t.clearSort() : t.setSort(i));
+				if (i.shiftKey && u.enableSorting) {
+					let i = u.orderedColumns[r];
+					if (i && !t(i.key)) {
+						let t = u.uiState.sort, r = t.find((e) => e.columnKey === i.key)?.direction ? "desc" : "asc", a = e(t, i.key, r, !0);
+						u.dispatch(a.length === 0 ? n.clearSort() : n.setSort(a));
 					}
 					return;
 				}
-				u.dispatch(t.startColumnSelection(n));
+				u.dispatch(n.startColumnSelection(r));
 			}
 		},
-		handleColumnHeaderPointerEnter: (e, n) => {
+		handleColumnHeaderPointerEnter: (e, t) => {
 			if (u === null) return;
 			u.setHoveredRowIndex(null), u.enableColumnHeaderHover && u.setHoveredColumnIndex(e);
 			let r = b();
 			r?.type !== "selection" || r.selectionKind !== "col" || (u.pointerClientRef.current = {
-				x: n.clientX,
-				y: n.clientY
-			}, u.dispatch(t.updateColumnSelection(e)));
+				x: t.clientX,
+				y: t.clientY
+			}, u.dispatch(n.updateColumnSelection(e)));
 		},
 		dispose: () => {
 			k(), A(), g !== null && (cancelAnimationFrame(g), g = null);

package/dist/controllers/selectOptionsCollector.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../logic/valueStore.cjs"),t=require("../logic/chunkedLoop.cjs"),n=require("../logic/selectOptions.cjs");var r=5e4,i=[],a=new Set,o={status:`idle`,options:i,allValues:a,progress:0},s={status:`collecting`,options:i,allValues:a,progress:0},c=e=>new Set(e.map(e=>e.value)),l=e=>{let t=e?.filterType??null;return t===`select`||t===`set`||t===`numberSet`||t===`textSet`||t===`dateSet`},u=(e,t,r)=>{if(!e||!l(e))return o;let i=e.filterOptions&&e.filterOptions.length>0?e.filterOptions:null;if(i)return{status:`ready`,options:i,allValues:c(i),progress:1};if(t<=5e4){let e=n.collectSelectOptions(t,r);return{status:`ready`,options:e,allValues:c(e),progress:1}}return null},d={source:null,rowCount:0,result:o},f=(e,t,n)=>e.source===n&&e.rowCount===t?e.result:s,p=()=>{let r=e.createValueStore(d),o=null,s=null,l=e=>{let{getRawValueAt:o,rowCount:l}=e,u=n.createSelectOptionsAccumulator(),d=!1;s=()=>{d=!0},t.runChunked(l,e=>u.collect(o(e)),{isCancelled:()=>d,onYield:(e,t)=>{r.setSnapshot({source:o,rowCount:l,result:{status:`collecting`,options:i,allValues:a,progress:e/t}})}}).then(e=>{if(!e)return;let t=u.finalize();r.setSnapshot({source:o,rowCount:l,result:{status:`ready`,options:t,allValues:c(t),progress:1}})})};return{update:e=>{let t=o===null||o.needsAsync!==e.needsAsync||o.rowCount!==e.rowCount||o.getRawValueAt!==e.getRawValueAt;o=e,t&&(s?.(),s=null,e.needsAsync&&l(e))},subscribe:r.subscribe,getSnapshot:r.getSnapshot,dispose:()=>{s?.(),s=null}}};exports.ASYNC_SELECT_COLLECT_ROW_THRESHOLD=r,exports.IDLE_SELECT_OPTIONS_RESULT=o,exports.createSelectOptionsCollector=p,exports.resolveSyncSelectOptions=u,exports.selectCollectorResult=f;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../logic/valueStore.cjs"),t=require("../logic/chunkedLoop.cjs"),n=require("../logic/selectOptions.cjs");var r=5e4,i=[],a=new Set,o={status:`idle`,options:i,allValues:a,progress:0},s={status:`collecting`,options:i,allValues:a,progress:0},c=e=>new Set(e.map(e=>e.value)),l=e=>e===`select`||e===`set`||e===`numberSet`||e===`textSet`||e===`dateSet`,u=e=>{let t=e?.filterType??null;return t===`select`||t===`set`||t===`numberSet`||t===`textSet`||t===`dateSet`},d=(e,t,r)=>{if(!e||!u(e))return o;let i=e.filterOptions&&e.filterOptions.length>0?e.filterOptions:null;if(i)return{status:`ready`,options:i,allValues:c(i),progress:1};if(t<=5e4){let e=n.collectSelectOptions(t,r);return{status:`ready`,options:e,allValues:c(e),progress:1}}return null},f={source:null,rowCount:0,result:o},p=(e,t,n)=>e.source===n&&e.rowCount===t?e.result:s,m=()=>{let r=e.createValueStore(f),o=null,s=null,l=e=>{let{getRawValueAt:o,rowCount:l}=e,u=n.createSelectOptionsAccumulator(),d=!1;s=()=>{d=!0},t.runChunked(l,e=>u.collect(o(e)),{isCancelled:()=>d,onYield:(e,t)=>{r.setSnapshot({source:o,rowCount:l,result:{status:`collecting`,options:i,allValues:a,progress:e/t}})}}).then(e=>{if(!e)return;let t=u.finalize();r.setSnapshot({source:o,rowCount:l,result:{status:`ready`,options:t,allValues:c(t),progress:1}})})};return{update:e=>{let t=o===null||o.needsAsync!==e.needsAsync||o.rowCount!==e.rowCount||o.getRawValueAt!==e.getRawValueAt;o=e,t&&(s?.(),s=null,e.needsAsync&&l(e))},subscribe:r.subscribe,getSnapshot:r.getSnapshot,dispose:()=>{s?.(),s=null}}};exports.ASYNC_SELECT_COLLECT_ROW_THRESHOLD=r,exports.IDLE_SELECT_OPTIONS_RESULT=o,exports.createSelectOptionsCollector=m,exports.isSelectLikeFilterType=l,exports.resolveSyncSelectOptions=d,exports.selectCollectorResult=p;

package/dist/controllers/selectOptionsCollector.d.ts

@@ -1,15 +1,18 @@
 import type { GridColumn } from '../model/gridTypes.unbound';
 import { type SelectOptionEntry } from '../logic/selectOptions';
 export declare const ASYNC_SELECT_COLLECT_ROW_THRESHOLD = 50000;
-export type ColumnSelectOptionsStatus = 'idle' | 'collecting' | 'ready';
+export type ColumnSelectOptionsStatus = 'idle' | 'collecting' | 'loading' | 'ready' | 'error';
 export type ColumnSelectOptionsResult = {
     status: ColumnSelectOptionsStatus;
     options: SelectOptionEntry[];
     allValues: ReadonlySet<string>;
     progress: number;
+    truncated?: boolean;
+    errorMessage?: string;
 };
 export declare const IDLE_SELECT_OPTIONS_RESULT: ColumnSelectOptionsResult;
 export type RawValueAccessor = (index: number) => unknown;
+export declare const isSelectLikeFilterType: (filterType: string | null | undefined) => boolean;
 export declare const resolveSyncSelectOptions: <T>(column: GridColumn<T> | null, rowCount: number, getRawValueAt: RawValueAccessor) => ColumnSelectOptionsResult | null;
 export type SelectOptionsCollectorArgs = {
     needsAsync: boolean;

package/dist/controllers/selectOptionsCollector.js

@@ -12,11 +12,11 @@ var i = 5e4, a = [], o = /* @__PURE__ */ new Set(), s = {
 	options: a,
 	allValues: o,
 	progress: 0
-}, l = (e) => new Set(e.map((e) => e.value)), u = (e) => {
+}, l = (e) => new Set(e.map((e) => e.value)), u = (e) => e === "select" || e === "set" || e === "numberSet" || e === "textSet" || e === "dateSet", d = (e) => {
 	let t = e?.filterType ?? null;
 	return t === "select" || t === "set" || t === "numberSet" || t === "textSet" || t === "dateSet";
-}, d = (e, t, r) => {
-	if (!e || !u(e)) return s;
+}, f = (e, t, r) => {
+	if (!e || !d(e)) return s;
 	let i = e.filterOptions && e.filterOptions.length > 0 ? e.filterOptions : null;
 	if (i) return {
 		status: "ready",
@@ -34,12 +34,12 @@ var i = 5e4, a = [], o = /* @__PURE__ */ new Set(), s = {
 		};
 	}
 	return null;
-}, f = {
+}, p = {
 	source: null,
 	rowCount: 0,
 	result: s
-}, p = (e, t, n) => e.source === n && e.rowCount === t ? e.result : c, m = () => {
-	let n = e(f), i = null, s = null, c = (e) => {
+}, m = (e, t, n) => e.source === n && e.rowCount === t ? e.result : c, h = () => {
+	let n = e(p), i = null, s = null, c = (e) => {
 		let { getRawValueAt: i, rowCount: c } = e, u = r(), d = !1;
 		s = () => {
 			d = !0;
@@ -85,4 +85,4 @@ var i = 5e4, a = [], o = /* @__PURE__ */ new Set(), s = {
 	};
 };
 //#endregion
-export { i as ASYNC_SELECT_COLLECT_ROW_THRESHOLD, s as IDLE_SELECT_OPTIONS_RESULT, m as createSelectOptionsCollector, d as resolveSyncSelectOptions, p as selectCollectorResult };
+export { i as ASYNC_SELECT_COLLECT_ROW_THRESHOLD, s as IDLE_SELECT_OPTIONS_RESULT, h as createSelectOptionsCollector, u as isSelectLikeFilterType, f as resolveSyncSelectOptions, m as selectCollectorResult };

package/dist/engine/columnCommands.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../model/gridActions.cjs"),t=require("../logic/geometry.cjs"),n=require("../logic/sorting.cjs"),r=require("../logic/columnReset.cjs");var i=300,a=4,o=()=>{let o=null,s=null,c=null,l=()=>{if(o===null)throw Error(`[SpreadsheetGrid] columnCommands は update 前に呼べません。`);return o},u=t=>{t(e.gridActions.stopEdit()),t(e.gridActions.clearSelection()),t(e.gridActions.activateCell(null))},d=(t,n)=>{n(t.length===0?e.gridActions.clearSort():e.gridActions.setSort(t))},f=(e,t)=>{let{closeColumnMenu:n,onColumnsChange:r,columns:i,columnWidths:a,dispatch:o}=l();if(n(),!r)return;let s=i.find(t=>t.key===e);s&&(s.pinned??void 0)!==t&&(r(i.map(n=>{let r=a[n.key]??n.width;return n.key===e?{...n,width:r,pinned:t}:r===n.width?n:{...n,width:r}})),u(o))},p=e=>{let{closeColumnMenu:t,visibleColumns:n,runAutosize:r}=l();t();let i=n.find(t=>t.key===e);i&&r([i])},m=()=>{let{closeColumnMenu:e,visibleColumns:t,runAutosize:n}=l();e(),n(t)},h=()=>{let{closeColumnMenu:e,openToolPanel:t}=l();e(),t(`columns`)},g=()=>{let{closeColumnMenu:e,openToolPanel:t}=l();e(),t(`sort`)},_=()=>{let{closeColumnMenu:e,openToolPanel:t}=l();e(),t(`filter`)},v=e=>{let{closeColumnMenu:t,openColumnFilterPopover:n}=l();t(),n(e)},y=t=>{l().dispatch(e.gridActions.clearColumnFilter(t))},b=()=>{let{dispatch:t,globalFilterText:n}=l();t(e.gridActions.setAllFilters({globalText:n,columnFilters:{}}))},x=()=>{l().dispatch(e.gridActions.setGlobalFilter(``))},S=(e,t)=>{let{onColumnsChange:n,columns:r,columnWidths:i,dispatch:a}=l();if(!n)return;let o=r.find(t=>t.key===e);o&&o.visible!==!1!==t&&(!t&&r.filter(e=>e.visible!==!1).length<=1||(n(r.map(n=>{let r=i[n.key]??n.width;return n.key===e?{...n,width:r,visible:t}:r===n.width?n:{...n,width:r}})),u(a)))},C=()=>{let{onColumnsChange:e,columns:t,columnWidths:n,dispatch:r}=l();e&&t.some(e=>e.visible===!1)&&(e(t.map(e=>{let t=n[e.key]??e.width,r=t!==e.width,i=e.visible===!1;return!r&&!i?e:i?{...e,width:t,visible:!0}:{...e,width:t}})),u(r))},w=()=>{let{onColumnsChange:e,columns:t,orderedColumns:n,columnWidths:r,dispatch:i}=l();if(!e)return;let a=n[0]?.key;a!==void 0&&t.some(e=>e.visible!==!1&&e.key!==a)&&(e(t.map(e=>{let t=r[e.key]??e.width,n=t!==e.width,i=e.visible!==!1&&e.key!==a;return!n&&!i?e:i?{...e,width:t,visible:!1}:{...e,width:t}})),u(i))},T=(e,n)=>{let{onColumnsChange:r,columns:i,columnWidths:a,dispatch:o}=l();if(!r||e.length!==i.length)return;let s=new Map(i.map(e=>[e.key,e]));if(!e.every(e=>s.has(e)))return;let c=t.reorderColumnsByPane(e.map(e=>{let t=s.get(e),r=a[t.key]??t.width,i=n?.has(e)?n.get(e):t.pinned,o=r!==t.width,c=(t.pinned??void 0)!==(i??void 0);return o||c?{...t,width:r,pinned:i}:t}));c.length===i.length&&c.every((e,t)=>{let n=i[t];return!!n&&n.key===e.key&&n.width===e.width&&(n.pinned??void 0)===(e.pinned??void 0)})||(r(c),u(o))},E=e=>{T(e)},D=()=>{let{onColumnsChange:e,columns:t,columnWidths:n,dispatch:i}=l();if(!e||!s)return;let a=r.buildResetColumns(t,s,n);a!==null&&(e(a),u(i))};return{update:e=>{o=e,s===null&&(s=new Map(e.columns.map(e=>[e.key,{width:e.width,pinned:e.pinned,visible:e.visible}])))},handleColumnMenuPinnedChange:f,handleColumnMenuAutosizeColumn:p,handleColumnMenuAutosizeAllColumns:m,handleColumnMenuOpenChooser:h,handleColumnMenuOpenSortManager:g,handleColumnMenuOpenFilter:v,handleColumnMenuOpenFilterManager:_,handleColumnMenuResetColumns:()=>{l().closeColumnMenu(),D()},handleColumnMenuSortChange:(e,t)=>{let{closeColumnMenu:r,enableSorting:i,sort:a,dispatch:o}=l();r(),i&&d(n.nextSortEntries(a,e,t,!1),o)},handleFilterManagerClearFilter:y,handleFilterManagerClearAll:b,handleFilterManagerClearGlobal:x,handleColumnChooserToggleVisibility:S,handleColumnChooserShowAll:C,handleColumnChooserHideAll:w,handleColumnChooserReorder:E,handleColumnChooserReset:D,applyColumnOrderAndPin:T,handleSortManagerAddLevel:(t,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(e.gridActions.setSort(n.addSortEntry(a,t,r)))},handleSortManagerChangeDirection:(t,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(e.gridActions.setSort(n.setSortEntryDirection(a,t,r)))},handleSortManagerChangeColumn:(t,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(e.gridActions.setSort(n.setSortEntryColumn(a,t,r)))},handleSortManagerRemoveLevel:e=>{let{enableSorting:t,sort:r,dispatch:i}=l();t&&d(n.removeSortEntryAt(r,e),i)},handleSortManagerClearAll:()=>{let{enableSorting:t,dispatch:n}=l();t&&n(e.gridActions.clearSort())},handleSortManagerMove:(t,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(e.gridActions.setSort(n.moveSortEntry(a,t,r)))},handleColumnResizePointerDown:(t,n)=>{n.preventDefault(),n.stopPropagation();let{columnWidths:r,dispatch:o,runAutosize:s}=l(),u=n.timeStamp,d=c;if(d&&d.key===t.key&&u-d.time<i&&Math.abs(n.clientX-d.x)<a){c=null,s([t]);return}c={key:t.key,time:u,x:n.clientX},o(e.gridActions.startColumnResize(t.key,n.clientX,r[t.key]??t.width,t.minWidth??60,t.maxWidth))},getInitialColumnState:()=>s}};exports.createColumnCommands=o;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../logic/sorting.cjs"),t=require("../model/gridActions.cjs"),n=require("../logic/geometry.cjs"),r=require("../logic/columnReset.cjs");var i=300,a=4,o=()=>{let o=null,s=null,c=null,l=()=>{if(o===null)throw Error(`[SpreadsheetGrid] columnCommands は update 前に呼べません。`);return o},u=e=>{e(t.gridActions.stopEdit()),e(t.gridActions.clearSelection()),e(t.gridActions.activateCell(null))},d=(e,n)=>{n(e.length===0?t.gridActions.clearSort():t.gridActions.setSort(e))},f=(e,t)=>{let{closeColumnMenu:n,onColumnsChange:r,columns:i,columnWidths:a,dispatch:o}=l();if(n(),!r)return;let s=i.find(t=>t.key===e);s&&(s.pinned??void 0)!==t&&(r(i.map(n=>{let r=a[n.key]??n.width;return n.key===e?{...n,width:r,pinned:t}:r===n.width?n:{...n,width:r}})),u(o))},p=e=>{let{closeColumnMenu:t,visibleColumns:n,runAutosize:r}=l();t();let i=n.find(t=>t.key===e);i&&r([i])},m=()=>{let{closeColumnMenu:e,visibleColumns:t,runAutosize:n}=l();e(),n(t)},h=()=>{let{closeColumnMenu:e,openToolPanel:t}=l();e(),t(`columns`)},g=()=>{let{closeColumnMenu:e,openToolPanel:t}=l();e(),t(`sort`)},_=()=>{let{closeColumnMenu:e,openToolPanel:t}=l();e(),t(`filter`)},v=e=>{let{closeColumnMenu:t,openColumnFilterPopover:n}=l();t(),n(e)},y=e=>{l().dispatch(t.gridActions.clearColumnFilter(e))},b=()=>{let{dispatch:e,globalFilterText:n}=l();e(t.gridActions.setAllFilters({globalText:n,columnFilters:{}}))},x=()=>{l().dispatch(t.gridActions.setGlobalFilter(``))},S=(e,t)=>{let{onColumnsChange:n,columns:r,columnWidths:i,dispatch:a}=l();if(!n)return;let o=r.find(t=>t.key===e);o&&o.visible!==!1!==t&&(!t&&r.filter(e=>e.visible!==!1).length<=1||(n(r.map(n=>{let r=i[n.key]??n.width;return n.key===e?{...n,width:r,visible:t}:r===n.width?n:{...n,width:r}})),u(a)))},C=()=>{let{onColumnsChange:e,columns:t,columnWidths:n,dispatch:r}=l();e&&t.some(e=>e.visible===!1)&&(e(t.map(e=>{let t=n[e.key]??e.width,r=t!==e.width,i=e.visible===!1;return!r&&!i?e:i?{...e,width:t,visible:!0}:{...e,width:t}})),u(r))},w=()=>{let{onColumnsChange:e,columns:t,orderedColumns:n,columnWidths:r,dispatch:i}=l();if(!e)return;let a=n[0]?.key;a!==void 0&&t.some(e=>e.visible!==!1&&e.key!==a)&&(e(t.map(e=>{let t=r[e.key]??e.width,n=t!==e.width,i=e.visible!==!1&&e.key!==a;return!n&&!i?e:i?{...e,width:t,visible:!1}:{...e,width:t}})),u(i))},T=(e,t)=>{let{onColumnsChange:r,columns:i,columnWidths:a,dispatch:o}=l();if(!r||e.length!==i.length)return;let s=new Map(i.map(e=>[e.key,e]));if(!e.every(e=>s.has(e)))return;let c=n.reorderColumnsByPane(e.map(e=>{let n=s.get(e),r=a[n.key]??n.width,i=t?.has(e)?t.get(e):n.pinned,o=r!==n.width,c=(n.pinned??void 0)!==(i??void 0);return o||c?{...n,width:r,pinned:i}:n}));c.length===i.length&&c.every((e,t)=>{let n=i[t];return!!n&&n.key===e.key&&n.width===e.width&&(n.pinned??void 0)===(e.pinned??void 0)})||(r(c),u(o))},E=e=>{T(e)},D=()=>{let{onColumnsChange:e,columns:t,columnWidths:n,dispatch:i}=l();if(!e||!s)return;let a=r.buildResetColumns(t,s,n);a!==null&&(e(a),u(i))};return{update:e=>{o=e,s===null&&(s=new Map(e.columns.map(e=>[e.key,{width:e.width,pinned:e.pinned,visible:e.visible}])))},handleColumnMenuPinnedChange:f,handleColumnMenuAutosizeColumn:p,handleColumnMenuAutosizeAllColumns:m,handleColumnMenuOpenChooser:h,handleColumnMenuOpenSortManager:g,handleColumnMenuOpenFilter:v,handleColumnMenuOpenFilterManager:_,handleColumnMenuResetColumns:()=>{l().closeColumnMenu(),D()},handleColumnMenuSortChange:(t,n)=>{let{closeColumnMenu:r,enableSorting:i,sort:a,dispatch:o}=l();r(),i&&d(e.nextSortEntries(a,t,n,!1),o)},handleFilterManagerClearFilter:y,handleFilterManagerClearAll:b,handleFilterManagerClearGlobal:x,handleColumnChooserToggleVisibility:S,handleColumnChooserShowAll:C,handleColumnChooserHideAll:w,handleColumnChooserReorder:E,handleColumnChooserReset:D,applyColumnOrderAndPin:T,handleSortManagerAddLevel:(n,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(t.gridActions.setSort(e.addSortEntry(a,n,r)))},handleSortManagerChangeDirection:(n,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(t.gridActions.setSort(e.setSortEntryDirection(a,n,r)))},handleSortManagerChangeColumn:(n,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(t.gridActions.setSort(e.setSortEntryColumn(a,n,r)))},handleSortManagerRemoveLevel:t=>{let{enableSorting:n,sort:r,dispatch:i}=l();n&&d(e.removeSortEntryAt(r,t),i)},handleSortManagerClearAll:()=>{let{enableSorting:e,dispatch:n}=l();e&&n(t.gridActions.clearSort())},handleSortManagerMove:(n,r)=>{let{enableSorting:i,sort:a,dispatch:o}=l();i&&o(t.gridActions.setSort(e.moveSortEntry(a,n,r)))},handleColumnResizePointerDown:(e,n)=>{n.preventDefault(),n.stopPropagation();let{columnWidths:r,dispatch:o,runAutosize:s}=l(),u=n.timeStamp,d=c;if(d&&d.key===e.key&&u-d.time<i&&Math.abs(n.clientX-d.x)<a){c=null,s([e]);return}c={key:e.key,time:u,x:n.clientX},o(t.gridActions.startColumnResize(e.key,n.clientX,r[e.key]??e.width,e.minWidth??60,e.maxWidth))},getInitialColumnState:()=>s}};exports.createColumnCommands=o;

package/dist/engine/columnCommands.js

@@ -1,16 +1,16 @@
-import { gridActions as e } from "../model/gridActions.js";
-import { reorderColumnsByPane as t } from "../logic/geometry.js";
-import { addSortEntry as n, moveSortEntry as r, nextSortEntries as i, removeSortEntryAt as a, setSortEntryColumn as o, setSortEntryDirection as s } from "../logic/sorting.js";
+import { addSortEntry as e, moveSortEntry as t, nextSortEntries as n, removeSortEntryAt as r, setSortEntryColumn as i, setSortEntryDirection as a } from "../logic/sorting.js";
+import { gridActions as o } from "../model/gridActions.js";
+import { reorderColumnsByPane as s } from "../logic/geometry.js";
 import { buildResetColumns as c } from "../logic/columnReset.js";
 //#region src/engine/columnCommands.ts
 var l = 300, u = 4, d = () => {
 	let d = null, f = null, p = null, m = () => {
 		if (d === null) throw Error("[SpreadsheetGrid] columnCommands は update 前に呼べません。");
 		return d;
-	}, h = (t) => {
-		t(e.stopEdit()), t(e.clearSelection()), t(e.activateCell(null));
-	}, g = (t, n) => {
-		n(t.length === 0 ? e.clearSort() : e.setSort(t));
+	}, h = (e) => {
+		e(o.stopEdit()), e(o.clearSelection()), e(o.activateCell(null));
+	}, g = (e, t) => {
+		t(e.length === 0 ? o.clearSort() : o.setSort(e));
 	}, _ = (e, t) => {
 		let { closeColumnMenu: n, onColumnsChange: r, columns: i, columnWidths: a, dispatch: o } = m();
 		if (n(), !r) return;
@@ -46,16 +46,16 @@ var l = 300, u = 4, d = () => {
 	}, C = (e) => {
 		let { closeColumnMenu: t, openColumnFilterPopover: n } = m();
 		t(), n(e);
-	}, w = (t) => {
-		m().dispatch(e.clearColumnFilter(t));
+	}, w = (e) => {
+		m().dispatch(o.clearColumnFilter(e));
 	}, T = () => {
-		let { dispatch: t, globalFilterText: n } = m();
-		t(e.setAllFilters({
-			globalText: n,
+		let { dispatch: e, globalFilterText: t } = m();
+		e(o.setAllFilters({
+			globalText: t,
 			columnFilters: {}
 		}));
 	}, E = () => {
-		m().dispatch(e.setGlobalFilter(""));
+		m().dispatch(o.setGlobalFilter(""));
 	}, D = (e, t) => {
 		let { onColumnsChange: n, columns: r, columnWidths: i, dispatch: a } = m();
 		if (!n) return;
@@ -99,23 +99,23 @@ var l = 300, u = 4, d = () => {
 				width: t
 			};
 		})), h(i));
-	}, A = (e, n) => {
-		let { onColumnsChange: r, columns: i, columnWidths: a, dispatch: o } = m();
-		if (!r || e.length !== i.length) return;
-		let s = new Map(i.map((e) => [e.key, e]));
-		if (!e.every((e) => s.has(e))) return;
-		let c = t(e.map((e) => {
-			let t = s.get(e), r = a[t.key] ?? t.width, i = n?.has(e) ? n.get(e) : t.pinned, o = r !== t.width, c = (t.pinned ?? void 0) !== (i ?? void 0);
-			return o || c ? {
-				...t,
+	}, A = (e, t) => {
+		let { onColumnsChange: n, columns: r, columnWidths: i, dispatch: a } = m();
+		if (!n || e.length !== r.length) return;
+		let o = new Map(r.map((e) => [e.key, e]));
+		if (!e.every((e) => o.has(e))) return;
+		let c = s(e.map((e) => {
+			let n = o.get(e), r = i[n.key] ?? n.width, a = t?.has(e) ? t.get(e) : n.pinned, s = r !== n.width, c = (n.pinned ?? void 0) !== (a ?? void 0);
+			return s || c ? {
+				...n,
 				width: r,
-				pinned: i
-			} : t;
+				pinned: a
+			} : n;
 		}));
-		c.length === i.length && c.every((e, t) => {
-			let n = i[t];
+		c.length === r.length && c.every((e, t) => {
+			let n = r[t];
 			return !!n && n.key === e.key && n.width === e.width && (n.pinned ?? void 0) === (e.pinned ?? void 0);
-		}) || (r(c), h(o));
+		}) || (n(c), h(a));
 	}, j = (e) => {
 		A(e);
 	}, M = () => {
@@ -143,8 +143,8 @@ var l = 300, u = 4, d = () => {
 			m().closeColumnMenu(), M();
 		},
 		handleColumnMenuSortChange: (e, t) => {
-			let { closeColumnMenu: n, enableSorting: r, sort: a, dispatch: o } = m();
-			n(), r && g(i(a, e, t, !1), o);
+			let { closeColumnMenu: r, enableSorting: i, sort: a, dispatch: o } = m();
+			r(), i && g(n(a, e, t, !1), o);
 		},
 		handleFilterManagerClearFilter: w,
 		handleFilterManagerClearAll: T,
@@ -155,42 +155,42 @@ var l = 300, u = 4, d = () => {
 		handleColumnChooserReorder: j,
 		handleColumnChooserReset: M,
 		applyColumnOrderAndPin: A,
-		handleSortManagerAddLevel: (t, r) => {
-			let { enableSorting: i, sort: a, dispatch: o } = m();
-			i && o(e.setSort(n(a, t, r)));
-		},
-		handleSortManagerChangeDirection: (t, n) => {
+		handleSortManagerAddLevel: (t, n) => {
 			let { enableSorting: r, sort: i, dispatch: a } = m();
-			r && a(e.setSort(s(i, t, n)));
+			r && a(o.setSort(e(i, t, n)));
 		},
-		handleSortManagerChangeColumn: (t, n) => {
-			let { enableSorting: r, sort: i, dispatch: a } = m();
-			r && a(e.setSort(o(i, t, n)));
+		handleSortManagerChangeDirection: (e, t) => {
+			let { enableSorting: n, sort: r, dispatch: i } = m();
+			n && i(o.setSort(a(r, e, t)));
+		},
+		handleSortManagerChangeColumn: (e, t) => {
+			let { enableSorting: n, sort: r, dispatch: a } = m();
+			n && a(o.setSort(i(r, e, t)));
 		},
 		handleSortManagerRemoveLevel: (e) => {
-			let { enableSorting: t, sort: n, dispatch: r } = m();
-			t && g(a(n, e), r);
+			let { enableSorting: t, sort: n, dispatch: i } = m();
+			t && g(r(n, e), i);
 		},
 		handleSortManagerClearAll: () => {
-			let { enableSorting: t, dispatch: n } = m();
-			t && n(e.clearSort());
+			let { enableSorting: e, dispatch: t } = m();
+			e && t(o.clearSort());
 		},
-		handleSortManagerMove: (t, n) => {
-			let { enableSorting: i, sort: a, dispatch: o } = m();
-			i && o(e.setSort(r(a, t, n)));
+		handleSortManagerMove: (e, n) => {
+			let { enableSorting: r, sort: i, dispatch: a } = m();
+			r && a(o.setSort(t(i, e, n)));
 		},
-		handleColumnResizePointerDown: (t, n) => {
-			n.preventDefault(), n.stopPropagation();
-			let { columnWidths: r, dispatch: i, runAutosize: a } = m(), o = n.timeStamp, s = p;
-			if (s && s.key === t.key && o - s.time < l && Math.abs(n.clientX - s.x) < u) {
-				p = null, a([t]);
+		handleColumnResizePointerDown: (e, t) => {
+			t.preventDefault(), t.stopPropagation();
+			let { columnWidths: n, dispatch: r, runAutosize: i } = m(), a = t.timeStamp, s = p;
+			if (s && s.key === e.key && a - s.time < l && Math.abs(t.clientX - s.x) < u) {
+				p = null, i([e]);
 				return;
 			}
 			p = {
-				key: t.key,
-				time: o,
-				x: n.clientX
-			}, i(e.startColumnResize(t.key, n.clientX, r[t.key] ?? t.width, t.minWidth ?? 60, t.maxWidth));
+				key: e.key,
+				time: a,
+				x: t.clientX
+			}, r(o.startColumnResize(e.key, t.clientX, n[e.key] ?? e.width, e.minWidth ?? 60, e.maxWidth));
 		},
 		getInitialColumnState: () => f
 	};

package/dist/engine/filterPopoverCommands.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../model/gridActions.cjs"),t=require("../logic/filtering.cjs"),n=require("../logic/numberFilterCondition.cjs"),r=require("../logic/textFilterCondition.cjs"),i=require("../logic/dateFilterCondition.cjs"),a=require("./memo.cjs"),o=require("../logic/setFilterSelection.cjs"),s=require("../logic/dateFilterTree.cjs");var c=(e,t)=>{let n=new Set(e);return n.add(t),n},l=(e,t)=>{let n=new Set(e);return n.delete(t),n},u=(e,t)=>{let n=new Set(e);for(let e of t)n.add(e);return n},d=(e,t)=>{let n=new Set(e);for(let e of t)n.delete(e);return n},f=()=>{let e=a.createMemo((e,t)=>e?s.normalizeDateSetOptions(t):t),n=a.createMemo((e,t,n)=>e?new Set(t.map(e=>e.value)):n),r=a.createMemo(e=>{let n=t.isSetColumnFilterValue(e)?e:t.isNumberSetColumnFilterValue(e)||t.isTextSetColumnFilterValue(e)||t.isDateSetColumnFilterValue(e)?e.set:null;return n?{mode:n.mode===`exclude`?`exclude`:`include`,values:new Set(n.values)}:null});return t=>{let{openedFilterColumn:i,openedFilterType:a,openedFilterSelectOptions:o,openedFilterAllValues:s,columnFilters:c}=t,l=a===`dateSet`,u=e(l,o),d=n(l,u,s),f=i?c[i.key]:void 0;return{isDateSetFilterColumn:l,openedPopoverSelectOptions:u,openedPopoverAllValues:d,openedSetFilterValue:f,openedSetSelection:r(f),openedColumnCanInvert:!(i?.filterOptions&&i.filterOptions.length>0),isComboFilterColumn:a===`numberSet`||a===`textSet`||a===`dateSet`}}},p=()=>{let a=null,s=()=>{if(a===null)throw Error(`[SpreadsheetGrid] filterPopoverCommands は update 前に呼べません。`);return a},f=(e,n)=>{let{openedFilterColumn:r,openedFilterType:i,columnFilters:a}=s(),o=r?.key===e?i:void 0,c=a[e];if(o===`numberSet`){let e=t.isNumberSetColumnFilterValue(c)?c.condition:null;return!e&&!n?null:{kind:`numberSet`,condition:e,set:n}}if(o===`textSet`){let e=t.isTextSetColumnFilterValue(c)?c.condition:null;return!e&&!n?null:{kind:`textSet`,condition:e,set:n}}if(o===`dateSet`){let e=t.isDateSetColumnFilterValue(c)?c.condition:null;return!e&&!n?null:{kind:`dateSet`,condition:e,set:n}}return null},p=(t,n,r)=>{let{openedFilterColumn:i,derived:a,dispatch:o}=s(),c=i?.key===t&&a.isComboFilterColumn,l=n.mode===`include`?n.values.size:r-n.values.size;if(l>=r){if(c){let n=f(t,null);if(n){o(e.gridActions.setColumnFilter(t,n));return}}o(e.gridActions.clearColumnFilter(t));return}let u=l<=0?{mode:`include`,values:[]}:{mode:n.mode,values:Array.from(n.values)};if(c){let n=f(t,u);if(n){o(e.gridActions.setColumnFilter(t,n));return}}let d={kind:`set`,...u};o(e.gridActions.setColumnFilter(t,d))},m=e=>{let{filterPopoverState:t,derived:n}=s();if(!t)return;let{openedPopoverSelectOptions:r,openedSetSelection:i,openedColumnCanInvert:a,openedPopoverAllValues:u}=n,d=r.length,f;f=o.isSetValueSelected(i,e)?i===null?a?{mode:`exclude`,values:new Set([e])}:{mode:`include`,values:l(u,e)}:i.mode===`include`?{mode:`include`,values:l(i.values,e)}:{mode:`exclude`,values:c(i.values,e)}:i.mode===`include`?{mode:`include`,values:c(i.values,e)}:{mode:`exclude`,values:l(i.values,e)},p(t.columnKey,f,d)},h=(e,t)=>{let{filterPopoverState:n,derived:r}=s();if(!n)return;let i=n.columnKey,{openedPopoverSelectOptions:a,openedSetSelection:o,openedColumnCanInvert:c,openedPopoverAllValues:l}=r,f=a.length;if(e===`all`){p(i,t?{mode:`exclude`,values:new Set}:{mode:`include`,values:new Set},f);return}let m;if(t){if(o===null){p(i,{mode:`exclude`,values:new Set},f);return}m=o.mode===`include`?{mode:`include`,values:u(o.values,e)}:{mode:`exclude`,values:d(o.values,e)}}else m=o===null?c?{mode:`exclude`,values:new Set(e)}:{mode:`include`,values:d(l,e)}:o.mode===`include`?{mode:`include`,values:d(o.values,e)}:{mode:`exclude`,values:u(o.values,e)};p(i,m,f)},g=e=>{let{filterPopoverState:t,derived:n}=s();t&&p(t.columnKey,{mode:`include`,values:new Set(e)},n.openedPopoverSelectOptions.length)},_=()=>{let{filterPopoverState:t,openedFilterType:a,dispatch:o,updateNumberDraft:c,updateTextDraft:l,updateDateDraft:u}=s();t&&(o(e.gridActions.clearColumnFilter(t.columnKey)),a===`numberSet`&&c(n.DEFAULT_NUMBER_FILTER_DRAFT),a===`textSet`&&l(r.DEFAULT_TEXT_FILTER_DRAFT),a===`dateSet`&&u(i.DEFAULT_DATE_FILTER_DRAFT))},v=e=>{let n=s().columnFilters[e];return t.isNumberSetColumnFilterValue(n)||t.isTextSetColumnFilterValue(n)||t.isDateSetColumnFilterValue(n)?n.set:t.isSetColumnFilterValue(n)?{mode:n.mode,values:n.values}:null},y=(t,n)=>{let{filterPopoverState:r,columnFilters:i,dispatch:a}=s();if(!r)return;let o=r.columnKey,c=v(o);if(!t&&!c){i[o]&&a(e.gridActions.clearColumnFilter(o));return}a(e.gridActions.setColumnFilter(o,n(c)))},b=e=>{let{updateNumberDraft:t,openedFilterType:r}=s();if(t(e),r!==`numberSet`)return;let i=n.buildParsedNumberFilterFromDraft(e);y(i!==null,e=>({kind:`numberSet`,condition:i,set:e}))},x=e=>{let{updateTextDraft:t,openedFilterType:n}=s();if(t(e),n!==`textSet`)return;let i=r.buildParsedTextFilterFromDraft(e);y(i!==null,e=>({kind:`textSet`,condition:i,set:e}))},S=e=>{let{updateDateDraft:t,openedFilterType:n}=s();if(t(e),n!==`dateSet`)return;let r=i.buildParsedDateFilterFromDraft(e);y(r!==null,e=>({kind:`dateSet`,condition:r,set:e}))};return{update:e=>{a=e},handleSetFilterValueToggle:m,handleSetFilterSelectAllChange:h,handleSetFilterReplaceSelection:g,clearSetFilterPopoverValue:_,handleNumberConditionDraftChange:b,handleTextConditionDraftChange:x,handleDateConditionDraftChange:S,handleComboConditionClear:()=>{let{openedFilterType:e}=s();if(e===`textSet`){x(r.DEFAULT_TEXT_FILTER_DRAFT);return}if(e===`dateSet`){S(i.DEFAULT_DATE_FILTER_DRAFT);return}b(n.DEFAULT_NUMBER_FILTER_DRAFT)},handleComboSelectionClear:()=>{let{filterPopoverState:t,dispatch:n}=s();if(!t)return;let r=t.columnKey,i=f(r,null);if(i){n(e.gridActions.setColumnFilter(r,i));return}n(e.gridActions.clearColumnFilter(r))},applyFilterPopoverValue:()=>{let{filterPopoverState:t,openedFilterType:r,dispatch:i,closeColumnFilterPopover:a}=s();if(!t)return;let o=r??`text`;if(o===`set`||o===`numberSet`||o===`textSet`||o===`dateSet`){a();return}if(o===`number`){let r=t.numberDraft?n.buildNumberColumnFilterValueFromDraft(t.numberDraft):null;if(!r){i(e.gridActions.clearColumnFilter(t.columnKey)),a();return}i(e.gridActions.setColumnFilter(t.columnKey,r)),a();return}let c=o===`select`?t.draftValue:t.draftValue.trim();if(!c){i(e.gridActions.clearColumnFilter(t.columnKey)),a();return}let l=o===`select`?{kind:`select`,value:c}:o===`date`?{kind:`date`,value:c}:o===`custom`?{kind:`custom`,value:c}:{kind:`text`,value:c};i(e.gridActions.setColumnFilter(t.columnKey,l)),a()},clearFilterPopoverValue:()=>{let{filterPopoverState:t,dispatch:n,closeColumnFilterPopover:r}=s();t&&(n(e.gridActions.clearColumnFilter(t.columnKey)),r())}}};exports.createFilterPopoverCommands=p,exports.createFilterPopoverDerivedResolver=f;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../model/gridActions.cjs"),t=require("../logic/filtering.cjs"),n=require("../logic/numberFilterCondition.cjs"),r=require("../logic/textFilterCondition.cjs"),i=require("../logic/dateFilterCondition.cjs"),a=require("./memo.cjs"),o=require("../logic/setFilterSelection.cjs"),s=require("../logic/dateFilterTree.cjs");var c=(e,t)=>{let n=new Set(e);return n.add(t),n},l=(e,t)=>{let n=new Set(e);return n.delete(t),n},u=(e,t)=>{let n=new Set(e);for(let e of t)n.add(e);return n},d=(e,t)=>{let n=new Set(e);for(let e of t)n.delete(e);return n},f=()=>{let e=a.createMemo((e,t)=>e?s.normalizeDateSetOptions(t):t),n=a.createMemo((e,t,n)=>e?new Set(t.map(e=>e.value)):n),r=a.createMemo(e=>{let n=t.isSetColumnFilterValue(e)?e:t.isNumberSetColumnFilterValue(e)||t.isTextSetColumnFilterValue(e)||t.isDateSetColumnFilterValue(e)?e.set:null;return n?{mode:n.mode===`exclude`?`exclude`:`include`,values:new Set(n.values)}:null});return t=>{let{openedFilterColumn:i,openedFilterType:a,openedFilterSelectOptions:o,openedFilterAllValues:s,columnFilters:c}=t,l=a===`dateSet`,u=e(l,o),d=n(l,u,s),f=i?c[i.key]:void 0;return{isDateSetFilterColumn:l,openedPopoverSelectOptions:u,openedPopoverAllValues:d,openedSetFilterValue:f,openedSetSelection:r(f),openedColumnCanInvert:!(i?.filterOptions&&i.filterOptions.length>0),isComboFilterColumn:a===`numberSet`||a===`textSet`||a===`dateSet`}}},p=()=>{let a=null,s=()=>{if(a===null)throw Error(`[SpreadsheetGrid] filterPopoverCommands は update 前に呼べません。`);return a},f=(e,n)=>{let{openedFilterColumn:r,openedFilterType:i,columnFilters:a}=s(),o=r?.key===e?i:void 0,c=a[e];if(o===`numberSet`){let e=t.isNumberSetColumnFilterValue(c)?c.condition:null;return!e&&!n?null:{kind:`numberSet`,condition:e,set:n}}if(o===`textSet`){let e=t.isTextSetColumnFilterValue(c)?c.condition:null;return!e&&!n?null:{kind:`textSet`,condition:e,set:n}}if(o===`dateSet`){let e=t.isDateSetColumnFilterValue(c)?c.condition:null;return!e&&!n?null:{kind:`dateSet`,condition:e,set:n}}return null},p=(t,n,r)=>{let{openedFilterColumn:i,derived:a,dispatch:o}=s(),c=i?.key===t&&a.isComboFilterColumn,l=n.mode===`include`?n.values.size:r-n.values.size;if(l>=r){if(c){let n=f(t,null);if(n){o(e.gridActions.setColumnFilter(t,n));return}}o(e.gridActions.clearColumnFilter(t));return}let u=l<=0?{mode:`include`,values:[]}:{mode:n.mode,values:Array.from(n.values)};if(c){let n=f(t,u);if(n){o(e.gridActions.setColumnFilter(t,n));return}}let d={kind:`set`,...u};o(e.gridActions.setColumnFilter(t,d))},m=e=>{let{filterPopoverState:t,derived:n}=s();if(!t)return;let{openedPopoverSelectOptions:r,openedSetSelection:i,openedColumnCanInvert:a,openedPopoverAllValues:u}=n,d=r.length,f;f=o.isSetValueSelected(i,e)?i===null?a?{mode:`exclude`,values:new Set([e])}:{mode:`include`,values:l(u,e)}:i.mode===`include`?{mode:`include`,values:l(i.values,e)}:{mode:`exclude`,values:c(i.values,e)}:i.mode===`include`?{mode:`include`,values:c(i.values,e)}:{mode:`exclude`,values:l(i.values,e)},p(t.columnKey,f,d)},h=(e,t)=>{let{filterPopoverState:n,derived:r}=s();if(!n)return;let i=n.columnKey,{openedPopoverSelectOptions:a,openedSetSelection:o,openedColumnCanInvert:c,openedPopoverAllValues:l}=r,f=a.length;if(e===`all`){p(i,t?{mode:`exclude`,values:new Set}:{mode:`include`,values:new Set},f);return}let m;if(t){if(o===null){p(i,{mode:`exclude`,values:new Set},f);return}m=o.mode===`include`?{mode:`include`,values:u(o.values,e)}:{mode:`exclude`,values:d(o.values,e)}}else m=o===null?c?{mode:`exclude`,values:new Set(e)}:{mode:`include`,values:d(l,e)}:o.mode===`include`?{mode:`include`,values:d(o.values,e)}:{mode:`exclude`,values:u(o.values,e)};p(i,m,f)},g=e=>{let{filterPopoverState:t,derived:n}=s();t&&p(t.columnKey,{mode:`include`,values:new Set(e)},n.openedPopoverSelectOptions.length)},_=()=>{let{filterPopoverState:t,openedFilterType:a,dispatch:o,updateNumberDraft:c,updateTextDraft:l,updateDateDraft:u}=s();t&&(o(e.gridActions.clearColumnFilter(t.columnKey)),a===`numberSet`&&c(n.DEFAULT_NUMBER_FILTER_DRAFT),a===`textSet`&&l(r.DEFAULT_TEXT_FILTER_DRAFT),a===`dateSet`&&u(i.DEFAULT_DATE_FILTER_DRAFT))},v=e=>{let n=s().columnFilters[e];return t.isNumberSetColumnFilterValue(n)||t.isTextSetColumnFilterValue(n)||t.isDateSetColumnFilterValue(n)?n.set:t.isSetColumnFilterValue(n)?{mode:n.mode,values:n.values}:null},y=(t,n)=>{let{filterPopoverState:r,columnFilters:i,dispatch:a}=s();if(!r)return;let o=r.columnKey,c=v(o);if(!t&&!c){i[o]&&a(e.gridActions.clearColumnFilter(o));return}a(e.gridActions.setColumnFilter(o,n(c)))},b=(e,t)=>{let{updateNumberDraft:r,openedFilterType:i}=s();if(r(e),i!==`numberSet`||t?.commit===!1)return;let a=n.buildParsedNumberFilterFromDraft(e);y(a!==null,e=>({kind:`numberSet`,condition:a,set:e}))},x=(e,t)=>{let{updateTextDraft:n,openedFilterType:i}=s();if(n(e),i!==`textSet`||t?.commit===!1)return;let a=r.buildParsedTextFilterFromDraft(e);y(a!==null,e=>({kind:`textSet`,condition:a,set:e}))},S=e=>{let{updateDateDraft:t,openedFilterType:n}=s();if(t(e),n!==`dateSet`)return;let r=i.buildParsedDateFilterFromDraft(e);y(r!==null,e=>({kind:`dateSet`,condition:r,set:e}))};return{update:e=>{a=e},handleSetFilterValueToggle:m,handleSetFilterSelectAllChange:h,handleSetFilterReplaceSelection:g,clearSetFilterPopoverValue:_,handleNumberConditionDraftChange:b,handleTextConditionDraftChange:x,handleDateConditionDraftChange:S,handleComboConditionClear:()=>{let{openedFilterType:e}=s();if(e===`textSet`){x(r.DEFAULT_TEXT_FILTER_DRAFT);return}if(e===`dateSet`){S(i.DEFAULT_DATE_FILTER_DRAFT);return}b(n.DEFAULT_NUMBER_FILTER_DRAFT)},handleComboSelectionClear:()=>{let{filterPopoverState:t,dispatch:n}=s();if(!t)return;let r=t.columnKey,i=f(r,null);if(i){n(e.gridActions.setColumnFilter(r,i));return}n(e.gridActions.clearColumnFilter(r))},applyFilterPopoverValue:()=>{let{filterPopoverState:t,openedFilterType:r,dispatch:i,closeColumnFilterPopover:a}=s();if(!t)return;let o=r??`text`;if(o===`set`||o===`numberSet`||o===`textSet`||o===`dateSet`){a();return}if(o===`number`){let r=t.numberDraft?n.buildNumberColumnFilterValueFromDraft(t.numberDraft):null;if(!r){i(e.gridActions.clearColumnFilter(t.columnKey)),a();return}i(e.gridActions.setColumnFilter(t.columnKey,r)),a();return}let c=o===`select`?t.draftValue:t.draftValue.trim();if(!c){i(e.gridActions.clearColumnFilter(t.columnKey)),a();return}let l=o===`select`?{kind:`select`,value:c}:o===`date`?{kind:`date`,value:c}:o===`custom`?{kind:`custom`,value:c}:{kind:`text`,value:c};i(e.gridActions.setColumnFilter(t.columnKey,l)),a()},clearFilterPopoverValue:()=>{let{filterPopoverState:t,dispatch:n,closeColumnFilterPopover:r}=s();t&&(n(e.gridActions.clearColumnFilter(t.columnKey)),r())}}};exports.createFilterPopoverCommands=p,exports.createFilterPopoverDerivedResolver=f;

package/dist/engine/filterPopoverCommands.d.ts

@@ -27,6 +27,9 @@ export type FilterPopoverStateLike = {
     draftValue: string;
     numberDraft: NumberFilterConditionDraft | null;
 };
+export type ConditionDraftChangeOptions = {
+    commit?: boolean;
+};
 export type FilterPopoverCommandsArgs<T> = {
     filterPopoverState: FilterPopoverStateLike | null;
     openedFilterColumn: GridColumn<T> | null;
@@ -45,8 +48,8 @@ export type FilterPopoverCommands<T> = {
     handleSetFilterSelectAllChange: (scope: 'all' | string[], nextChecked: boolean) => void;
     handleSetFilterReplaceSelection: (values: string[]) => void;
     clearSetFilterPopoverValue: () => void;
-    handleNumberConditionDraftChange: (draft: NumberFilterConditionDraft) => void;
-    handleTextConditionDraftChange: (draft: TextFilterConditionDraft) => void;
+    handleNumberConditionDraftChange: (draft: NumberFilterConditionDraft, options?: ConditionDraftChangeOptions) => void;
+    handleTextConditionDraftChange: (draft: TextFilterConditionDraft, options?: ConditionDraftChangeOptions) => void;
     handleDateConditionDraftChange: (draft: DateFilterConditionDraft) => void;
     handleComboConditionClear: () => void;
     handleComboSelectionClear: () => void;