@searchspring/snap-controller 0.61.5 → 0.62.0

package/dist/cjs/Autocomplete/AutocompleteController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,4BAA4B,EAAkD,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEnJ,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AA2B/B,KAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;KAC5C,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,kBAAgC;IACnC,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACtC,OAAO,EAAE,YAAY,CAAC;gBAG5B,MAAM,EAAE,4BAA4B,EACpC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAuE3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA0CrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,OAAO,GAAG,SAAS,CAAC;wBAkDpD,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;4BAQN,MAAM,SAAS,CAAC,gBAAgB,CAAC,KAAG,QAAQ,IAAI,CAAC;mCAgDhD,MAAM,WAAW,CAAC,gBAAgB,CAAC,KAAG,IAAI;uBAqBtD,KAAK;;;;uBAsDL,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAgBR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgF3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAwBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CAmI9B;CACF"}
+{"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,4BAA4B,EAAiC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAElI,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AA+B/B,KAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;KAC5C,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,kBAAgC;IACnC,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACtC,OAAO,EAAE,YAAY,CAAC;gBAG5B,MAAM,EAAE,4BAA4B,EACpC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAwD3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA0CrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,OAAO,GAAG,SAAS,CAAC;wBAkDpD,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;4BAQN,MAAM,SAAS,CAAC,gBAAgB,CAAC,KAAG,QAAQ,IAAI,CAAC;mCAgDhD,MAAM,WAAW,CAAC,gBAAgB,CAAC,KAAG,IAAI;uBAqBtD,KAAK;;;;uBAyDL,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAgBR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgF3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAwBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA0I9B;CACF"}

package/dist/cjs/Autocomplete/AutocompleteController.js

@@ -95,6 +95,10 @@ var defaultConfig = {
             merchandising: true,
             singleResult: false,
         },
