@searchspring/snap-controller 0.21.1 → 0.23.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/cjs/Autocomplete/AutocompleteController.d.ts +1 -1
  2. package/dist/cjs/Autocomplete/AutocompleteController.d.ts.map +1 -1
  3. package/dist/cjs/Autocomplete/AutocompleteController.js +39 -30
  4. package/dist/cjs/Finder/FinderController.d.ts.map +1 -1
  5. package/dist/cjs/Finder/FinderController.js +7 -4
  6. package/dist/cjs/index.js +5 -1
  7. package/dist/esm/Autocomplete/AutocompleteController.d.ts +1 -1
  8. package/dist/esm/Autocomplete/AutocompleteController.d.ts.map +1 -1
  9. package/dist/esm/Autocomplete/AutocompleteController.js +27 -20
  10. package/dist/esm/Finder/FinderController.d.ts.map +1 -1
  11. package/dist/esm/Finder/FinderController.js +7 -4
  12. package/package.json +10 -10
package/dist/cjs/Autocomplete/AutocompleteController.d.ts CHANGED
@@ -21,7 +21,7 @@ export declare class AutocompleteController extends AbstractController {
21
21
  reset(): void;
22
22
  handlers: {
23
23
  input: {
24
- enterKey: (e: KeyboardEvent) => Promise<void>;
24
+ enterKey: (e: KeyboardEvent) => Promise<boolean>;
25
25
  escKey: (e: KeyboardEvent) => void;
26
26
  focus: (e: FocusEvent) => void;
27
27
  formSubmit: (e: any) => Promise<void>;
package/dist/cjs/Autocomplete/AutocompleteController.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EACX,4BAA4B,EAI5B,kBAAkB,EAElB,gBAAgB,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AAoB/B,aAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;KAC3B,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,SAAkB;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACrC,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;IAmD3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA+BrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,IAAI,CAAC;wBA6CrC,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;oCAQL,QAAQ,IAAI,CAAC;uBAwCzB,aAAa,KAAG,IAAI;;;;uBA0CpB,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAYR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAsBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
1
+ {"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EACX,4BAA4B,EAI5B,kBAAkB,EAElB,gBAAgB,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AAoB/B,aAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;KAC3B,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,SAAkB;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACrC,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;IAmD3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA+BrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsChE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,OAAO,CAAC;wBA6CxC,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;oCAQL,QAAQ,IAAI,CAAC;uBAwCzB,aAAa,KAAG,IAAI;;;;uBA8CpB,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAYR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA2D3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAsBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
package/dist/cjs/Autocomplete/AutocompleteController.js CHANGED
@@ -68,7 +68,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
68
68
  exports.AutocompleteController = exports.INPUT_DELAY = void 0;
69
69
  var deepmerge_1 = __importDefault(require("deepmerge"));
70
70
  var snap_store_mobx_1 = require("@searchspring/snap-store-mobx");
71
- var snap_toolbox_1 = require("@searchspring/snap-toolbox");
72
71
  var AbstractController_1 = require("../Abstract/AbstractController");
73
72
  var getParams_1 = require("../utils/getParams");
74
73
  var INPUT_ATTRIBUTE = 'ss-autocomplete-input';
@@ -107,14 +106,15 @@ var AutocompleteController = /** @class */ (function (_super) {
107
106
  _this.handlers = {
108
107
  input: {
109
108
  enterKey: function (e) { return __awaiter(_this, void 0, void 0, function () {
110
- var actionUrl, input, inputParam, err_1, newUrl;
109
+ var input, actionUrl, err_1;
111
110
  var _a, _b, _c;
112
111
  return __generator(this, function (_d) {
113
112
  switch (_d.label) {
114
113
  case 0:
115
114
  if (!(e.keyCode == KEY_ENTER)) return [3 /*break*/, 10];
116
- actionUrl = (0, snap_toolbox_1.url)(this.config.action);
117
115
  input = e.target;
116
+ actionUrl = this.store.services.urlManager;
117
+ e.preventDefault();
118
118
  if (!((_c = (_b = (_a = this.config.globals) === null || _a === void 0 ? void 0 : _a.search) === null || _b === void 0 ? void 0 : _b.query) === null || _c === void 0 ? void 0 : _c.spellCorrection)) return [3 /*break*/, 5];
119
119
  // wait until loading is complete before submission
120
120
  // TODO make this better
@@ -134,12 +134,11 @@ var AutocompleteController = /** @class */ (function (_super) {
134
134
  // use corrected query and originalQuery
135
135
  if (this.store.search.originalQuery) {
136
136
  input.value = this.store.search.query.string;
137
- actionUrl.params.query[PARAM_ORIGINAL_QUERY] = this.store.search.originalQuery.string;
137
+ actionUrl = actionUrl.set(PARAM_ORIGINAL_QUERY, this.store.search.originalQuery.string);
138
138
  }
139
139
  _d.label = 5;
140
140
  case 5:
141
- inputParam = input.name || this.urlManager.getTranslatorConfig().queryParameter;
142
- actionUrl.params.query[inputParam] = input.value;
141
+ actionUrl = actionUrl.set('query', input.value);
143
142
  _d.label = 6;
144
143
  case 6:
145
144
  _d.trys.push([6, 8, , 9]);
@@ -162,8 +161,7 @@ var AutocompleteController = /** @class */ (function (_super) {
162
161
  }
163
162
  return [3 /*break*/, 9];
164
163
  case 9:
165
- newUrl = actionUrl.url();
166
- window.location.href = newUrl;
164
+ window.location.href = actionUrl.href;
167
165
  _d.label = 10;
168
166
  case 10: return [2 /*return*/];
169
167
  }
@@ -239,6 +237,7 @@ var AutocompleteController = /** @class */ (function (_super) {
239
237
  });
240
238
  }); },
241
239
  keyUp: function (e) {
240
+ var _a, _b, _c;
242
241
  // ignore enter and escape keys
243
242
  if ((e === null || e === void 0 ? void 0 : e.keyCode) == KEY_ENTER || (e === null || e === void 0 ? void 0 : e.keyCode) == KEY_ESCAPE)
244
243
  return;
@@ -263,6 +262,9 @@ var AutocompleteController = /** @class */ (function (_super) {
263
262
  // TODO cancel any current requests?
264
263
  _this.store.reset();
265
264
  _this.urlManager.reset().go();
265
+ if (((_a = _this.store.trending) === null || _a === void 0 ? void 0 : _a.length) && ((_c = (_b = _this.config.settings) === null || _b === void 0 ? void 0 : _b.trending) === null || _c === void 0 ? void 0 : _c.showResults)) {
266
+ _this.store.trending[0].preview();
267
+ }
266
268
  }
267
269
  else {
268
270
  _this.handlers.input.timeoutDelay = setTimeout(function () {
@@ -543,27 +545,28 @@ var AutocompleteController = /** @class */ (function (_super) {
543
545
  configurable: true
544
546
  });
545
547
  AutocompleteController.prototype.setFocused = function (inputElement) {
548
+ var _a, _b, _c, _d, _e;
546
549
  return __awaiter(this, void 0, void 0, function () {
547
550
  var err_7, err_8;
548
- return __generator(this, function (_a) {
549
- switch (_a.label) {
551
+ return __generator(this, function (_f) {
552
+ switch (_f.label) {
550
553
  case 0:
551
554
  if (!(this.store.state.focusedInput !== inputElement)) return [3 /*break*/, 7];
552
555
  this.store.state.focusedInput = inputElement;
553
- _a.label = 1;
556
+ _f.label = 1;
554
557
  case 1:
555
- _a.trys.push([1, 6, , 7]);
556
- _a.label = 2;
558
+ _f.trys.push([1, 6, , 7]);
559
+ _f.label = 2;
557
560
  case 2:
558
- _a.trys.push([2, 4, , 5]);
561
+ _f.trys.push([2, 4, , 5]);
559
562
  return [4 /*yield*/, this.eventManager.fire('focusChange', {
560
563
  controller: this,
561
564
  })];
562
565
  case 3:
563
- _a.sent();
566
+ _f.sent();
564
567
  return [3 /*break*/, 5];
565
568
  case 4:
566
- err_7 = _a.sent();
569
+ err_7 = _f.sent();
567
570
  if ((err_7 === null || err_7 === void 0 ? void 0 : err_7.message) == 'cancelled') {
568
571
  this.log.warn("'focusChange' middleware cancelled");
569
572
  }
@@ -574,13 +577,23 @@ var AutocompleteController = /** @class */ (function (_super) {
574
577
  return [3 /*break*/, 5];
575
578
  case 5: return [3 /*break*/, 7];
576
579
  case 6:
577
- err_8 = _a.sent();
580
+ err_8 = _f.sent();
578
581
  if (err_8) {
579
582
  console.error(err_8);
580
583
  }
581
584
  return [3 /*break*/, 7];
582
585
  case 7:
583
- inputElement === null || inputElement === void 0 ? void 0 : inputElement.dispatchEvent(new Event('keyup'));
586
+ // auto select first trending term?
587
+ if (inputElement &&
588
+ !((_a = this.store.state) === null || _a === void 0 ? void 0 : _a.input) &&
589
+ ((_b = this.store.trending) === null || _b === void 0 ? void 0 : _b.length) &&
590
+ !((_c = this.store.terms) === null || _c === void 0 ? void 0 : _c.length) &&
591
+ ((_e = (_d = this.config.settings) === null || _d === void 0 ? void 0 : _d.trending) === null || _e === void 0 ? void 0 : _e.showResults)) {
592
+ this.store.trending[0].preview();
593
+ }
594
+ else {
595
+ inputElement === null || inputElement === void 0 ? void 0 : inputElement.dispatchEvent(new Event('keyup'));
596
+ }
584
597
  return [2 /*return*/];
585
598
  }
586
599
  });
@@ -600,8 +613,8 @@ var AutocompleteController = /** @class */ (function (_super) {
600
613
  inputs === null || inputs === void 0 ? void 0 : inputs.forEach(function (input) {
601
614
  var _a;
602
615
  input.removeEventListener('keyup', _this.handlers.input.keyUp);
603
- input.removeEventListener('keyup', _this.handlers.input.enterKey);
604
- input.removeEventListener('keyup', _this.handlers.input.escKey);
616
+ input.removeEventListener('keydown', _this.handlers.input.enterKey);
617
+ input.removeEventListener('keydown', _this.handlers.input.escKey);
605
618
  input.removeEventListener('focus', _this.handlers.input.focus);
606
619
  (_a = input.form) === null || _a === void 0 ? void 0 : _a.removeEventListener('submit', _this.handlers.input.formSubmit);
607
620
  });
@@ -632,19 +645,15 @@ var AutocompleteController = /** @class */ (function (_super) {
632
645
  input.value = _this.store.state.input;
633
646
  }
634
647
  input.addEventListener('focus', _this.handlers.input.focus);
635
- input.addEventListener('keyup', _this.handlers.input.escKey);
648
+ input.addEventListener('keydown', _this.handlers.input.escKey);
636
649
  var form = input.form;
637
- var formActionUrl = _this.config.action;
638
- if (!form && _this.config.action) {
639
- input.addEventListener('keyup', _this.handlers.input.enterKey);
650
+ var formActionUrl;
651
+ if (_this.config.action) {
652
+ formActionUrl = _this.config.action;
653
+ input.addEventListener('keydown', _this.handlers.input.enterKey);
640
654
  }
641
655
  else if (form) {
642
- if (_this.config.action) {
643
- form.action = _this.config.action;
644
- }
645
- else {
646
- formActionUrl = form.action;
647
- }
656
+ formActionUrl = form.action;
648
657
  form.addEventListener('submit', _this.handlers.input.formSubmit);
649
658
  }
650
659
  // set the root URL on urlManager
package/dist/cjs/Finder/FinderController.d.ts.map CHANGED
@@ -1 +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,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAmC,kBAAkB,EAAa,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAQzI,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,SAAY;IAChB,KAAK,EAAE,WAAW,CAAC;IAC1B,MAAM,EAAE,sBAAsB,CAAC;gBAG9B,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,CAUhC;IAED,IAAI,QAAO,IAAI,CAEb;IAEF,KAAK,QAAO,IAAI,CAMd;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
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,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAmC,kBAAkB,EAAa,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAQzI,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,SAAY;IAChB,KAAK,EAAE,WAAW,CAAC;IAC1B,MAAM,EAAE,sBAAsB,CAAC;gBAG9B,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,CAchC;IAED,IAAI,QAAO,IAAI,CAEb;IAEF,KAAK,QAAO,IAAI,CAMd;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
package/dist/cjs/Finder/FinderController.js CHANGED
@@ -271,11 +271,14 @@ var FinderController = /** @class */ (function (_super) {
271
271
  Object.defineProperty(FinderController.prototype, "params", {
272
272
  get: function () {
273
273
  var urlState = this.urlManager.state;
274
- var params = (0, deepmerge_1.default)(__assign({}, (0, getParams_1.getSearchParams)(urlState)), this.config.globals);
275
- // get only the finder fields
276
- params.facets = {
277
- include: this.config.fields.map(function (fieldConfig) { return fieldConfig.field; }),
274
+ // get only the finder fields and disable auto drill down
275
+ var defaultParams = {
276
+ facets: {
277
+ include: this.config.fields.map(function (fieldConfig) { return fieldConfig.field; }),
278
+ autoDrillDown: false,
279
+ },
278
280
  };
281
+ var params = (0, deepmerge_1.default)(__assign({}, (0, getParams_1.getSearchParams)(urlState)), (0, deepmerge_1.default)(defaultParams, this.config.globals));
279
282
  return params;
280
283
  },
281
284
  enumerable: false,
package/dist/cjs/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
package/dist/esm/Autocomplete/AutocompleteController.d.ts CHANGED
@@ -21,7 +21,7 @@ export declare class AutocompleteController extends AbstractController {
21
21
  reset(): void;
22
22
  handlers: {
23
23
  input: {
24
- enterKey: (e: KeyboardEvent) => Promise<void>;
24
+ enterKey: (e: KeyboardEvent) => Promise<boolean>;
25
25
  escKey: (e: KeyboardEvent) => void;
26
26
  focus: (e: FocusEvent) => void;
27
27
  formSubmit: (e: any) => Promise<void>;
package/dist/esm/Autocomplete/AutocompleteController.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EACX,4BAA4B,EAI5B,kBAAkB,EAElB,gBAAgB,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AAoB/B,aAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;KAC3B,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,SAAkB;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACrC,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;IAmD3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA+BrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,IAAI,CAAC;wBA6CrC,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;oCAQL,QAAQ,IAAI,CAAC;uBAwCzB,aAAa,KAAG,IAAI;;;;uBA0CpB,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAYR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAsBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
1
+ {"version":3,"file":"AutocompleteController.d.ts","sourceRoot":"","sources":["../../../src/Autocomplete/AutocompleteController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EACX,4BAA4B,EAI5B,kBAAkB,EAElB,gBAAgB,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,eAAO,MAAM,WAAW,MAAM,CAAC;AAoB/B,aAAK,wBAAwB,GAAG;IAC/B,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;KAC3B,CAAC;CACF,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,kBAAkB;IACtD,IAAI,SAAkB;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,4BAA4B,CAAC;IACrC,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;IAmD3B,KAAK,EAAE,wBAAwB,CAO7B;IAEF,IAAI,MAAM,IAAI,wBAAwB,CA+BrC;IAEK,UAAU,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsChE,KAAK,IAAI,IAAI;IASb,QAAQ;;0BAEc,aAAa,KAAG,QAAQ,OAAO,CAAC;wBA6CxC,aAAa,KAAG,IAAI;uBAMrB,UAAU,KAAG,IAAI;oCAQL,QAAQ,IAAI,CAAC;uBAwCzB,aAAa,KAAG,IAAI;;;;uBA8CpB,UAAU,KAAG,IAAI;;MAS5B;IAEF,MAAM,IAAI,IAAI;IAYR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA2D3B,cAAc,QAAa,QAAQ,IAAI,CAAC,CAsBtC;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
package/dist/esm/Autocomplete/AutocompleteController.js CHANGED
@@ -1,6 +1,5 @@
1
1
  import deepmerge from 'deepmerge';
2
2
  import { StorageStore, StorageType, ErrorType } from '@searchspring/snap-store-mobx';
3
- import { url } from '@searchspring/snap-toolbox';
4
3
  import { AbstractController } from '../Abstract/AbstractController';
5
4
  import { getSearchParams } from '../utils/getParams';
6
5
  const INPUT_ATTRIBUTE = 'ss-autocomplete-input';
@@ -38,8 +37,9 @@ export class AutocompleteController extends AbstractController {
38
37
  input: {
39
38
  enterKey: async (e) => {
40
39
  if (e.keyCode == KEY_ENTER) {
41
- const actionUrl = url(this.config.action);
42
40
  const input = e.target;
41
+ let actionUrl = this.store.services.urlManager;
42
+ e.preventDefault();
43
43
  // when spellCorrection is enabled
44
44
  if (this.config.globals?.search?.query?.spellCorrection) {
45
45
  // wait until loading is complete before submission
@@ -51,11 +51,10 @@ export class AutocompleteController extends AbstractController {
51
51
  // use corrected query and originalQuery
52
52
  if (this.store.search.originalQuery) {
53
53
  input.value = this.store.search.query.string;
54
- actionUrl.params.query[PARAM_ORIGINAL_QUERY] = this.store.search.originalQuery.string;
54
+ actionUrl = actionUrl.set(PARAM_ORIGINAL_QUERY, this.store.search.originalQuery.string);
55
55
  }
56
56
  }
57
- const inputParam = input.name || this.urlManager.getTranslatorConfig().queryParameter;
58
- actionUrl.params.query[inputParam] = input.value;
57
+ actionUrl = actionUrl.set('query', input.value);
59
58
  // TODO expected spell correct behavior queryAssumption
60
59
  try {
61
60
  await this.eventManager.fire('beforeSubmit', {
@@ -73,8 +72,7 @@ export class AutocompleteController extends AbstractController {
73
72
  console.error(err);
74
73
  }
75
74
  }
76
- const newUrl = actionUrl.url();
77
- window.location.href = newUrl;
75
+ window.location.href = actionUrl.href;
78
76
  }
79
77
  },
80
78
  escKey: (e) => {
@@ -151,6 +149,9 @@ export class AutocompleteController extends AbstractController {
151
149
  // TODO cancel any current requests?
152
150
  this.store.reset();
153
151
  this.urlManager.reset().go();
152
+ if (this.store.trending?.length && this.config.settings?.trending?.showResults) {
153
+ this.store.trending[0].preview();
154
+ }
154
155
  }
155
156
  else {
156
157
  this.handlers.input.timeoutDelay = setTimeout(() => {
@@ -388,7 +389,17 @@ export class AutocompleteController extends AbstractController {
388
389
  }
389
390
  }
390
391
  }
391
- inputElement?.dispatchEvent(new Event('keyup'));
392
+ // auto select first trending term?
393
+ if (inputElement &&
394
+ !this.store.state?.input &&
395
+ this.store.trending?.length &&
396
+ !this.store.terms?.length &&
397
+ this.config.settings?.trending?.showResults) {
398
+ this.store.trending[0].preview();
399
+ }
400
+ else {
401
+ inputElement?.dispatchEvent(new Event('keyup'));
402
+ }
392
403
  }
393
404
  reset() {
394
405
  // reset input values and state
@@ -402,8 +413,8 @@ export class AutocompleteController extends AbstractController {
402
413
  const inputs = document.querySelectorAll(`input[${INPUT_ATTRIBUTE}]`);
403
414
  inputs?.forEach((input) => {
404
415
  input.removeEventListener('keyup', this.handlers.input.keyUp);
405
- input.removeEventListener('keyup', this.handlers.input.enterKey);
406
- input.removeEventListener('keyup', this.handlers.input.escKey);
416
+ input.removeEventListener('keydown', this.handlers.input.enterKey);
417
+ input.removeEventListener('keydown', this.handlers.input.escKey);
407
418
  input.removeEventListener('focus', this.handlers.input.focus);
408
419
  input.form?.removeEventListener('submit', this.handlers.input.formSubmit);
409
420
  });
@@ -424,19 +435,15 @@ export class AutocompleteController extends AbstractController {
424
435
  input.value = this.store.state.input;
425
436
  }
426
437
  input.addEventListener('focus', this.handlers.input.focus);
427
- input.addEventListener('keyup', this.handlers.input.escKey);
438
+ input.addEventListener('keydown', this.handlers.input.escKey);
428
439
  const form = input.form;
429
- let formActionUrl = this.config.action;
430
- if (!form && this.config.action) {
431
- input.addEventListener('keyup', this.handlers.input.enterKey);
440
+ let formActionUrl;
441
+ if (this.config.action) {
442
+ formActionUrl = this.config.action;
443
+ input.addEventListener('keydown', this.handlers.input.enterKey);
432
444
  }
433
445
  else if (form) {
434
- if (this.config.action) {
435
- form.action = this.config.action;
436
- }
437
- else {
438
- formActionUrl = form.action;
439
- }
446
+ formActionUrl = form.action;
440
447
  form.addEventListener('submit', this.handlers.input.formSubmit);
441
448
  }
442
449
  // set the root URL on urlManager
package/dist/esm/Finder/FinderController.d.ts.map CHANGED
@@ -1 +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,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAmC,kBAAkB,EAAa,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAQzI,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,SAAY;IAChB,KAAK,EAAE,WAAW,CAAC;IAC1B,MAAM,EAAE,sBAAsB,CAAC;gBAG9B,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,CAUhC;IAED,IAAI,QAAO,IAAI,CAEb;IAEF,KAAK,QAAO,IAAI,CAMd;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
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,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAmC,kBAAkB,EAAa,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAQzI,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,SAAY;IAChB,KAAK,EAAE,WAAW,CAAC;IAC1B,MAAM,EAAE,sBAAsB,CAAC;gBAG9B,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,CAchC;IAED,IAAI,QAAO,IAAI,CAEb;IAEF,KAAK,QAAO,IAAI,CAMd;IAEF,MAAM,QAAa,QAAQ,IAAI,CAAC,CA6G9B;CACF"}
package/dist/esm/Finder/FinderController.js CHANGED
@@ -154,11 +154,14 @@ export class FinderController extends AbstractController {
154
154
  }
155
155
  get params() {
156
156
  const urlState = this.urlManager.state;
157
- const params = deepmerge({ ...getSearchParams(urlState) }, this.config.globals);
158
- // get only the finder fields
159
- params.facets = {
160
- include: this.config.fields.map((fieldConfig) => fieldConfig.field),
157
+ // get only the finder fields and disable auto drill down
158
+ const defaultParams = {
159
+ facets: {
160
+ include: this.config.fields.map((fieldConfig) => fieldConfig.field),
161
+ autoDrillDown: false,
162
+ },
161
163
  };
164
+ const params = deepmerge({ ...getSearchParams(urlState) }, deepmerge(defaultParams, this.config.globals));
162
165
  return params;
163
166
  }
164
167
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@searchspring/snap-controller",
3
- "version": "0.21.1",
3
+ "version": "0.23.1",
4
4
  "description": "Snap Controllers",
5
5
  "main": "dist/cjs/index.js",
6
6
  "module": "dist/esm/index.js",
@@ -20,21 +20,21 @@
20
20
  "test:watch": "jest --watch"
21
21
  },
22
22
  "dependencies": {
23
- "@searchspring/snap-toolbox": "^0.21.1",
23
+ "@searchspring/snap-toolbox": "^0.23.1",
24
24
  "deepmerge": "^4.2.2"
25
25
  },
26
26
  "devDependencies": {
27
- "@searchspring/snap-client": "^0.21.1",
28
- "@searchspring/snap-event-manager": "^0.21.1",
29
- "@searchspring/snap-logger": "^0.21.1",
30
- "@searchspring/snap-profiler": "^0.21.1",
31
- "@searchspring/snap-store-mobx": "^0.21.1",
32
- "@searchspring/snap-tracker": "^0.21.1",
33
- "@searchspring/snap-url-manager": "^0.21.1"
27
+ "@searchspring/snap-client": "^0.23.1",
28
+ "@searchspring/snap-event-manager": "^0.23.1",
29
+ "@searchspring/snap-logger": "^0.23.1",
30
+ "@searchspring/snap-profiler": "^0.23.1",
31
+ "@searchspring/snap-store-mobx": "^0.23.1",
32
+ "@searchspring/snap-tracker": "^0.23.1",
33
+ "@searchspring/snap-url-manager": "^0.23.1"
34
34
  },
35
35
  "sideEffects": false,
36
36
  "files": [
37
37
  "dist/**/*"
38
38
  ],
39
- "gitHead": "e54d2d21a811b65b0e766d2dc0fd5b0f6da6053e"
39
+ "gitHead": "56fee54f115b415326331ac2aa1100c73ced6523"
40
40
  }