@planningcenter/tapestry 4.12.0 → 4.13.0

package/dist/components/DataTable/TableActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableActions.js","sources":["../../../src/components/DataTable/TableActions.tsx"],"sourcesContent":["import { IconButton } from \"@components/button\"\nimport { ButtonGroup } from \"@components/button-group\"\nimport React, { type ReactNode } from \"react\"\n\nimport { formatCount, resolveNoun, type ResultNoun } from \"./ResultsCount\"\nimport {\n  type DataTableSelection,\n  useDataTableSelectionContext,\n} from \"./useDataTableSelection\"\n\n/**\n * A table action rendered as an `IconButton` in the button group above the\n * table. Replaces the original RFC's `{ buttonProps; callback }` shape with a\n * narrower, more controllable API so the design can evolve without exposing the\n * full button surface.\n */\nexport type TableAction<\n  SelectionValue extends DataTableSelection = (number | string)[],\n> = {\n  /** Called with the current selection when the action is triggered. */\n  callback?: (selection: SelectionValue) => void\n  /** Whether the action's button is disabled. */\n  disabled?: boolean\n  /** The icon rendered inside the action's icon button. */\n  icon: ReactNode\n  /** Accessible label for the icon-only action button. */\n  label: string\n  /** Standard click handler, invoked with the click event before `callback`. */\n  onClick?: React.MouseEventHandler<HTMLButtonElement>\n}\n\nexport interface TableActionsProps {\n  /** The table actions to render as an `IconButton` group. */\n  actions: TableAction<DataTableSelection>[]\n  /**\n   * The noun used to describe the selection in each action's `aria-label`.\n   * See {@link ResultNoun}.\n   */\n  resultNoun?: ResultNoun\n}\n\n/**\n * Renders the table actions as an `IconButton` group displayed directly after\n * the results count, above the table. Each entry becomes an icon button whose\n * `callback` receives the current selection.\n */\nexport const TableActions = ({ actions, resultNoun }: TableActionsProps) => {\n  const { selectedCount, selection } = useDataTableSelectionContext()\n  // The count/noun suffix is the same for every table action, so compute it once\n  // here rather than per-button inside the map below.\n  const countSuffix = getTableActionCountSuffix(selectedCount, resultNoun)\n\n  return (\n    <ButtonGroup aria-label=\"Table actions\">\n      {actions.map(({ callback, disabled, icon, label, onClick }) => (\n        <IconButton\n          key={label}\n          aria-label={`${label}${countSuffix}`}\n          disabled={disabled}\n          icon={icon}\n          onClick={(event) => {\n            onClick?.(event)\n            callback?.(selection)\n          }}\n          tooltip={label}\n          tooltipPlacement=\"bottom\"\n        />\n      ))}\n    </ButtonGroup>\n  )\n}\n\nTableActions.displayName = \"TableActions\"\n\n/**\n * The count/noun suffix appended to each table action's `aria-label` when rows\n * are selected, e.g. `\" (2 selected people)\"` — so `\"Email\"` reads as\n * `\"Email (2 selected people)\"`. Empty when nothing is selected. Falls back to\n * the default `\"result\"` noun when `resultNoun` isn't provided. Shared across\n * every action, so it's computed once rather than per-button.\n */\nfunction getTableActionCountSuffix(\n  count: number,\n  resultNoun: ResultNoun | undefined\n): string {\n  if (!count) return \"\"\n  // An absent or `true` noun both default to `\"result\"`/`\"results\"`.\n  const noun = resolveNoun(count, resultNoun || true)\n  return ` (${formatCount(count)} selected ${noun})`\n}\n"],"names":["React"],"mappings":";;;;;;;;;;;;AAyCA;;;;AAIG;AACI,MAAM,YAAY,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,EAAqB,KAAI;IACzE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,4BAA4B,EAAE;;;IAGnE,MAAM,WAAW,GAAG,yBAAyB,CAAC,aAAa,EAAE,UAAU,CAAC;IAExE,QACEA,cAAA,CAAA,aAAA,CAAC,WAAW,EAAA,EAAA,YAAA,EAAY,eAAe,IACpC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MACxDA,6BAAC,UAAU,EAAA,EACT,GAAG,EAAE,KAAK,EAAA,YAAA,EACE,GAAG,KAAK,CAAA,EAAG,WAAW,CAAA,CAAE,EACpC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,KAAI;AACjB,YAAA,OAAO,GAAG,KAAK,CAAC;AAChB,YAAA,QAAQ,GAAG,SAAS,CAAC;AACvB,QAAA,CAAC,EACD,OAAO,EAAE,KAAK,EACd,gBAAgB,EAAC,QAAQ,EAAA,CACzB,CACH,CAAC,CACU;AAElB;AAEA,YAAY,CAAC,WAAW,GAAG,cAAc;AAEzC;;;;;;AAMG;AACH,SAAS,yBAAyB,CAChC,KAAa,EACb,UAAkC,EAAA;AAElC,IAAA,IAAI,CAAC,KAAK;AAAE,QAAA,OAAO,EAAE;;IAErB,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC;IACnD,OAAO,CAAA,EAAA,EAAK,WAAW,CAAC,KAAK,CAAC,CAAA,UAAA,EAAa,IAAI,GAAG;AACpD;;;;"}
+{"version":3,"file":"TableActions.js","sources":["../../../src/components/DataTable/TableActions.tsx"],"sourcesContent":["import { IconButton } from \"@components/button\"\nimport { ButtonGroup } from \"@components/button-group\"\nimport React, { type ReactNode } from \"react\"\n\nimport { formatCount, resolveNoun, type ResultNoun } from \"./ResultsCount\"\nimport {\n  type DataTableSelection,\n  useDataTableSelectionContext,\n} from \"./useDataTableSelection\"\n\n/**\n * A table action rendered as an `IconButton` in the button group above the\n * table. Replaces the original RFC's `{ buttonProps; callback }` shape with a\n * narrower, more controllable API so the design can evolve without exposing the\n * full button surface.\n */\nexport type TableAction<\n  SelectionValue extends DataTableSelection = (number | string)[],\n> = {\n  /** Called with the current selection when the action is triggered. */\n  callback?: (selection: SelectionValue) => void\n  /** Whether the action's button is disabled. */\n  disabled?: boolean\n  /** The icon rendered inside the action's icon button. */\n  icon: ReactNode\n  /** Accessible label for the icon-only action button. */\n  label: string\n  /** Standard click handler, invoked with the click event before `callback`. */\n  onClick?: React.MouseEventHandler<HTMLButtonElement>\n}\n\nexport interface TableActionsProps {\n  /** The table actions to render as an `IconButton` group. */\n  actions: TableAction<DataTableSelection>[]\n  /**\n   * The noun used to describe the selection in the group's `aria-label`.\n   * See {@link ResultNoun}.\n   */\n  resultNoun?: ResultNoun\n}\n\n/**\n * Renders the table actions as an `IconButton` group displayed directly after\n * the results count, above the table. Each entry becomes an icon button whose\n * `callback` receives the current selection. The group's label carries the\n * selected count, so screen readers announce it once on entering the group\n * rather than on every button.\n */\nexport const TableActions = ({ actions, resultNoun }: TableActionsProps) => {\n  const { selectedCount, selection } = useDataTableSelectionContext()\n\n  return (\n    <ButtonGroup\n      aria-label={getTableActionsGroupLabel(selectedCount, resultNoun)}\n    >\n      {actions.map(({ callback, disabled, icon, label, onClick }) => (\n        <IconButton\n          key={label}\n          aria-label={label}\n          disabled={disabled}\n          icon={icon}\n          onClick={(event) => {\n            onClick?.(event)\n            callback?.(selection)\n          }}\n          tooltip={label}\n          tooltipPlacement=\"bottom\"\n        />\n      ))}\n    </ButtonGroup>\n  )\n}\n\nTableActions.displayName = \"TableActions\"\n\n/**\n * The table actions group's `aria-label`, e.g. `\"Actions for 2 selected\n * people\"` when rows are selected, or `\"Table actions\"` when nothing is\n * selected. Falls back to the default `\"result\"` noun when `resultNoun` isn't\n * provided.\n */\nfunction getTableActionsGroupLabel(\n  count: number,\n  resultNoun: ResultNoun | undefined\n): string {\n  if (!count) return \"Table actions\"\n  const noun = resolveNoun(count, resultNoun || true)\n  return `Actions for ${formatCount(count)} selected ${noun}`\n}\n"],"names":["React"],"mappings":";;;;;;;;;;;;AAyCA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,EAAqB,KAAI;IACzE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,4BAA4B,EAAE;IAEnE,QACEA,cAAA,CAAA,aAAA,CAAC,WAAW,EAAA,EAAA,YAAA,EACE,yBAAyB,CAAC,aAAa,EAAE,UAAU,CAAC,EAAA,EAE/D,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MACxDA,cAAA,CAAA,aAAA,CAAC,UAAU,IACT,GAAG,EAAE,KAAK,EAAA,YAAA,EACE,KAAK,EACjB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,KAAI;AACjB,YAAA,OAAO,GAAG,KAAK,CAAC;AAChB,YAAA,QAAQ,GAAG,SAAS,CAAC;AACvB,QAAA,CAAC,EACD,OAAO,EAAE,KAAK,EACd,gBAAgB,EAAC,QAAQ,EAAA,CACzB,CACH,CAAC,CACU;AAElB;AAEA,YAAY,CAAC,WAAW,GAAG,cAAc;AAEzC;;;;;AAKG;AACH,SAAS,yBAAyB,CAChC,KAAa,EACb,UAAkC,EAAA;AAElC,IAAA,IAAI,CAAC,KAAK;AAAE,QAAA,OAAO,eAAe;IAClC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC;IACnD,OAAO,CAAA,YAAA,EAAe,WAAW,CAAC,KAAK,CAAC,CAAA,UAAA,EAAa,IAAI,EAAE;AAC7D;;;;"}