+        bind: {
+            input: true,
+            submit: true,
+        },
     },
 };
 var AutocompleteController = /** @class */ (function (_super) {
@@ -290,6 +294,8 @@ var AutocompleteController = /** @class */ (function (_super) {
                         return;
                     }
                     _this.store.state.input = value;
+                    // remove merch redirect to prevent race condition
+                    _this.store.merchandising.redirect = '';
                     if ((_b = (_a = _this.config) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.syncInputs) {
                         var inputs = document.querySelectorAll(_this.config.selector);
                         inputs.forEach(function (input) {
@@ -375,6 +381,13 @@ var AutocompleteController = /** @class */ (function (_super) {
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        _d.trys.push([0, 16, 17, 18]);
+                        if (!!this.initialized) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.init()];
+                    case 1:
+                        _d.sent();
+                        _d.label = 2;
+                    case 2:
                         // if urlManager has no query, there will be no need to get params and no query
                         if (!this.urlManager.state.query) {
                             return [2 /*return*/];
@@ -384,20 +397,18 @@ var AutocompleteController = /** @class */ (function (_super) {
                         if (!((_c = (_b = params === null || params === void 0 ? void 0 : params.search) === null || _b === void 0 ? void 0 : _b.query) === null || _c === void 0 ? void 0 : _c.string)) {
                             return [2 /*return*/];
                         }
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 15, , 16]);
-                        _d.label = 2;
-                    case 2:
-                        _d.trys.push([2, 4, , 5]);
+                        this.store.loading = true;
+                        _d.label = 3;
+                    case 3:
+                        _d.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, this.eventManager.fire('beforeSearch', {
                                 controller: this,
                                 request: params,
                             })];
-                    case 3:
-                        _d.sent();
-                        return [3 /*break*/, 5];
                     case 4:
+                        _d.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
                         err_3 = _d.sent();
                         if ((err_3 === null || err_3 === void 0 ? void 0 : err_3.message) == 'cancelled') {
                             this.log.warn("'beforeSearch' middleware cancelled");
@@ -407,11 +418,11 @@ var AutocompleteController = /** @class */ (function (_super) {
                             this.log.error("error in 'beforeSearch' middleware");
                             throw err_3;
                         }
-                        return [3 /*break*/, 5];
-                    case 5:
+                        return [3 /*break*/, 6];
+                    case 6:
                         searchProfile = this.profiler.create({ type: 'event', name: 'search', context: params }).start();
                         return [4 /*yield*/, this.client.autocomplete(params)];
-                    case 6:
+                    case 7:
                         _a = _d.sent(), meta = _a[0], response = _a[1];
                         // @ts-ignore : MockClient will overwrite the client search() method and use SearchData to return mock data which already contains meta data
                         if (!response.meta) {
@@ -421,18 +432,18 @@ var AutocompleteController = /** @class */ (function (_super) {
                         searchProfile.stop();
                         this.log.profile(searchProfile);
                         afterSearchProfile = this.profiler.create({ type: 'event', name: 'afterSearch', context: params }).start();
-                        _d.label = 7;
-                    case 7:
-                        _d.trys.push([7, 9, , 10]);
+                        _d.label = 8;
+                    case 8:
+                        _d.trys.push([8, 10, , 11]);
                         return [4 /*yield*/, this.eventManager.fire('afterSearch', {
                                 controller: this,
                                 request: params,
                                 response: response,
                             })];
-                    case 8:
-                        _d.sent();
-                        return [3 /*break*/, 10];
                     case 9:
+                        _d.sent();
+                        return [3 /*break*/, 11];
+                    case 10:
                         err_4 = _d.sent();
                         if ((err_4 === null || err_4 === void 0 ? void 0 : err_4.message) == 'cancelled') {
                             this.log.warn("'afterSearch' middleware cancelled");
@@ -443,25 +454,25 @@ var AutocompleteController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterSearch' middleware");
                             throw err_4;
                         }
-                        return [3 /*break*/, 10];
-                    case 10:
+                        return [3 /*break*/, 11];
+                    case 11:
                         afterSearchProfile.stop();
                         this.log.profile(afterSearchProfile);
                         // update the store
                         this.store.update(response);
                         afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params }).start();
-                        _d.label = 11;
-                    case 11:
-                        _d.trys.push([11, 13, , 14]);
+                        _d.label = 12;
+                    case 12:
+                        _d.trys.push([12, 14, , 15]);
                         return [4 /*yield*/, this.eventManager.fire('afterStore', {
                                 controller: this,
                                 request: params,
                                 response: response,
                             })];
-                    case 12:
-                        _d.sent();
-                        return [3 /*break*/, 14];
                     case 13:
+                        _d.sent();
+                        return [3 /*break*/, 15];
+                    case 14:
                         err_5 = _d.sent();
                         if ((err_5 === null || err_5 === void 0 ? void 0 : err_5.message) == 'cancelled') {
                             this.log.warn("'afterStore' middleware cancelled");
@@ -472,12 +483,12 @@ var AutocompleteController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterStore' middleware");
                             throw err_5;
                         }
-                        return [3 /*break*/, 14];
-                    case 14:
+                        return [3 /*break*/, 15];
+                    case 15:
                         afterStoreProfile.stop();
                         this.log.profile(afterStoreProfile);
-                        return [3 /*break*/, 16];
-                    case 15:
+                        return [3 /*break*/, 18];
+                    case 16:
                         err_6 = _d.sent();
                         if (err_6) {
                             if (err_6.err && err_6.fetchDetails) {
@@ -517,10 +528,12 @@ var AutocompleteController = /** @class */ (function (_super) {
                                 this.log.error(err_6);
                                 this.handleError(err_6);
                             }
-                            this.store.loading = false;
                         }
-                        return [3 /*break*/, 16];
-                    case 16: return [2 /*return*/];
+                        return [3 /*break*/, 18];
+                    case 17:
+                        this.store.loading = false;
+                        return [7 /*endfinally*/];
+                    case 18: return [2 /*return*/];
                 }
             });
         }); };
@@ -539,19 +552,6 @@ var AutocompleteController = /** @class */ (function (_super) {
             type: 'session',
             key: "ss-controller-".concat(_this.config.id),
         });
-        // add 'beforeSearch' middleware
-        _this.eventManager.on('beforeSearch', function (ac, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        ac.controller.store.loading = true;
-                        return [4 /*yield*/, next()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
         // add 'afterSearch' middleware
         _this.eventManager.on('afterSearch', function (ac, next) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -561,25 +561,12 @@ var AutocompleteController = /** @class */ (function (_super) {
                         _a.sent();
                         // cancel search if no input or query doesn't match current urlState
                         if (ac.response.autocomplete.query != ac.controller.urlManager.state.query) {
-                            ac.controller.store.loading = false;
                             return [2 /*return*/, false];
                         }
                         return [2 /*return*/];
                 }
             });
         }); });
-        // add 'afterStore' middleware
-        _this.eventManager.on('afterStore', function (ac, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, next()];
-                    case 1:
-                        _a.sent();
-                        ac.controller.store.loading = false;
-                        return [2 /*return*/];
-                }
-            });
-        }); });
         _this.eventManager.on('beforeSubmit', function (ac, next) { return __awaiter(_this, void 0, void 0, function () {
             var redirectURL, results, singleResultUrl;
             var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -734,14 +721,14 @@ var AutocompleteController = /** @class */ (function (_super) {
                         this.unbind();
                         inputs = document.querySelectorAll(this.config.selector);
                         inputs.forEach(function (input) {
-                            var _a, _b, _c;
+                            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                             input.setAttribute('spellcheck', 'false');
                             input.setAttribute('autocomplete', 'off');
                             input.setAttribute('autocorrect', 'off');
                             input.setAttribute('autocapitalize', 'none');
                             input.setAttribute(INPUT_ATTRIBUTE, '');
-                            input.addEventListener('input', _this.handlers.input.input);
-                            if (((_b = (_a = _this.config) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.initializeFromUrl) && !input.value && _this.store.state.input) {
+                            ((_b = (_a = _this.config.settings) === null || _a === void 0 ? void 0 : _a.bind) === null || _b === void 0 ? void 0 : _b.input) && input.addEventListener('input', _this.handlers.input.input);
+                            if (((_d = (_c = _this.config) === null || _c === void 0 ? void 0 : _c.settings) === null || _d === void 0 ? void 0 : _d.initializeFromUrl) && !input.value && _this.store.state.input) {
                                 input.value = _this.store.state.input;
                             }
                             input.addEventListener('focus', _this.handlers.input.focus);
@@ -749,14 +736,14 @@ var AutocompleteController = /** @class */ (function (_super) {
                             var form = input.form;
                             var formActionUrl;
                             if (_this.config.action) {
-                                input.addEventListener('keydown', _this.handlers.input.enterKey);
+                                ((_f = (_e = _this.config.settings) === null || _e === void 0 ? void 0 : _e.bind) === null || _f === void 0 ? void 0 : _f.submit) && input.addEventListener('keydown', _this.handlers.input.enterKey);
                                 formActionUrl = _this.config.action;
                             }
                             else if (form) {
-                                form.addEventListener('submit', _this.handlers.input.formSubmit);
+                                ((_h = (_g = _this.config.settings) === null || _g === void 0 ? void 0 : _g.bind) === null || _h === void 0 ? void 0 : _h.submit) && form.addEventListener('submit', _this.handlers.input.formSubmit);
                                 formActionUrl = form.action || '';
                                 // serializeForm will include additional form element in our urlManager as globals
-                                if ((_c = _this.config.settings) === null || _c === void 0 ? void 0 : _c.serializeForm) {
+                                if ((_j = _this.config.settings) === null || _j === void 0 ? void 0 : _j.serializeForm) {
                                     bindFormParameters(form, _this.handlers.input.formElementChange, function (elem) {
                                         return elem != input;
                                     });

package/dist/cjs/Finder/FinderController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FinderController.d.ts","sourceRoot":"","sources":["../../../src/Finder/FinderController.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAmC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiB9H,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;gBAGtC,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAqC3B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA+BhC;IAED,IAAI,QAAa,QAAQ,IAAI,CAAC,CAkB5B;IAEF,KAAK,QAAO,IAAI,CAId;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CAkI9B;CACF"}
+{"version":3,"file":"FinderController.d.ts","sourceRoot":"","sources":["../../../src/Finder/FinderController.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAkB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiB7G,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;gBAGtC,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA+B3B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA+BhC;IAED,IAAI,QAAa,QAAQ,IAAI,CAAC,CAkB5B;IAEF,KAAK,QAAO,IAAI,CAId;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CAoI9B;CACF"}

package/dist/cjs/Finder/FinderController.js

@@ -133,6 +133,7 @@ var FinderController = /** @class */ (function (_super) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        _b.trys.push([0, 16, 17, 18]);
                         if (!!this.initialized) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.init()];
                     case 1:
@@ -143,20 +144,18 @@ var FinderController = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         params = this.params;
+                        this.store.loading = true;
                         _b.label = 3;
                     case 3:
-                        _b.trys.push([3, 17, , 18]);
-                        _b.label = 4;
-                    case 4:
-                        _b.trys.push([4, 6, , 7]);
+                        _b.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, this.eventManager.fire('beforeSearch', {
                                 controller: this,
                                 request: params,
                             })];
-                    case 5:
+                    case 4:
                         _b.sent();
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 6];
+                    case 5:
                         err_2 = _b.sent();
                         if ((err_2 === null || err_2 === void 0 ? void 0 : err_2.message) == 'cancelled') {
                             this.log.warn("'beforeSearch' middleware cancelled");
@@ -166,11 +165,11 @@ var FinderController = /** @class */ (function (_super) {
                             this.log.error("error in 'beforeSearch' middleware");
                             throw err_2;
                         }
-                        return [3 /*break*/, 7];
-                    case 7:
+                        return [3 /*break*/, 6];
+                    case 6:
                         searchProfile = this.profiler.create({ type: 'event', name: 'search', context: params }).start();
                         return [4 /*yield*/, this.client.finder(params)];
-                    case 8:
+                    case 7:
                         _a = _b.sent(), meta = _a[0], response = _a[1];
                         // @ts-ignore : MockClient will overwrite the client search() method and use SearchData to return mock data which already contains meta data
                         if (!response.meta) {
@@ -180,18 +179,18 @@ var FinderController = /** @class */ (function (_super) {
                         searchProfile.stop();
                         this.log.profile(searchProfile);
                         afterSearchProfile = this.profiler.create({ type: 'event', name: 'afterSearch', context: params }).start();
-                        _b.label = 9;
-                    case 9:
-                        _b.trys.push([9, 11, , 12]);
+                        _b.label = 8;
+                    case 8:
+                        _b.trys.push([8, 10, , 11]);
                         return [4 /*yield*/, this.eventManager.fire('afterSearch', {
                                 controller: this,
                                 request: params,
                                 response: response,
                             })];
-                    case 10:
+                    case 9:
                         _b.sent();
-                        return [3 /*break*/, 12];
-                    case 11:
+                        return [3 /*break*/, 11];
+                    case 10:
                         err_3 = _b.sent();
                         if ((err_3 === null || err_3 === void 0 ? void 0 : err_3.message) == 'cancelled') {
                             this.log.warn("'afterSearch' middleware cancelled");
@@ -202,26 +201,26 @@ var FinderController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterSearch' middleware");
                             throw err_3;
                         }
-                        return [3 /*break*/, 12];
-                    case 12:
+                        return [3 /*break*/, 11];
+                    case 11:
                         afterSearchProfile.stop();
                         this.log.profile(afterSearchProfile);
                         // update the store
                         // @ts-ignore : MockClient will overwrite the client search() method and use SearchData to return mock data which already contains meta data
                         this.store.update(response);
                         afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params }).start();
-                        _b.label = 13;
-                    case 13:
-                        _b.trys.push([13, 15, , 16]);
+                        _b.label = 12;
+                    case 12:
+                        _b.trys.push([12, 14, , 15]);
                         return [4 /*yield*/, this.eventManager.fire('afterStore', {
                                 controller: this,
                                 request: params,
                                 response: response,
                             })];
-                    case 14:
+                    case 13:
                         _b.sent();
-                        return [3 /*break*/, 16];
-                    case 15:
+                        return [3 /*break*/, 15];
+                    case 14:
                         err_4 = _b.sent();
                         if ((err_4 === null || err_4 === void 0 ? void 0 : err_4.message) == 'cancelled') {
                             this.log.warn("'afterStore' middleware cancelled");
@@ -232,12 +231,12 @@ var FinderController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterStore' middleware");
                             throw err_4;
                         }
-                        return [3 /*break*/, 16];
-                    case 16:
+                        return [3 /*break*/, 15];
+                    case 15:
                         afterStoreProfile.stop();
                         this.log.profile(afterStoreProfile);
                         return [3 /*break*/, 18];
-                    case 17:
+                    case 16:
                         err_5 = _b.sent();
                         if (err_5) {
                             if (err_5.err && err_5.fetchDetails) {
@@ -277,9 +276,11 @@ var FinderController = /** @class */ (function (_super) {
                                 this.log.error(err_5);
                                 this.handleError(err_5);
                             }
-                            this.store.loading = false;
                         }
                         return [3 /*break*/, 18];
+                    case 17:
+                        this.store.loading = false;
+                        return [7 /*endfinally*/];
                     case 18: return [2 /*return*/];
                 }
             });
@@ -293,19 +294,7 @@ var FinderController = /** @class */ (function (_super) {
                 return __assign(__assign({}, translatorConfig), { urlRoot: _this.config.url });
             });
         }
-        _this.eventManager.on('beforeSearch', function (finder, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        finder.controller.store.loading = true;
-                        return [4 /*yield*/, next()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        // TODO: move this to afterStore
+        // TODO: remove this aftersearch when store interface changes
         _this.eventManager.on('afterSearch', function (finder, next) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {

package/dist/cjs/Recommendation/RecommendationController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,8BAA8B,EAAkC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErI,KAAK,0BAA0B,GAAG;IACjC,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACnE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACrD,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACzD,iBAAiB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QAChE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;KAC5D,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,GAAG,SAAS,CAAC;IAClD,SAAS,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;IAC1E,UAAU,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAUF,qBAAa,wBAAyB,SAAQ,kBAAkB;IACxD,IAAI,kBAAkC;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,8BAA8B,CAAC;IAE/C,MAAM,EAAE;QACP,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,UAAU,CAAC,EAAE,WAAW,CAAC;YAAC,MAAM,CAAC,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC7E,CAKC;gBAGD,MAAM,EAAE,8BAA8B,EACtC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA2C3B,KAAK,EAAE,0BAA0B,CAwS5B;IAEL,IAAI,MAAM,IAAI,qBAAqB,CA2BlC;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAuH9B;CACF"}
+{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,8BAA8B,EAAiB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEpH,KAAK,0BAA0B,GAAG;IACjC,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACnE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACrD,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACzD,iBAAiB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QAChE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;KAC5D,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,GAAG,SAAS,CAAC;IAClD,SAAS,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;IAC1E,UAAU,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAUF,qBAAa,wBAAyB,SAAQ,kBAAkB;IACxD,IAAI,kBAAkC;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,8BAA8B,CAAC;IAE/C,MAAM,EAAE;QACP,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,UAAU,CAAC,EAAE,WAAW,CAAC;YAAC,MAAM,CAAC,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC7E,CAKC;gBAGD,MAAM,EAAE,8BAA8B,EACtC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA4C3B,KAAK,EAAE,0BAA0B,CAwS5B;IAEL,IAAI,MAAM,IAAI,qBAAqB,CA2BlC;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CA0H9B;CACF"}

package/dist/cjs/Recommendation/RecommendationController.js

@@ -82,6 +82,7 @@ var RecommendationController = /** @class */ (function (_super) {
     __extends(RecommendationController, _super);
     function RecommendationController(config, _a, context) {
         var client = _a.client, store = _a.store, urlManager = _a.urlManager, eventManager = _a.eventManager, profiler = _a.profiler, logger = _a.logger, tracker = _a.tracker;
+        var _b;
         var _this = _super.call(this, config, { client: client, store: store, urlManager: urlManager, eventManager: eventManager, profiler: profiler, logger: logger, tracker: tracker }, context) || this;
         _this.type = types_1.ControllerTypes.recommendation;
         _this.events = {
@@ -395,6 +396,7 @@ var RecommendationController = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        _a.trys.push([0, 16, 17, 18]);
                         if (!!this.initialized) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.init()];
                     case 1:
@@ -402,20 +404,18 @@ var RecommendationController = /** @class */ (function (_super) {
                         _a.label = 2;
                     case 2:
                         params = this.params;
+                        this.store.loading = true;
                         _a.label = 3;
                     case 3:
-                        _a.trys.push([3, 17, , 18]);
-                        _a.label = 4;
-                    case 4:
-                        _a.trys.push([4, 6, , 7]);
+                        _a.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, this.eventManager.fire('beforeSearch', {
                                 controller: this,
                                 request: params,
                             })];
-                    case 5:
+                    case 4:
                         _a.sent();
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 6];
+                    case 5:
                         err_1 = _a.sent();
                         if ((err_1 === null || err_1 === void 0 ? void 0 : err_1.message) == 'cancelled') {
                             this.log.warn("'beforeSearch' middleware cancelled");
@@ -425,27 +425,27 @@ var RecommendationController = /** @class */ (function (_super) {
                             this.log.error("error in 'beforeSearch' middleware");
                             throw err_1;
                         }
-                        return [3 /*break*/, 7];
-                    case 7:
+                        return [3 /*break*/, 6];
+                    case 6:
                         searchProfile = this.profiler.create({ type: 'event', name: 'search', context: params }).start();
                         return [4 /*yield*/, this.client.recommend(params)];
-                    case 8:
+                    case 7:
                         response = _a.sent();
                         searchProfile.stop();
                         this.log.profile(searchProfile);
                         afterSearchProfile = this.profiler.create({ type: 'event', name: 'afterSearch', context: params }).start();
-                        _a.label = 9;
-                    case 9:
-                        _a.trys.push([9, 11, , 12]);
+                        _a.label = 8;
+                    case 8:
+                        _a.trys.push([8, 10, , 11]);
                         return [4 /*yield*/, this.eventManager.fire('afterSearch', {
                                 controller: this,
                                 request: params,
                                 response: response,
                             })];
-                    case 10:
+                    case 9:
                         _a.sent();
-                        return [3 /*break*/, 12];
-                    case 11:
+                        return [3 /*break*/, 11];
+                    case 10:
                         err_2 = _a.sent();
                         if ((err_2 === null || err_2 === void 0 ? void 0 : err_2.message) == 'cancelled') {
                             this.log.warn("'afterSearch' middleware cancelled");
@@ -456,25 +456,25 @@ var RecommendationController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterSearch' middleware");
                             throw err_2;
                         }
-                        return [3 /*break*/, 12];
-                    case 12:
+                        return [3 /*break*/, 11];
+                    case 11:
                         afterSearchProfile.stop();
                         this.log.profile(afterSearchProfile);
                         // update the store
                         this.store.update(response);
                         afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params }).start();
-                        _a.label = 13;
-                    case 13:
-                        _a.trys.push([13, 15, , 16]);
+                        _a.label = 12;
+                    case 12:
+                        _a.trys.push([12, 14, , 15]);
                         return [4 /*yield*/, this.eventManager.fire('afterStore', {
                                 controller: this,
                                 request: params,
                                 response: response,
                             })];
-                    case 14:
+                    case 13:
                         _a.sent();
-                        return [3 /*break*/, 16];
-                    case 15:
+                        return [3 /*break*/, 15];
+                    case 14:
                         err_3 = _a.sent();
                         if ((err_3 === null || err_3 === void 0 ? void 0 : err_3.message) == 'cancelled') {
                             this.log.warn("'afterStore' middleware cancelled");
@@ -485,12 +485,12 @@ var RecommendationController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterStore' middleware");
                             throw err_3;
                         }
-                        return [3 /*break*/, 16];
-                    case 16:
+                        return [3 /*break*/, 15];
+                    case 15:
                         afterStoreProfile.stop();
                         this.log.profile(afterStoreProfile);
                         return [3 /*break*/, 18];
-                    case 17:
+                    case 16:
                         err_4 = _a.sent();
                         if (err_4) {
                             if (err_4.err && err_4.fetchDetails) {
@@ -530,9 +530,11 @@ var RecommendationController = /** @class */ (function (_super) {
                                 this.log.error(err_4);
                                 this.handleError(err_4);
                             }
-                            this.store.loading = false;
                         }
                         return [3 /*break*/, 18];
+                    case 17:
+                        this.store.loading = false;
+                        return [7 /*endfinally*/];
                     case 18: return [2 /*return*/];
                 }
             });
@@ -540,22 +542,18 @@ var RecommendationController = /** @class */ (function (_super) {
         if (!config.tag) {
             throw new Error("Invalid config passed to RecommendationController. The \"tag\" attribute is required.");
         }
+        // attach to bfCache restore event and re-run search on the controller
+        // enabled by default
+        if (((_b = config.settings) === null || _b === void 0 ? void 0 : _b.searchOnPageShow) !== false) {
+            window.addEventListener('pageshow', function (e) {
+                if (e.persisted && !_this.store.error && _this.store.loaded && !_this.store.loading) {
+                    _this.search();
+                }
+            });
+        }
         // deep merge config with defaults
         _this.config = (0, deepmerge_1.default)(defaultConfig, _this.config);
         _this.store.setConfig(_this.config);
-        // add 'beforeSearch' middleware
-        _this.eventManager.on('beforeSearch', function (recommend, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        recommend.controller.store.loading = true;
-                        return [4 /*yield*/, next()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
         // add 'afterStore' middleware
         _this.eventManager.on('afterStore', function (recommend, next) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
@@ -578,7 +576,6 @@ var RecommendationController = /** @class */ (function (_super) {
                                 _this.track.product.removedFromBundle(item);
                             });
                         });
-                        recommend.controller.store.loading = false;
                         return [2 /*return*/];
                 }
             });

package/dist/cjs/Search/SearchController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EACX,sBAAsB,EAItB,kBAAkB,EAClB,gBAAgB,EAGhB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EACX,kBAAkB,EAKlB,MAAM,2BAA2B,CAAC;AAmBnC,KAAK,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KAC/D,CAAC;CACF,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;IACvC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,eAAe,CAAwC;gBAG9D,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAgK3B,KAAK,EAAE,kBAAkB,CA+CvB;IAEF,IAAI,MAAM,IAAI,kBAAkB,CAiD/B;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAkN9B;CACF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAiBxF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,GAAG,SAAS,CAgCvG"}
+{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EACX,sBAAsB,EAGtB,kBAAkB,EAClB,gBAAgB,EAGhB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EACX,kBAAkB,EAKlB,MAAM,2BAA2B,CAAC;AAmBnC,KAAK,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KAC/D,CAAC;CACF,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;IACvC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,eAAe,CAAwC;gBAG9D,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAuJ3B,KAAK,EAAE,kBAAkB,CA+CvB;IAEF,IAAI,MAAM,IAAI,kBAAkB,CAiD/B;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAmN9B;CACF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAiBxF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,GAAG,SAAS,CAgCvG"}

package/dist/cjs/Search/SearchController.js

@@ -148,38 +148,37 @@ var SearchController = /** @class */ (function (_super) {
             },
         };
         _this.search = function () { return __awaiter(_this, void 0, void 0, function () {
-            var params, err_1, stringyParams, prevStringyParams, searchProfile, meta, response, preventBackfill, dontBackfill, backfillRequests, backfillResponses, backfillResults, afterSearchProfile, err_2, afterStoreProfile, err_3, err_4;
+            var params_1, err_1, stringyParams, prevStringyParams, searchProfile, meta, response, preventBackfill, dontBackfill, backfillRequests, backfillResponses, backfillResults, afterSearchProfile, err_2, afterStoreProfile, err_3, err_4;
             var _a, _b;
             var _this = this;
             var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             return __generator(this, function (_p) {
                 switch (_p.label) {
                     case 0:
+                        _p.trys.push([0, 22, 23, 24]);
                         if (!!this.initialized) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.init()];
                     case 1:
                         _p.sent();
                         _p.label = 2;
                     case 2:
-                        params = this.params;
+                        params_1 = this.params;
                         if (((_d = (_c = this.params.search) === null || _c === void 0 ? void 0 : _c.query) === null || _d === void 0 ? void 0 : _d.string) && ((_f = (_e = this.params.search) === null || _e === void 0 ? void 0 : _e.query) === null || _f === void 0 ? void 0 : _f.string.length)) {
                             // save it to the history store
                             this.store.history.save(this.params.search.query.string);
                         }
+                        this.store.loading = true;
                         _p.label = 3;
                     case 3:
-                        _p.trys.push([3, 23, , 24]);
-                        _p.label = 4;
-                    case 4:
-                        _p.trys.push([4, 6, , 7]);
+                        _p.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, this.eventManager.fire('beforeSearch', {
                                 controller: this,
-                                request: params,
+                                request: params_1,
                             })];
-                    case 5:
+                    case 4:
                         _p.sent();
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 6];
+                    case 5:
                         err_1 = _p.sent();
                         if ((err_1 === null || err_1 === void 0 ? void 0 : err_1.message) == 'cancelled') {
                             this.log.warn("'beforeSearch' middleware cancelled");
@@ -189,19 +188,19 @@ var SearchController = /** @class */ (function (_super) {
                             this.log.error("error in 'beforeSearch' middleware");
                             throw err_1;
                         }
-                        return [3 /*break*/, 7];
-                    case 7:
-                        stringyParams = JSON.stringify(params);
+                        return [3 /*break*/, 6];
+                    case 6:
+                        stringyParams = JSON.stringify(params_1);
                         prevStringyParams = this.storage.get('lastStringyParams');
                         if (stringyParams == prevStringyParams) {
                             // no param change - not searching
                             return [2 /*return*/];
                         }
-                        searchProfile = this.profiler.create({ type: 'event', name: 'search', context: params }).start();
+                        searchProfile = this.profiler.create({ type: 'event', name: 'search', context: params_1 }).start();
                         meta = {};
                         response = {};
-                        if (!(((_g = this.config.settings) === null || _g === void 0 ? void 0 : _g.infinite) && ((_h = params.pagination) === null || _h === void 0 ? void 0 : _h.page) && params.pagination.page > 1)) return [3 /*break*/, 12];
-                        preventBackfill = ((_j = this.config.settings.infinite) === null || _j === void 0 ? void 0 : _j.backfill) && !this.store.results.length && params.pagination.page > this.config.settings.infinite.backfill;
+                        if (!(((_g = this.config.settings) === null || _g === void 0 ? void 0 : _g.infinite) && ((_h = params_1.pagination) === null || _h === void 0 ? void 0 : _h.page) && params_1.pagination.page > 1)) return [3 /*break*/, 11];
+                        preventBackfill = ((_j = this.config.settings.infinite) === null || _j === void 0 ? void 0 : _j.backfill) && !this.store.results.length && params_1.pagination.page > this.config.settings.infinite.backfill;
                         dontBackfill = !((_k = this.config.settings.infinite) === null || _k === void 0 ? void 0 : _k.backfill) && !this.store.results.length;
                         // if the page is higher than the backfill setting redirect back to page 1
                         if (preventBackfill || dontBackfill) {
@@ -209,12 +208,12 @@ var SearchController = /** @class */ (function (_super) {
                             this.urlManager.set('page', 1).go();
                             return [2 /*return*/];
                         }
-                        if (!(((_l = this.config.settings) === null || _l === void 0 ? void 0 : _l.infinite.backfill) && !this.previousResults.length)) return [3 /*break*/, 9];
-                        backfillRequests = Array(params.pagination.page)
+                        if (!(((_l = this.config.settings) === null || _l === void 0 ? void 0 : _l.infinite.backfill) && !this.previousResults.length)) return [3 /*break*/, 8];
+                        backfillRequests = Array(params_1.pagination.page)
                             .fill('backfill')
                             .map(function (v, i) {
                             var _a, _b, _c, _d;
-                            var backfillParams = (0, deepmerge_1.default)(__assign({}, params), { pagination: { page: i + 1 }, search: { redirectResponse: 'full' } });
+                            var backfillParams = (0, deepmerge_1.default)(__assign({}, params_1), { pagination: { page: i + 1 }, search: { redirectResponse: 'full' } });
                             // don't include page parameter if on page 1
                             if (i + 1 == 1) {
                                 (_a = backfillParams === null || backfillParams === void 0 ? void 0 : backfillParams.pagination) === null || _a === void 0 ? true : delete _a.page;
@@ -227,7 +226,7 @@ var SearchController = /** @class */ (function (_super) {
                             return _this.client.search(backfillParams);
                         });
                         return [4 /*yield*/, Promise.all(backfillRequests)];
-                    case 8:
+                    case 7:
                         backfillResponses = _p.sent();
                         // backfillResponses are [meta, searchResponse][]
                         // set the meta and response to the first page of backfillResponses
@@ -239,43 +238,43 @@ var SearchController = /** @class */ (function (_super) {
                         }, []);
                         // overwrite pagination params to expected state
                         response.pagination.totalPages = Math.ceil(response.pagination.totalResults / response.pagination.pageSize);
-                        response.pagination.page = (_m = params.pagination) === null || _m === void 0 ? void 0 : _m.page;
+                        response.pagination.page = (_m = params_1.pagination) === null || _m === void 0 ? void 0 : _m.page;
                         // set the response results with results from backfill responses
                         response.results = backfillResults;
-                        return [3 /*break*/, 11];
-                    case 9: return [4 /*yield*/, this.client.search(params)];
-                    case 10:
+                        return [3 /*break*/, 10];
+                    case 8: return [4 /*yield*/, this.client.search(params_1)];
+                    case 9:
                         // infinite with no backfills.
                         _a = _p.sent(), meta = _a[0], response = _a[1];
                         // append new results to previous results
                         response.results = __spreadArray(__spreadArray([], this.previousResults, true), (response.results || []), true);
-                        _p.label = 11;
-                    case 11: return [3 /*break*/, 14];
-                    case 12: return [4 /*yield*/, this.client.search(params)];
-                    case 13:
+                        _p.label = 10;
+                    case 10: return [3 /*break*/, 13];
+                    case 11: return [4 /*yield*/, this.client.search(params_1)];
+                    case 12:
                         // standard request (not using infinite scroll)
                         _b = _p.sent(), meta = _b[0], response = _b[1];
-                        _p.label = 14;
-                    case 14:
+                        _p.label = 13;
+                    case 13:
                         // MockClient will overwrite the client search() method and use SearchData to return mock data which already contains meta data
                         if (!response.meta) {
                             response.meta = meta;
                         }
                         searchProfile.stop();
                         this.log.profile(searchProfile);
-                        afterSearchProfile = this.profiler.create({ type: 'event', name: 'afterSearch', context: params }).start();
-                        _p.label = 15;
-                    case 15:
-                        _p.trys.push([15, 17, , 18]);
+                        afterSearchProfile = this.profiler.create({ type: 'event', name: 'afterSearch', context: params_1 }).start();
+                        _p.label = 14;
+                    case 14:
+                        _p.trys.push([14, 16, , 17]);
                         return [4 /*yield*/, this.eventManager.fire('afterSearch', {
                                 controller: this,
-                                request: params,
+                                request: params_1,
                                 response: response,
                             })];
-                    case 16:
+                    case 15:
                         _p.sent();
-                        return [3 /*break*/, 18];
-                    case 17:
+                        return [3 /*break*/, 17];
+                    case 16:
                         err_2 = _p.sent();
                         if ((err_2 === null || err_2 === void 0 ? void 0 : err_2.message) == 'cancelled') {
                             this.log.warn("'afterSearch' middleware cancelled");
@@ -286,8 +285,8 @@ var SearchController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterSearch' middleware");
                             throw err_2;
                         }
-                        return [3 /*break*/, 18];
-                    case 18:
+                        return [3 /*break*/, 17];
+                    case 17:
                         afterSearchProfile.stop();
                         this.log.profile(afterSearchProfile);
                         // store previous results for infinite usage
@@ -296,19 +295,19 @@ var SearchController = /** @class */ (function (_super) {
                         }
                         // update the store
                         this.store.update(response);
-                        afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params }).start();
-                        _p.label = 19;
-                    case 19:
-                        _p.trys.push([19, 21, , 22]);
+                        afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params_1 }).start();
+                        _p.label = 18;
+                    case 18:
+                        _p.trys.push([18, 20, , 21]);
                         return [4 /*yield*/, this.eventManager.fire('afterStore', {
                                 controller: this,
-                                request: params,
+                                request: params_1,
                                 response: response,
                             })];
-                    case 20:
+                    case 19:
                         _p.sent();
-                        return [3 /*break*/, 22];
-                    case 21:
+                        return [3 /*break*/, 21];
+                    case 20:
                         err_3 = _p.sent();
                         if ((err_3 === null || err_3 === void 0 ? void 0 : err_3.message) == 'cancelled') {
                             this.log.warn("'afterStore' middleware cancelled");
@@ -319,12 +318,12 @@ var SearchController = /** @class */ (function (_super) {
                             this.log.error("error in 'afterStore' middleware");
                             throw err_3;
                         }
-                        return [3 /*break*/, 22];
-                    case 22:
+                        return [3 /*break*/, 21];
+                    case 21:
                         afterStoreProfile.stop();
                         this.log.profile(afterStoreProfile);
                         return [3 /*break*/, 24];
-                    case 23:
+                    case 22:
                         err_4 = _p.sent();
                         if (err_4) {
                             if (err_4.err && err_4.fetchDetails) {
@@ -364,9 +363,11 @@ var SearchController = /** @class */ (function (_super) {
                                 this.log.error(err_4);
                                 this.handleError(err_4);
                             }
-                            this.store.loading = false;
                         }
                         return [3 /*break*/, 24];
+                    case 23:
+                        this.store.loading = false;
+                        return [7 /*endfinally*/];
                     case 24: return [2 /*return*/];
                 }
             });
@@ -384,19 +385,6 @@ var SearchController = /** @class */ (function (_super) {
         });
         // set last params to undefined for compare in search
         _this.storage.set('lastStringyParams', undefined);
-        // add 'beforeSearch' middleware
-        _this.eventManager.on('beforeSearch', function (search, next) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        search.controller.store.loading = true;
-                        return [4 /*yield*/, next()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
         // add 'afterSearch' middleware
         _this.eventManager.on('afterSearch', function (search, next) { return __awaiter(_this, void 0, void 0, function () {
             var config, redirectURL, searchStore, nonBackgroundFilters;
@@ -447,7 +435,6 @@ var SearchController = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.eventManager.fire('restorePosition', { controller: this, element: elementPosition })];
                     case 2:
                         _a.sent();
-                        search.controller.store.loading = false;
                         return [2 /*return*/];
                 }
             });

package/dist/esm/Autocomplete/AutocompleteController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,4BAA4B,EAAkD,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEnJ,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AA2B/B,KAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;KAC5C,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,kBAAgC;IACnC,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACtC,OAAO,EAAE,YAAY,CAAC;gBAG5B,MAAM,EAAE,4BAA4B,EACpC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAuE3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA0CrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,OAAO,GAAG,SAAS,CAAC;wBAkDpD,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;4BAQN,MAAM,SAAS,CAAC,gBAAgB,CAAC,KAAG,QAAQ,IAAI,CAAC;mCAgDhD,MAAM,WAAW,CAAC,gBAAgB,CAAC,KAAG,IAAI;uBAqBtD,KAAK;;;;uBAsDL,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAgBR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgF3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAwBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CAmI9B;CACF"}
+{"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,4BAA4B,EAAiC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAElI,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AA+B/B,KAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;KAC5C,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,kBAAgC;IACnC,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACtC,OAAO,EAAE,YAAY,CAAC;gBAG5B,MAAM,EAAE,4BAA4B,EACpC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAwD3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA0CrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,OAAO,GAAG,SAAS,CAAC;wBAkDpD,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;4BAQN,MAAM,SAAS,CAAC,gBAAgB,CAAC,KAAG,QAAQ,IAAI,CAAC;mCAgDhD,MAAM,WAAW,CAAC,gBAAgB,CAAC,KAAG,IAAI;uBAqBtD,KAAK;;;;uBAyDL,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAgBR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgF3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAwBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA0I9B;CACF"}

package/dist/esm/Autocomplete/AutocompleteController.js

@@ -27,6 +27,10 @@ const defaultConfig = {
             merchandising: true,
             singleResult: false,
         },
+        bind: {
+            input: true,
+            submit: true,
+        },
     },
 };
 export class AutocompleteController extends AbstractController {
@@ -176,6 +180,8 @@ export class AutocompleteController extends AbstractController {
                         return;
                     }
                     this.store.state.input = value;
+                    // remove merch redirect to prevent race condition
+                    this.store.merchandising.redirect = '';
                     if (this.config?.settings?.syncInputs) {
                         const inputs = document.querySelectorAll(this.config.selector);
                         inputs.forEach((input) => {
@@ -247,16 +253,20 @@ export class AutocompleteController extends AbstractController {
             this.store.updateTrendingTerms(terms);
         };
         this.search = async () => {
-            // if urlManager has no query, there will be no need to get params and no query
-            if (!this.urlManager.state.query) {
-                return;
-            }
-            const params = this.params;
-            // if params have no query do not search
-            if (!params?.search?.query?.string) {
-                return;
-            }
             try {
+                if (!this.initialized) {
+                    await this.init();
+                }
+                // if urlManager has no query, there will be no need to get params and no query
+                if (!this.urlManager.state.query) {
+                    return;
+                }
+                const params = this.params;
+                // if params have no query do not search
+                if (!params?.search?.query?.string) {
+                    return;
+                }
+                this.store.loading = true;
                 try {
                     await this.eventManager.fire('beforeSearch', {
                         controller: this,
@@ -366,9 +376,11 @@ export class AutocompleteController extends AbstractController {
                         this.log.error(err);
                         this.handleError(err);
                     }
-                    this.store.loading = false;
                 }
             }
+            finally {
+                this.store.loading = false;
+            }
         };
         // deep merge config with defaults
         this.config = deepmerge(defaultConfig, this.config);
@@ -385,25 +397,14 @@ export class AutocompleteController extends AbstractController {
             type: 'session',
             key: `ss-controller-${this.config.id}`,
         });
-        // add 'beforeSearch' middleware
-        this.eventManager.on('beforeSearch', async (ac, next) => {
-            ac.controller.store.loading = true;
-            await next();
-        });
         // add 'afterSearch' middleware
         this.eventManager.on('afterSearch', async (ac, next) => {
             await next();
             // cancel search if no input or query doesn't match current urlState
             if (ac.response.autocomplete.query != ac.controller.urlManager.state.query) {
-                ac.controller.store.loading = false;
                 return false;
             }
         });
-        // add 'afterStore' middleware
-        this.eventManager.on('afterStore', async (ac, next) => {
-            await next();
-            ac.controller.store.loading = false;
-        });
         this.eventManager.on('beforeSubmit', async (ac, next) => {
             await next();
             const redirectURL = ac.controller.store.merchandising?.redirect;
@@ -521,7 +522,7 @@ export class AutocompleteController extends AbstractController {
             input.setAttribute('autocorrect', 'off');
             input.setAttribute('autocapitalize', 'none');
             input.setAttribute(INPUT_ATTRIBUTE, '');
-            input.addEventListener('input', this.handlers.input.input);
+            this.config.settings?.bind?.input && input.addEventListener('input', this.handlers.input.input);
             if (this.config?.settings?.initializeFromUrl && !input.value && this.store.state.input) {
                 input.value = this.store.state.input;
             }
@@ -530,11 +531,11 @@ export class AutocompleteController extends AbstractController {
             const form = input.form;
             let formActionUrl;
             if (this.config.action) {
-                input.addEventListener('keydown', this.handlers.input.enterKey);
+                this.config.settings?.bind?.submit && input.addEventListener('keydown', this.handlers.input.enterKey);
                 formActionUrl = this.config.action;
             }
             else if (form) {
-                form.addEventListener('submit', this.handlers.input.formSubmit);
+                this.config.settings?.bind?.submit && form.addEventListener('submit', this.handlers.input.formSubmit);
                 formActionUrl = form.action || '';
                 // serializeForm will include additional form element in our urlManager as globals
                 if (this.config.settings?.serializeForm) {

package/dist/esm/Finder/FinderController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FinderController.d.ts","sourceRoot":"","sources":["../../../src/Finder/FinderController.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAmC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiB9H,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;gBAGtC,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAqC3B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA+BhC;IAED,IAAI,QAAa,QAAQ,IAAI,CAAC,CAkB5B;IAEF,KAAK,QAAO,IAAI,CAId;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CAkI9B;CACF"}
+{"version":3,"file":"FinderController.d.ts","sourceRoot":"","sources":["../../../src/Finder/FinderController.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAkB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiB7G,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;gBAGtC,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA+B3B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA+BhC;IAED,IAAI,QAAa,QAAQ,IAAI,CAAC,CAkB5B;IAEF,KAAK,QAAO,IAAI,CAId;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CAoI9B;CACF"}

package/dist/esm/Finder/FinderController.js

@@ -46,14 +46,15 @@ export class FinderController extends AbstractController {
             this.store.setService('urlManager', this.urlManager);
         };
         this.search = async () => {
-            if (!this.initialized) {
-                await this.init();
-            }
-            if (this.store.state.persisted) {
-                return;
-            }
-            const params = this.params;
             try {
+                if (!this.initialized) {
+                    await this.init();
+                }
+                if (this.store.state.persisted) {
+                    return;
+                }
+                const params = this.params;
+                this.store.loading = true;
                 try {
                     await this.eventManager.fire('beforeSearch', {
                         controller: this,
@@ -164,9 +165,11 @@ export class FinderController extends AbstractController {
                         this.log.error(err);
                         this.handleError(err);
                     }
-                    this.store.loading = false;
                 }
             }
+            finally {
+                this.store.loading = false;
+            }
         };
         // deep merge config with defaults
         this.config = deepmerge(defaultConfig, this.config);
@@ -180,11 +183,7 @@ export class FinderController extends AbstractController {
                 };
             });
         }
-        this.eventManager.on('beforeSearch', async (finder, next) => {
-            finder.controller.store.loading = true;
-            await next();
-        });
-        // TODO: move this to afterStore
+        // TODO: remove this aftersearch when store interface changes
         this.eventManager.on('afterSearch', async (finder, next) => {
             await next();
             finder.controller.store.loading = false;

package/dist/esm/Recommendation/RecommendationController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,8BAA8B,EAAkC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErI,KAAK,0BAA0B,GAAG;IACjC,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACnE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACrD,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACzD,iBAAiB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QAChE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;KAC5D,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,GAAG,SAAS,CAAC;IAClD,SAAS,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;IAC1E,UAAU,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAUF,qBAAa,wBAAyB,SAAQ,kBAAkB;IACxD,IAAI,kBAAkC;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,8BAA8B,CAAC;IAE/C,MAAM,EAAE;QACP,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,UAAU,CAAC,EAAE,WAAW,CAAC;YAAC,MAAM,CAAC,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC7E,CAKC;gBAGD,MAAM,EAAE,8BAA8B,EACtC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA2C3B,KAAK,EAAE,0BAA0B,CAwS5B;IAEL,IAAI,MAAM,IAAI,qBAAqB,CA2BlC;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAuH9B;CACF"}
+{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,8BAA8B,EAAiB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEpH,KAAK,0BAA0B,GAAG;IACjC,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACnE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACrD,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QACzD,iBAAiB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;QAChE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,CAAC;KAC5D,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,GAAG,SAAS,CAAC;IAClD,SAAS,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;IAC1E,UAAU,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAUF,qBAAa,wBAAyB,SAAQ,kBAAkB;IACxD,IAAI,kBAAkC;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,8BAA8B,CAAC;IAE/C,MAAM,EAAE;QACP,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,UAAU,CAAC,EAAE,WAAW,CAAC;YAAC,MAAM,CAAC,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC7E,CAKC;gBAGD,MAAM,EAAE,8BAA8B,EACtC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA4C3B,KAAK,EAAE,0BAA0B,CAwS5B;IAEL,IAAI,MAAM,IAAI,qBAAqB,CA2BlC;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CA0H9B;CACF"}

package/dist/esm/Recommendation/RecommendationController.js

@@ -311,11 +311,12 @@ export class RecommendationController extends AbstractController {
             };
         })();
         this.search = async () => {
-            if (!this.initialized) {
-                await this.init();
-            }
-            const params = this.params;
             try {
+                if (!this.initialized) {
+                    await this.init();
+                }
+                const params = this.params;
+                this.store.loading = true;
                 try {
                     await this.eventManager.fire('beforeSearch', {
                         controller: this,
@@ -420,21 +421,27 @@ export class RecommendationController extends AbstractController {
                         this.log.error(err);
                         this.handleError(err);
                     }
-                    this.store.loading = false;
                 }
             }
+            finally {
+                this.store.loading = false;
+            }
         };
         if (!config.tag) {
             throw new Error(`Invalid config passed to RecommendationController. The "tag" attribute is required.`);
         }
+        // attach to bfCache restore event and re-run search on the controller
+        // enabled by default
+        if (config.settings?.searchOnPageShow !== false) {
+            window.addEventListener('pageshow', (e) => {
+                if (e.persisted && !this.store.error && this.store.loaded && !this.store.loading) {
+                    this.search();
+                }
+            });
+        }
         // deep merge config with defaults
         this.config = deepmerge(defaultConfig, this.config);
         this.store.setConfig(this.config);
-        // add 'beforeSearch' middleware
-        this.eventManager.on('beforeSearch', async (recommend, next) => {
-            recommend.controller.store.loading = true;
-            await next();
-        });
         // add 'afterStore' middleware
         this.eventManager.on('afterStore', async (recommend, next) => {
             await next();
@@ -449,7 +456,6 @@ export class RecommendationController extends AbstractController {
                     this.track.product.removedFromBundle(item);
                 });
             });
-            recommend.controller.store.loading = false;
         });
         // attach config plugins and event middleware
         this.use(this.config);

package/dist/esm/Search/SearchController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EACX,sBAAsB,EAItB,kBAAkB,EAClB,gBAAgB,EAGhB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EACX,kBAAkB,EAKlB,MAAM,2BAA2B,CAAC;AAmBnC,KAAK,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KAC/D,CAAC;CACF,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;IACvC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,eAAe,CAAwC;gBAG9D,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAgK3B,KAAK,EAAE,kBAAkB,CA+CvB;IAEF,IAAI,MAAM,IAAI,kBAAkB,CAiD/B;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAkN9B;CACF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAiBxF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,GAAG,SAAS,CAgCvG"}
+{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAa,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EACX,sBAAsB,EAGtB,kBAAkB,EAClB,gBAAgB,EAGhB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EACX,kBAAkB,EAKlB,MAAM,2BAA2B,CAAC;AAmBnC,KAAK,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KAC/D,CAAC;CACF,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;IACvC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,eAAe,CAAwC;gBAG9D,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IAuJ3B,KAAK,EAAE,kBAAkB,CA+CvB;IAEF,IAAI,MAAM,IAAI,kBAAkB,CAiD/B;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAmN9B;CACF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAiBxF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,GAAG,SAAS,CAgCvG"}

package/dist/esm/Search/SearchController.js

@@ -67,15 +67,16 @@ export class SearchController extends AbstractController {
             },
         };
         this.search = async () => {
-            if (!this.initialized) {
-                await this.init();
-            }
-            const params = this.params;
-            if (this.params.search?.query?.string && this.params.search?.query?.string.length) {
-                // save it to the history store
-                this.store.history.save(this.params.search.query.string);
-            }
             try {
+                if (!this.initialized) {
+                    await this.init();
+                }
+                const params = this.params;
+                if (this.params.search?.query?.string && this.params.search?.query?.string.length) {
+                    // save it to the history store
+                    this.store.history.save(this.params.search.query.string);
+                }
+                this.store.loading = true;
                 try {
                     await this.eventManager.fire('beforeSearch', {
                         controller: this,
@@ -250,9 +251,11 @@ export class SearchController extends AbstractController {
                         this.log.error(err);
                         this.handleError(err);
                     }
-                    this.store.loading = false;
                 }
             }
+            finally {
+                this.store.loading = false;
+            }
         };
         // deep merge config with defaults
         this.config = deepmerge(defaultConfig, this.config);
@@ -267,11 +270,6 @@ export class SearchController extends AbstractController {
         });
         // set last params to undefined for compare in search
         this.storage.set('lastStringyParams', undefined);
-        // add 'beforeSearch' middleware
-        this.eventManager.on('beforeSearch', async (search, next) => {
-            search.controller.store.loading = true;
-            await next();
-        });
         // add 'afterSearch' middleware
         this.eventManager.on('afterSearch', async (search, next) => {
             const config = search.controller.config;
@@ -306,7 +304,6 @@ export class SearchController extends AbstractController {
                 this.storage.set('scrollMap', {});
             }
             await this.eventManager.fire('restorePosition', { controller: this, element: elementPosition });
-            search.controller.store.loading = false;
         });
         // restore position
         if (this.config.settings?.restorePosition?.enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@searchspring/snap-controller",
-	"version": "0.61.5",
+	"version": "0.62.0",
 	"description": "Snap Controllers",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
@@ -20,22 +20,22 @@
 		"test:watch": "jest --watch"
 	},
 	"dependencies": {
-		"@searchspring/snap-toolbox": "^0.61.5",
+		"@searchspring/snap-toolbox": "^0.62.0",
 		"css.escape": "1.5.1",
 		"deepmerge": "4.3.1"
 	},
 	"devDependencies": {
-		"@searchspring/snap-client": "^0.61.5",
-		"@searchspring/snap-event-manager": "^0.61.5",
-		"@searchspring/snap-logger": "^0.61.5",
-		"@searchspring/snap-profiler": "^0.61.5",
-		"@searchspring/snap-store-mobx": "^0.61.5",
-		"@searchspring/snap-tracker": "^0.61.5",
-		"@searchspring/snap-url-manager": "^0.61.5"
+		"@searchspring/snap-client": "^0.62.0",
+		"@searchspring/snap-event-manager": "^0.62.0",
+		"@searchspring/snap-logger": "^0.62.0",
+		"@searchspring/snap-profiler": "^0.62.0",
+		"@searchspring/snap-store-mobx": "^0.62.0",
+		"@searchspring/snap-tracker": "^0.62.0",
+		"@searchspring/snap-url-manager": "^0.62.0"
 	},
 	"sideEffects": false,
 	"files": [
 		"dist/**/*"
 	],
-	"gitHead": "bae1305742558d1736e535d77a76da7b845bc046"
+	"gitHead": "2c9561e8b0097a44c5587bc5629068b06041385f"
 }