@shaxpir/duiduidui-models 1.9.29 → 1.9.30

package/dist/models/Device.d.ts

@@ -89,11 +89,12 @@ export declare class Device extends Content {
     get currentSearchState(): SearchState | undefined;
     /**
      * Returns true if back navigation is possible.
-     * Only returns true if the previous entry is non-empty (has query or conditions).
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoBack(): boolean;
     /**
      * Returns true if forward navigation is possible.
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoForward(): boolean;
     /**
@@ -106,12 +107,12 @@ export declare class Device extends Content {
      */
     pushSearchState(state: SearchState): SearchState | undefined;
     /**
-     * Navigates back in search history.
+     * Navigates back in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go back
      */
     goBack(): SearchState | undefined;
     /**
-     * Navigates forward in search history.
+     * Navigates forward in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go forward
      */
     goForward(): SearchState | undefined;

package/dist/models/Device.js

@@ -267,24 +267,33 @@ class Device extends Content_1.Content {
     }
     /**
      * Returns true if back navigation is possible.
-     * Only returns true if the previous entry is non-empty (has query or conditions).
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoBack() {
         this.checkDisposed("Device.canGoBack");
         const history = this.searchHistory;
-        if (history.cursor <= 0)
-            return false;
-        // Check if the entry we'd navigate to is non-empty
-        const prevEntry = history.entries[history.cursor - 1];
-        return !(0, SearchState_1.isEmptySearchState)(prevEntry);
+        // Look for any non-empty entry before the cursor
+        for (let i = history.cursor - 1; i >= 0; i--) {
+            if (!(0, SearchState_1.isEmptySearchState)(history.entries[i])) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Returns true if forward navigation is possible.
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoForward() {
         this.checkDisposed("Device.canGoForward");
         const history = this.searchHistory;
-        return history.cursor < history.entries.length - 1;
+        // Look for any non-empty entry after the cursor
+        for (let i = history.cursor + 1; i < history.entries.length; i++) {
+            if (!(0, SearchState_1.isEmptySearchState)(history.entries[i])) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Pushes a new search state onto the history stack.
@@ -328,7 +337,7 @@ class Device extends Content_1.Content {
         return state;
     }
     /**
-     * Navigates back in search history.
+     * Navigates back in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go back
      */
     goBack() {
@@ -337,14 +346,21 @@ class Device extends Content_1.Content {
             return undefined;
         }
         const history = this.searchHistory;
-        const newCursor = history.cursor - 1;
+        // Find the first non-empty entry before the cursor
+        let newCursor = history.cursor - 1;
+        while (newCursor >= 0 && (0, SearchState_1.isEmptySearchState)(history.entries[newCursor])) {
+            newCursor--;
+        }
+        if (newCursor < 0) {
+            return undefined;
+        }
         const batch = new Operation_1.BatchOperation(this);
         batch.setPathValue(['payload', 'search_history', 'cursor'], newCursor);
         batch.commit();
         return history.entries[newCursor];
     }
     /**
-     * Navigates forward in search history.
+     * Navigates forward in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go forward
      */
     goForward() {
@@ -353,7 +369,14 @@ class Device extends Content_1.Content {
             return undefined;
         }
         const history = this.searchHistory;
-        const newCursor = history.cursor + 1;
+        // Find the first non-empty entry after the cursor
+        let newCursor = history.cursor + 1;
+        while (newCursor < history.entries.length && (0, SearchState_1.isEmptySearchState)(history.entries[newCursor])) {
+            newCursor++;
+        }
+        if (newCursor >= history.entries.length) {
+            return undefined;
+        }
         const batch = new Operation_1.BatchOperation(this);
         batch.setPathValue(['payload', 'search_history', 'cursor'], newCursor);
         batch.commit();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.9.29",
+  "version": "1.9.30",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"