package/dist/components/DataTable/index.d.ts

@@ -14,4 +14,6 @@ export type { PresenceActiveFilter, PresenceFilterConfig, PresenceFilterValue, P
 export type { SavedView, StaticView } from "./savedViews";
 export type { ScopedFilterConfig, ScopedFilterOptions } from "./scopedFilter";
 export type { TextActiveFilter, TextFilterValue, TextOperatorName, } from "./textFilter";
+export type { ApiClient, UseSavedViewsClientOptions, } from "./useSavedViewsClient";
+export { useSavedViewsClient } from "./useSavedViewsClient";
 //# sourceMappingURL=index.d.ts.map

package/dist/components/DataTable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,eAAe,CAAA;AAEtB,YAAY,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACtE,YAAY,EACV,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;AAC3B,YAAY,EACV,qBAAqB,EACrB,qBAAqB,EACrB,cAAc,EACd,kBAAkB,EAClB,IAAI,GACL,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,YAAY,EACV,aAAa,EACb,cAAc,EACd,YAAY,EACZ,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,UAAU,EACV,YAAY,EACZ,YAAY,GACb,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,cAAc,CAAA;AACrB,YAAY,EACV,eAAe,EACf,cAAc,EACd,eAAe,GAChB,MAAM,aAAa,CAAA;AACpB,cAAc,WAAW,CAAA;AACzB,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,UAAU,EACV,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,gBAAgB,CAAA;AACvB,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzD,YAAY,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAC7E,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,eAAe,CAAA;AAEtB,YAAY,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACtE,YAAY,EACV,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;AAC3B,YAAY,EACV,qBAAqB,EACrB,qBAAqB,EACrB,cAAc,EACd,kBAAkB,EAClB,IAAI,GACL,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,YAAY,EACV,aAAa,EACb,cAAc,EACd,YAAY,EACZ,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,UAAU,EACV,YAAY,EACZ,YAAY,GACb,MAAM,mBAAmB,CAAA;AAC1B,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,cAAc,CAAA;AACrB,YAAY,EACV,eAAe,EACf,cAAc,EACd,eAAe,GAChB,MAAM,aAAa,CAAA;AACpB,cAAc,WAAW,CAAA;AACzB,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,UAAU,EACV,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,gBAAgB,CAAA;AACvB,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzD,YAAY,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAC7E,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,cAAc,CAAA;AACrB,YAAY,EACV,SAAS,EACT,0BAA0B,GAC3B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA"}

package/dist/components/DataTable/saveErrorMessage.d.ts

@@ -0,0 +1,3 @@
+/** The rejection's message, else a generic one. */
+export declare function saveErrorMessage(error: unknown): string;
+//# sourceMappingURL=saveErrorMessage.d.ts.map

package/dist/components/DataTable/saveErrorMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"saveErrorMessage.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/saveErrorMessage.ts"],"names":[],"mappings":"AAEA,mDAAmD;AACnD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,UAG9C"}

package/dist/components/DataTable/saveErrorMessage.js

@@ -0,0 +1,9 @@
+const DEFAULT_MESSAGE = "Your change couldn't be saved. Try again.";
+/** The rejection's message, else a generic one. */
+function saveErrorMessage(error) {
+    const message = error?.message;
+    return typeof message === "string" && message ? message : DEFAULT_MESSAGE;
+}
+
+export { saveErrorMessage };
+//# sourceMappingURL=saveErrorMessage.js.map

package/dist/components/DataTable/saveErrorMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"saveErrorMessage.js","sources":["../../../src/components/DataTable/saveErrorMessage.ts"],"sourcesContent":["const DEFAULT_MESSAGE = \"Your change couldn't be saved. Try again.\"\n\n/** The rejection's message, else a generic one. */\nexport function saveErrorMessage(error: unknown) {\n  const message = (error as { message?: unknown } | null)?.message\n  return typeof message === \"string\" && message ? message : DEFAULT_MESSAGE\n}\n"],"names":[],"mappings":"AAAA,MAAM,eAAe,GAAG,2CAA2C;AAEnE;AACM,SAAU,gBAAgB,CAAC,KAAc,EAAA;AAC7C,IAAA,MAAM,OAAO,GAAI,KAAsC,EAAE,OAAO;AAChE,IAAA,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,GAAG,OAAO,GAAG,eAAe;AAC3E;;;;"}

package/dist/components/DataTable/savedViews.d.ts

