@astryxdesign/core 0.7.8-canary.c239daf → 0.7.8-canary.cc034ed

package/dist/PowerSearch/PowerSearch.d.ts

@@ -133,8 +133,10 @@ export interface PowerSearchProps extends Omit<BaseProps<HTMLElement>, 'onChange
      *   above it with the fields (or the content search with inline
      *   suggestions), and a value step opens above that, stages operator →
      *   value, and confirms from its footer. Dismissing a step reveals the
-     *   one beneath. Suited to compact touch screens, where the editor
-     *   popover competes with the software keyboard.
+     *   one beneath. The flow edits a draft: `onChange` is called when Done
+     *   applies it, once per edit in order, and a dismissal with a changed
+     *   draft asks before discarding it. Suited to compact touch screens,
+     *   where the editor popover competes with the software keyboard.
      * - `'adaptive'`: the bottom sheet on compact coarse-pointer screens,
      *   otherwise the popover — the same resolution Selector uses. The server
      *   render and the hydrating render are the popover.

package/dist/PowerSearch/PowerSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PowerSearch.d.ts","sourceRoot":"","sources":["../../src/PowerSearch/PowerSearch.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PowerSearch.d.ts","sourceRoot":"","sources":["../../src/PowerSearch/PowerSearch.tsx"],"names":[],"mappings":"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"}

package/dist/PowerSearch/PowerSearchBottomSheet.d.ts

