osl-base-extended 1.1.49 → 1.1.51

package/fesm2022/osl-base-extended.mjs

@@ -2591,6 +2591,7 @@ class OslSetup {
     saveLoading = false;
     restoredRow = null;
     _pendingScrollTop = null;
+    _isRestoring = false;
     formBodyTpl;
     formFooterTpl;
     customFooterWrapperTpl;
@@ -2653,12 +2654,20 @@ class OslSetup {
             this.gridRef.pageSize = state.pageSize;
             this.gridRef.setRestorePage(state.page);
         }
-        if (this.searchbar) {
+        if (this.searchbar && state.searchValue) {
+            this._isRestoring = true;
             this.searchbar.searchControl.setValue(state.searchValue, { emitEvent: false });
         }
-        // Emit a dedicated restore event so the parent can re-fetch with the correct params.
-        // Existing outputs (onSearch, pageChange) are intentionally NOT touched here — firing them
-        // automatically would cause double API calls and unexpected side effects in the application.
+        // Trigger the same code path as a real search so the parent re-fetches with the correct
+        // page + searchValue in a single unified event — no new events, no application changes needed.
+        if (state.searchValue) {
+            this.onSearchSetup(state.searchValue);
+        }
+        else {
+            // No search was active — just restore the page via pageChange.
+            this.pageChange.emit({ page: state.page, pageSize: state.pageSize, searchValue: '' });
+        }
+        // Also emit the dedicated restore event for apps that want fine-grained control.
         this.onStateRestored.emit(state);
         setTimeout(() => {
             this.restoredRow = null;
@@ -2677,6 +2686,14 @@ class OslSetup {
         }
     }
     onSearchSetup(event) {
+        if (this._isRestoring) {
+            // Called from state restore — keep the saved page, don't reset to 1
+            const restoredPage = this.gridRef?.currentPage ?? 1;
+            this._isRestoring = false;
+            this.pageChange.emit({ page: restoredPage, pageSize: this.gridRef?.pageSize ?? this.pageSize, searchValue: event });
+            this.onSearch.emit(event);
+            return;
+        }
         if (this.gridRef) {
             this.gridRef.clearRestorePage();
             this.gridRef.currentPage = 1;