@@ -1,6 +1,7 @@
 import type { Sort } from "./DataTable";
 import type { ActiveFilter } from "./FilterTypes";
 export interface SavedView {
+    /** A search (`q`) filter is ignored; applying a view keeps the search. */
     activeFilters: ActiveFilter[];
     /** Omit to leave the current column visibility unchanged when applied. */
     hiddenColumnNames?: string[];
@@ -9,11 +10,6 @@ export interface SavedView {
     name: string;
     /** Omit to leave the current sort unchanged when applied. */
     sort?: Sort;
-    /**
-     * The view's position, as a fractional index. Views without one are listed
-     * after those with one.
-     */
-    sortKey?: string;
 }
 /** An app-provided view. Read-only. */
 export type StaticView = SavedView & {
@@ -25,36 +21,25 @@ export type StaticView = SavedView & {
  */
 export declare const initialView: StaticView;
 /**
- * Views by `sortKey`, then views without one, each in array order. Compares
- * by code unit rather than locale, since keys mix upper and lower case.
+ * A view from the app, without any search. Search isn't part of a view, so
+ * views enter the table without it. A view without one is returned as is.
  */
-export declare function sortSavedViews(savedViews: SavedView[]): SavedView[];
+export declare function withoutSearch<View extends SavedView>(view: View): View;
 /**
- * A `sortKey` after every view's, for a view added at the end. Undefined
- * while any view has no key, since those are listed last, so a view added
- * without one stays at the end.
+ * A duplicate of a view under a new name. It's a new view, so it doesn't keep
+ * the original's id.
  */
-export declare function sortKeyAfter(savedViews: SavedView[]): string | undefined;
+export declare function savedViewDuplicate({ id: _id, ...view }: SavedView, name: string): Omit<SavedView, "id">;
 /**
- * The views to update so the view at `from` is dropped before or after the
- * view at `target`, both positions in the order. Usually just the dropped
- * view, with a key between its new neighbors'. Dropping among views without
- * a key also gives a key to those before it, since they come after every
- * view with one.
+ * Whether a view can be renamed, deleted, or saved over. Static views can't,
+ * and neither can a view that isn't saved yet, since updates are matched by id.
  */
-export declare function savedViewUpdatesForReorder(savedViews: SavedView[], from: number, target: number, dropPosition: "after" | "before"): SavedView[];
-interface SavedViewState {
-    activeFilters: ActiveFilter[];
-    hiddenColumnNames: string[];
-    sort: Sort | undefined;
-}
+export declare function isSavedViewEditable(view: SavedView, savedViews: SavedView[]): boolean;
 /**
- * The most specific view matching the current state, or undefined. Only
- * picks the initially selected view. Filters match regardless of order,
- * ignoring display-only labels. A view's `sort` and `hiddenColumnNames` are
- * only compared when the view sets them, so a view that sets more of them is
- * more specific. Among equally specific matches, the first wins.
+ * Whether the table's filters, sort, or hidden columns differ from a view.
+ * Filters match by name, operator, scope, and value, in any order; labels are
+ * display-only. Sort and hidden columns count only when both the view and the
+ * table have them.
  */
-export declare function findActiveSavedView(savedViews: SavedView[], state: SavedViewState): SavedView | undefined;
-export {};
+export declare function isSavedViewModified(view: SavedView, { activeFilters, hiddenColumnNames, sort }: Omit<SavedView, "id" | "name">): boolean;
 //# sourceMappingURL=savedViews.d.ts.map

package/dist/components/DataTable/savedViews.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"savedViews.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/savedViews.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,MAAM,WAAW,SAAS;IACxB,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,6DAA6D;IAC7D,IAAI,CAAC,EAAE,IAAI,CAAA;IACX;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,uCAAuC;AACvC,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAE5D;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,UAIzB,CAAA;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAOnE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,SAAS,CAOxE;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,SAAS,EAAE,EACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,GAAG,QAAQ,GAC/B,SAAS,EAAE,CAmBb;AAED,UAAU,cAAc;IACtB,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAA;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,SAAS,EAAE,EACvB,KAAK,EAAE,cAAc,GACpB,SAAS,GAAG,SAAS,CAYvB"}
+{"version":3,"file":"savedViews.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/savedViews.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAGjD,MAAM,WAAW,SAAS;IACxB,0EAA0E;IAC1E,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,6DAA6D;IAC7D,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED,uCAAuC;AACvC,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAA;AAE5D;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,UAIzB,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,SAAS,SAAS,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAQtE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,SAAS,EAC/B,IAAI,EAAE,MAAM,GACX,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAEvB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,WAE3E;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,SAAS,EACf,EAAE,aAAa,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,CAAC,WAoB3E"}

package/dist/components/DataTable/savedViews.js

@@ -1,4 +1,4 @@
-import { generateNKeysBetween, generateKeyBetween } from 'fractional-indexing';
+import { isSearchFilter } from './useSearchFilter.js';
 
 /**
  * Always listed, so there's a view to fall back to. Added before the static
@@ -10,121 +10,74 @@ const initialView = {
     name: "All",
 };
 /**
- * Views by `sortKey`, then views without one, each in array order. Compares
- * by code unit rather than locale, since keys mix upper and lower case.
+ * A view from the app, without any search. Search isn't part of a view, so
+ * views enter the table without it. A view without one is returned as is.
  */
-function sortSavedViews(savedViews) {
-    return [...savedViews].sort((a, b) => {
-        if (a.sortKey === b.sortKey)
-            return 0;
-        if (a.sortKey === undefined)
-            return 1;
-        if (b.sortKey === undefined)
-            return -1;
-        return a.sortKey < b.sortKey ? -1 : 1;
-    });
+function withoutSearch(view) {
+    if (!view.activeFilters.some(isSearchFilter))
+        return view;
+    return {
+        ...view,
+        activeFilters: view.activeFilters.filter((filter) => !isSearchFilter(filter)),
+    };
 }
 /**
- * A `sortKey` after every view's, for a view added at the end. Undefined
- * while any view has no key, since those are listed last, so a view added
- * without one stays at the end.
+ * A duplicate of a view under a new name. It's a new view, so it doesn't keep
+ * the original's id.
  */
-function sortKeyAfter(savedViews) {
-    let lastSortKey = null;
-    for (const { sortKey } of savedViews) {
-        if (sortKey === undefined)
-            return undefined;
-        if (lastSortKey === null || sortKey > lastSortKey)
-            lastSortKey = sortKey;
-    }
-    return generateKeyBetween(lastSortKey, null);
+function savedViewDuplicate({ id: _id, ...view }, name) {
+    return { ...view, name };
 }
 /**
- * The views to update so the view at `from` is dropped before or after the
- * view at `target`, both positions in the order. Usually just the dropped
- * view, with a key between its new neighbors'. Dropping among views without
- * a key also gives a key to those before it, since they come after every
- * view with one.
+ * Whether a view can be renamed, deleted, or saved over. Static views can't,
+ * and neither can a view that isn't saved yet, since updates are matched by id.
  */
-function savedViewUpdatesForReorder(savedViews, from, target, dropPosition) {
-    let to = dropPosition === "after" ? target + 1 : target;
-    // Taking the view out shifts the views after it up one.
-    if (from < to)
-        to--;
-    if (from === to)
-        return [];
-    const newOrder = [...savedViews];
-    const [view] = newOrder.splice(from, 1);
-    newOrder.splice(to, 0, view);
-    let start = to;
-    while (start > 0 && newOrder[start - 1].sortKey === undefined)
-        start--;
-    const keys = generateNKeysBetween(newOrder[start - 1]?.sortKey ?? null, newOrder[to + 1]?.sortKey ?? null, to - start + 1);
-    return newOrder
-        .slice(start, to + 1)
-        .map((view, index) => ({ ...view, sortKey: keys[index] }));
+function isSavedViewEditable(view, savedViews) {
+    return view.id !== undefined && savedViews.includes(view);
 }
 /**
- * The most specific view matching the current state, or undefined. Only
- * picks the initially selected view. Filters match regardless of order,
- * ignoring display-only labels. A view's `sort` and `hiddenColumnNames` are
- * only compared when the view sets them, so a view that sets more of them is
- * more specific. Among equally specific matches, the first wins.
+ * Whether the table's filters, sort, or hidden columns differ from a view.
+ * Filters match by name, operator, scope, and value, in any order; labels are
+ * display-only. Sort and hidden columns count only when both the view and the
+ * table have them.
  */
-function findActiveSavedView(savedViews, state) {
-    let mostSpecificMatch;
-    for (const view of savedViews) {
-        if (!savedViewMatches(view, state))
-            continue;
-        if (!mostSpecificMatch ||
-            specificity(view) > specificity(mostSpecificMatch)) {
-            mostSpecificMatch = view;
-        }
-    }
-    return mostSpecificMatch;
-}
-function specificity(view) {
-    return Number(Boolean(view.sort)) + Number(Boolean(view.hiddenColumnNames));
-}
-function savedViewMatches(view, state) {
-    if (!filtersMatch(view.activeFilters, state.activeFilters))
-        return false;
-    if (view.sort && !sortMatches(view.sort, state.sort))
-        return false;
-    return (!view.hiddenColumnNames ||
-        namesMatch(view.hiddenColumnNames, state.hiddenColumnNames));
-}
-function filtersMatch(a, b) {
-    if (a.length !== b.length)
-        return false;
-    const unmatched = [...b];
-    return a.every((filter) => {
-        const index = unmatched.findIndex((other) => filterMatches(filter, other));
-        if (index === -1)
-            return false;
-        unmatched.splice(index, 1);
+function isSavedViewModified(view, { activeFilters, hiddenColumnNames, sort }) {
+    if (view.sort && sort && !isSameSort(view.sort, sort))
+        return true;
+    if (view.hiddenColumnNames &&
+        hiddenColumnNames &&
+        !isSameNames(view.hiddenColumnNames, hiddenColumnNames))
         return true;
-    });
+    // Each saved filter matches one current filter, so repeats count.
+    const unmatched = [...view.activeFilters];
+    return (activeFilters.length !== unmatched.length ||
+        !activeFilters.every((filter) => {
+            const index = unmatched.findIndex((saved) => isSameFilter(saved, filter));
+            if (index === -1)
+                return false;
+            unmatched.splice(index, 1);
+            return true;
+        }));
 }
-function filterMatches(a, b) {
+function isSameFilter(a, b) {
     return (a.name === b.name &&
         a.operator === b.operator &&
         a.scope === b.scope &&
-        valueMatches(a.value, b.value));
+        isSameValue(a.value, b.value));
 }
-function valueMatches(a, b) {
-    if (Array.isArray(a) && Array.isArray(b)) {
-        return a.length === b.length && a.every((item, i) => item === b[i]);
-    }
-    return a === b;
+// Filter values are primitives or flat arrays, such as ranges. Arrays match
+// only in the same order.
+function isSameValue(a, b) {
+    if (!Array.isArray(a) || !Array.isArray(b))
+        return a === b;
+    return a.length === b.length && a.every((item, index) => item === b[index]);
 }
-function sortMatches(a, b) {
-    return a.column === b?.column && a.direction === b?.direction;
+function isSameSort(a, b) {
+    return a.column === b.column && a.direction === b.direction;
 }
-function namesMatch(a, b) {
-    const names = new Set(b);
-    return new Set(a).size === names.size && a.every((name) => names.has(name));
+function isSameNames(a, b) {
+    return a.length === b.length && a.every((name) => b.includes(name));
 }
 
-export { findActiveSavedView, initialView, savedViewUpdatesForReorder, sortKeyAfter, sortSavedViews };
+export { initialView, isSavedViewEditable, isSavedViewModified, savedViewDuplicate, withoutSearch };
 //# sourceMappingURL=savedViews.js.map

package/dist/components/DataTable/savedViews.js.map

@@ -1 +1 @@
-{"version":3,"file":"savedViews.js","sources":["../../../src/components/DataTable/savedViews.ts"],"sourcesContent":["import { generateKeyBetween, generateNKeysBetween } from \"fractional-indexing\"\n\nimport type { Sort } from \"./DataTable\"\nimport type { ActiveFilter } from \"./FilterTypes\"\n\nexport interface SavedView {\n  activeFilters: ActiveFilter[]\n  /** Omit to leave the current column visibility unchanged when applied. */\n  hiddenColumnNames?: string[]\n  /** Assigned by the consumer once the view is saved. */\n  id?: number | string\n  name: string\n  /** Omit to leave the current sort unchanged when applied. */\n  sort?: Sort\n  /**\n   * The view's position, as a fractional index. Views without one are listed\n   * after those with one.\n   */\n  sortKey?: string\n}\n\n/** An app-provided view. Read-only. */\nexport type StaticView = SavedView & { id: number | string }\n\n/**\n * Always listed, so there's a view to fall back to. Added before the static\n * views unless one of them uses its id, which replaces it.\n */\nexport const initialView: StaticView = {\n  activeFilters: [],\n  id: \"initial\",\n  name: \"All\",\n}\n\n/**\n * Views by `sortKey`, then views without one, each in array order. Compares\n * by code unit rather than locale, since keys mix upper and lower case.\n */\nexport function sortSavedViews(savedViews: SavedView[]): SavedView[] {\n  return [...savedViews].sort((a, b) => {\n    if (a.sortKey === b.sortKey) return 0\n    if (a.sortKey === undefined) return 1\n    if (b.sortKey === undefined) return -1\n    return a.sortKey < b.sortKey ? -1 : 1\n  })\n}\n\n/**\n * A `sortKey` after every view's, for a view added at the end. Undefined\n * while any view has no key, since those are listed last, so a view added\n * without one stays at the end.\n */\nexport function sortKeyAfter(savedViews: SavedView[]): string | undefined {\n  let lastSortKey: string | null = null\n  for (const { sortKey } of savedViews) {\n    if (sortKey === undefined) return undefined\n    if (lastSortKey === null || sortKey > lastSortKey) lastSortKey = sortKey\n  }\n  return generateKeyBetween(lastSortKey, null)\n}\n\n/**\n * The views to update so the view at `from` is dropped before or after the\n * view at `target`, both positions in the order. Usually just the dropped\n * view, with a key between its new neighbors'. Dropping among views without\n * a key also gives a key to those before it, since they come after every\n * view with one.\n */\nexport function savedViewUpdatesForReorder(\n  savedViews: SavedView[],\n  from: number,\n  target: number,\n  dropPosition: \"after\" | \"before\"\n): SavedView[] {\n  let to = dropPosition === \"after\" ? target + 1 : target\n  // Taking the view out shifts the views after it up one.\n  if (from < to) to--\n  if (from === to) return []\n  const newOrder = [...savedViews]\n  const [view] = newOrder.splice(from, 1)\n  newOrder.splice(to, 0, view)\n\n  let start = to\n  while (start > 0 && newOrder[start - 1].sortKey === undefined) start--\n  const keys = generateNKeysBetween(\n    newOrder[start - 1]?.sortKey ?? null,\n    newOrder[to + 1]?.sortKey ?? null,\n    to - start + 1\n  )\n  return newOrder\n    .slice(start, to + 1)\n    .map((view, index) => ({ ...view, sortKey: keys[index] }))\n}\n\ninterface SavedViewState {\n  activeFilters: ActiveFilter[]\n  hiddenColumnNames: string[]\n  sort: Sort | undefined\n}\n\n/**\n * The most specific view matching the current state, or undefined. Only\n * picks the initially selected view. Filters match regardless of order,\n * ignoring display-only labels. A view's `sort` and `hiddenColumnNames` are\n * only compared when the view sets them, so a view that sets more of them is\n * more specific. Among equally specific matches, the first wins.\n */\nexport function findActiveSavedView(\n  savedViews: SavedView[],\n  state: SavedViewState\n): SavedView | undefined {\n  let mostSpecificMatch: SavedView | undefined\n  for (const view of savedViews) {\n    if (!savedViewMatches(view, state)) continue\n    if (\n      !mostSpecificMatch ||\n      specificity(view) > specificity(mostSpecificMatch)\n    ) {\n      mostSpecificMatch = view\n    }\n  }\n  return mostSpecificMatch\n}\n\nfunction specificity(view: SavedView): number {\n  return Number(Boolean(view.sort)) + Number(Boolean(view.hiddenColumnNames))\n}\n\nfunction savedViewMatches(view: SavedView, state: SavedViewState): boolean {\n  if (!filtersMatch(view.activeFilters, state.activeFilters)) return false\n  if (view.sort && !sortMatches(view.sort, state.sort)) return false\n  return (\n    !view.hiddenColumnNames ||\n    namesMatch(view.hiddenColumnNames, state.hiddenColumnNames)\n  )\n}\n\nfunction filtersMatch(a: ActiveFilter[], b: ActiveFilter[]): boolean {\n  if (a.length !== b.length) return false\n  const unmatched = [...b]\n  return a.every((filter) => {\n    const index = unmatched.findIndex((other) => filterMatches(filter, other))\n    if (index === -1) return false\n    unmatched.splice(index, 1)\n    return true\n  })\n}\n\nfunction filterMatches(a: ActiveFilter, b: ActiveFilter): boolean {\n  return (\n    a.name === b.name &&\n    a.operator === b.operator &&\n    a.scope === b.scope &&\n    valueMatches(a.value, b.value)\n  )\n}\n\nfunction valueMatches(a: unknown, b: unknown): boolean {\n  if (Array.isArray(a) && Array.isArray(b)) {\n    return a.length === b.length && a.every((item, i) => item === b[i])\n  }\n  return a === b\n}\n\nfunction sortMatches(a: Sort, b: Sort | undefined): boolean {\n  return a.column === b?.column && a.direction === b?.direction\n}\n\nfunction namesMatch(a: string[], b: string[]): boolean {\n  const names = new Set(b)\n  return new Set(a).size === names.size && a.every((name) => names.has(name))\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"savedViews.js","sources":["../../../src/components/DataTable/savedViews.ts"],"sourcesContent":["import type { Sort } from \"./DataTable\"\nimport type { ActiveFilter } from \"./FilterTypes\"\nimport { isSearchFilter } from \"./useSearchFilter\"\n\nexport interface SavedView {\n  /** A search (`q`) filter is ignored; applying a view keeps the search. */\n  activeFilters: ActiveFilter[]\n  /** Omit to leave the current column visibility unchanged when applied. */\n  hiddenColumnNames?: string[]\n  /** Assigned by the consumer once the view is saved. */\n  id?: number | string\n  name: string\n  /** Omit to leave the current sort unchanged when applied. */\n  sort?: Sort\n}\n\n/** An app-provided view. Read-only. */\nexport type StaticView = SavedView & { id: number | string }\n\n/**\n * Always listed, so there's a view to fall back to. Added before the static\n * views unless one of them uses its id, which replaces it.\n */\nexport const initialView: StaticView = {\n  activeFilters: [],\n  id: \"initial\",\n  name: \"All\",\n}\n\n/**\n * A view from the app, without any search. Search isn't part of a view, so\n * views enter the table without it. A view without one is returned as is.\n */\nexport function withoutSearch<View extends SavedView>(view: View): View {\n  if (!view.activeFilters.some(isSearchFilter)) return view\n  return {\n    ...view,\n    activeFilters: view.activeFilters.filter(\n      (filter) => !isSearchFilter(filter)\n    ),\n  }\n}\n\n/**\n * A duplicate of a view under a new name. It's a new view, so it doesn't keep\n * the original's id.\n */\nexport function savedViewDuplicate(\n  { id: _id, ...view }: SavedView,\n  name: string\n): Omit<SavedView, \"id\"> {\n  return { ...view, name }\n}\n\n/**\n * Whether a view can be renamed, deleted, or saved over. Static views can't,\n * and neither can a view that isn't saved yet, since updates are matched by id.\n */\nexport function isSavedViewEditable(view: SavedView, savedViews: SavedView[]) {\n  return view.id !== undefined && savedViews.includes(view)\n}\n\n/**\n * Whether the table's filters, sort, or hidden columns differ from a view.\n * Filters match by name, operator, scope, and value, in any order; labels are\n * display-only. Sort and hidden columns count only when both the view and the\n * table have them.\n */\nexport function isSavedViewModified(\n  view: SavedView,\n  { activeFilters, hiddenColumnNames, sort }: Omit<SavedView, \"id\" | \"name\">\n) {\n  if (view.sort && sort && !isSameSort(view.sort, sort)) return true\n  if (\n    view.hiddenColumnNames &&\n    hiddenColumnNames &&\n    !isSameNames(view.hiddenColumnNames, hiddenColumnNames)\n  )\n    return true\n  // Each saved filter matches one current filter, so repeats count.\n  const unmatched = [...view.activeFilters]\n  return (\n    activeFilters.length !== unmatched.length ||\n    !activeFilters.every((filter) => {\n      const index = unmatched.findIndex((saved) => isSameFilter(saved, filter))\n      if (index === -1) return false\n      unmatched.splice(index, 1)\n      return true\n    })\n  )\n}\n\nfunction isSameFilter(a: ActiveFilter, b: ActiveFilter) {\n  return (\n    a.name === b.name &&\n    a.operator === b.operator &&\n    a.scope === b.scope &&\n    isSameValue(a.value, b.value)\n  )\n}\n\n// Filter values are primitives or flat arrays, such as ranges. Arrays match\n// only in the same order.\nfunction isSameValue(a: unknown, b: unknown) {\n  if (!Array.isArray(a) || !Array.isArray(b)) return a === b\n  return a.length === b.length && a.every((item, index) => item === b[index])\n}\n\nfunction isSameSort(a: Sort, b: Sort) {\n  return a.column === b.column && a.direction === b.direction\n}\n\nfunction isSameNames(a: string[], b: string[]) {\n  return a.length === b.length && a.every((name) => b.includes(name))\n}\n"],"names":[],"mappings":"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"}

package/dist/components/DataTable/useActiveSavedView.d.ts

@@ -2,6 +2,6 @@ import type { SavedView } from "./savedViews";
 export declare function useActiveSavedView(savedViews: SavedView[], getInitialView: () => SavedView | undefined): {
     activeSavedView: SavedView | undefined;
     select: (view: SavedView) => void;
-    selectWhenSaved: (savedView: Promise<SavedView> | SavedView) => Promise<void>;
+    selectWhenSaved: (savedView: Promise<SavedView | undefined> | SavedView) => Promise<SavedView | undefined>;
 };
 //# sourceMappingURL=useActiveSavedView.d.ts.map

package/dist/components/DataTable/useActiveSavedView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useActiveSavedView.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/useActiveSavedView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,SAAS,GAAG,SAAS;;mBAY1B,SAAS;iCAIW,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;EAQpE"}
+{"version":3,"file":"useActiveSavedView.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/useActiveSavedView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,SAAS,GAAG,SAAS;;mBAY1B,SAAS;iCAMX,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,SAAS;EAW1D"}

package/dist/components/DataTable/useActiveSavedView.js

@@ -13,14 +13,15 @@ function useActiveSavedView(savedViews, getInitialView) {
             selectionCount.current++;
             setActiveId(view.id);
         },
+        // Resolves to the view it selected, if any.
         selectWhenSaved: async (savedView) => {
             const selection = ++selectionCount.current;
             // Tolerates a consumer that returns nothing, leaving the selection as is.
-            const id = (await savedView)?.id;
-            if (id === undefined)
+            const saved = await savedView;
+            if (saved?.id === undefined || selection !== selectionCount.current)
                 return;
-            if (selection === selectionCount.current)
-                setActiveId(id);
+            setActiveId(saved.id);
+            return saved;
         },
     };
 }

package/dist/components/DataTable/useActiveSavedView.js.map

@@ -1 +1 @@
-{"version":3,"file":"useActiveSavedView.js","sources":["../../../src/components/DataTable/useActiveSavedView.ts"],"sourcesContent":["import { useRef, useState } from \"react\"\n\nimport type { SavedView } from \"./savedViews\"\n\nexport function useActiveSavedView(\n  savedViews: SavedView[],\n  getInitialView: () => SavedView | undefined\n) {\n  const [activeId, setActiveId] = useState(() => getInitialView()?.id)\n  // Lets a slow save skip selecting its view if the user picked another.\n  const selectionCount = useRef(0)\n\n  return {\n    // A view without an id isn't saved yet, so it can't be the active one.\n    activeSavedView:\n      activeId === undefined\n        ? undefined\n        : savedViews.find(({ id }) => id === activeId),\n    select: (view: SavedView) => {\n      selectionCount.current++\n      setActiveId(view.id)\n    },\n    selectWhenSaved: async (savedView: Promise<SavedView> | SavedView) => {\n      const selection = ++selectionCount.current\n      // Tolerates a consumer that returns nothing, leaving the selection as is.\n      const id = (await savedView)?.id\n      if (id === undefined) return\n      if (selection === selectionCount.current) setActiveId(id)\n    },\n  }\n}\n"],"names":[],"mappings":";;AAIM,SAAU,kBAAkB,CAChC,UAAuB,EACvB,cAA2C,EAAA;AAE3C,IAAA,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,MAAM,cAAc,EAAE,EAAE,EAAE,CAAC;;AAEpE,IAAA,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC;IAEhC,OAAO;;QAEL,eAAe,EACb,QAAQ,KAAK;AACX,cAAE;AACF,cAAE,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,QAAQ,CAAC;AAClD,QAAA,MAAM,EAAE,CAAC,IAAe,KAAI;YAC1B,cAAc,CAAC,OAAO,EAAE;AACxB,YAAA,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,CAAC;AACD,QAAA,eAAe,EAAE,OAAO,SAAyC,KAAI;AACnE,YAAA,MAAM,SAAS,GAAG,EAAE,cAAc,CAAC,OAAO;;YAE1C,MAAM,EAAE,GAAG,CAAC,MAAM,SAAS,GAAG,EAAE;YAChC,IAAI,EAAE,KAAK,SAAS;gBAAE;AACtB,YAAA,IAAI,SAAS,KAAK,cAAc,CAAC,OAAO;gBAAE,WAAW,CAAC,EAAE,CAAC;QAC3D,CAAC;KACF;AACH;;;;"}
+{"version":3,"file":"useActiveSavedView.js","sources":["../../../src/components/DataTable/useActiveSavedView.ts"],"sourcesContent":["import { useRef, useState } from \"react\"\n\nimport type { SavedView } from \"./savedViews\"\n\nexport function useActiveSavedView(\n  savedViews: SavedView[],\n  getInitialView: () => SavedView | undefined\n) {\n  const [activeId, setActiveId] = useState(() => getInitialView()?.id)\n  // Lets a slow save skip selecting its view if the user picked another.\n  const selectionCount = useRef(0)\n\n  return {\n    // A view without an id isn't saved yet, so it can't be the active one.\n    activeSavedView:\n      activeId === undefined\n        ? undefined\n        : savedViews.find(({ id }) => id === activeId),\n    select: (view: SavedView) => {\n      selectionCount.current++\n      setActiveId(view.id)\n    },\n    // Resolves to the view it selected, if any.\n    selectWhenSaved: async (\n      savedView: Promise<SavedView | undefined> | SavedView\n    ) => {\n      const selection = ++selectionCount.current\n      // Tolerates a consumer that returns nothing, leaving the selection as is.\n      const saved = await savedView\n      if (saved?.id === undefined || selection !== selectionCount.current)\n        return\n      setActiveId(saved.id)\n      return saved\n    },\n  }\n}\n"],"names":[],"mappings":";;AAIM,SAAU,kBAAkB,CAChC,UAAuB,EACvB,cAA2C,EAAA;AAE3C,IAAA,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,MAAM,cAAc,EAAE,EAAE,EAAE,CAAC;;AAEpE,IAAA,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC;IAEhC,OAAO;;QAEL,eAAe,EACb,QAAQ,KAAK;AACX,cAAE;AACF,cAAE,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,QAAQ,CAAC;AAClD,QAAA,MAAM,EAAE,CAAC,IAAe,KAAI;YAC1B,cAAc,CAAC,OAAO,EAAE;AACxB,YAAA,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,CAAC;;AAED,QAAA,eAAe,EAAE,OACf,SAAqD,KACnD;AACF,YAAA,MAAM,SAAS,GAAG,EAAE,cAAc,CAAC,OAAO;;AAE1C,YAAA,MAAM,KAAK,GAAG,MAAM,SAAS;YAC7B,IAAI,KAAK,EAAE,EAAE,KAAK,SAAS,IAAI,SAAS,KAAK,cAAc,CAAC,OAAO;gBACjE;AACF,YAAA,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;AACrB,YAAA,OAAO,KAAK;QACd,CAAC;KACF;AACH;;;;"}

package/dist/components/DataTable/useColumnVisibility.d.ts

@@ -1,22 +1,22 @@
 import type { DataTableColumn } from "./DataTableColumn";
 /**
- * Resolves which columns render for a given `visibleColumnNames` value. Only
+ * Resolves which columns render for a given `hiddenColumnNames` value. Only
  * columns that opted in with `hideable` can be hidden; every other column is
- * always visible. Omitting `visibleColumnNames` leaves all columns visible,
+ * always visible. Omitting `hiddenColumnNames` leaves all columns visible,
  * and unknown names are ignored.
  *
  * Visibility is controlled: `onColumnVisibilityChange` reports the next value
  * but nothing is stored here, so the table renders whatever
- * `visibleColumnNames` says on the next render.
+ * `hiddenColumnNames` says on the next render.
  */
-export declare function useColumnVisibility({ columns, onVisibleColumnNamesChange, visibleColumnNames, }: {
+export declare function useColumnVisibility({ columns, hiddenColumnNames, onHiddenColumnNamesChange, }: {
     columns: DataTableColumn[];
-    onVisibleColumnNamesChange: ((visibleColumnNames: string[]) => void) | undefined;
-    visibleColumnNames: string[] | undefined;
+    hiddenColumnNames: string[] | undefined;
+    onHiddenColumnNamesChange: ((hiddenColumnNames: string[]) => void) | undefined;
 }): {
     hideableColumns: DataTableColumn[];
     isColumnVisible: ({ hideable, name }: DataTableColumn) => boolean;
-    onColumnVisibilityChange: (selectedColumns: string[]) => void;
+    onColumnVisibilityChange: (visibleNames: string[]) => void;
     visibleHideableColumns: string[];
 };
 //# sourceMappingURL=useColumnVisibility.d.ts.map

package/dist/components/DataTable/useColumnVisibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useColumnVisibility.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/useColumnVisibility.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,0BAA0B,EAC1B,kBAAkB,GACnB,EAAE;IACD,OAAO,EAAE,eAAe,EAAE,CAAA;IAC1B,0BAA0B,EACtB,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC,GACxC,SAAS,CAAA;IACb,kBAAkB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;CACzC;;0CAiBwB,eAAe;gDAWlB,MAAM,EAAE;;EAuB7B"}
+{"version":3,"file":"useColumnVisibility.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/useColumnVisibility.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,iBAAiB,EACjB,yBAAyB,GAC1B,EAAE;IACD,OAAO,EAAE,eAAe,EAAE,CAAA;IAC1B,iBAAiB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IACvC,yBAAyB,EAAE,CAAC,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;CAC/E;;0CAiBwB,eAAe;6CAWrB,MAAM,EAAE;;EAuB1B"}

package/dist/components/DataTable/useColumnVisibility.js

@@ -1,35 +1,35 @@
 import { useMemo, useCallback } from 'react';
 
 /**
- * Resolves which columns render for a given `visibleColumnNames` value. Only
+ * Resolves which columns render for a given `hiddenColumnNames` value. Only
  * columns that opted in with `hideable` can be hidden; every other column is
- * always visible. Omitting `visibleColumnNames` leaves all columns visible,
+ * always visible. Omitting `hiddenColumnNames` leaves all columns visible,
  * and unknown names are ignored.
  *
  * Visibility is controlled: `onColumnVisibilityChange` reports the next value
  * but nothing is stored here, so the table renders whatever
- * `visibleColumnNames` says on the next render.
+ * `hiddenColumnNames` says on the next render.
  */
-function useColumnVisibility({ columns, onVisibleColumnNamesChange, visibleColumnNames, }) {
+function useColumnVisibility({ columns, hiddenColumnNames, onHiddenColumnNamesChange, }) {
     // Everything below keys off the props themselves. `DataTable` documents
     // `columns` as a stable reference, so a consumer that honors that contract
     // gets the memoization; one that passes a fresh literal each render only
     // repeats a filter and a `Set` build, which is cheaper than the indirection
     // needed to avoid it.
     const hideableColumns = useMemo(() => columns.filter(({ hideable }) => hideable), [columns]);
-    const visibleNames = useMemo(() => visibleColumnNames && new Set(visibleColumnNames), [visibleColumnNames]);
-    const isColumnVisible = useCallback(({ hideable, name }) => !hideable || !visibleNames || visibleNames.has(name), [visibleNames]);
+    const hiddenNames = useMemo(() => new Set(hiddenColumnNames), [hiddenColumnNames]);
+    const isColumnVisible = useCallback(({ hideable, name }) => !hideable || !hiddenNames.has(name), [hiddenNames]);
     /**
-     * Maps the toggle's selection back to every visible column name — including
-     * the always-visible ones — in `columns` order, so the reported value can be
-     * passed straight back as `visibleColumnNames`.
+     * Reports the hideable columns left out of `visibleNames`, in `columns`
+     * order, so the reported value can be passed straight back as
+     * `hiddenColumnNames`.
      */
-    const onColumnVisibilityChange = useCallback((selectedColumns) => {
-        const selectedNames = new Set(selectedColumns);
-        onVisibleColumnNamesChange?.(columns
-            .filter(({ hideable, name }) => !hideable || selectedNames.has(name))
+    const onColumnVisibilityChange = useCallback((visibleNames) => {
+        const visibleNameSet = new Set(visibleNames);
+        onHiddenColumnNamesChange?.(hideableColumns
+            .filter(({ name }) => !visibleNameSet.has(name))
             .map(({ name }) => name));
-    }, [columns, onVisibleColumnNamesChange]);
+    }, [hideableColumns, onHiddenColumnNamesChange]);
     const visibleHideableColumns = useMemo(() => hideableColumns.filter(isColumnVisible).map(({ name }) => name), [hideableColumns, isColumnVisible]);
     return {
         hideableColumns,

package/dist/components/DataTable/useColumnVisibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"useColumnVisibility.js","sources":["../../../src/components/DataTable/useColumnVisibility.ts"],"sourcesContent":["import { useCallback, useMemo } from \"react\"\n\nimport type { DataTableColumn } from \"./DataTableColumn\"\n\n/**\n * Resolves which columns render for a given `visibleColumnNames` value. Only\n * columns that opted in with `hideable` can be hidden; every other column is\n * always visible. Omitting `visibleColumnNames` leaves all columns visible,\n * and unknown names are ignored.\n *\n * Visibility is controlled: `onColumnVisibilityChange` reports the next value\n * but nothing is stored here, so the table renders whatever\n * `visibleColumnNames` says on the next render.\n */\nexport function useColumnVisibility({\n  columns,\n  onVisibleColumnNamesChange,\n  visibleColumnNames,\n}: {\n  columns: DataTableColumn[]\n  onVisibleColumnNamesChange:\n    | ((visibleColumnNames: string[]) => void)\n    | undefined\n  visibleColumnNames: string[] | undefined\n}) {\n  // Everything below keys off the props themselves. `DataTable` documents\n  // `columns` as a stable reference, so a consumer that honors that contract\n  // gets the memoization; one that passes a fresh literal each render only\n  // repeats a filter and a `Set` build, which is cheaper than the indirection\n  // needed to avoid it.\n  const hideableColumns = useMemo(\n    () => columns.filter(({ hideable }) => hideable),\n    [columns]\n  )\n\n  const visibleNames = useMemo(\n    () => visibleColumnNames && new Set(visibleColumnNames),\n    [visibleColumnNames]\n  )\n\n  const isColumnVisible = useCallback(\n    ({ hideable, name }: DataTableColumn) =>\n      !hideable || !visibleNames || visibleNames.has(name),\n    [visibleNames]\n  )\n\n  /**\n   * Maps the toggle's selection back to every visible column name — including\n   * the always-visible ones — in `columns` order, so the reported value can be\n   * passed straight back as `visibleColumnNames`.\n   */\n  const onColumnVisibilityChange = useCallback(\n    (selectedColumns: string[]) => {\n      const selectedNames = new Set(selectedColumns)\n\n      onVisibleColumnNamesChange?.(\n        columns\n          .filter(({ hideable, name }) => !hideable || selectedNames.has(name))\n          .map(({ name }) => name)\n      )\n    },\n    [columns, onVisibleColumnNamesChange]\n  )\n\n  const visibleHideableColumns = useMemo(\n    () => hideableColumns.filter(isColumnVisible).map(({ name }) => name),\n    [hideableColumns, isColumnVisible]\n  )\n\n  return {\n    hideableColumns,\n    isColumnVisible,\n    onColumnVisibilityChange,\n    visibleHideableColumns,\n  }\n}\n"],"names":[],"mappings":";;AAIA;;;;;;;;;AASG;AACG,SAAU,mBAAmB,CAAC,EAClC,OAAO,EACP,0BAA0B,EAC1B,kBAAkB,GAOnB,EAAA;;;;;;IAMC,MAAM,eAAe,GAAG,OAAO,CAC7B,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,QAAQ,CAAC,EAChD,CAAC,OAAO,CAAC,CACV;AAED,IAAA,MAAM,YAAY,GAAG,OAAO,CAC1B,MAAM,kBAAkB,IAAI,IAAI,GAAG,CAAC,kBAAkB,CAAC,EACvD,CAAC,kBAAkB,CAAC,CACrB;AAED,IAAA,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAmB,KAClC,CAAC,QAAQ,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EACtD,CAAC,YAAY,CAAC,CACf;AAED;;;;AAIG;AACH,IAAA,MAAM,wBAAwB,GAAG,WAAW,CAC1C,CAAC,eAAyB,KAAI;AAC5B,QAAA,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC;QAE9C,0BAA0B,GACxB;AACG,aAAA,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;aACnE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,CAC3B;AACH,IAAA,CAAC,EACD,CAAC,OAAO,EAAE,0BAA0B,CAAC,CACtC;AAED,IAAA,MAAM,sBAAsB,GAAG,OAAO,CACpC,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,EACrE,CAAC,eAAe,EAAE,eAAe,CAAC,CACnC;IAED,OAAO;QACL,eAAe;QACf,eAAe;QACf,wBAAwB;QACxB,sBAAsB;KACvB;AACH;;;;"}
+{"version":3,"file":"useColumnVisibility.js","sources":["../../../src/components/DataTable/useColumnVisibility.ts"],"sourcesContent":["import { useCallback, useMemo } from \"react\"\n\nimport type { DataTableColumn } from \"./DataTableColumn\"\n\n/**\n * Resolves which columns render for a given `hiddenColumnNames` value. Only\n * columns that opted in with `hideable` can be hidden; every other column is\n * always visible. Omitting `hiddenColumnNames` leaves all columns visible,\n * and unknown names are ignored.\n *\n * Visibility is controlled: `onColumnVisibilityChange` reports the next value\n * but nothing is stored here, so the table renders whatever\n * `hiddenColumnNames` says on the next render.\n */\nexport function useColumnVisibility({\n  columns,\n  hiddenColumnNames,\n  onHiddenColumnNamesChange,\n}: {\n  columns: DataTableColumn[]\n  hiddenColumnNames: string[] | undefined\n  onHiddenColumnNamesChange: ((hiddenColumnNames: string[]) => void) | undefined\n}) {\n  // Everything below keys off the props themselves. `DataTable` documents\n  // `columns` as a stable reference, so a consumer that honors that contract\n  // gets the memoization; one that passes a fresh literal each render only\n  // repeats a filter and a `Set` build, which is cheaper than the indirection\n  // needed to avoid it.\n  const hideableColumns = useMemo(\n    () => columns.filter(({ hideable }) => hideable),\n    [columns]\n  )\n\n  const hiddenNames = useMemo(\n    () => new Set(hiddenColumnNames),\n    [hiddenColumnNames]\n  )\n\n  const isColumnVisible = useCallback(\n    ({ hideable, name }: DataTableColumn) =>\n      !hideable || !hiddenNames.has(name),\n    [hiddenNames]\n  )\n\n  /**\n   * Reports the hideable columns left out of `visibleNames`, in `columns`\n   * order, so the reported value can be passed straight back as\n   * `hiddenColumnNames`.\n   */\n  const onColumnVisibilityChange = useCallback(\n    (visibleNames: string[]) => {\n      const visibleNameSet = new Set(visibleNames)\n\n      onHiddenColumnNamesChange?.(\n        hideableColumns\n          .filter(({ name }) => !visibleNameSet.has(name))\n          .map(({ name }) => name)\n      )\n    },\n    [hideableColumns, onHiddenColumnNamesChange]\n  )\n\n  const visibleHideableColumns = useMemo(\n    () => hideableColumns.filter(isColumnVisible).map(({ name }) => name),\n    [hideableColumns, isColumnVisible]\n  )\n\n  return {\n    hideableColumns,\n    isColumnVisible,\n    onColumnVisibilityChange,\n    visibleHideableColumns,\n  }\n}\n"],"names":[],"mappings":";;AAIA;;;;;;;;;AASG;AACG,SAAU,mBAAmB,CAAC,EAClC,OAAO,EACP,iBAAiB,EACjB,yBAAyB,GAK1B,EAAA;;;;;;IAMC,MAAM,eAAe,GAAG,OAAO,CAC7B,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,QAAQ,CAAC,EAChD,CAAC,OAAO,CAAC,CACV;AAED,IAAA,MAAM,WAAW,GAAG,OAAO,CACzB,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,EAChC,CAAC,iBAAiB,CAAC,CACpB;AAED,IAAA,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAmB,KAClC,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EACrC,CAAC,WAAW,CAAC,CACd;AAED;;;;AAIG;AACH,IAAA,MAAM,wBAAwB,GAAG,WAAW,CAC1C,CAAC,YAAsB,KAAI;AACzB,QAAA,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC;QAE5C,yBAAyB,GACvB;AACG,aAAA,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC;aAC9C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,CAC3B;AACH,IAAA,CAAC,EACD,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAC7C;AAED,IAAA,MAAM,sBAAsB,GAAG,OAAO,CACpC,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,EACrE,CAAC,eAAe,EAAE,eAAe,CAAC,CACnC;IAED,OAAO;QACL,eAAe;QACf,eAAe;QACf,wBAAwB;QACxB,sBAAsB;KACvB;AACH;;;;"}

package/dist/components/DataTable/useResultsAnnouncement.d.ts

@@ -0,0 +1,26 @@
+import type { DataTableLoadingState } from "./DataTable";
+import type { ActiveFilter } from "./FilterTypes";
+import { type ResultNoun } from "./ResultsCount";
+export declare const RESULTS_ANNOUNCEMENT_DELAY_MS = 500;
+/**
+ * Announces the results count to screen reader users after each filter
+ * change and each load, once the results settle: `loadingState` is
+ * `"idle"`, and neither it nor the count has changed for
+ * {@link RESULTS_ANNOUNCEMENT_DELAY_MS}. A load covers the first load and
+ * page changes too. A change to `"error"` cancels the message, because the
+ * error is announced on its own. An `"error"` left over from an earlier
+ * request only delays it.
+ *
+ * Returns an `onActiveFiltersChange` to use in place of the caller's, so
+ * filter changes the user makes are announced without a load. Filter changes
+ * from outside are announced only when they load.
+ */
+export declare function useResultsAnnouncement({ isPageCount, loadingState, onActiveFiltersChange, resultNoun, totalCount, }: {
+    /** Whether `totalCount` covers only the current page, not the whole set. */
+    isPageCount: boolean;
+    loadingState: DataTableLoadingState;
+    onActiveFiltersChange: (activeFilters: ActiveFilter[]) => void;
+    resultNoun: ResultNoun | undefined;
+    totalCount: number;
+}): (activeFilters: ActiveFilter[]) => void;
+//# sourceMappingURL=useResultsAnnouncement.d.ts.map

package/dist/components/DataTable/useResultsAnnouncement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useResultsAnnouncement.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/useResultsAnnouncement.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAwB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEtE,eAAO,MAAM,6BAA6B,MAAM,CAAA;AAEhD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,YAAY,EACZ,qBAAqB,EACrB,UAAU,EACV,UAAU,GACX,EAAE;IACD,4EAA4E;IAC5E,WAAW,EAAE,OAAO,CAAA;IACpB,YAAY,EAAE,qBAAqB,CAAA;IACnC,qBAAqB,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,KAAK,IAAI,CAAA;IAC9D,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;IAClC,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,CAAC,aAAa,EAAE,YAAY,EAAE,KAAK,IAAI,CA+B1C"}