@uncinc/uncinc-react-kitchen-sink 2.5.4-1-treeshaking → 2.5.4-2-custom-searchkit-routing2

package/dist/components/SearchKit/SearchPage/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import c from 'classnames';
-import { withSearchkitRouting } from '@searchkit/client';
+import withSearchkitRouting from './withSearchkitRouting';
 var SearchPage = function SearchPage(_ref) {
   var className = _ref.className,
     children = _ref.children;
@@ -33,7 +33,7 @@ export var routeToStateFn = function routeToStateFn(routeState) {
       item.max = Number(item.max);
     }
     if (item.boolValue) {
-      item.boolValue = !!item.boolValue;
+      item.boolValue = item.boolValue === "true";
     }
     if (item.geoBoundingBox) {
       item.geoBoundingBox.topLeft.lat = Number(item.geoBoundingBox.topLeft.lat);

package/dist/components/SearchKit/SearchPage/withSearchkitRouting.d.ts

@@ -0,0 +1,39 @@
+import React from 'react';
+import qs from 'qs';
+import { RouteState } from '@searchkit/client/lib/esm/history';
+export declare const routeStateEqual: (a: any, b: any) => boolean;
+export declare const stateToRouteFn: (searchState: any) => Object;
+export declare const routeToStateFn: (routeState: any) => {
+    query: any;
+    sortBy: any;
+    filters: any;
+    page: {
+        size: number;
+        from: number;
+    };
+};
+export default function withSearchkitRouting(Page: any, { stateToRoute, routeToState, createURL, parseURL, router, }?: {
+    stateToRoute?: (searchState: any) => Object;
+    routeToState?: (routeState: any) => {
+        query: any;
+        sortBy: any;
+        filters: any;
+        page: {
+            size: number;
+            from: number;
+        };
+    };
+    createURL?: ({ qsModule, routeState, location }: {
+        qsModule: typeof qs;
+        routeState: RouteState;
+        location: Location;
+    }) => string;
+    parseURL?: ({ qsModule, location }: {
+        qsModule: typeof qs;
+        location: Location;
+    }) => RouteState;
+    router?: any;
+}): {
+    (props: any): React.JSX.Element;
+    getInitialProps(pageCtx: any): Promise<any>;
+};

package/dist/components/SearchKit/SearchPage/withSearchkitRouting.js

@@ -0,0 +1,184 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+// NOTE this is a vendored version of the searchkit one,
+// because we needed to fix routing and defaultFilters;
+
+import React, { useEffect } from 'react';
+import isEqual from 'fast-deep-equal';
+import qs from 'qs';
+import history, { defaultParseURL, defaultCreateURL } from '@searchkit/client/lib/esm/history';
+import { useSearchkitVariables, useSearchkit, searchStateEqual, SearchkitRoutingOptionsContext } from '@searchkit/client';
+var sanitiseRouteState = function sanitiseRouteState(routeState) {
+  var intKeys = ['size', 'from'];
+  // eslint-disable-next-line no-restricted-syntax
+  for (var _i = 0, _intKeys = intKeys; _i < _intKeys.length; _i++) {
+    var key = _intKeys[_i];
+    if (routeState[key] !== undefined && typeof routeState[key] === 'string') {
+      // eslint-disable-next-line no-param-reassign
+      routeState[key] = Number(routeState[key]);
+    }
+  }
+  return routeState;
+};
+export var routeStateEqual = function routeStateEqual(a, b) {
+  return isEqual(sanitiseRouteState(a), sanitiseRouteState(b));
+};
+export var stateToRouteFn = function stateToRouteFn(searchState) {
+  var _searchState$page, _searchState$page2;
+  var routeState = {
+    query: searchState.query,
+    sort: searchState.sortBy,
+    filters: searchState.filters,
+    size: Number((_searchState$page = searchState.page) === null || _searchState$page === void 0 ? void 0 : _searchState$page.size),
+    from: Number((_searchState$page2 = searchState.page) === null || _searchState$page2 === void 0 ? void 0 : _searchState$page2.from)
+  };
+  return Object.keys(routeState).reduce(function (sum, key) {
+    if (Array.isArray(routeState[key]) && routeState[key].length > 0 || !Array.isArray(routeState[key]) && !!routeState[key]) {
+      // eslint-disable-next-line no-param-reassign
+      sum[key] = routeState[key];
+    }
+    return sum;
+  }, {});
+};
+export var routeToStateFn = function routeToStateFn(routeState) {
+  return {
+    query: routeState.query || '',
+    sortBy: routeState.sort || '',
+    filters: routeState.filters || [],
+    page: {
+      size: Number(routeState.size) || 10,
+      from: Number(routeState.from) || 0
+    }
+  };
+};
+export default function withSearchkitRouting(Page) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    _ref$stateToRoute = _ref.stateToRoute,
+    stateToRoute = _ref$stateToRoute === void 0 ? stateToRouteFn : _ref$stateToRoute,
+    _ref$routeToState = _ref.routeToState,
+    routeToState = _ref$routeToState === void 0 ? routeToStateFn : _ref$routeToState,
+    _ref$createURL = _ref.createURL,
+    _createURL = _ref$createURL === void 0 ? defaultCreateURL : _ref$createURL,
+    _ref$parseURL = _ref.parseURL,
+    _parseURL = _ref$parseURL === void 0 ? defaultParseURL : _ref$parseURL,
+    _ref$router = _ref.router,
+    router = _ref$router === void 0 ? null : _ref$router;
+  var routingInstance = router;
+  var getRouting = function getRouting() {
+    if (routingInstance) return routingInstance;
+    if (typeof window === 'undefined') {
+      return null;
+    }
+    routingInstance = history({
+      createURL: _createURL,
+      parseURL: _parseURL
+    });
+    return routingInstance;
+  };
+  var routingOptions = {
+    stateToRoute: stateToRoute,
+    routeToState: routeToState,
+    createURL: function createURL(config) {
+      return _createURL(_objectSpread(_objectSpread({}, config), {}, {
+        qsModule: qs
+      }));
+    },
+    parseURL: function parseURL(config) {
+      return _parseURL(_objectSpread(_objectSpread({}, config), {}, {
+        qsModule: qs
+      }));
+    }
+  };
+
+  // eslint-disable-next-line @typescript-eslint/no-shadow
+  var withSearchkitRouting = function withSearchkitRouting(props) {
+    var searchkitVariables = useSearchkitVariables();
+    var api = useSearchkit();
+    useEffect(function () {
+      var routerEffect = getRouting();
+      if (routerEffect) {
+        var _api$baseSearchState$;
+        var routeState = stateToRoute(searchkitVariables);
+        var currentRouteState = _objectSpread({
+          size: (_api$baseSearchState$ = api.baseSearchState.page) === null || _api$baseSearchState$ === void 0 ? void 0 : _api$baseSearchState$.size
+        }, routerEffect.read());
+        if (!routeStateEqual(currentRouteState, routeState)) {
+          routerEffect.write(routeState, true);
+        }
+      }
+    }, [searchkitVariables]);
+    useEffect(function () {
+      var routerEffect = getRouting();
+      var routeToSearchFn = function routeToSearchFn(routeState) {
+        var searchState = routeToState(routeState);
+        if (!searchStateEqual(searchState, api.searchState)) {
+          api.setSearchState(searchState);
+          api.search();
+        }
+      };
+      if (routerEffect) {
+        routerEffect.onUpdate(routeToSearchFn);
+      }
+      var routeState = routerEffect.read();
+      var routeStateOld = stateToRoute(searchkitVariables);
+      var searchState = routeToState(_objectSpread(_objectSpread({}, routeStateOld), routeState));
+      api.setSearchState(searchState);
+      api.search();
+      return function cleanup() {
+        routerEffect.dispose();
+      };
+    }, []);
+    return /*#__PURE__*/React.createElement(SearchkitRoutingOptionsContext.Provider, {
+      value: routingOptions
+    }, /*#__PURE__*/React.createElement(Page, props));
+  };
+  withSearchkitRouting.getInitialProps = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(pageCtx) {
+      var _ctx$req;
+      var props, ctx, searchkitClient, mockLocation, searchState;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            ctx = 'Component' in pageCtx ? pageCtx.ctx : pageCtx;
+            searchkitClient = pageCtx.searchkitClient;
+            if (!Page.getInitialProps) {
+              _context.next = 6;
+              break;
+            }
+            _context.next = 5;
+            return Page.getInitialProps(ctx);
+          case 5:
+            props = _context.sent;
+          case 6:
+            mockLocation = {
+              hostname: (_ctx$req = ctx.req) === null || _ctx$req === void 0 ? void 0 : _ctx$req.headers.host,
+              href: ctx.asPath,
+              pathname: ctx.pathname,
+              search: ctx.asPath.substring(ctx.pathname.length)
+            };
+            searchState = routeToState(routingOptions.parseURL({
+              location: mockLocation
+            }));
+            searchkitClient.updateBaseSearchState(searchState);
+            return _context.abrupt("return", _objectSpread(_objectSpread({}, props), {}, {
+              searchState: searchState
+            }));
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return withSearchkitRouting;
+}

package/dist/components/SearchKit/index.js

@@ -1,3 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useEffect, useState, useMemo } from 'react';
 import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client';
 import { SearchkitProvider, SearchkitClient } from '@searchkit/client';
@@ -52,6 +58,30 @@ var SearchKit = function SearchKit(_ref) {
       },
       sortBy: defaultSorting
     });
