@jsenv/navi 0.27.58 → 0.27.60

package/dist/jsenv_navi.js

@@ -14285,9 +14285,14 @@ This prevents cross-test pollution and ensures clean state.`,
               // 1. We're navigating within the same route family (not to completely unrelated routes)
               // 2. AND no matching route extracts this parameter from URL
               // 3. AND parameter has no default value (making it truly optional)
+              // 4. AND parameter is a path segment (not a search param)
+              //    Search params represent user preferences/choices and must survive
+              //    navigation away — only path segments are explicitly removed from
+              //    the URL when the route stops matching.
               if (
                 matchingRouteInSameFamily &&
-                !parameterExtractedByMatchingRoute
+                !parameterExtractedByMatchingRoute &&
+                pathConnectionMap.has(paramName)
               ) {
                 const defaultValue = connection.getDefaultValue();
                 if (defaultValue === undefined) {
@@ -14309,6 +14314,10 @@ This prevents cross-test pollution and ensures clean state.`,
                   console.debug(
                     `[route] Different route family: preserving ${paramName} signal value: ${paramSignal.value}`,
                   );
+                } else if (queryConnectionMap.has(paramName)) {
+                  console.debug(
+                    `[route] Search param ${paramName}: preserving signal value (user choice): ${paramSignal.value}`,
+                  );
                 } else {
                   console.debug(
                     `[route] Parameter ${paramName} extracted by matching route: preserving signal value: ${paramSignal.value}`,
@@ -14698,9 +14707,14 @@ const setupBrowserIntegrationViaHistory = ({
     const isSameUrl = url === window.location.href;
 
     if (navigationType === "push" || navigationType === "replace") {
-      // Pre-merge visited URLs so push/replaceState is called only once.
+      // Merge onto the current state so existing useNavState entries (e.g. an
+      // open dialog/popover) survive URL changes triggered by signal updates.
+      // "traverse" is intentionally excluded: it restores the exact historical
+      // state from the history entry, which is the source of truth for back/forward.
+      const currentState = getDocumentState() || {};
       markUrlAsVisited(url);
       const effectiveState = {
+        ...currentState,
         ...(state || {}),
         jsenv_visited_urls: Array.from(visitedUrlSet),
       };
@@ -35663,6 +35677,9 @@ const Dialog = props => {
       };
       closeRequestHandler(e, closePermission, detail);
       if (denied) {
+        if (e.type === "cancel") {
+          e.preventDefault();
+        }
         closePermission.allow = () => {
           close(e, detail);
         };
@@ -35713,9 +35730,6 @@ const Dialog = props => {
       }
     },
     onCancel: e => {
-      // The browser fires "cancel" (then closes the dialog) when the user presses Escape.
-      // Prevent the native close so we control the close flow and dispatch navi_dialog_close.
-      e.preventDefault();
       onRequestClose(e);
     },
     onnavi_request_open: e => {
@@ -36403,7 +36417,11 @@ const PickerCustom = props => {
         isClickOutside
       } = {}) => {
         const cancelEvent = findEvent(requestCloseEvent, eInChain => eInChain.type === "navi_request_close" && eInChain.detail.isCancel);
-        const isCancel = isClickOutside || Boolean(cancelEvent);
+        // open_prop_change means the parent is driving the open state directly
+        // (e.g. back-button navigation flipped openProp to false before onLeave fires).
+        // Always treat it as cancel — the user's in-progress edit should be discarded.
+        const isPropDrivenClose = requestCloseEvent.type === "open_prop_change";
+        const isCancel = isClickOutside || Boolean(cancelEvent) || isPropDrivenClose;
         if (isCancel) {
           const pickerEl = ref.current;
           const inputEl = getPickerInput(pickerEl);