@@ -72,7 +72,14 @@ export interface PowerSearchBottomSheetProps {
     config: InternalConfig;
     /** The caller's config, handed to Editor overrides as they expect it. */
     configProp: PowerSearchConfig;
+    /** The committed filters; the draft the sheet edits starts from them. */
     filters: ReadonlyArray<PowerSearchFilter>;
+    /**
+     * The field's `onChange`. Done replays the draft's edits through it, in
+     * order, onto the field's latest filters, each call carrying that list
+     * with the edit applied; nothing is reported before Done, and nothing when
+     * the field is read-only or disabled at Done.
+     */
     onChange: (filters: ReadonlyArray<PowerSearchFilter>, changeType: PowerSearchChangeType, index: number) => void;
     /** The field typeahead source; the content search lists its suggestions. */
     searchSource: SearchSource<PowerSearchItem>;
@@ -90,13 +97,29 @@ export interface PowerSearchBottomSheetProps {
     components?: PowerSearchComponents;
     editors: PowerSearchSheetEditors;
 }
+/** One edit of the draft: the draft before and after it, and its type and index in the draft; Done replays it onto the field's latest filters. */
+interface DraftEdit {
+    before: ReadonlyArray<PowerSearchFilter>;
+    after: ReadonlyArray<PowerSearchFilter>;
+    changeType: PowerSearchChangeType;
+    index: number;
+}
+/**
+ * Replays the draft's edits onto `base`, the field's latest filters, and
+ * reports each through `report` with the list after it. An add appends; an
+ * edit replaces the first filter matching the one it edited; a removal drops
+ * the filters it removed, by signature. An edit or removal whose target is
+ * not in the base list is skipped: the parent removed it meanwhile.
+ */
+export declare function replayDraftEdits(base: ReadonlyArray<PowerSearchFilter>, edits: ReadonlyArray<DraftEdit>, report: (filters: ReadonlyArray<PowerSearchFilter>, changeType: PowerSearchChangeType, index: number) => void): ReadonlyArray<PowerSearchFilter>;
 /**
  * The sheet flow of PowerSearch's touch presentation: Filters, Add filter,
  * and the value step, as standalone sheets that stack, each open beneath the
  * step it led to.
  */
-export declare function PowerSearchBottomSheet({ isOpen, onOpenChange, finalFocusRef, resultCountText, config, configProp, filters, onChange, searchSource, placeholder, isReadOnly, isDisabled, hasClear, maxOperatorMenuItems, timezoneID, maxSearchResults, saveButtonLabel: saveButtonLabelFromProps, components: componentOverrides, editors, }: PowerSearchBottomSheetProps): React.JSX.Element;
+export declare function PowerSearchBottomSheet({ isOpen, onOpenChange, finalFocusRef, resultCountText, config, configProp, filters: committedFilters, onChange: onCommit, searchSource, placeholder, isReadOnly, isDisabled, hasClear, maxOperatorMenuItems, timezoneID, maxSearchResults, saveButtonLabel: saveButtonLabelFromProps, components: componentOverrides, editors, }: PowerSearchBottomSheetProps): React.JSX.Element;
 export declare namespace PowerSearchBottomSheet {
     var displayName: string;
 }
+export {};
 //# sourceMappingURL=PowerSearchBottomSheet.d.ts.map

package/dist/PowerSearch/PowerSearchBottomSheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PowerSearchBottomSheet.d.ts","sourceRoot":"","sources":["../../src/PowerSearch/PowerSearchBottomSheet.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,KAAK,EAAE,EASZ,KAAK,SAAS,EAEf,MAAM,OAAO,CAAC;AAoBf,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAkCrD,OAAO,KAAK,EACV,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAe3D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAIV,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EAEjB,iBAAiB,EACjB,eAAe,EAEhB,MAAM,SAAS,CAAC;AAajB;;;;;;GAMG;AACH,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,wBAAwB,EAAE,OAAO,wBAAwB,CAAC;CAC3D;AAED,MAAM,WAAW,2BAA2B;IAC1C,wEAAwE;IACxE,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,aAAa,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC7C;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,cAAc,CAAC;IACvB,yEAAyE;IACzE,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC1C,QAAQ,EAAE,CACR,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACzC,UAAU,EAAE,qBAAqB,EACjC,KAAK,EAAE,MAAM,KACV,IAAI,CAAC;IACV,4EAA4E;IAC5E,YAAY,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;IAC5C,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,OAAO,EAAE,uBAAuB,CAAC;CAClC;AA4mBD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,YAAY,EACZ,aAAa,EACb,eAAe,EACf,MAAM,EACN,UAAU,EACV,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,UAAU,EACV,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,UAAU,EACV,gBAAgB,EAChB,eAAe,EAAE,wBAAwB,EACzC,UAAU,EAAE,kBAAkB,EAC9B,OAAO,GACR,EAAE,2BAA2B,qBAyoD7B;yBA7pDe,sBAAsB"}
+{"version":3,"file":"PowerSearchBottomSheet.d.ts","sourceRoot":"","sources":["../../src/PowerSearch/PowerSearchBottomSheet.tsx"],"names":[],"mappings":"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"}

package/dist/PowerSearch/PowerSearchBottomSheet.js

@@ -104,6 +104,82 @@ registerEnglishFallback(english);
 // Styles
 // =============================================================================
 
+/** One edit of the draft: the draft before and after it, and its type and index in the draft; Done replays it onto the field's latest filters. */
+
+// Whether two filter lists hold the same filters in the same order, by the
+// key-order-insensitive signature the sheet matches filters with.
+function hasSameFilters(a, b) {
+  return a.length === b.length && a.every((filter, index) => b[index] != null && filterSignature(filter) === filterSignature(b[index]));
+}
+
+// The filters `before` holds that `after` does not, as a multiset by
+// signature, in `before` order.
+function removedFilters(before, after) {
+  const remaining = new Map();
+  for (const filter of after) {
+    const signature = filterSignature(filter);
+    remaining.set(signature, (remaining.get(signature) ?? 0) + 1);
+  }
+  return before.filter(filter => {
+    const signature = filterSignature(filter);
+    const count = remaining.get(signature) ?? 0;
+    if (count > 0) {
+      remaining.set(signature, count - 1);
+      return false;
+    }
+    return true;
+  });
+}
+
+/**
+ * Replays the draft's edits onto `base`, the field's latest filters, and
+ * reports each through `report` with the list after it. An add appends; an
+ * edit replaces the first filter matching the one it edited; a removal drops
+ * the filters it removed, by signature. An edit or removal whose target is
+ * not in the base list is skipped: the parent removed it meanwhile.
+ */
+export function replayDraftEdits(base, edits, report) {
+  let current = base;
+  for (const edit of edits) {
+    if (edit.changeType === 'add') {
+      const added = edit.after[edit.index];
+      if (added == null) {
+        continue;
+      }
+      current = [...current, added];
+      report(current, 'add', current.length - 1);
+    } else if (edit.changeType === 'edit') {
+      const original = edit.before[edit.index];
+      const updated = edit.after[edit.index];
+      if (original == null || updated == null) {
+        continue;
+      }
+      const signature = filterSignature(original);
+      const index = current.findIndex(filter => filterSignature(filter) === signature);
+      if (index === -1) {
+        continue;
+      }
+      current = current.map((filter, i) => i === index ? updated : filter);
+      report(current, 'edit', index);
+    } else {
+      const removed = removedFilters(edit.before, edit.after).map(filterSignature);
+      const indexes = [];
+      for (const signature of removed) {
+        const index = current.findIndex((filter, i) => !indexes.includes(i) && filterSignature(filter) === signature);
+        if (index !== -1) {
+          indexes.push(index);
+        }
+      }
+      if (indexes.length === 0) {
+        continue;
+      }
+      current = current.filter((_, i) => !indexes.includes(i));
+      report(current, 'remove', Math.min(...indexes));
+    }
+  }
+  return current;
+}
+
 // The trailing plus a field row shows when choosing it adds the filter at
 // once, and the Add filter actions' glyph. Core's default icon set has no plus.
 function PlusIcon(props) {
@@ -514,8 +590,8 @@ export function PowerSearchBottomSheet({
   resultCountText,
   config,
   configProp,
-  filters,
-  onChange,
+  filters: committedFilters,
+  onChange: onCommit,
   searchSource,
   placeholder,
   isReadOnly,
@@ -535,6 +611,27 @@ export function PowerSearchBottomSheet({
   const locale = useLocale();
   const formatList = useListFormatter();
   const isInteractive = !isDisabled && !isReadOnly;
+
+  // ---- draft ----
+  // One open flow edits one draft of the filter list; `onChange` waits for
+  // Done, and a dismissal with a changed draft asks first.
+  const [filtersAtOpen, setFiltersAtOpen] = useState(() => committedFilters);
+  const [filters, setFilters] = useState(() => committedFilters);
+  // The draft as of the last edit, for the edit log's `before` lists.
+  const draftRef = useRef(filters);
+  const draftEditsRef = useRef([]);
+  const onChange = useCallback((next, changeType, index) => {
+    draftEditsRef.current.push({
+      before: draftRef.current,
+      after: next,
+      changeType,
+      index
+    });
+    draftRef.current = next;
+    setFilters(next);
+  }, []);
+  const isDraftDirty = !hasSameFilters(filtersAtOpen, filters);
+  const [isDiscardConfirmationOpen, setIsDiscardConfirmationOpen] = useState(false);
   const contentSearchFieldKey = config.config.contentSearchFieldKey;
   const contentSearchOperator = contentSearchFieldKey == null ? undefined : config.getDefaultOperator(contentSearchFieldKey);
   const hasContentSearch = contentSearchOperator?.value.type === 'string';
@@ -616,9 +713,6 @@ export function PowerSearchBottomSheet({
   const [contentQuery, setContentQuery] = useState('');
   const [isClearConfirmationOpen, setIsClearConfirmationOpen] = useState(false);
   const clearAllButtonRef = useRef(null);
-  // Set while Clear all commits, so the result count that changes in that
-  // commit is spoken with Clear all's outcome, as one message.
-  const isClearingRef = useRef(false);
 
   // `useAnnounce` delivers inside the open Astryx modal that encloses its
   // caller, and this component renders above the
@@ -645,13 +739,21 @@ export function PowerSearchBottomSheet({
   if (isOpen !== wasOpen) {
     setWasOpen(isOpen);
     if (isOpen) {
+      // A fresh draft from the committed filters; the entry step is judged
+      // against them, not the previous session's draft.
+      setFiltersAtOpen(committedFilters);
+      setFilters(committedFilters);
+      draftRef.current = committedFilters;
+      draftEditsRef.current = [];
+      const startsOnAddFilter = committedFilters.length === 0 && isInteractive;
       setFieldQuery('');
       setContentQuery('');
-      setStep(isEntryAddFilter ? 'fields' : 'manage');
-      setFieldPickerOrigin(isEntryAddFilter ? 'trigger' : 'manage');
+      setStep(startsOnAddFilter ? 'fields' : 'manage');
+      setFieldPickerOrigin(startsOnAddFilter ? 'trigger' : 'manage');
     } else {
       setStep(null);
       setIsClearConfirmationOpen(false);
+      setIsDiscardConfirmationOpen(false);
     }
   }
   const closeFlow = useCallback(() => {
@@ -659,6 +761,32 @@ export function PowerSearchBottomSheet({
     setStep(null);
     onOpenChange(false);
   }, [onOpenChange]);
+  // Done replays each edit in order onto the field's latest filters, so a
+  // consumer gets the calls a popover session makes and keeps a filter it
+  // added meanwhile.
+  const commitAndClose = useCallback(() => {
+    // A field that became read-only while the flow was open reports nothing.
+    if (isDraftDirty && isInteractive) {
+      replayDraftEdits(committedFilters, draftEditsRef.current, onCommit);
+    }
+    draftEditsRef.current = [];
+    closeFlow();
+  }, [closeFlow, committedFilters, isDraftDirty, isInteractive, onCommit]);
+  const requestDismiss = useCallback(() => {
+    if (isDraftDirty) {
+      setIsDiscardConfirmationOpen(true);
+    } else {
+      closeFlow();
+    }
+  }, [closeFlow, isDraftDirty]);
+  const closeDiscardConfirmation = () => {
+    // eslint-disable-next-line @eslint-react/dom-no-flush-sync -- the confirmation must be gone before focus moves back into the sheet
+    flushSync(() => setIsDiscardConfirmationOpen(false));
+    const target = stepRef.current === 'manage' ? managerAddButtonRef.current ?? manageSheetRef.current?.closest('[tabindex="-1"]') : fieldsSheetRef.current?.closest('[tabindex="-1"]');
+    target?.focus({
+      preventScroll: true
+    });
+  };
 
   // Whether a Filters row is a button: the field interactive and the
   // filter not read-only. The row opens the value step — the editor for its
@@ -864,14 +992,8 @@ export function PowerSearchBottomSheet({
   // is quiet then, so the change is spoken here, inside the dialog. Only a
   // change after the flow opened is spoken.
   const announcedResultCountRef = useRef(resultCountText);
-  // The latest result count, for Clear all's handler to read after its
-  // commit has flushed.
-  const latestResultCountRef = useRef(resultCountText);
-  useLayoutEffect(() => {
-    latestResultCountRef.current = resultCountText;
-  }, [resultCountText]);
   useEffect(() => {
-    if (isClearingRef.current || resultCountText === announcedResultCountRef.current) {
+    if (resultCountText === announcedResultCountRef.current) {
       return;
     }
     announcedResultCountRef.current = resultCountText;
@@ -1138,26 +1260,21 @@ export function PowerSearchBottomSheet({
   // confirmation must be gone before focus moves into the sheet and the
   // outcome is routed into the sheet's region, so its close is flushed
   // first. The outcome is "Editable filters removed" while a read-only filter
-  // remains, otherwise "All filters removed", joined with a result count that
-  // changed in the same commit as one catalog message; focus moves to the
-  // sheet's first remaining control: a kept read-only row has none, so Add
-  // filter.
+  // remains, otherwise "All filters removed"; the result count follows the
+  // applied filters, which change on Done, so none changes here. Focus moves
+  // to the sheet's first remaining control: a kept read-only row has none,
+  // so Add filter.
   const closeClearConfirmation = confirmed => {
     const kept = filters.filter(filter => filter.isReadOnly);
     const firstRemovedIndex = filters.findIndex(filter => !filter.isReadOnly);
     const isClearing = confirmed && isInteractive && firstRemovedIndex >= 0;
-    isClearingRef.current = isClearing;
-    try {
-      // eslint-disable-next-line @eslint-react/dom-no-flush-sync -- the confirmation must be gone before focus moves into the sheet and the words are routed into it
-      flushSync(() => {
-        setIsClearConfirmationOpen(false);
-        if (isClearing) {
-          onChange(kept, 'remove', firstRemovedIndex);
-        }
-      });
-    } finally {
-      isClearingRef.current = false;
-    }
+    // eslint-disable-next-line @eslint-react/dom-no-flush-sync -- the confirmation must be gone before focus moves into the sheet and the words are routed into it
+    flushSync(() => {
+      setIsClearConfirmationOpen(false);
+      if (isClearing) {
+        onChange(kept, 'remove', firstRemovedIndex);
+      }
+    });
     if (!isClearing) {
       clearAllButtonRef.current?.focus();
       return;
@@ -1165,18 +1282,7 @@ export function PowerSearchBottomSheet({
     managerAddButtonRef.current?.focus({
       preventScroll: true
     });
-    const resultCount = latestResultCountRef.current;
-    const changedCount = resultCount !== announcedResultCountRef.current ? resultCount : null;
-    announcedResultCountRef.current = resultCount;
-    if (kept.length > 0) {
-      announce(changedCount == null ? t('@astryx.powersearch.editableFiltersRemoved') : t('@astryx.powersearch.sheet.editableFiltersClearedWithCount', {
-        resultCount: changedCount
-      }));
-    } else {
-      announce(changedCount == null ? t('@astryx.powersearch.allFiltersRemoved') : t('@astryx.powersearch.sheet.filtersClearedWithCount', {
-        resultCount: changedCount
-      }));
-    }
+    announce(kept.length > 0 ? t('@astryx.powersearch.editableFiltersRemoved') : t('@astryx.powersearch.allFiltersRemoved'));
   };
   const handleOperatorSelect = useCallback(operator => {
     setDraft(current => {
@@ -1270,20 +1376,20 @@ export function PowerSearchBottomSheet({
   // Every step change goes through the handlers above.
   const handleManageOpenChange = useCallback(isSheetOpen => {
     if (!isSheetOpen && stepRef.current === 'manage') {
-      closeFlow();
+      requestDismiss();
     }
-  }, [closeFlow]);
+  }, [requestDismiss]);
   const handleFieldsOpenChange = useCallback(isSheetOpen => {
     if (isSheetOpen || stepRef.current !== 'fields') {
       return;
     }
     if (fieldPickerOrigin === 'trigger') {
-      closeFlow();
+      requestDismiss();
       return;
     }
     queueManagerAddFocus();
     setStep('manage');
-  }, [closeFlow, fieldPickerOrigin, queueManagerAddFocus]);
+  }, [fieldPickerOrigin, queueManagerAddFocus, requestDismiss]);
   const handleValueOpenChange = useCallback(isSheetOpen => {
     if (!isSheetOpen && stepRef.current === 'value') {
       returnFromValue();
@@ -1510,7 +1616,7 @@ export function PowerSearchBottomSheet({
             // action. Mounted only while the sheet is open, so its text
             // is spoken in this sheet when it appears.
             isManageSheetOpen && /*#__PURE__*/_jsx(EmptyState, {
-              title: t('@astryx.powersearch.sheet.noFilters'),
+              title: t(isDraftDirty ? '@astryx.powersearch.sheet.noFiltersInDraft' : '@astryx.powersearch.sheet.noFilters'),
               description: t('@astryx.powersearch.sheet.noFiltersDescription'),
               headingLevel: 4,
               icon: /*#__PURE__*/_jsx(Icon, {
@@ -1574,7 +1680,7 @@ export function PowerSearchBottomSheet({
               })
             })
           })
-        }), filterRows.length > 0 && /*#__PURE__*/_jsxs("div", {
+        }), (filterRows.length > 0 || isDraftDirty) && /*#__PURE__*/_jsxs("div", {
           ...{
             className: "x1vjfegm x78zum5 x6s0dn4 x1qughib x1txdalj x8o8v82 x1pzlopt x10xzikg x1n2onr6 xdd4er5 x2lah0s"
           },
@@ -1590,7 +1696,7 @@ export function PowerSearchBottomSheet({
             variant: "primary",
             size: "lg",
             xstyle: isClearAllShown ? styles.footerEqualAction : [styles.footerSoleAction, styles.touchHitArea],
-            onClick: closeFlow,
+            onClick: commitAndClose,
             width: isClearAllShown ? undefined : '100%'
           })]
         })]
@@ -1776,7 +1882,7 @@ export function PowerSearchBottomSheet({
             variant: "primary",
             width: "100%",
             xstyle: styles.touchAction,
-            onClick: closeFlow
+            onClick: commitAndClose
           })
         })]
       })
@@ -1913,6 +2019,22 @@ export function PowerSearchBottomSheet({
       actionLabel: t('@astryx.powersearch.sheet.clearAllConfirm'),
       cancelLabel: t('@astryx.powersearch.sheet.clearAllCancel'),
       onAction: () => closeClearConfirmation(true)
+    }), isDiscardConfirmationOpen && /*#__PURE__*/_jsx(SheetConfirmation, {
+      isOpen: true,
+      onOpenChange: isConfirmationOpen => {
+        if (!isConfirmationOpen) {
+          closeDiscardConfirmation();
+        }
+      },
+      title: t('@astryx.powersearch.sheet.discardTitle'),
+      description: t('@astryx.powersearch.sheet.discardDescription'),
+      actionLabel: t('@astryx.powersearch.sheet.discardConfirm'),
+      cancelLabel: t('@astryx.powersearch.sheet.keepEditing'),
+      onAction: () => {
+        setIsDiscardConfirmationOpen(false);
+        draftEditsRef.current = [];
+        closeFlow();
+      }
     })]
   });
 }

package/dist/i18n/generated-english/PowerSearch/PowerSearchBottomSheet.generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PowerSearchBottomSheet.generated.d.ts","sourceRoot":"","sources":["../../../../src/i18n/generated-english/PowerSearch/PowerSearchBottomSheet.generated.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgC7C,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"PowerSearchBottomSheet.generated.d.ts","sourceRoot":"","sources":["../../../../src/i18n/generated-english/PowerSearch/PowerSearchBottomSheet.generated.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmC7C,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/dist/i18n/generated-english/PowerSearch/PowerSearchBottomSheet.generated.js

@@ -18,15 +18,18 @@ const english = {
   "@astryx.powersearch.sheet.clearAllConfirm": "Clear filters",
   "@astryx.powersearch.sheet.clearAllDescription": "This removes all editable filters from this search.",
   "@astryx.powersearch.sheet.clearAllTitle": "Clear all filters?",
+  "@astryx.powersearch.sheet.discardConfirm": "Discard changes",
+  "@astryx.powersearch.sheet.discardDescription": "Your changes to the filters haven't been applied.",
+  "@astryx.powersearch.sheet.discardTitle": "Discard changes?",
   "@astryx.powersearch.sheet.done": "Done",
-  "@astryx.powersearch.sheet.editableFiltersClearedWithCount": "Editable filters removed. {resultCount}",
   "@astryx.powersearch.sheet.fieldOperator": "{field} {operator}",
   "@astryx.powersearch.sheet.filterUnavailable": "This filter is no longer available",
-  "@astryx.powersearch.sheet.filtersClearedWithCount": "All filters removed. {resultCount}",
   "@astryx.powersearch.sheet.filtersTitle": "Filters",
+  "@astryx.powersearch.sheet.keepEditing": "Keep editing",
   "@astryx.powersearch.sheet.labelValue": "{label} {value}",
   "@astryx.powersearch.sheet.noFilters": "No filters applied",
   "@astryx.powersearch.sheet.noFiltersDescription": "Add a filter to narrow your results and find what you need faster.",
+  "@astryx.powersearch.sheet.noFiltersInDraft": "No filters",
   "@astryx.powersearch.sheet.noMatchingFields": "No filters match your search",
   "@astryx.powersearch.sheet.noResults": "No results found",
   "@astryx.powersearch.sheet.removeFilter": "Remove {field} filter",

package/dist/i18n/generated-locales/en.generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"en.generated.d.ts","sourceRoot":"","sources":["../../../src/i18n/generated-locales/en.generated.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiqBpD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"en.generated.d.ts","sourceRoot":"","sources":["../../../src/i18n/generated-locales/en.generated.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmqBpD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/i18n/generated-locales/en.generated.js

@@ -74,6 +74,7 @@ const runtimeCatalog = {
   '@astryx.powersearch.sheet.filtersTitle': 'Filters',
   '@astryx.powersearch.sheet.addFilter': 'Add filter',
   '@astryx.powersearch.sheet.noFilters': 'No filters applied',
+  '@astryx.powersearch.sheet.noFiltersInDraft': 'No filters',
   '@astryx.powersearch.sheet.noFiltersDescription': 'Add a filter to narrow your results and find what you need faster.',
   '@astryx.powersearch.sheet.clearAll': 'Clear all',
   '@astryx.powersearch.sheet.clearAllTitle': 'Clear all filters?',
@@ -81,6 +82,10 @@ const runtimeCatalog = {
   '@astryx.powersearch.sheet.clearAllConfirm': 'Clear filters',
   '@astryx.powersearch.sheet.clearAllCancel': 'Keep filters',
   '@astryx.powersearch.sheet.done': 'Done',
+  '@astryx.powersearch.sheet.discardTitle': 'Discard changes?',
+  '@astryx.powersearch.sheet.discardDescription': "Your changes to the filters haven't been applied.",
+  '@astryx.powersearch.sheet.keepEditing': 'Keep editing',
+  '@astryx.powersearch.sheet.discardConfirm': 'Discard changes',
   '@astryx.powersearch.sheet.search': 'Search',
   '@astryx.powersearch.sheet.searchResults': 'Search results',
   '@astryx.powersearch.sheet.searchFields': 'Search filters',
@@ -99,8 +104,6 @@ const runtimeCatalog = {
   '@astryx.powersearch.sheet.relativeMonthsFromNow': '{count, number} {count, plural, one {month} other {months}} from now',
   '@astryx.powersearch.sheet.fieldOperator': '{field} {operator}',
   '@astryx.powersearch.sheet.labelValue': '{label} {value}',
-  '@astryx.powersearch.sheet.filtersClearedWithCount': 'All filters removed. {resultCount}',
-  '@astryx.powersearch.sheet.editableFiltersClearedWithCount': 'Editable filters removed. {resultCount}',
   '@astryx.alertDialog.cancel': 'Cancel',
   '@astryx.appShell.mobileNavigation': 'Mobile navigation',
   '@astryx.appShell.skipToContent': 'Skip to content',

package/dist/i18n/generated-locales/pseudo.generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pseudo.generated.d.ts","sourceRoot":"","sources":["../../../src/i18n/generated-locales/pseudo.generated.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA6qBpD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"pseudo.generated.d.ts","sourceRoot":"","sources":["../../../src/i18n/generated-locales/pseudo.generated.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA+qBpD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/i18n/generated-locales/pseudo.generated.js

@@ -74,6 +74,7 @@ const runtimeCatalog = {
   '@astryx.powersearch.sheet.filtersTitle': '⟦Ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.addFilter': '⟦Àðð ƒíłţéř⟧',
   '@astryx.powersearch.sheet.noFilters': '⟦Ñó ƒíłţéřš àþþłíéð⟧',
+  '@astryx.powersearch.sheet.noFiltersInDraft': '⟦Ñó ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.noFiltersDescription': '⟦Àðð à ƒíłţéř ţó ñàřřóŵ ýóúř řéšúłţš àñð ƒíñð ŵĥàţ ýóú ñééð ƒàšţéř.⟧',
   '@astryx.powersearch.sheet.clearAll': '⟦Çłéàř àłł⟧',
   '@astryx.powersearch.sheet.clearAllTitle': '⟦Çłéàř àłł ƒíłţéřš?⟧',
@@ -81,6 +82,10 @@ const runtimeCatalog = {
   '@astryx.powersearch.sheet.clearAllConfirm': '⟦Çłéàř ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.clearAllCancel': '⟦Ķééþ ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.done': '⟦Ðóñé⟧',
+  '@astryx.powersearch.sheet.discardTitle': '⟦Ðíšçàřð çĥàñĝéš?⟧',
+  '@astryx.powersearch.sheet.discardDescription': "⟦Ýóúř çĥàñĝéš ţó ţĥé ƒíłţéřš ĥàṽéñ'ţ ƀééñ àþþłíéð.⟧",
+  '@astryx.powersearch.sheet.keepEditing': '⟦Ķééþ éðíţíñĝ⟧',
+  '@astryx.powersearch.sheet.discardConfirm': '⟦Ðíšçàřð çĥàñĝéš⟧',
   '@astryx.powersearch.sheet.search': '⟦Šéàřçĥ⟧',
   '@astryx.powersearch.sheet.searchResults': '⟦Šéàřçĥ řéšúłţš⟧',
   '@astryx.powersearch.sheet.searchFields': '⟦Šéàřçĥ ƒíłţéřš⟧',
@@ -99,8 +104,6 @@ const runtimeCatalog = {
   '@astryx.powersearch.sheet.relativeMonthsFromNow': '⟦{count, number} {count, plural, one {month} other {months}} ƒřóɱ ñóŵ⟧',
   '@astryx.powersearch.sheet.fieldOperator': '⟦{field} {operator}⟧',
   '@astryx.powersearch.sheet.labelValue': '⟦{label} {value}⟧',
-  '@astryx.powersearch.sheet.filtersClearedWithCount': '⟦Àłł ƒíłţéřš řéɱóṽéð. {resultCount}⟧',
-  '@astryx.powersearch.sheet.editableFiltersClearedWithCount': '⟦Éðíţàƀłé ƒíłţéřš řéɱóṽéð. {resultCount}⟧',
   '@astryx.alertDialog.cancel': '⟦Çàñçéł⟧',
   '@astryx.appShell.mobileNavigation': '⟦Ṁóƀíłé ñàṽíĝàţíóñ⟧',
   '@astryx.appShell.skipToContent': '⟦Šķíþ ţó çóñţéñţ⟧',

package/locales/en.json

@@ -267,6 +267,10 @@
     "defaultMessage": "No filters applied",
     "description": "Heading of the PowerSearch Filters sheet empty state when no filter is active (experimental bottom-sheet presentation). Neutral tone."
   },
+  "@astryx.powersearch.sheet.noFiltersInDraft": {
+    "defaultMessage": "No filters",
+    "description": "Heading of the PowerSearch Filters sheet empty state while the sheet's draft is empty but the field still has applied filters, which Done replaces. Must not say the filters are applied or removed yet. Neutral tone."
+  },
   "@astryx.powersearch.sheet.noFiltersDescription": {
     "defaultMessage": "Add a filter to narrow your results and find what you need faster.",
     "description": "Guidance line under the PowerSearch Filters sheet empty state, above its Add filter action. One short sentence."
@@ -293,7 +297,23 @@
   },
   "@astryx.powersearch.sheet.done": {
     "defaultMessage": "Done",
-    "description": "Primary button label in the PowerSearch Filters sheet footer that closes the sheet. Short; marks the end of the filtering task."
+    "description": "Primary button label in the PowerSearch Filters sheet footer that commits the sheet's filter draft and closes the sheet. Short; marks the end of the filtering task."
+  },
+  "@astryx.powersearch.sheet.discardTitle": {
+    "defaultMessage": "Discard changes?",
+    "description": "Title of the confirmation dialog shown when someone tries to dismiss the PowerSearch filter sheet after changing its filter draft. A question."
+  },
+  "@astryx.powersearch.sheet.discardDescription": {
+    "defaultMessage": "Your changes to the filters haven't been applied.",
+    "description": "Body of the dirty-dismiss confirmation inside the PowerSearch filter sheet. Done applies the draft; a dismissal would drop it."
+  },
+  "@astryx.powersearch.sheet.keepEditing": {
+    "defaultMessage": "Keep editing",
+    "description": "Label of the safe cancel action in the PowerSearch dirty-dismiss confirmation. It closes the confirmation and returns to the unchanged draft."
+  },
+  "@astryx.powersearch.sheet.discardConfirm": {
+    "defaultMessage": "Discard changes",
+    "description": "Label of the destructive action in the PowerSearch dirty-dismiss confirmation. It closes the sheet without applying its filter draft."
   },
   "@astryx.powersearch.sheet.search": {
     "defaultMessage": "Search",
@@ -367,14 +387,6 @@
     "defaultMessage": "{label} {value}",
     "description": "A Filters row's \"field operator\" text joined with its value, as the removal announcement reads it (for example \"Status is Open\"). Translators may reorder the two parts."
   },
-  "@astryx.powersearch.sheet.filtersClearedWithCount": {
-    "defaultMessage": "All filters removed. {resultCount}",
-    "description": "Polite screen-reader announcement after Clear all in the PowerSearch touch sheet when the result count changed with it; resultCount is the field's already formatted result count (for example \"240 results\"). Live-region text, never shown on screen."
-  },
-  "@astryx.powersearch.sheet.editableFiltersClearedWithCount": {
-    "defaultMessage": "Editable filters removed. {resultCount}",
-    "description": "Polite screen-reader announcement after Clear all in the PowerSearch touch sheet removes the editable filters, keeps read-only ones, and the result count changed with it; resultCount is the field's already formatted result count (for example \"240 results\"). Live-region text, never shown on screen."
-  },
   "@astryx.alertDialog.cancel": {
     "defaultMessage": "Cancel",
     "description": "Button label on the secondary/dismiss button of an AlertDialog (modal confirmation). Imperative verb; consumers usually override with task-specific text."

package/locales/pseudo.json

@@ -200,6 +200,9 @@
   "@astryx.powersearch.sheet.noFilters": {
     "defaultMessage": "⟦Ñó ƒíłţéřš àþþłíéð⟧"
   },
+  "@astryx.powersearch.sheet.noFiltersInDraft": {
+    "defaultMessage": "⟦Ñó ƒíłţéřš⟧"
+  },
   "@astryx.powersearch.sheet.noFiltersDescription": {
     "defaultMessage": "⟦Àðð à ƒíłţéř ţó ñàřřóŵ ýóúř řéšúłţš àñð ƒíñð ŵĥàţ ýóú ñééð ƒàšţéř.⟧"
   },
@@ -221,6 +224,18 @@
   "@astryx.powersearch.sheet.done": {
     "defaultMessage": "⟦Ðóñé⟧"
   },
+  "@astryx.powersearch.sheet.discardTitle": {
+    "defaultMessage": "⟦Ðíšçàřð çĥàñĝéš?⟧"
+  },
+  "@astryx.powersearch.sheet.discardDescription": {
+    "defaultMessage": "⟦Ýóúř çĥàñĝéš ţó ţĥé ƒíłţéřš ĥàṽéñ'ţ ƀééñ àþþłíéð.⟧"
+  },
+  "@astryx.powersearch.sheet.keepEditing": {
+    "defaultMessage": "⟦Ķééþ éðíţíñĝ⟧"
+  },
+  "@astryx.powersearch.sheet.discardConfirm": {
+    "defaultMessage": "⟦Ðíšçàřð çĥàñĝéš⟧"
+  },
   "@astryx.powersearch.sheet.search": {
     "defaultMessage": "⟦Šéàřçĥ⟧"
   },
@@ -275,12 +290,6 @@
   "@astryx.powersearch.sheet.labelValue": {
     "defaultMessage": "⟦{label} {value}⟧"
   },
-  "@astryx.powersearch.sheet.filtersClearedWithCount": {
-    "defaultMessage": "⟦Àłł ƒíłţéřš řéɱóṽéð. {resultCount}⟧"
-  },
-  "@astryx.powersearch.sheet.editableFiltersClearedWithCount": {
-    "defaultMessage": "⟦Éðíţàƀłé ƒíłţéřš řéɱóṽéð. {resultCount}⟧"
-  },
   "@astryx.alertDialog.cancel": {
     "defaultMessage": "⟦Çàñçéł⟧"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/core",
-  "version": "0.7.8-canary.c239daf",
+  "version": "0.7.8-canary.cc034ed",
   "displayName": "Astryx Core",
   "description": "The component library. Accessible, themeable React components with built-in spacing, dark mode, and StyleX styling.",
   "author": "Meta Open Source",
@@ -870,9 +870,9 @@
     "react-dom": ">=19.0.0"
   },
   "devDependencies": {
-    "@astryxdesign/a11y-spec": "0.7.8-canary.c239daf",
-    "@astryxdesign/cli": "0.7.8-canary.c239daf",
-    "@astryxdesign/interaction-harness": "0.7.8-canary.c239daf",
+    "@astryxdesign/a11y-spec": "0.7.8-canary.cc034ed",
+    "@astryxdesign/cli": "0.7.8-canary.cc034ed",
+    "@astryxdesign/interaction-harness": "0.7.8-canary.cc034ed",
     "@babel/cli": "^7.29.7",
     "@babel/core": "^7.29.7",
     "@babel/preset-react": "^7.29.7",

package/src/PowerSearch/PowerSearch.doc.mjs

@@ -211,7 +211,7 @@ export const docs = {
       name: 'presentation',
       type: "'popover' | 'bottom-sheet' | 'adaptive'",
       description:
-        'How the field presents filter editing. adaptive (the default) uses the bottom sheet on compact touch screens and the popover otherwise, resolved the same way Selector resolves it; the server render and the hydrating render are the popover. popover is the tokenizer field with its typeahead and the editor popover on every device. bottom-sheet makes the whole field, on every device, one trigger showing display-only filter tokens: it opens a Filters sheet listing the filters as rows that edit or remove a filter, with Add filter, Done, and Clear all (which asks first and keeps read-only filters); an Add filter sheet with the fields (or the content search with inline suggestions) opens above it, and a value step that stages operator → value and confirms from its footer opens above that. Dismissing a step reveals the one beneath. List values edit through the Tokenizer\'s own sheet. In the sheet presentation menuWidth and tokenOverflowBehavior have no surface to act on and warn in development. Pass presentation="popover" to keep the tokenizer field and the editor popover on every device.',
+        'How the field presents filter editing. adaptive (the default) uses the bottom sheet on compact touch screens and the popover otherwise, resolved the same way Selector resolves it; the server render and the hydrating render are the popover. popover is the tokenizer field with its typeahead and the editor popover on every device. bottom-sheet makes the whole field, on every device, one trigger showing display-only filter tokens: it opens a Filters sheet listing the filters as rows that edit or remove a filter, with Add filter, Done, and Clear all (which asks first and keeps read-only filters); an Add filter sheet with the fields (or the content search with inline suggestions) opens above it, and a value step that stages operator → value and confirms from its footer opens above that. Dismissing a step reveals the one beneath. The flow edits a draft: adding, editing and removing filters and Clear all change the draft, and onChange is called when Done applies it, once per edit in order; dismissing the flow with a changed draft asks before discarding it. List values edit through the Tokenizer\'s own sheet. In the sheet presentation menuWidth and tokenOverflowBehavior have no surface to act on and warn in development. Pass presentation="popover" to keep the tokenizer field and the editor popover on every device.',
       default: "'adaptive'",
     },
   ],
@@ -484,7 +484,7 @@ export const docsZh = {
       name: 'presentation',
       type: "'popover' | 'bottom-sheet' | 'adaptive'",
       description:
-        '字段如何呈现筛选编辑。adaptive（默认）在紧凑触摸屏上使用底部面板，其他情况使用 popover，解析方式与 Selector 相同；服务端渲染和水合期间的渲染均为 popover。popover 在所有设备上为带有预输入和编辑弹出层的标记字段。bottom-sheet 在所有设备上将整个字段变为一个显示只读筛选标记的触发按钮——点按后打开列出筛选项的「筛选」面板，每行可编辑或移除筛选（含添加筛选、完成、全部清除；全部清除会先确认，并保留只读筛选）；列出字段（或带内联建议的内容搜索）的「添加筛选」面板在其上方打开，按运算符 → 值暂存并在底部确认的取值步骤再在其上方打开。关闭某一步会露出下方的那一步。列表值通过 Tokenizer 自身的面板编辑。在底部面板呈现中，menuWidth 和 tokenOverflowBehavior 没有作用对象，并会在开发环境中发出警告。传入 presentation="popover" 可在所有设备上保留标记字段和编辑弹出层。',
+        '字段如何呈现筛选编辑。adaptive（默认）在紧凑触摸屏上使用底部面板，其他情况使用 popover，解析方式与 Selector 相同；服务端渲染和水合期间的渲染均为 popover。popover 在所有设备上为带有预输入和编辑弹出层的标记字段。bottom-sheet 在所有设备上将整个字段变为一个显示只读筛选标记的触发按钮——点按后打开列出筛选项的「筛选」面板，每行可编辑或移除筛选（含添加筛选、完成、全部清除；全部清除会先确认，并保留只读筛选）；列出字段（或带内联建议的内容搜索）的「添加筛选」面板在其上方打开，按运算符 → 值暂存并在底部确认的取值步骤再在其上方打开。关闭某一步会露出下方的那一步。整个流程编辑的是草稿：添加、编辑、移除筛选和全部清除都只改动草稿，点按「完成」应用草稿时才按编辑顺序逐次触发 onChange；草稿有改动时关闭流程会先询问是否放弃。列表值通过 Tokenizer 自身的面板编辑。在底部面板呈现中，menuWidth 和 tokenOverflowBehavior 没有作用对象，并会在开发环境中发出警告。传入 presentation="popover" 可在所有设备上保留标记字段和编辑弹出层。',
       default: "'adaptive'",
     },
   ],

package/src/PowerSearch/PowerSearch.tsx

@@ -430,8 +430,10 @@ export interface PowerSearchProps extends Omit<
    *   above it with the fields (or the content search with inline
    *   suggestions), and a value step opens above that, stages operator →
    *   value, and confirms from its footer. Dismissing a step reveals the
-   *   one beneath. Suited to compact touch screens, where the editor
-   *   popover competes with the software keyboard.
+   *   one beneath. The flow edits a draft: `onChange` is called when Done
+   *   applies it, once per edit in order, and a dismissal with a changed
+   *   draft asks before discarding it. Suited to compact touch screens,
+   *   where the editor popover competes with the software keyboard.
    * - `'adaptive'`: the bottom sheet on compact coarse-pointer screens,
    *   otherwise the popover — the same resolution Selector uses. The server
    *   render and the hydrating render are the popover.

package/src/PowerSearch/PowerSearchBottomSheet.tsx

@@ -181,7 +181,14 @@ export interface PowerSearchBottomSheetProps {
   config: InternalConfig;
   /** The caller's config, handed to Editor overrides as they expect it. */
   configProp: PowerSearchConfig;
+  /** The committed filters; the draft the sheet edits starts from them. */
   filters: ReadonlyArray<PowerSearchFilter>;
+  /**
+   * The field's `onChange`. Done replays the draft's edits through it, in
+   * order, onto the field's latest filters, each call carrying that list
+   * with the edit applied; nothing is reported before Done, and nothing when
+   * the field is read-only or disabled at Done.
+   */
   onChange: (
     filters: ReadonlyArray<PowerSearchFilter>,
     changeType: PowerSearchChangeType,
@@ -208,6 +215,116 @@ export interface PowerSearchBottomSheetProps {
 // Styles
 // =============================================================================
 
+/** One edit of the draft: the draft before and after it, and its type and index in the draft; Done replays it onto the field's latest filters. */
+interface DraftEdit {
+  before: ReadonlyArray<PowerSearchFilter>;
+  after: ReadonlyArray<PowerSearchFilter>;
+  changeType: PowerSearchChangeType;
+  index: number;
+}
+
+// Whether two filter lists hold the same filters in the same order, by the
+// key-order-insensitive signature the sheet matches filters with.
+function hasSameFilters(
+  a: ReadonlyArray<PowerSearchFilter>,
+  b: ReadonlyArray<PowerSearchFilter>,
+): boolean {
+  return (
+    a.length === b.length &&
+    a.every(
+      (filter, index) =>
+        b[index] != null &&
+        filterSignature(filter) === filterSignature(b[index]),
+    )
+  );
+}
+
+// The filters `before` holds that `after` does not, as a multiset by
+// signature, in `before` order.
+function removedFilters(
+  before: ReadonlyArray<PowerSearchFilter>,
+  after: ReadonlyArray<PowerSearchFilter>,
+): PowerSearchFilter[] {
+  const remaining = new Map<string, number>();
+  for (const filter of after) {
+    const signature = filterSignature(filter);
+    remaining.set(signature, (remaining.get(signature) ?? 0) + 1);
+  }
+  return before.filter(filter => {
+    const signature = filterSignature(filter);
+    const count = remaining.get(signature) ?? 0;
+    if (count > 0) {
+      remaining.set(signature, count - 1);
+      return false;
+    }
+    return true;
+  });
+}
+
+/**
+ * Replays the draft's edits onto `base`, the field's latest filters, and
+ * reports each through `report` with the list after it. An add appends; an
+ * edit replaces the first filter matching the one it edited; a removal drops
+ * the filters it removed, by signature. An edit or removal whose target is
+ * not in the base list is skipped: the parent removed it meanwhile.
+ */
+export function replayDraftEdits(
+  base: ReadonlyArray<PowerSearchFilter>,
+  edits: ReadonlyArray<DraftEdit>,
+  report: (
+    filters: ReadonlyArray<PowerSearchFilter>,
+    changeType: PowerSearchChangeType,
+    index: number,
+  ) => void,
+): ReadonlyArray<PowerSearchFilter> {
+  let current = base;
+  for (const edit of edits) {
+    if (edit.changeType === 'add') {
+      const added = edit.after[edit.index];
+      if (added == null) {
+        continue;
+      }
+      current = [...current, added];
+      report(current, 'add', current.length - 1);
+    } else if (edit.changeType === 'edit') {
+      const original = edit.before[edit.index];
+      const updated = edit.after[edit.index];
+      if (original == null || updated == null) {
+        continue;
+      }
+      const signature = filterSignature(original);
+      const index = current.findIndex(
+        filter => filterSignature(filter) === signature,
+      );
+      if (index === -1) {
+        continue;
+      }
+      current = current.map((filter, i) => (i === index ? updated : filter));
+      report(current, 'edit', index);
+    } else {
+      const removed = removedFilters(edit.before, edit.after).map(
+        filterSignature,
+      );
+      const indexes: number[] = [];
+      for (const signature of removed) {
+        const index = current.findIndex(
+          (filter, i) =>
+            !indexes.includes(i) && filterSignature(filter) === signature,
+        );
+        if (index !== -1) {
+          indexes.push(index);
+        }
+      }
+      if (indexes.length === 0) {
+        continue;
+      }
+      current = current.filter((_, i) => !indexes.includes(i));
+      report(current, 'remove', Math.min(...indexes));
+    }
+  }
+  return current;
+}
+
 // The trailing plus a field row shows when choosing it adds the filter at
 // once, and the Add filter actions' glyph. Core's default icon set has no plus.
 function PlusIcon(props: SVGProps<SVGSVGElement>) {
@@ -834,8 +951,8 @@ export function PowerSearchBottomSheet({
   resultCountText,
   config,
   configProp,
-  filters,
-  onChange,
+  filters: committedFilters,
+  onChange: onCommit,
   searchSource,
   placeholder,
   isReadOnly,
@@ -854,6 +971,35 @@ export function PowerSearchBottomSheet({
   const formatList = useListFormatter();
   const isInteractive = !isDisabled && !isReadOnly;
 
+  // ---- draft ----
+  // One open flow edits one draft of the filter list; `onChange` waits for
+  // Done, and a dismissal with a changed draft asks first.
+  const [filtersAtOpen, setFiltersAtOpen] = useState(() => committedFilters);
+  const [filters, setFilters] = useState(() => committedFilters);
+  // The draft as of the last edit, for the edit log's `before` lists.
+  const draftRef = useRef(filters);
+  const draftEditsRef = useRef<DraftEdit[]>([]);
+  const onChange = useCallback(
+    (
+      next: ReadonlyArray<PowerSearchFilter>,
+      changeType: PowerSearchChangeType,
+      index: number,
+    ) => {
+      draftEditsRef.current.push({
+        before: draftRef.current,
+        after: next,
+        changeType,
+        index,
+      });
+      draftRef.current = next;
+      setFilters(next);
+    },
+    [],
+  );
+  const isDraftDirty = !hasSameFilters(filtersAtOpen, filters);
+  const [isDiscardConfirmationOpen, setIsDiscardConfirmationOpen] =
+    useState(false);
+
   const contentSearchFieldKey = config.config.contentSearchFieldKey;
   const contentSearchOperator =
     contentSearchFieldKey == null
@@ -961,9 +1107,6 @@ export function PowerSearchBottomSheet({
   const [contentQuery, setContentQuery] = useState('');
   const [isClearConfirmationOpen, setIsClearConfirmationOpen] = useState(false);
   const clearAllButtonRef = useRef<HTMLButtonElement>(null);
-  // Set while Clear all commits, so the result count that changes in that
-  // commit is spoken with Clear all's outcome, as one message.
-  const isClearingRef = useRef(false);
 
   // `useAnnounce` delivers inside the open Astryx modal that encloses its
   // caller, and this component renders above the
@@ -990,13 +1133,21 @@ export function PowerSearchBottomSheet({
   if (isOpen !== wasOpen) {
     setWasOpen(isOpen);
     if (isOpen) {
+      // A fresh draft from the committed filters; the entry step is judged
+      // against them, not the previous session's draft.
+      setFiltersAtOpen(committedFilters);
+      setFilters(committedFilters);
+      draftRef.current = committedFilters;
+      draftEditsRef.current = [];
+      const startsOnAddFilter = committedFilters.length === 0 && isInteractive;
       setFieldQuery('');
       setContentQuery('');
-      setStep(isEntryAddFilter ? 'fields' : 'manage');
-      setFieldPickerOrigin(isEntryAddFilter ? 'trigger' : 'manage');
+      setStep(startsOnAddFilter ? 'fields' : 'manage');
+      setFieldPickerOrigin(startsOnAddFilter ? 'trigger' : 'manage');
     } else {
       setStep(null);
       setIsClearConfirmationOpen(false);
+      setIsDiscardConfirmationOpen(false);
     }
   }
 
@@ -1005,6 +1156,34 @@ export function PowerSearchBottomSheet({
     setStep(null);
     onOpenChange(false);
   }, [onOpenChange]);
+  // Done replays each edit in order onto the field's latest filters, so a
+  // consumer gets the calls a popover session makes and keeps a filter it
+  // added meanwhile.
+  const commitAndClose = useCallback(() => {
+    // A field that became read-only while the flow was open reports nothing.
+    if (isDraftDirty && isInteractive) {
+      replayDraftEdits(committedFilters, draftEditsRef.current, onCommit);
+    }
+    draftEditsRef.current = [];
+    closeFlow();
+  }, [closeFlow, committedFilters, isDraftDirty, isInteractive, onCommit]);
+  const requestDismiss = useCallback(() => {
+    if (isDraftDirty) {
+      setIsDiscardConfirmationOpen(true);
+    } else {
+      closeFlow();
+    }
+  }, [closeFlow, isDraftDirty]);
+  const closeDiscardConfirmation = () => {
+    // eslint-disable-next-line @eslint-react/dom-no-flush-sync -- the confirmation must be gone before focus moves back into the sheet
+    flushSync(() => setIsDiscardConfirmationOpen(false));
+    const target =
+      stepRef.current === 'manage'
+        ? (managerAddButtonRef.current ??
+          manageSheetRef.current?.closest<HTMLElement>('[tabindex="-1"]'))
+        : fieldsSheetRef.current?.closest<HTMLElement>('[tabindex="-1"]');
+    target?.focus({preventScroll: true});
+  };
 
   // Whether a Filters row is a button: the field interactive and the
   // filter not read-only. The row opens the value step — the editor for its
@@ -1279,17 +1458,8 @@ export function PowerSearchBottomSheet({
   // is quiet then, so the change is spoken here, inside the dialog. Only a
   // change after the flow opened is spoken.
   const announcedResultCountRef = useRef(resultCountText);
-  // The latest result count, for Clear all's handler to read after its
-  // commit has flushed.
-  const latestResultCountRef = useRef(resultCountText);
-  useLayoutEffect(() => {
-    latestResultCountRef.current = resultCountText;
-  }, [resultCountText]);
   useEffect(() => {
-    if (
-      isClearingRef.current ||
-      resultCountText === announcedResultCountRef.current
-    ) {
+    if (resultCountText === announcedResultCountRef.current) {
       return;
     }
     announcedResultCountRef.current = resultCountText;
@@ -1630,52 +1800,31 @@ export function PowerSearchBottomSheet({
   // confirmation must be gone before focus moves into the sheet and the
   // outcome is routed into the sheet's region, so its close is flushed
   // first. The outcome is "Editable filters removed" while a read-only filter
-  // remains, otherwise "All filters removed", joined with a result count that
-  // changed in the same commit as one catalog message; focus moves to the
-  // sheet's first remaining control: a kept read-only row has none, so Add
-  // filter.
+  // remains, otherwise "All filters removed"; the result count follows the
+  // applied filters, which change on Done, so none changes here. Focus moves
+  // to the sheet's first remaining control: a kept read-only row has none,
+  // so Add filter.
   const closeClearConfirmation = (confirmed: boolean) => {
     const kept = filters.filter(filter => filter.isReadOnly);
     const firstRemovedIndex = filters.findIndex(filter => !filter.isReadOnly);
     const isClearing = confirmed && isInteractive && firstRemovedIndex >= 0;
-    isClearingRef.current = isClearing;
-    try {
-      // eslint-disable-next-line @eslint-react/dom-no-flush-sync -- the confirmation must be gone before focus moves into the sheet and the words are routed into it
-      flushSync(() => {
-        setIsClearConfirmationOpen(false);
-        if (isClearing) {
-          onChange(kept, 'remove', firstRemovedIndex);
-        }
-      });
-    } finally {
-      isClearingRef.current = false;
-    }
+    // eslint-disable-next-line @eslint-react/dom-no-flush-sync -- the confirmation must be gone before focus moves into the sheet and the words are routed into it
+    flushSync(() => {
+      setIsClearConfirmationOpen(false);
+      if (isClearing) {
+        onChange(kept, 'remove', firstRemovedIndex);
+      }
+    });
     if (!isClearing) {
       clearAllButtonRef.current?.focus();
       return;
     }
     managerAddButtonRef.current?.focus({preventScroll: true});
-    const resultCount = latestResultCountRef.current;
-    const changedCount =
-      resultCount !== announcedResultCountRef.current ? resultCount : null;
-    announcedResultCountRef.current = resultCount;
-    if (kept.length > 0) {
-      announce(
-        changedCount == null
-          ? t('@astryx.powersearch.editableFiltersRemoved')
-          : t('@astryx.powersearch.sheet.editableFiltersClearedWithCount', {
-              resultCount: changedCount,
-            }),
-      );
-    } else {
-      announce(
-        changedCount == null
-          ? t('@astryx.powersearch.allFiltersRemoved')
-          : t('@astryx.powersearch.sheet.filtersClearedWithCount', {
-              resultCount: changedCount,
-            }),
-      );
-    }
+    announce(
+      kept.length > 0
+        ? t('@astryx.powersearch.editableFiltersRemoved')
+        : t('@astryx.powersearch.allFiltersRemoved'),
+    );
   };
 
   const handleOperatorSelect = useCallback((operator: PowerSearchOperator) => {
@@ -1776,10 +1925,10 @@ export function PowerSearchBottomSheet({
   const handleManageOpenChange = useCallback(
     (isSheetOpen: boolean) => {
       if (!isSheetOpen && stepRef.current === 'manage') {
-        closeFlow();
+        requestDismiss();
       }
     },
-    [closeFlow],
+    [requestDismiss],
   );
   const handleFieldsOpenChange = useCallback(
     (isSheetOpen: boolean) => {
@@ -1787,13 +1936,13 @@ export function PowerSearchBottomSheet({
         return;
       }
       if (fieldPickerOrigin === 'trigger') {
-        closeFlow();
+        requestDismiss();
         return;
       }
       queueManagerAddFocus();
       setStep('manage');
     },
-    [closeFlow, fieldPickerOrigin, queueManagerAddFocus],
+    [fieldPickerOrigin, queueManagerAddFocus, requestDismiss],
   );
   const handleValueOpenChange = useCallback(
     (isSheetOpen: boolean) => {
@@ -2076,7 +2225,11 @@ export function PowerSearchBottomSheet({
                 // is spoken in this sheet when it appears.
                 isManageSheetOpen && (
                   <EmptyState
-                    title={t('@astryx.powersearch.sheet.noFilters')}
+                    title={t(
+                      isDraftDirty
+                        ? '@astryx.powersearch.sheet.noFiltersInDraft'
+                        : '@astryx.powersearch.sheet.noFilters',
+                    )}
                     description={t(
                       '@astryx.powersearch.sheet.noFiltersDescription',
                     )}
@@ -2157,7 +2310,10 @@ export function PowerSearchBottomSheet({
               )}
             </div>
           </div>
-          {filterRows.length > 0 && (
+          {/* The footer stays while the draft differs from the applied
+              filters: an emptied draft still needs Done to apply the
+              removals. */}
+          {(filterRows.length > 0 || isDraftDirty) && (
             <div {...stylex.props(styles.footer, styles.fixedFooter)}>
               {isClearAllShown && (
                 <Button
@@ -2178,7 +2334,7 @@ export function PowerSearchBottomSheet({
                     ? styles.footerEqualAction
                     : [styles.footerSoleAction, styles.touchHitArea]
                 }
-                onClick={closeFlow}
+                onClick={commitAndClose}
                 width={isClearAllShown ? undefined : '100%'}
               />
             </div>
@@ -2373,7 +2529,7 @@ export function PowerSearchBottomSheet({
                 variant="primary"
                 width="100%"
                 xstyle={styles.touchAction}
-                onClick={closeFlow}
+                onClick={commitAndClose}
               />
             </div>
           )}
@@ -2518,6 +2674,25 @@ export function PowerSearchBottomSheet({
           onAction={() => closeClearConfirmation(true)}
         />
       )}
+      {isDiscardConfirmationOpen && (
+        <SheetConfirmation
+          isOpen
+          onOpenChange={isConfirmationOpen => {
+            if (!isConfirmationOpen) {
+              closeDiscardConfirmation();
+            }
+          }}
+          title={t('@astryx.powersearch.sheet.discardTitle')}
+          description={t('@astryx.powersearch.sheet.discardDescription')}
+          actionLabel={t('@astryx.powersearch.sheet.discardConfirm')}
+          cancelLabel={t('@astryx.powersearch.sheet.keepEditing')}
+          onAction={() => {
+            setIsDiscardConfirmationOpen(false);
+            draftEditsRef.current = [];
+            closeFlow();
+          }}
+        />
+      )}
     </>
   );
 }

package/src/i18n/generated-english/PowerSearch/PowerSearchBottomSheet.generated.ts

@@ -18,15 +18,18 @@ const english: Readonly<Record<string, string>> = {
   "@astryx.powersearch.sheet.clearAllConfirm": "Clear filters",
   "@astryx.powersearch.sheet.clearAllDescription": "This removes all editable filters from this search.",
   "@astryx.powersearch.sheet.clearAllTitle": "Clear all filters?",
+  "@astryx.powersearch.sheet.discardConfirm": "Discard changes",
+  "@astryx.powersearch.sheet.discardDescription": "Your changes to the filters haven't been applied.",
+  "@astryx.powersearch.sheet.discardTitle": "Discard changes?",
   "@astryx.powersearch.sheet.done": "Done",
-  "@astryx.powersearch.sheet.editableFiltersClearedWithCount": "Editable filters removed. {resultCount}",
   "@astryx.powersearch.sheet.fieldOperator": "{field} {operator}",
   "@astryx.powersearch.sheet.filterUnavailable": "This filter is no longer available",
-  "@astryx.powersearch.sheet.filtersClearedWithCount": "All filters removed. {resultCount}",
   "@astryx.powersearch.sheet.filtersTitle": "Filters",
+  "@astryx.powersearch.sheet.keepEditing": "Keep editing",
   "@astryx.powersearch.sheet.labelValue": "{label} {value}",
   "@astryx.powersearch.sheet.noFilters": "No filters applied",
   "@astryx.powersearch.sheet.noFiltersDescription": "Add a filter to narrow your results and find what you need faster.",
+  "@astryx.powersearch.sheet.noFiltersInDraft": "No filters",
   "@astryx.powersearch.sheet.noMatchingFields": "No filters match your search",
   "@astryx.powersearch.sheet.noResults": "No results found",
   "@astryx.powersearch.sheet.removeFilter": "Remove {field} filter",

package/src/i18n/generated-locales/en.generated.ts

@@ -81,6 +81,7 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
   '@astryx.powersearch.sheet.filtersTitle': 'Filters',
   '@astryx.powersearch.sheet.addFilter': 'Add filter',
   '@astryx.powersearch.sheet.noFilters': 'No filters applied',
+  '@astryx.powersearch.sheet.noFiltersInDraft': 'No filters',
   '@astryx.powersearch.sheet.noFiltersDescription':
     'Add a filter to narrow your results and find what you need faster.',
   '@astryx.powersearch.sheet.clearAll': 'Clear all',
@@ -90,6 +91,11 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
   '@astryx.powersearch.sheet.clearAllConfirm': 'Clear filters',
   '@astryx.powersearch.sheet.clearAllCancel': 'Keep filters',
   '@astryx.powersearch.sheet.done': 'Done',
+  '@astryx.powersearch.sheet.discardTitle': 'Discard changes?',
+  '@astryx.powersearch.sheet.discardDescription':
+    "Your changes to the filters haven't been applied.",
+  '@astryx.powersearch.sheet.keepEditing': 'Keep editing',
+  '@astryx.powersearch.sheet.discardConfirm': 'Discard changes',
   '@astryx.powersearch.sheet.search': 'Search',
   '@astryx.powersearch.sheet.searchResults': 'Search results',
   '@astryx.powersearch.sheet.searchFields': 'Search filters',
@@ -115,10 +121,6 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
     '{count, number} {count, plural, one {month} other {months}} from now',
   '@astryx.powersearch.sheet.fieldOperator': '{field} {operator}',
   '@astryx.powersearch.sheet.labelValue': '{label} {value}',
-  '@astryx.powersearch.sheet.filtersClearedWithCount':
-    'All filters removed. {resultCount}',
-  '@astryx.powersearch.sheet.editableFiltersClearedWithCount':
-    'Editable filters removed. {resultCount}',
   '@astryx.alertDialog.cancel': 'Cancel',
   '@astryx.appShell.mobileNavigation': 'Mobile navigation',
   '@astryx.appShell.skipToContent': 'Skip to content',

package/src/i18n/generated-locales/pseudo.generated.ts

@@ -83,6 +83,7 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
   '@astryx.powersearch.sheet.filtersTitle': '⟦Ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.addFilter': '⟦Àðð ƒíłţéř⟧',
   '@astryx.powersearch.sheet.noFilters': '⟦Ñó ƒíłţéřš àþþłíéð⟧',
+  '@astryx.powersearch.sheet.noFiltersInDraft': '⟦Ñó ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.noFiltersDescription':
     '⟦Àðð à ƒíłţéř ţó ñàřřóŵ ýóúř řéšúłţš àñð ƒíñð ŵĥàţ ýóú ñééð ƒàšţéř.⟧',
   '@astryx.powersearch.sheet.clearAll': '⟦Çłéàř àłł⟧',
@@ -92,6 +93,11 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
   '@astryx.powersearch.sheet.clearAllConfirm': '⟦Çłéàř ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.clearAllCancel': '⟦Ķééþ ƒíłţéřš⟧',
   '@astryx.powersearch.sheet.done': '⟦Ðóñé⟧',
+  '@astryx.powersearch.sheet.discardTitle': '⟦Ðíšçàřð çĥàñĝéš?⟧',
+  '@astryx.powersearch.sheet.discardDescription':
+    "⟦Ýóúř çĥàñĝéš ţó ţĥé ƒíłţéřš ĥàṽéñ'ţ ƀééñ àþþłíéð.⟧",
+  '@astryx.powersearch.sheet.keepEditing': '⟦Ķééþ éðíţíñĝ⟧',
+  '@astryx.powersearch.sheet.discardConfirm': '⟦Ðíšçàřð çĥàñĝéš⟧',
   '@astryx.powersearch.sheet.search': '⟦Šéàřçĥ⟧',
   '@astryx.powersearch.sheet.searchResults': '⟦Šéàřçĥ řéšúłţš⟧',
   '@astryx.powersearch.sheet.searchFields': '⟦Šéàřçĥ ƒíłţéřš⟧',
@@ -118,10 +124,6 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
     '⟦{count, number} {count, plural, one {month} other {months}} ƒřóɱ ñóŵ⟧',
   '@astryx.powersearch.sheet.fieldOperator': '⟦{field} {operator}⟧',
   '@astryx.powersearch.sheet.labelValue': '⟦{label} {value}⟧',
-  '@astryx.powersearch.sheet.filtersClearedWithCount':
-    '⟦Àłł ƒíłţéřš řéɱóṽéð. {resultCount}⟧',
-  '@astryx.powersearch.sheet.editableFiltersClearedWithCount':
-    '⟦Éðíţàƀłé ƒíłţéřš řéɱóṽéð. {resultCount}⟧',
   '@astryx.alertDialog.cancel': '⟦Çàñçéł⟧',
   '@astryx.appShell.mobileNavigation': '⟦Ṁóƀíłé ñàṽíĝàţíóñ⟧',
   '@astryx.appShell.skipToContent': '⟦Šķíþ ţó çóñţéñţ⟧',