+
+    // We override the setQuery and resetFilters functions to include our default filters,
+    // e.g when you do a new search query or press the reset button.
+    skClient.setQuery = function (query) {
+      // eslint-disable-next-line react/no-this-in-sfc
+      this.setSearchState(function (searchState) {
+        return _objectSpread(_objectSpread({}, searchState), {}, {
+          query: query,
+          filters: defaultFilters,
+          page: {
+            from: 0,
+            size: pageSize
+          }
+        });
+      });
+    };
+    skClient.resetFilters = function (query) {
+      // eslint-disable-next-line react/no-this-in-sfc
+      this.setSearchState(function (searchState) {
+        return _objectSpread(_objectSpread({}, searchState), {}, {
+          filters: defaultFilters
+        });
+      });
+    };
     return skClient;
   }, [useRouting, defaultFilters, defaultQuery, pageSize, defaultSorting]);
   return /*#__PURE__*/React.createElement(ApolloProvider, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uncinc/uncinc-react-kitchen-sink",
-  "version": "2.5.4-1-treeshaking",
+  "version": "2.5.4-2-custom-searchkit-routing2",
   "description": "Default React components that are easily extended.",
   "author": "uncinc",
   "license": "MIT",
@@ -52,8 +52,8 @@
     "@apollo/client": "^3.4.16",
     "@elastic/datemath": "^5.0.3",
     "@loadable/component": "^5.15.0",
-    "@searchkit/client": "^3.0.0-canary.45",
-    "@searchkit/elastic-ui": "^3.0.0-canary.45",
+    "@searchkit/client": "3.0.0",
+    "@searchkit/elastic-ui": "^3.0.0",
     "@types/jest": "^29.5.1",
     "@types/node": "^20.1.0",
     "@types/react": "^18.2.6",