@zengenti/contensis-react-base 3.0.2-beta.2 → 3.0.2-beta.21

package/cjs/{sagas-8a20e424.js → sagas-e04b94c1.js}

@@ -81,7 +81,8 @@ var types = /*#__PURE__*/Object.freeze({
 });
 
 const withMappers = (action, mappers) => {
-  return { ...action,
+  return {
+    ...action,
     mappers
   };
 };
@@ -136,18 +137,18 @@ const clearFilters$1 = filterKey => {
     filterKey
   };
 };
-const updatePageIndex$1 = (pageIndex, scrollYPos) => {
+const updatePageIndex$1 = (pageIndex, scrollToElement) => {
   return {
     type: UPDATE_PAGE_INDEX,
     pageIndex,
-    scrollYPos
+    scrollToElement
   };
 };
-const updatePageSize$1 = (pageSize, scrollYPos) => {
+const updatePageSize$1 = (pageSize, scrollToElement) => {
   return {
     type: UPDATE_PAGE_SIZE,
     pageSize,
-    scrollYPos
+    scrollToElement
   };
 };
 const updateCurrentFacet$1 = facet => {
@@ -168,13 +169,13 @@ const updateSearchTerm$1 = term => {
     term
   };
 };
-const updateSelectedFilters = (filter, key, isUnknownItem = false, scrollYPos) => {
+const updateSelectedFilters = (filter, key, isUnknownItem = false, scrollToElement) => {
   return {
     type: UPDATE_SELECTED_FILTERS,
     filter,
     key,
     isUnknownItem,
-    scrollYPos
+    scrollToElement
   };
 };
 const updateSortOrder$1 = (orderBy, facet) => {
@@ -201,53 +202,47 @@ var actions = /*#__PURE__*/Object.freeze({
   updateSortOrder: updateSortOrder$1
 });
 
-exports.Context = void 0; // export type Context = 'facets' | 'listings' | 'minilist';
-
-(function (Context) {
+let Context = /*#__PURE__*/function (Context) {
   Context["facets"] = "facets";
   Context["listings"] = "listings";
   Context["minilist"] = "minilist";
-})(exports.Context || (exports.Context = {}));
+  return Context;
+}({});
+// export type Context = 'facets' | 'listings' | 'minilist';
 
+// Find a fromJS function from global that is dynamically loaded in createStore
 // or replace with a stub function for non-immutable gets
-
 const makeFromJS = (returnType = globalThis.STATE_TYPE || 'immutable') => {
   var _immutable, _immutable2;
-
   return returnType === 'immutable' ? ((_immutable = globalThis.immutable) === null || _immutable === void 0 ? void 0 : _immutable.fromJSOrdered) || ((_immutable2 = globalThis.immutable) === null || _immutable2 === void 0 ? void 0 : _immutable2.fromJS) || (v => v) : v => v;
 };
-
 const getImmutableOrJS = (state, stateKey, fallbackValue, returnType = globalThis.STATE_TYPE || 'immutable') => {
   // Find a fromJS function from global that is dynamically loaded in createStore
   // or replace with a stub function for non-immutable gets
   const fromJS = makeFromJS(returnType);
-
   if (state && 'get' in state && typeof state.get === 'function' && 'getIn' in state && typeof state.getIn === 'function' && 'toJS' in state && typeof state.toJS === 'function') {
     if (Array.isArray(stateKey)) return fromJS(state.getIn(stateKey, fallbackValue));
     return fromJS(state.get(stateKey, fallbackValue));
   }
-
   if (Array.isArray(stateKey) && state && typeof state === 'object') {
     const result = mapJson.jpath(stateKey.join('.'), state);
     if (typeof result === 'undefined') return fallbackValue;
     return result;
   }
-
   const result = state && typeof state === 'object' ? state[stateKey] : undefined;
   if (typeof result === 'undefined') return fallbackValue;
   return result;
 };
 
-const getSearchContext = state => getImmutableOrJS(state, ['search', 'context'], exports.Context.facets);
-const getCurrent = (state, context = exports.Context.facets) => context === exports.Context.facets ? getCurrentFacet(state) : getCurrentListing(state);
+const getSearchContext = state => getImmutableOrJS(state, ['search', 'context'], Context.facets);
+const getCurrent = (state, context = Context.facets) => context === Context.facets ? getCurrentFacet(state) : getCurrentListing(state);
 const getCurrentFacet = state => getImmutableOrJS(state, ['search', 'currentFacet']);
 const getCurrentListing = state => getImmutableOrJS(state, ['search', 'currentListing']);
-const getCurrentTab = state => getImmutableOrJS(state, ['search', exports.Context.facets, getCurrentFacet(state), 'tabId'], 0);
-const getFacets = (state, returnType) => getImmutableOrJS(state, ['search', exports.Context.facets], {}, returnType);
+const getCurrentTab = state => getImmutableOrJS(state, ['search', Context.facets, getCurrentFacet(state), 'tabId'], 0);
+const getFacets = (state, returnType) => getImmutableOrJS(state, ['search', Context.facets], {}, returnType);
 const getTabFacets = state => Object.fromEntries(Object.entries(getFacets(state, 'js')).filter(([key]) => getImmutableOrJS(getFacets(state), [key, 'tabId'], 0) === getCurrentTab(state)));
 const getFacetTitles = state => Object.entries(getFacets(state, 'js')).map(([key, facet = {}]) => {
   var _facet$pagingInfo;
-
   return {
     isSelected: getCurrentFacet(state) === key,
     key,
@@ -255,28 +250,29 @@ const getFacetTitles = state => Object.entries(getFacets(state, 'js')).map(([key
     totalCount: (_facet$pagingInfo = facet.pagingInfo) === null || _facet$pagingInfo === void 0 ? void 0 : _facet$pagingInfo.totalCount
   };
 });
-const getFacet = (state, facetName = '', context = exports.Context.facets, returnType) => {
+const getFacet = (state, facetName = '', context = Context.facets, returnType) => {
   const currentFacet = facetName || getCurrentFacet(state);
   return getImmutableOrJS(state, ['search', context, currentFacet], {}, returnType);
 };
 const getListing = (state, listing = '') => {
   const currentListing = listing || getCurrentListing(state);
-  return getImmutableOrJS(state, ['search', exports.Context.listings, currentListing], {});
+  return getImmutableOrJS(state, ['search', Context.listings, currentListing], {});
 };
-const getFilters = (state, facet, context = exports.Context.facets, returnType) => {
+const getFilters = (state, facet, context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent(state, context), 'filters'], {}, returnType);
 };
-const getRenderableFilters = (state, facet = '', context = exports.Context.facets) => Object.fromEntries(Object.entries(getFilters(state, facet, context, 'js')).filter(([, f = {}]) => typeof f.renderable !== 'boolean' ? true : f.renderable));
-const getFiltersToLoad = (state, facet, context = exports.Context.facets, returnType) => {
+const getRenderableFilters = (state, facet = '', context = Context.facets) => Object.fromEntries(Object.entries(getFilters(state, facet, context, 'js')).filter(([, f = {}]) => typeof f.renderable !== 'boolean' ? true : f.renderable));
+const getFiltersToLoad = (state, facet, context = Context.facets, returnType) => {
   const filters = getFilters(state, facet, context, returnType);
   const loadedFilters = Object.entries(filters).map(([key, f = {}]) => [key, (f.items || []).filter(i => {
     const title = i === null || i === void 0 ? void 0 : i.title;
     return typeof title !== 'undefined' && !!title;
   }).length > 0 && (f.isError || false) === false]);
   return loadedFilters.map(([filterKey, isLoaded]) => !isLoaded ? filterKey : null).filter(f => !!f);
-}; // We lowercase the filter key unless it's an ISO date string where the T must be uppercase
+};
 
-const getSelectedFilters = (state, facet = '', context = exports.Context.facets, returnType) => {
+// We lowercase the filter key unless it's an ISO date string where the T must be uppercase
+const getSelectedFilters = (state, facet = '', context = Context.facets, returnType) => {
   const filters = getFilters(state, facet, context, 'js');
   const isoDateRegex = RegExp(/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d/);
   const selectedFilters = Object.fromEntries(Object.entries(filters).map(([key, filter = {}]) => [key, (filter.items || []).filter(item => !!(item.isSelected || false)).map(item => {
@@ -287,60 +283,61 @@ const getSelectedFilters = (state, facet = '', context = exports.Context.facets,
   const fromJS = makeFromJS(returnType);
   return fromJS(selectedFilters);
 };
-const getResults = (state, current = '', context = exports.Context.facets, returnType) => {
+const getResults = (state, current = '', context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'results'], [], returnType);
 };
-const getIsInternalPaging = (state, current, context = exports.Context.facets) => {
+const getIsInternalPaging = (state, current, context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'queryParams', 'internalPaging'], false);
 };
-const getIsLoaded = (state, context = exports.Context.facets, facet) => {
+const getIsLoaded = (state, context = Context.facets, facet) => {
   return !!getImmutableOrJS(state, ['search', context, facet || getCurrent(state, context), 'queryDuration'], 0);
 };
-const getIsLoading = (state, context = exports.Context.facets, facet) => {
+const getIsLoading = (state, context = Context.facets, facet) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent(state, context), 'entries', 'isLoading']);
 };
 const getIsSsr = state => getImmutableOrJS(state, ['search', 'config', 'ssr'], false);
-const getFeaturedResults = (state, current = '', context = exports.Context.facets, returnType) => {
+const getFeaturedResults = (state, current = '', context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'featuredResults'], [], returnType);
 };
-const getPaging = (state, current = '', context = exports.Context.facets, returnType) => {
+const getPaging = (state, current = '', context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo'], {}, returnType);
 };
-const getPageIndex = (state, current = '', context = exports.Context.facets) => {
+const getPageIndex = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'pageIndex']);
 };
-const getPageSize = (state, current = '', context = exports.Context.facets) => {
+const getPageSize = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'pageSize'], 0 // Defaults to 0 because we want it to fall back to a query param if not defined
   );
 };
-const getPrevPageIndex = (state, current = '', context = exports.Context.facets) => {
+
+const getPrevPageIndex = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'prevPageIndex']);
 };
-const getPageIsLoading = (state, current = '', context = exports.Context.facets) => {
+const getPageIsLoading = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'isLoading']);
 };
-const getPagesLoaded = (state, current = '', context = exports.Context.facets) => {
+const getPagesLoaded = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'pagesLoaded'], [], 'js');
 };
-const getTotalCount = (state, current = '', context = exports.Context.facets) => {
+const getTotalCount = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'totalCount']);
 };
 const getSearchTerm = state => getImmutableOrJS(state, ['search', 'term']);
 const getSearchTabs = (state, returnType) => getImmutableOrJS(state, ['search', 'tabs'], [], returnType);
-const getQueryParams = (state, current = '', context = exports.Context.facets) => {
+const getQueryParams = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'queryParams'], {}, 'js');
 };
 const getQueryParameter = ({
   state,
   facet,
-  context = exports.Context.facets
+  context = Context.facets
 }, key, ifnull = null) => {
   return getImmutableOrJS(getQueryParams(state, facet, context), key, ifnull, 'js');
 };
-const getCustomApi = (state, current, context = exports.Context.facets, returnType) => {
+const getCustomApi = (state, current, context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'customApi'], null, returnType);
 };
-const getCustomEnv = (state, current, context = exports.Context.facets) => {
+const getCustomEnv = (state, current, context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'env']);
 };
 const getTabsAndFacets = (state, returnType) => {
@@ -355,8 +352,9 @@ const getTabsAndFacets = (state, returnType) => {
       if (!countFields || countFields.find((f = []) => (f === null || f === void 0 ? void 0 : f[0]) === facetName)) return getImmutableOrJS(facet, ['pagingInfo', 'totalCount']);
       return 0;
     }).reduce((a, b) => a + b, 0);
-    return { ...tab,
-      [exports.Context.facets]: Object.fromEntries(thisTabFacets),
+    return {
+      ...tab,
+      [Context.facets]: Object.fromEntries(thisTabFacets),
       totalCount: thisTabTotal
     };
   });
@@ -372,12 +370,12 @@ const getFacetsTotalCount = state => {
   const facets = getFacets(state);
   const wholeSearchTotal = Object.entries(facets).map(([, t = {}]) => {
     var _t$pagingInfo;
-
     return ((_t$pagingInfo = t.pagingInfo) === null || _t$pagingInfo === void 0 ? void 0 : _t$pagingInfo.totalCount) || 0;
   }).reduce((a, b) => a + b, 0);
   return wholeSearchTotal;
-}; // An exported copy of the relevant selectors scoped by default to a facets context
+};
 
+// An exported copy of the relevant selectors scoped by default to a facets context
 const selectFacets = {
   getCurrent: getCurrentFacet,
   getCurrentTab,
@@ -396,14 +394,14 @@ const selectFacets = {
   getPageIsLoading,
   getPagesLoaded,
   getPaging,
-  getQueryParams: (state, facet) => getQueryParams(state, facet, exports.Context.facets),
+  getQueryParams: (state, facet) => getQueryParams(state, facet, Context.facets),
   getQueryParameter: ({
     state,
     facet
   }, key, ifnull) => getQueryParameter({
     state,
     facet,
-    context: exports.Context.facets
+    context: Context.facets
   }, key, ifnull),
   getRenderableFilters,
   getResults,
@@ -414,34 +412,35 @@ const selectFacets = {
   getSearchTerm,
   getSearchTotalCount,
   getSelectedFilters
-}; // An exported copy of the relevant selectors pre-scoped to a listing context
+};
 
+// An exported copy of the relevant selectors pre-scoped to a listing context
 const selectListing = {
   getCurrent: getCurrentListing,
-  getFeaturedResults: (state, listing = '') => getFeaturedResults(state, listing, exports.Context.listings, 'js'),
-  getFilters: (state, listing = '') => getFilters(state, listing, exports.Context.listings, 'js'),
-  getFiltersToLoad: (state, listing = '') => getFiltersToLoad(state, listing, exports.Context.listings),
+  getFeaturedResults: (state, listing = '') => getFeaturedResults(state, listing, Context.listings, 'js'),
+  getFilters: (state, listing = '') => getFilters(state, listing, Context.listings, 'js'),
+  getFiltersToLoad: (state, listing = '') => getFiltersToLoad(state, listing, Context.listings),
   getListing,
-  getIsLoaded: state => getIsLoaded(state, exports.Context.listings),
-  getIsLoading: state => getIsLoading(state, exports.Context.listings),
-  getPageIndex: (state, listing = '') => getPageIndex(state, listing, exports.Context.listings),
-  getPaging: (state, listing = '') => getPaging(state, listing, exports.Context.listings, 'js'),
-  getPageIsLoading: (state, listing = '') => getPageIsLoading(state, listing, exports.Context.listings),
-  getPagesLoaded: (state, listing = '') => getPagesLoaded(state, listing, exports.Context.listings),
-  getQueryParams: (state, listing = '') => getQueryParams(state, listing, exports.Context.listings),
+  getIsLoaded: state => getIsLoaded(state, Context.listings),
+  getIsLoading: state => getIsLoading(state, Context.listings),
+  getPageIndex: (state, listing = '') => getPageIndex(state, listing, Context.listings),
+  getPaging: (state, listing = '') => getPaging(state, listing, Context.listings, 'js'),
+  getPageIsLoading: (state, listing = '') => getPageIsLoading(state, listing, Context.listings),
+  getPagesLoaded: (state, listing = '') => getPagesLoaded(state, listing, Context.listings),
+  getQueryParams: (state, listing = '') => getQueryParams(state, listing, Context.listings),
   getQueryParameter: ({
     state,
     facet
   }, key, ifnull) => getQueryParameter({
     state,
     facet,
-    context: exports.Context.listings
+    context: Context.listings
   }, key, ifnull),
-  getRenderableFilters: (state, listing = '') => getRenderableFilters(state, listing, exports.Context.listings),
-  getResults: (state, listing = '') => getResults(state, listing, exports.Context.listings, 'js'),
+  getRenderableFilters: (state, listing = '') => getRenderableFilters(state, listing, Context.listings),
+  getResults: (state, listing = '') => getResults(state, listing, Context.listings, 'js'),
   getSearchTerm,
-  getTotalCount: (state, listing = '') => getTotalCount(state, listing, exports.Context.listings),
-  getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, exports.Context.listings, 'js')
+  getTotalCount: (state, listing = '') => getTotalCount(state, listing, Context.listings),
+  getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context.listings, 'js')
 };
 const selectCurrentPath = state => getImmutableOrJS(state, ['routing', 'currentPath']);
 const selectCurrentProject = state => getImmutableOrJS(state, ['routing', 'currentProject']);
@@ -496,31 +495,23 @@ const now = () => {
   if (typeof window == 'undefined') {
     return Date.now();
   }
-
   return window.performance.now();
 };
 
 const getClientConfig = (project, env) => {
-  let config = DELIVERY_API_CONFIG;
-  /* global DELIVERY_API_CONFIG */
-
+  let config = DELIVERY_API_CONFIG; /* global DELIVERY_API_CONFIG */
   if (project) {
     config.projectId = project;
   }
-
-  if (typeof window != 'undefined' && PROXY_DELIVERY_API
-  /* global PROXY_DELIVERY_API */
-  ) {
+  if (typeof window != 'undefined' && PROXY_DELIVERY_API /* global PROXY_DELIVERY_API */) {
     // ensure a relative url is used to bypass the need for CORS (separate OPTIONS calls)
     config.rootUrl = env || '';
     config.responseHandler = {
       404: () => null
     };
   }
-
   return config;
 };
-
 class CacheNode {
   constructor(key, value) {
     this.key = key;
@@ -528,9 +519,7 @@ class CacheNode {
     this.next = null;
     this.prev = null;
   }
-
 }
-
 class LruCache {
   constructor(limit = 100) {
     this.map = {};
@@ -539,7 +528,6 @@ class LruCache {
     this.limit = limit || 100;
     this.size = 0;
   }
-
   get(key) {
     if (this.map[key]) {
       let value = this.map[key].value;
@@ -549,10 +537,8 @@ class LruCache {
       return value;
     }
   }
-
   set(key, value) {
     let node = new CacheNode(key, value);
-
     if (this.map[key]) {
       this.remove(key);
     } else {
@@ -563,60 +549,46 @@ class LruCache {
         this.tail.next = null;
       }
     }
-
     this.setHead(node);
   }
-
   setHead(node) {
     node.next = this.head;
     node.prev = null;
-
     if (this.head) {
       this.head.prev = node;
     }
-
     this.head = node;
-
     if (!this.tail) {
       this.tail = node;
     }
-
     this.size++;
     this.map[node.key] = node;
   }
-
   remove(key) {
     let node = this.map[key];
-
     if (node.prev) {
       node.prev.next = node.next;
     } else {
       this.head = node.next;
     }
-
     if (node.next) {
       node.next.prev = node.prev;
     } else {
       this.tail = node.prev;
     }
-
     delete this.map[key];
     this.size--;
   }
-
 }
-
 class CachedSearch {
   constructor() {
     this.cache = new LruCache();
     this.taxonomyLookup = {};
   }
-
   search(query, linkDepth, project, env) {
     const client = contensisDeliveryApi.Client.create(getClientConfig(project, env));
     return this.request(project + JSON.stringify(query) + linkDepth.toString(), () => client.entries.search(query, linkDepth));
   }
-
   getTaxonomyNodeByPath(path, project, env) {
     const client = contensisDeliveryApi.Client.create(getClientConfig(project, env));
     return this.request(`[TAXONOMY NODE] ${path}`, () => client.taxonomy.getNodeByPath({
@@ -625,7 +597,6 @@ class CachedSearch {
       childDepth: 2
     }).then(node => this.extendTaxonomyNode(node)));
   }
-
   request(key, execute) {
     if (!this.cache.get(key) || typeof window == 'undefined') {
       let promise = execute();
@@ -634,41 +605,36 @@ class CachedSearch {
         this.cache.remove(key);
       });
     }
-
     return this.cache.get(key);
   }
-
   extendTaxonomyNode(node) {
     let id = this.getTaxonomyId(node);
     this.taxonomyLookup[id] = node.key;
-    return { ...node,
+    return {
+      ...node,
       id,
       children: node.children ? node.children.map(n => this.extendTaxonomyNode(n)) : null
     };
   }
-
   getTaxonomyId(node) {
     if (node.key) {
       let parts = node.key.split('/');
       return parts[parts.length - 1];
     }
-
     return '';
   }
-
   fetch(uri, opts = {}) {
     return this.request(`[FETCH] ${uri} ${JSON.stringify(opts)}`, () => fetch(uri, opts));
   }
-
 }
-
 const cachedSearch = new CachedSearch();
 
 // eslint-disable-next-line import/default
 function fixFreeTextForElastic(s) {
   const illegalChars = ['>', '<', '=', '|', '!', '{', '}', '[', ']', '^', '~', '*', '?', ':', '\\', '/'];
   const illegalRegEx = new RegExp(illegalChars.map(c => '\\' + c).join('|'), 'g');
-  s = s.replace(illegalRegEx, ''); // s = s.replace(encodedRegEx, ''); // (m) => '\\\\' + m);
+  s = s.replace(illegalRegEx, '');
+  // s = s.replace(encodedRegEx, ''); // (m) => '\\\\' + m);
 
   return s;
 }
@@ -688,13 +654,11 @@ const getItemsFromResult = result => {
   const {
     payload
   } = result || {};
-
   if (payload) {
     if (Array.isArray(payload)) return payload;
     if (Array.isArray(payload.items)) return payload.items;
     return payload;
   }
-
   return [];
 };
 const extractQuotedPhrases = searchTerm => {
@@ -706,6 +670,7 @@ const buildUrl = (route, params) => {
   const path = qs ? `${route}${route.includes('?') ? '&' : '?'}${qs}` : route;
   return path;
 };
+
 /**
  * Returns all params from the current route query string or static route
  * Supply static route argument if reading parameters from the route path
@@ -714,15 +679,14 @@ const buildUrl = (route, params) => {
  * @param location location object containing at least pathname and search
  * @returns Keyed params object
  */
-
 const routeParams = (staticRoute, location) => {
   var _staticRoute$match;
-
   // match.params is react-router-config/react-router@5 style
   // params is supplied with RouteObject in react-router@6
   const pathParams = (staticRoute === null || staticRoute === void 0 ? void 0 : (_staticRoute$match = staticRoute.match) === null || _staticRoute$match === void 0 ? void 0 : _staticRoute$match.params) || (staticRoute === null || staticRoute === void 0 ? void 0 : staticRoute.params) || {};
   const queryParams = queryString.parse(typeof window !== 'undefined' ? window.location.search : (location === null || location === void 0 ? void 0 : location.search) || '');
-  return { ...pathParams,
+  return {
+    ...pathParams,
     ...queryParams
   };
 };
@@ -730,13 +694,11 @@ const callCustomApi = async (customApi, filters) => {
   const apiUri = customApi.uri || '';
   let uri = buildUrl(apiUri, filters);
   if (!uri) throw new Error('uri is required to use customApi');
-
   if (typeof window == 'undefined') {
     if (!uri.startsWith('http')) uri = `http://localhost:3001${uri}`;
     const response = await fetch(uri);
     return await response.json();
   }
-
   const response = await cachedSearch.fetch(uri);
   return await response.clone().json();
 };
@@ -744,32 +706,27 @@ const removeEmptyAttributes = obj => {
   Object.entries(obj).forEach(([key, val]) => val && typeof val === 'object' && removeEmptyAttributes(val) || (typeof val === 'undefined' || val === null || val === '') && delete obj[key]);
   return obj;
 };
-const toArray = (obj, seperator = ',') => typeof obj === 'undefined' || obj === null ? obj : Array.isArray(obj) ? obj : obj.split(seperator); // assumes array elements are primitive types
+const toArray = (obj, seperator = ',') => typeof obj === 'undefined' || obj === null ? obj : Array.isArray(obj) ? obj : obj.split(seperator);
 
+// assumes array elements are primitive types
 const areArraysEqualSets = (a1, a2) => {
   const superSet = {};
-
   for (const ai of a1) {
     const e = ai + typeof ai;
     superSet[e] = 1;
   }
-
   for (const ai of a2) {
     const e = ai + typeof ai;
-
     if (!superSet[e]) {
       return false;
     }
-
     superSet[e] = 2;
   }
-
   for (const e in superSet) {
     if (superSet[e] === 1) {
       return false;
     }
   }
-
   return true;
 };
 
@@ -780,12 +737,12 @@ const searchUriTemplate = {
   }) => {
     const context = getSearchContext(state);
     const currentPath = selectCurrentPath(state) || '/search';
-
     if (context !== 'listings') {
       const currentFacet = facet || getCurrentFacet(state);
       const filters = getSelectedFilters(state, facet, context);
-      const currentFilter = filters.contentTypeId; // Check if we have a filter first
+      const currentFilter = filters.contentTypeId;
 
+      // Check if we have a filter first
       const newPath = (currentFilter === null || currentFilter === void 0 ? void 0 : currentFilter.length) > 0 && currentFacet ? `${currentPath}/${currentFacet}/${currentFilter}` : currentFacet ? `${currentPath}/${currentFacet}` : currentPath;
       return newPath;
     } else {
@@ -800,29 +757,29 @@ const searchUriTemplate = {
     pageIndex,
     pageSize
   }) => {
-    const searchContext = getSearchContext(state); // Lose stateFilters and currentSearch if a new
+    const searchContext = getSearchContext(state);
+    // Lose stateFilters and currentSearch if a new
     // term is passed via an argument
-
     const stateFilters = term ? {} : Object.fromEntries(Object.entries(getSelectedFilters(state, facet, searchContext, 'js')).map(([k, f]) => [k, f === null || f === void 0 ? void 0 : f.join(',')]));
     const currentSearch = !term && getImmutableOrJS(state, ['routing', 'location', 'search']);
     const currentQs = removeEmptyAttributes(queryString.parse(currentSearch));
     if (orderBy) currentQs.orderBy = orderBy;
-    const searchTerm = getSearchTerm(state); // Use Immutable's merge to merge the stateFilters with any current Qs
+    const searchTerm = getSearchTerm(state);
+    // Use Immutable's merge to merge the stateFilters with any current Qs
     // to build the new Qs.
-
     const mergedSearch = removeEmptyAttributes(merge__default["default"](currentQs, stateFilters));
     if (searchTerm) mergedSearch.term = searchTerm;
     if (pageIndex) mergedSearch.pageIndex = pageIndex + 1;
     if (pageIndex === 0) mergedSearch.pageIndex = undefined;
-    if (pageSize) mergedSearch.pageSize = pageSize; // We don't want these as search params in the url, we just need the search package to see them
+    if (pageSize) mergedSearch.pageSize = pageSize;
 
+    // We don't want these as search params in the url, we just need the search package to see them
     return queryString.stringify(mergedSearch);
   },
   hash: ({
     state
   }) => getImmutableOrJS(state, ['routing', 'location', 'hash'], '').replace('#', '')
 };
-
 const mapStateToSearchUri = state => mapJson__default["default"](state, searchUriTemplate);
 
 const DataFormats = {
@@ -857,7 +814,8 @@ const Fields = {
 
 const fieldExpression = (field, value, operator = 'equalTo', weight, fuzzySearch = false) => {
   if (!field || !value || Array.isArray(value) && value.length === 0) return [];
-  if (Array.isArray(field)) // If an array of fieldIds have been provided, call self for each fieldId
+  if (Array.isArray(field))
+    // If an array of fieldIds have been provided, call self for each fieldId
     // to generate expressions that are combined with an 'or' operator
     return [contensisCoreApi.Op.or(...field.map(fieldId => fieldExpression(fieldId, value, operator, weight, fuzzySearch)).flat())];
   if (operator === 'between') return between(field, value);
@@ -866,19 +824,15 @@ const fieldExpression = (field, value, operator = 'equalTo', weight, fuzzySearch
 const contentTypeIdExpression = (contentTypeIds, webpageTemplates, assetTypes) => {
   const expressions = [];
   if (!contentTypeIds && !webpageTemplates && !assetTypes) return expressions;
-
   if (contentTypeIds && contentTypeIds.length > 0) {
     expressions.push(...dataFormatExpression(contentTypeIds, DataFormats.entry));
   }
-
   if (webpageTemplates && webpageTemplates.length > 0) {
     expressions.push(...dataFormatExpression(webpageTemplates, DataFormats.webpage));
   }
-
   if (assetTypes && assetTypes.length > 0) {
     expressions.push(...dataFormatExpression(assetTypes, DataFormats.asset));
   }
-
   if (expressions.length > 1) return [contensisCoreApi.Op.or(...expressions)];
   return expressions;
 };
@@ -886,14 +840,16 @@ const filterExpressions = (filters, isOptional = false) => {
   if (!filters) return [];
   const expressions = [];
   filters.map(selectedFilter => {
-    if (selectedFilter.logicOperator === 'and') // using 'and' logic operator we loop through each filter
+    if (selectedFilter.logicOperator === 'and')
+      // using 'and' logic operator we loop through each filter
       // and loop through all values to add an expression for each filter value
       selectedFilter.values.forEach(value => expressions.push(...fieldExpression(selectedFilter.key, value, selectedFilter.fieldOperator || 'equalTo')));else if (selectedFilter.logicOperator === 'not') {
       const fieldExpressions = fieldExpression(selectedFilter.key, selectedFilter.values, selectedFilter.fieldOperator || 'in');
       fieldExpressions.forEach(expr => {
         expressions.push(contensisCoreApi.Op.not(expr));
       });
-    } // using 'or' logic operator we loop over each filter
+    }
+    // using 'or' logic operator we loop over each filter
     // and simply add the array of values to an expression with an 'in' operator
     else expressions.push(...fieldExpression(selectedFilter.key, selectedFilter.values, selectedFilter.fieldOperator || 'in'));
     if (isOptional) expressions.push(contensisCoreApi.Op.not(fieldExpression(selectedFilter.key, true, 'exists')[0]));
@@ -917,7 +873,6 @@ const dataFormatExpression = (contentTypeIds, dataFormat = DataFormats.entry) =>
     if (notContentTypeIds.length > 0 && notExpr) andExpr.add(notExpr);
     return [andExpr];
   }
-
   return [];
 };
 const featuredResultsExpression = ({
@@ -926,24 +881,22 @@ const featuredResultsExpression = ({
   fieldValue = true
 } = {}) => {
   const expressions = [];
-
   if (contentTypeId) {
     expressions.push(...contentTypeIdExpression(Array.isArray(contentTypeId) ? contentTypeId : [contentTypeId]));
   }
-
   if (fieldId && fieldValue) {
     expressions.push(...fieldExpression(fieldId, fieldValue));
   }
-
   return expressions;
 };
 const languagesExpression = languages => fieldExpression(Fields.sys.language, languages);
 const includeInSearchExpressions = (webpageTemplates, includeInSearchFields) => {
-  const expressions = []; // Or include this expression if we have explicity specified non-default includeInSearch fields
+  const expressions = [];
+  // Or include this expression if we have explicity specified non-default includeInSearch fields
+  if (Array.isArray(includeInSearchFields)) expressions.push(...includeInSearchFields.map(includeInSearchField => contensisCoreApi.Op.or(contensisCoreApi.Op.and(contensisCoreApi.Op.exists(includeInSearchField, true), contensisCoreApi.Op.equalTo(includeInSearchField, true)), contensisCoreApi.Op.exists(includeInSearchField, false))));
 
-  if (Array.isArray(includeInSearchFields)) expressions.push(...includeInSearchFields.map(includeInSearchField => contensisCoreApi.Op.or(contensisCoreApi.Op.and(contensisCoreApi.Op.exists(includeInSearchField, true), contensisCoreApi.Op.equalTo(includeInSearchField, true)), contensisCoreApi.Op.exists(includeInSearchField, false)))); // If webpageTemplates have been specified, include this expression
+  // If webpageTemplates have been specified, include this expression
   // with the default includeInSearch field from classic Contensis.
-
   if (Array.isArray(webpageTemplates) && webpageTemplates.length > 0) expressions.push(contensisCoreApi.Op.or(contensisCoreApi.Op.and(contensisCoreApi.Op.exists(Fields.sys.includeInSearch, true), contensisCoreApi.Op.equalTo(Fields.sys.includeInSearch, true)), contensisCoreApi.Op.exists(Fields.sys.includeInSearch, false)));
   return expressions;
 };
@@ -963,69 +916,52 @@ const excludeIdsExpression = excludeIds => {
 };
 const orderByExpression = orderBy => {
   let expression;
-
   if (orderBy && orderBy.length > 0) {
     expression = contensisCoreApi.OrderBy;
-
     for (const ob of orderBy) {
       var _expression, _expression2;
-
       expression = ob.startsWith('-') ? (_expression = expression) === null || _expression === void 0 ? void 0 : _expression.desc(ob.substring(1)) : (_expression2 = expression) === null || _expression2 === void 0 ? void 0 : _expression2.asc(ob);
     }
   }
-
   return expression;
 };
-
 const equalToOrIn = (field, value, operator = 'equalTo', fuzzySearch = false) => {
   if (value.length === 0) return [];
-
   if (Array.isArray(value)) {
     if (operator === 'equalTo' || operator === 'in') return [contensisCoreApi.Op.in(field, ...value)];
     const expressions = value.map(innerValue => {
       var _between, _distanceWithin;
-
       switch (operator) {
         case 'between':
           return (_between = between(field, innerValue)) === null || _between === void 0 ? void 0 : _between[0];
-
         case 'distanceWithin':
           return (_distanceWithin = distanceWithin(field, innerValue)) === null || _distanceWithin === void 0 ? void 0 : _distanceWithin[0];
-
         case 'exists':
           return contensisCoreApi.Op.exists(field, innerValue);
-
         case 'freeText':
           // TODO: Potentially needs further implementation of new options
           return contensisCoreApi.Op[operator](field, innerValue, fuzzySearch, undefined);
-
         default:
           return contensisCoreApi.Op[operator](field, innerValue);
       }
     });
     return (expressions === null || expressions === void 0 ? void 0 : expressions.length) > 1 ? [contensisCoreApi.Op.or(...expressions)] : expressions || [];
   }
-
   switch (operator) {
     case 'between':
       return between(field, value);
-
     case 'distanceWithin':
       return distanceWithin(field, value);
-
     case 'freeText':
       // TODO: Potentially needs further implementation of new options
       return [contensisCoreApi.Op.freeText(field, value, fuzzySearch, undefined)];
-
     default:
       return [contensisCoreApi.Op[operator](field, value)];
   }
 };
-
 const between = (field, value) => {
   const handle = betweenValue => {
     const valArr = betweenValue.split('--');
-
     if (valArr.length > 1) {
       const [minimum, maximum] = valArr;
       return contensisCoreApi.Op.between(field, minimum, maximum);
@@ -1035,17 +971,14 @@ const between = (field, value) => {
       return false;
     }
   };
-
   if (value.length === 0) return [];
   if (Array.isArray(value)) return [contensisCoreApi.Op.or(...value.map(handle).filter(bc => bc !== false))];
   const op = handle(value);
   return op ? [op] : [];
 };
-
 const distanceWithin = (field, value) => {
   const handle = distanceValue => {
     const valArr = distanceValue.split(' ');
-
     if (valArr.length > 1) {
       const [lat, lon] = valArr;
       return contensisCoreApi.Op.distanceWithin(field, Number(lat), Number(lon), (valArr === null || valArr === void 0 ? void 0 : valArr[2]) || '10mi');
@@ -1055,28 +988,27 @@ const distanceWithin = (field, value) => {
       return false;
     }
   };
-
   if (value.length === 0) return [];
   if (Array.isArray(value)) return [contensisCoreApi.Op.or(...value.map(handle).filter(bc => bc !== false))];
   const op = handle(value);
   return op ? [op] : [];
 };
+
 /**
  * Accept HTTP style objects and map them to
  * their equivalent JS client "Op" expressions
  * @param {array} where the where array as you'd provide it to the HTTP API
  * @returns {array} array of constructed Delivery API Operators
  */
-
-
 const customWhereExpressions = where => {
-  if (!where || !Array.isArray(where)) return []; // Map each clause inside the where array
+  if (!where || !Array.isArray(where)) return [];
 
+  // Map each clause inside the where array
   return where.map(clause => {
-    let expression; // Map through each property in the clause so we can
+    let expression;
+    // Map through each property in the clause so we can
     // capture the values required and reconstruct them as
     // a Delivery API expression
-
     let operator;
     Object.keys(clause).map((key, idx) => {
       // The clause may contain only one key
@@ -1084,7 +1016,6 @@ const customWhereExpressions = where => {
       const field = clause.field;
       const value = clause[Object.keys(clause).find(k => !['field', 'weight'].includes(k)) || ''];
       const weight = clause.weight;
-
       if (idx === 0) {
         if (operator === 'and' || operator === 'or') {
           // These are array expressions so we can call ourself recursively
@@ -1092,24 +1023,21 @@ const customWhereExpressions = where => {
           const recurseExpr = customWhereExpressions(clause[operator]);
           expression = contensisCoreApi.Op[operator](...recurseExpr);
         }
-
         if (['not'].includes(operator)) {
           // A 'not' expression is an object with only one inner field and inner operator
           Object.keys(value).map((notKey, notIdx) => {
             const innerOperator = notKey;
             const innerValue = value[notKey];
-            const innerField = value.field; // Map the expression when we've looped and scoped to
+            const innerField = value.field;
+            // Map the expression when we've looped and scoped to
             // the second property inside the clause
-
             if (notIdx === 1) expression = contensisCoreApi.Op.not(makeJsExpression(innerOperator, innerField, innerValue));
           });
         }
-      } // Map the expression when we've looped and scoped to
+      }
+      // Map the expression when we've looped and scoped to
       // the second property inside the clause
-
-
       operator = Object.keys(clause).find(clauseKey => !['field', 'weight'].includes(clauseKey));
-
       if (idx === 1) {
         expression = makeJsExpression(operator, field, value);
         if (typeof weight === 'number') expression = expression.weight(weight);
@@ -1118,28 +1046,29 @@ const customWhereExpressions = where => {
     return expression;
   });
 };
-
 const makeJsExpression = (operator, field, value) => operator === 'freeText' || operator === 'contains' ? contensisCoreApi.Op[operator](field, value) : operator === 'in' ? contensisCoreApi.Op[operator](field, ...value) : operator === 'exists' ? contensisCoreApi.Op[operator](field, value) : operator === 'between' ? contensisCoreApi.Op[operator](field, value[0], value[1]) : operator === 'distanceWithin' ? contensisCoreApi.Op[operator](field, value === null || value === void 0 ? void 0 : value.lat, value === null || value === void 0 ? void 0 : value.lon, value === null || value === void 0 ? void 0 : value.distance) : contensisCoreApi.Op[operator](field, value);
-
-const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch) => {
+const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch, omitSearchFields = []) => {
   if (searchTerm && weightedSearchFields && weightedSearchFields.length > 0) {
     // Extract any phrases in quotes to array
-    const quotedPhrases = extractQuotedPhrases(searchTerm); // Modify the search term to remove any quoted phrases to leave any remaining terms
+    const quotedPhrases = extractQuotedPhrases(searchTerm);
 
+    // Modify the search term to remove any quoted phrases to leave any remaining terms
     let modifiedSearchTerm = searchTerm;
-    quotedPhrases.forEach(qp => modifiedSearchTerm = modifiedSearchTerm.replace(qp, '').replace('""', '').trim()); // Push to the operators array to include in the query
+    quotedPhrases.forEach(qp => modifiedSearchTerm = modifiedSearchTerm.replace(qp, '').replace('""', '').trim());
 
-    const operators = []; // Helper functions to generate Op expressions
+    // Push to the operators array to include in the query
+    const operators = [];
 
+    // Helper functions to generate Op expressions
     const containsOp = (f, term) => fieldExpression(f.fieldId, fixFreeTextForElastic(term), 'contains', f.weight);
+    const freeTextOp = (f, term) => fieldExpression(f.fieldId, fixFreeTextForElastic(term), 'freeText', f.weight, fuzzySearch);
 
-    const freeTextOp = (f, term) => fieldExpression(f.fieldId, fixFreeTextForElastic(term), 'freeText', f.weight, fuzzySearch); // For each weighted search field
-
-
+    // For each weighted search field
     weightedSearchFields.forEach(wsf => {
       // Push to field operators
-      const fieldOperators = []; // Add operator expressions for modified search term
+      const fieldOperators = [];
 
+      // Add operator expressions for modified search term
       if (modifiedSearchTerm) {
         if ([Fields.keywords, Fields.sys.filename, Fields.sys.uri].includes(wsf.fieldId)) {
           fieldOperators.push(...containsOp(wsf, modifiedSearchTerm));
@@ -1150,25 +1079,41 @@ const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch) => {
             fieldOperators.push(...freeTextOp(wsf, modifiedSearchTerm));
           }
         }
-      } // Add operator expressions for any quoted phrases
+      }
 
+      // Add operator expressions for any quoted phrases
+      quotedPhrases.forEach(qp => fieldOperators.push(...containsOp(wsf, qp)));
 
-      quotedPhrases.forEach(qp => fieldOperators.push(...containsOp(wsf, qp))); // If we are using multiple operators for a field we will
+      // If we are using multiple operators for a field we will
       // wrap each field inside an And operator so we will match
       // all terms/phrases rather than any terms/phrases
-
       if (fieldOperators.length > 1) {
         operators.push(contensisCoreApi.Op.and(...fieldOperators));
       } else {
         operators.push(...fieldOperators);
       }
-    }); // Wrap operators in an Or operator
+    });
 
-    return [contensisCoreApi.Op.or().addRange(operators).add(contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];
+    // Wrap operators in an Or operator
+    const expressions = contensisCoreApi.Op.or().addRange(operators);
+    if (!omitSearchFields.find(sf => sf === Fields.searchContent))
+      // include "searchContent" field by default unless omitted
+      return [expressions.add(contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];else return [expressions];
   } else if (searchTerm) {
     // Searching without weightedSearchFields defined will fall back
     // to a default set of search fields with arbritary weights set.
-    return [contensisCoreApi.Op.or(contensisCoreApi.Op.equalTo(Fields.entryTitle, searchTerm).weight(10), contensisCoreApi.Op.freeText(Fields.entryTitle, searchTerm, fuzzySearch).weight(2), contensisCoreApi.Op.freeText(Fields.entryDescription, searchTerm, fuzzySearch).weight(2), contensisCoreApi.Op.contains(Fields.keywords, searchTerm).weight(2), contensisCoreApi.Op.contains(Fields.sys.uri, searchTerm).weight(2), contensisCoreApi.Op.contains(Fields.sys.allUris, searchTerm), contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];
+
+    const exp = [];
+    if (!omitSearchFields.find(sf => sf === Fields.entryTitle)) {
+      exp.push(contensisCoreApi.Op.equalTo(Fields.entryTitle, searchTerm).weight(10));
+      exp.push(contensisCoreApi.Op.freeText(Fields.entryTitle, searchTerm, fuzzySearch).weight(2));
+    }
+    if (!omitSearchFields.find(sf => sf === Fields.entryDescription)) exp.push(contensisCoreApi.Op.freeText(Fields.entryDescription, searchTerm, fuzzySearch).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.keywords)) exp.push(contensisCoreApi.Op.contains(Fields.keywords, searchTerm).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.sys.uri)) exp.push(contensisCoreApi.Op.contains(Fields.sys.uri, searchTerm).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.sys.allUris)) exp.push(contensisCoreApi.Op.contains(Fields.sys.allUris, searchTerm));
+    if (!omitSearchFields.find(sf => sf === Fields.searchContent)) exp.push(contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch));
+    return [contensisCoreApi.Op.or(...exp)];
   } else {
     return [];
   }
@@ -1211,23 +1156,22 @@ const searchQuery = ({
   languages,
   pageSize,
   pageIndex,
+  omitDefaultSearchFields,
   orderBy,
   searchTerm,
   versionStatus,
   webpageTemplates,
   weightedSearchFields
 }, isFeatured = false) => {
-  let expressions = [...termExpressions(searchTerm, weightedSearchFields, fuzzySearch), ...defaultExpressions(versionStatus), ...includeInSearchExpressions(webpageTemplates, includeInSearchFields), ...languagesExpression(languages), ...customWhereExpressions(customWhere), ...excludeIdsExpression(excludeIds)];
+  let expressions = [...termExpressions(searchTerm, weightedSearchFields, fuzzySearch, omitDefaultSearchFields), ...defaultExpressions(versionStatus), ...includeInSearchExpressions(webpageTemplates, includeInSearchFields), ...languagesExpression(languages), ...customWhereExpressions(customWhere), ...excludeIdsExpression(excludeIds)];
   if (isFeatured) expressions = [...expressions, ...featuredResultsExpression(featuredResults)];
   if (!isFeatured || featuredResults && !featuredResults.contentTypeId) expressions = [...expressions, ...filterExpressions(filters), ...contentTypeIdExpression(contentTypeIds, webpageTemplates, assetTypes)];
   const query = new contensisCoreApi.Query(...expressions);
   if (!searchTerm) query.orderBy = orderByExpression(orderBy);
   if (dynamicOrderBy && dynamicOrderBy.length) query.orderBy = orderByExpression(dynamicOrderBy);
-
   if (fields && fields.length > 0 && !isFeatured) {
     query.fields = fields;
   }
-
   query.pageIndex = isFeatured ? 0 : pageIndex;
   query.pageSize = isFeatured && typeof featuredResults.count === 'number' ? featuredResults.count : pageSize;
   return query;
@@ -1248,7 +1192,6 @@ const mapEntriesToSearchResults = ({
   const mapperFunc = mapper || mappers && mappers.results;
   return items && typeof mapperFunc === 'function' ? mapperFunc(items, facet, context, state) : [];
 };
-
 const facetTemplate = {
   type: () => SET_SEARCH_ENTRIES,
   context: 'action.context',
@@ -1291,11 +1234,9 @@ const facetTemplate = {
           pagesLoaded
         }) => {
           const loaded = [...(pagesLoaded || [])];
-
           if (isNaN(loaded.find(l => l === pageIndex))) {
             loaded.push(pageIndex);
           }
-
           return loaded.sort((a, b) => a - b);
         }
       },
@@ -1318,18 +1259,21 @@ const facetTemplate = {
         prevPageIndex
       } = action.queryParams;
       const results = mapEntriesToSearchResults(action, getItemsFromResult(result), state);
-      if (!loadMorePaging) return results; // add a _pageIndex property to the returned results to help us later
+      if (!loadMorePaging) return results;
 
+      // add a _pageIndex property to the returned results to help us later
       const nextResults = results.map((r, idx) => ({
         _pageIndex: pageIndex,
         _pagePosition: idx,
         ...r
       }));
-      const loadedPages = pagesLoaded || []; // if pageIndex is found in loadedPages, we have already loaded this page
+      const loadedPages = pagesLoaded || [];
 
-      if (!isNaN(loadedPages.find(l => l === pageIndex))) return prevResults; // Determine where we put the results depending on if we
-      // are paging forwards, backwards, or doing a new search
+      // if pageIndex is found in loadedPages, we have already loaded this page
+      if (!isNaN(loadedPages.find(l => l === pageIndex))) return prevResults;
 
+      // Determine where we put the results depending on if we
+      // are paging forwards, backwards, or doing a new search
       const firstResultSet = pageIndex > prevPageIndex ? prevResults || [] : nextResults;
       const secondResultSet = pageIndex > prevPageIndex ? nextResults : prevResults || [];
       const onlyResultSet = loadedPages.length === 0 ? nextResults : false;
@@ -1360,13 +1304,11 @@ const filterTemplate = {
       if (payload && (payload.items || payload.children)) {
         const items = (payload.items || payload.children).map(item => {
           var _item$sys;
-
           item.isSelected = selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys.includes((item === null || item === void 0 ? void 0 : (_item$sys = item.sys) === null || _item$sys === void 0 ? void 0 : _item$sys.id) || item.key);
           return item;
         });
         return mapper(items);
       }
-
       return [];
     }
   },
@@ -1389,22 +1331,22 @@ const filterExpressionMapper = {
   fieldOperator: 'fieldOperator',
   logicOperator: 'logicOperator'
 };
-
 const mapFilterToFilterExpression = filter => mapJson__default["default"](filter, filterExpressionMapper);
 
 const mapFiltersToFilterExpression = (filters, selectedFilters) => {
   if (!selectedFilters || Object.keys(selectedFilters).length === 0) return [];
-  const filterExpressions = []; // Iterate through the keys in selectedFilters and locate
-  // the items that are selected and queryable
+  const filterExpressions = [];
 
+  // Iterate through the keys in selectedFilters and locate
+  // the items that are selected and queryable
   Object.entries(selectedFilters).map(([fkey, selectedValues]) => {
     const filter = filters[fkey];
-
     if (selectedValues && filter) {
       // Where we have a value for a selectedFilter
       // and a filter is found for the current key
       // map the filter to a filterExpression object
-      const expr = mapFilterToFilterExpression({ ...filter,
+      const expr = mapFilterToFilterExpression({
+        ...filter,
         selectedValues
       });
       filterExpressions.push(expr);
@@ -1440,8 +1382,8 @@ const queryParamsTemplate = {
     context
   }) => {
     const stateFilters = getFilters(state, facet, context, 'js');
-    const selectedFilters = getSelectedFilters(state, facet, context, 'js'); // Use another mapping function to map the filter parameters for the query
-
+    const selectedFilters = getSelectedFilters(state, facet, context, 'js');
+    // Use another mapping function to map the filter parameters for the query
     const filterParams = mapFiltersToFilterExpression(stateFilters, selectedFilters);
     return filterParams;
   },
@@ -1457,6 +1399,7 @@ const queryParamsTemplate = {
   }) => action.defaultLang ? [action.defaultLang] : [],
   linkDepth: root => getQueryParameter(root, 'linkDepth', 0),
   loadMorePaging: root => getQueryParameter(root, 'loadMorePaging', false),
+  omitDefaultSearchFields: root => getQueryParameter(root, 'omitDefaultSearchFields', []),
   orderBy: root => getQueryParameter(root, 'orderBy', []),
   pageIndex: root => {
     const {
@@ -1490,10 +1433,9 @@ const queryParamsTemplate = {
     context
   }) => {
     var _getFacet;
-
-    return ((_getFacet = getFacet(state, facet, context)) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectCurrentProject(state);
+    return ((_getFacet = getFacet(state, facet, context, 'js')) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectCurrentProject(state);
   },
-  searchTerm: root => root.context !== exports.Context.minilist || getQueryParameter(root, 'useSearchTerm', false) ? getSearchTerm(root.state) : '',
+  searchTerm: root => root.context !== Context.minilist || getQueryParameter(root, 'useSearchTerm', false) ? getSearchTerm(root.state) : '',
   selectedFilters: ({
     state,
     facet,
@@ -1505,11 +1447,12 @@ const queryParamsTemplate = {
   weightedSearchFields: root => {
     const wsf = getQueryParameter(root, 'weightedSearchFields', []);
     const deduped = wsf.filter((v, i, a) => a.findIndex(t => t.fieldId === v.fieldId) === i);
-    return deduped; // return wsf;
+    return deduped;
+    // return wsf;
   },
+
   webpageTemplates: root => getQueryParameter(root, 'webpageTemplates', [])
 };
-
 const mapStateToQueryParams = sourceJson => mapJson__default["default"](sourceJson, queryParamsTemplate);
 
 /**
@@ -1523,9 +1466,9 @@ const generateQueryParams = (action, state) => {
   const {
     context,
     facet
-  } = action; // Map parameters using state and some additional
+  } = action;
+  // Map parameters using state and some additional
   // inputs from the action
-
   const queryParams = mapStateToQueryParams({
     context,
     facet,
@@ -1534,12 +1477,12 @@ const generateQueryParams = (action, state) => {
   });
   return [queryParams, runSearch(action, state, queryParams)];
 };
+
 /**
  * Checks if we have already loaded everything we're asking for and tells us to run the search or not
  * @param action
  * @param state
  */
-
 const runSearch = (action, state, queryParams) => {
   const {
     context,
@@ -1551,13 +1494,14 @@ const runSearch = (action, state, queryParams) => {
   } = action;
   let willRun = false;
   const facetIsLoaded = defaultLang ? false : getIsLoaded(state, context, facet);
-  const stateParams = { ...getQueryParams(ogState, facet, context)
+  const stateParams = {
+    ...getQueryParams(ogState, facet, context)
   };
   stateParams.pageIndex = getPageIndex(ogState, facet, context);
   stateParams.searchTerm = getSearchTerm(ogState);
   stateParams.pageSize = getPageSize(ogState, facet, context);
-
-  if (context === exports.Context.facets && ssr || // context === Context.minilist ||
+  if (context === Context.facets && ssr ||
+  // context === Context.minilist ||
   preload || !facetIsLoaded || filterParamsChanged(action) || defaultLang) {
     willRun = true;
   } else {
@@ -1565,28 +1509,24 @@ const runSearch = (action, state, queryParams) => {
     // are the same as what we already have in state
     Object.entries(stateParams).forEach(([param, value]) => {
       const queryParam = queryParams[param];
-
       if (JSON.stringify(value) !== JSON.stringify(queryParam)) {
         willRun = true;
       }
     });
   }
-
   const internalPaging = getIsInternalPaging(ogState, facet, context);
-
   if (internalPaging && facetIsLoaded) {
     willRun = false;
   }
-
   return willRun;
 };
+
 /**
  * This will tell us if filter parameters have been
  * changed by some external event such as a route change
  * @param action
  * @returns true or false
  */
-
 const filterParamsChanged = (action, state) => {
   const {
     context,
@@ -1601,26 +1541,36 @@ const filterParamsChanged = (action, state) => {
   });
   return paramsChanged.filter(f => f === true).length > 0;
 };
-/* eslint-disable no-console */
 
+/* eslint-disable no-console */
 const debugExecuteSearch = (action, state) => {
   const [queryParams, runSearch] = generateQueryParams(action, state);
   console.log('runSearch', runSearch, 'action', action, 'filterParamsChanged', filterParamsChanged(action, state), 'getIsLoaded(state, context, facet)', getIsLoaded(state, action.context, action.facet));
-  const stateParams = { ...getQueryParams(action.ogState || state, action.facet, action.context),
+  const stateParams = {
+    ...getQueryParams(action.ogState || state, action.facet, action.context),
     pageIndex: getPageIndex(action.ogState || state, action.facet, action.context),
     searchTerm: getSearchTerm(action.ogState || state)
   };
   console.log(stateParams, queryParams);
   console.log('getSelectedFilters', getSelectedFilters(action.ogState || state, action.facet, action.context, 'js'), 'params', action.params);
 };
-const scrollTop = scrollYPos => {
-  if (typeof window !== 'undefined') window.scrollTo(0, scrollYPos);
+const scrollTo = scrollToElement => {
+  if (typeof window !== 'undefined') {
+    if (typeof scrollToElement === 'number')
+      // Used to be Y coordinate, deprecated, because it's not accessible
+      console.warn('updatePageIndex arg2 needs string');else if (typeof scrollToElement === 'string') {
+      /* Effectively simulates an anchor link. Needed for accessibility, as window.scrollTo
+         does not change focus, only scrolls the screen */
+      window.location.href = `${location.pathname}${location.search}#${scrollToElement}`;
+    }
+  }
 };
 
+// *** FILTER ITEM MAPPING ***
+
 // Base mapping, fields that are the same across all mappings
 // to save repeating these elements in every mapper, spread this
 // into your discrete mappings
-
 const base = {
   contentTypeId: Fields.sys.contentTypeId,
   title: 'entryTitle',
@@ -1628,16 +1578,13 @@ const base = {
   path: 'sys.slug',
   isSelected: 'isSelected'
 };
-
 const mapEntriesToFilterItems = entries => {
   if (!entries) return [];
   return entries.map(entry => {
     const template = base;
-
     if (template) {
       return mapJson__default["default"](entry, template);
     }
-
     return entry;
   });
 };
@@ -1667,9 +1614,7 @@ const mapQueryParamsToCustomApi = queryParams => {
 };
 
 const searchSagas = [effects.takeEvery(CLEAR_FILTERS, clearFilters), effects.takeEvery(DO_SEARCH, doSearch), effects.takeEvery(SET_ROUTE_FILTERS, loadFilters), effects.takeEvery(SET_SEARCH_ENTRIES, preloadOtherFacets), effects.takeEvery(UPDATE_CURRENT_FACET, updateCurrentFacet), effects.takeEvery(UPDATE_CURRENT_TAB, updateCurrentTab), effects.takeEvery(UPDATE_PAGE_INDEX, updatePageIndex), effects.takeEvery(UPDATE_PAGE_SIZE, updatePageSize), effects.takeEvery(UPDATE_SEARCH_TERM, updateSearchTerm), effects.takeEvery(UPDATE_SORT_ORDER, updateSortOrder), effects.takeEvery(UPDATE_SELECTED_FILTERS, applySearchFilter)];
-
 const toJS = obj => obj && 'toJS' in obj && typeof obj.toJS === 'function' ? obj.toJS() : obj;
-
 function* setRouteFilters(action) {
   const {
     mappers,
@@ -1678,19 +1623,19 @@ function* setRouteFilters(action) {
     defaultLang,
     debug
   } = action;
-  const context = listingType ? exports.Context.listings : exports.Context.facets;
+  const context = listingType ? Context.listings : Context.facets;
   const state = toJS(yield effects.select());
-  const ssr = getIsSsr(state); // Get current facet from params or state
+  const ssr = getIsSsr(state);
 
-  let currentFacet = params && params.facet || listingType; // Pick the default facet from initialState
+  // Get current facet from params or state
+  let currentFacet = params && params.facet || listingType;
 
+  // Pick the default facet from initialState
   if (!currentFacet) {
     var _Object$keys;
-
     const tabs = getSearchTabs(state, 'js');
     currentFacet = (tabs === null || tabs === void 0 ? void 0 : tabs[0].defaultFacet) || ((_Object$keys = Object.keys(getFacets(state, 'js'))) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0]) || '';
   }
-
   const nextAction = {
     type: SET_ROUTE_FILTERS,
     context,
@@ -1701,48 +1646,50 @@ function* setRouteFilters(action) {
     ssr,
     debug
   };
-  yield effects.put(nextAction); // keep track of this state ref for comparing changes to params later
+  yield effects.put(nextAction);
 
+  // keep track of this state ref for comparing changes to params later
   const ogState = {
     search: state.search
-  }; // Using call instead of triggering from the put
-  // to allow this exported saga to continue during SSR
+  };
 
-  yield effects.call(ensureSearch, { ...nextAction,
+  // Using call instead of triggering from the put
+  // to allow this exported saga to continue during SSR
+  yield effects.call(ensureSearch, {
+    ...nextAction,
     ogState
   });
 }
 function* doSearch(action) {
   var _action$params;
-
   const state = toJS(yield effects.select());
-
   if (action.config) {
     // If the action contains a config object, we can add this to the
     // state at runtime
-    yield effects.put({ ...action,
+    yield effects.put({
+      ...action,
       type: APPLY_CONFIG
     });
   }
-
-  const nextAction = { ...action,
+  const nextAction = {
+    ...action,
     type: SET_SEARCH_FILTERS,
     ssr: getIsSsr(state),
     facet: action.facet || ((_action$params = action.params) === null || _action$params === void 0 ? void 0 : _action$params.facet)
   };
-
   if (nextAction.facet && (action.config || Object.keys(getFacet(state, nextAction.facet, action.context, 'js')).length > 0)) {
-    yield effects.put(nextAction); // keep track of this state ref for comparing changes to params later
+    yield effects.put(nextAction);
 
+    // keep track of this state ref for comparing changes to params later
     const ogState = {
       search: state.search
     };
-    yield effects.call(ensureSearch, { ...nextAction,
+    yield effects.call(ensureSearch, {
+      ...nextAction,
       ogState
     });
   }
 }
-
 function* loadFilters(action) {
   const {
     facet: facetKey,
@@ -1750,7 +1697,6 @@ function* loadFilters(action) {
     mappers = {}
   } = action;
   const filtersToLoad = yield effects.select(getFiltersToLoad, facetKey, context, 'js');
-
   if (filtersToLoad.length > 0) {
     yield effects.put({
       type: LOAD_FILTERS,
@@ -1776,7 +1722,6 @@ function* loadFilters(action) {
     if (filtersToLoadSagas) yield effects.all(filtersToLoadSagas);
   }
 }
-
 function* loadFilter(action) {
   const {
     facetKey,
@@ -1802,7 +1747,6 @@ function* loadFilter(action) {
     selectedKeys,
     mapper
   };
-
   try {
     if (contentTypeId) {
       const versionStatus = yield effects.select(selectVersionStatus);
@@ -1812,7 +1756,6 @@ function* loadFilter(action) {
       if (payload.type === 'error') throw payload;
       createStateFrom.payload = payload;
     }
-
     if (path) {
       const payload = yield cachedSearch.getTaxonomyNodeByPath(path, projectId);
       if (!payload) throw new Error(`No payload returned for taxonomy path: '${path}'`);
@@ -1823,35 +1766,33 @@ function* loadFilter(action) {
     createStateFrom.type = LOAD_FILTERS_ERROR;
     createStateFrom.error = error;
   }
-
   const nextAction = mapJson__default["default"](createStateFrom, filterTemplate);
   yield effects.put(nextAction);
 }
-
 function* ensureSearch(action) {
   const {
     context,
     facet,
     debug
   } = action;
-
   try {
     const state = yield effects.select();
-    const nextAction = { ...action,
+    const nextAction = {
+      ...action,
       ogState: action.ogState || {
         search: state.search
       }
     };
     const [queryParams, runSearch] = generateQueryParams(nextAction, state);
     if (debug && (debug === true || debug.executeSearch)) debugExecuteSearch(nextAction, state);
-
     if (runSearch) {
       yield effects.put({
         type: EXECUTE_SEARCH,
         facet,
         context
       });
-      yield effects.call(executeSearch, { ...nextAction,
+      yield effects.call(executeSearch, {
+        ...nextAction,
         context,
         facet,
         queryParams,
@@ -1863,7 +1804,6 @@ function* ensureSearch(action) {
     log__namespace.error(...['Error running search saga:', error, error.stack]);
   }
 }
-
 function* executeSearch(action) {
   const {
     context,
@@ -1871,14 +1811,12 @@ function* executeSearch(action) {
     queryParams,
     mappers
   } = action;
-
   try {
     const state = yield effects.select();
     let result = {};
     let featuredResult;
     let featuredQuery;
     const customApi = getCustomApi(state, facet, context, 'js');
-
     if (customApi) {
       const apiParams = typeof mappers === 'object' && typeof mappers.customApi === 'function' && mappers.customApi(queryParams) || mapQueryParamsToCustomApi(queryParams);
       result.payload = yield callCustomApi(customApi, apiParams);
@@ -1886,19 +1824,16 @@ function* executeSearch(action) {
     } else {
       if (queryParams.featuredResults) {
         featuredQuery = searchQuery(queryParams, true);
-        featuredResult = yield timedSearch(featuredQuery, queryParams.linkDepth, queryParams.projectId, queryParams.env); // eslint-disable-next-line require-atomic-updates
-
+        featuredResult = yield timedSearch(featuredQuery, queryParams.linkDepth, queryParams.projectId, queryParams.env);
+        // eslint-disable-next-line require-atomic-updates
         queryParams.excludeIds = getItemsFromResult(featuredResult).map(fi => {
           var _fi$sys;
-
           return fi === null || fi === void 0 ? void 0 : (_fi$sys = fi.sys) === null || _fi$sys === void 0 ? void 0 : _fi$sys.id;
         }).filter(fi => typeof fi === 'string');
       }
-
       const query = searchQuery(queryParams);
       result = yield timedSearch(query, queryParams.linkDepth, queryParams.projectId, queryParams.env);
     }
-
     const createStateFrom = {
       action,
       featuredResult,
@@ -1914,7 +1849,6 @@ function* executeSearch(action) {
     log__namespace.error(...['Error running search saga:', error, error.stack]);
   }
 }
-
 function* preloadOtherFacets(action) {
   const {
     preload,
@@ -1924,18 +1858,19 @@ function* preloadOtherFacets(action) {
   } = action;
   const state = yield effects.select();
   const currentFacet = getCurrentFacet(state);
-
-  if (!preload && facet === currentFacet && context !== exports.Context.listings) {
+  if (!preload && facet === currentFacet && context !== Context.listings) {
     const allFacets = getFacets(state, 'js');
     const otherFacets = Object.keys(allFacets).filter(f => f !== currentFacet);
     yield effects.all(otherFacets.map((preloadFacet = '') => {
-      const preloadAction = { ...action,
+      const preloadAction = {
+        ...action,
         facet: preloadFacet,
         preload: true
       };
       const [queryParams, runSearch] = generateQueryParams(preloadAction, state);
       if (debug && (debug === true || debug.preloadOtherFacets)) debugExecuteSearch(preloadAction, state);
-      return runSearch && effects.call(executeSearch, { ...action,
+      return runSearch && effects.call(executeSearch, {
+        ...action,
         type: EXECUTE_SEARCH_PRELOAD,
         preload: true,
         facet: preloadFacet,
@@ -1944,7 +1879,6 @@ function* preloadOtherFacets(action) {
     }));
   }
 }
-
 function* updateCurrentTab(action) {
   const {
     id,
@@ -1954,19 +1888,16 @@ function* updateCurrentTab(action) {
   const facets = getFacets(state, 'js');
   const tabs = getSearchTabs(state, 'js');
   let nextFacet = tabs === null || tabs === void 0 ? void 0 : tabs[id].currentFacet;
-
   if (!nextFacet) {
     Object.entries(facets).map(([facetName, facet]) => {
       if (facet.tabId === id && (tabs === null || tabs === void 0 ? void 0 : tabs[id].defaultFacet) === facetName) nextFacet = facetName;
     });
-  } // If the next Tab does not have a defaultFacet,
+  }
+  // If the next Tab does not have a defaultFacet,
   // take the first facet for that tab
-
-
   if (!nextFacet) nextFacet = Object.entries(facets).filter(([, f]) => f.tabId === id)[0][0];
   yield effects.put(withMappers(updateCurrentFacet$1(nextFacet), mappers));
 }
-
 function* clearFilters(action) {
   const {
     mappers
@@ -1974,7 +1905,6 @@ function* clearFilters(action) {
   const uri = yield buildUri({}, mappers);
   yield effects.put(navigate(uri));
 }
-
 function* updateCurrentFacet(action) {
   const {
     facet,
@@ -1987,7 +1917,6 @@ function* updateCurrentFacet(action) {
   }, mappers);
   yield effects.put(navigate(uri));
 }
-
 function* updateSearchTerm(action) {
   const {
     term,
@@ -1998,7 +1927,6 @@ function* updateSearchTerm(action) {
   }, mappers);
   yield effects.put(navigate(uri));
 }
-
 function* updateSortOrder(action) {
   const {
     orderBy,
@@ -2011,43 +1939,39 @@ function* updateSortOrder(action) {
   }, mappers);
   yield effects.put(navigate(uri));
 }
-
 function* updatePageIndex(action) {
   const {
     pageIndex,
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({
     pageIndex
   }, mappers);
   yield effects.put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
-
 function* updatePageSize(action) {
   const {
     pageSize,
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({
     pageSize
   }, mappers);
   yield effects.put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
-
 function* applySearchFilter(action) {
   const {
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({}, mappers);
   yield effects.put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
-
 function* buildUri({
   facet,
   orderBy,
@@ -2064,11 +1988,10 @@ function* buildUri({
     pageIndex,
     pageSize,
     term
-  }); // return uri;
-
+  });
+  // return uri;
   return `${uri.path}${uri.search && `?${uri.search}` || ''}${uri.hash && `#${uri.hash}` || ''}`;
 }
-
 function* triggerMinilistSsr(options) {
   yield effects.call(doSearch, {
     type: DO_SEARCH,
@@ -2084,6 +2007,7 @@ function* triggerSearchSsr(options) {
 
 exports.APPLY_CONFIG = APPLY_CONFIG;
 exports.CLEAR_FILTERS = CLEAR_FILTERS;
+exports.Context = Context;
 exports.EXECUTE_SEARCH = EXECUTE_SEARCH;
 exports.EXECUTE_SEARCH_ERROR = EXECUTE_SEARCH_ERROR;
 exports.LOAD_FILTERS = LOAD_FILTERS;
@@ -2149,4 +2073,4 @@ exports.updateSearchTerm = updateSearchTerm$1;
 exports.updateSelectedFilters = updateSelectedFilters;
 exports.updateSortOrder = updateSortOrder$1;
 exports.withMappers = withMappers;
-//# sourceMappingURL=sagas-8a20e424.js.map
+//# sourceMappingURL=sagas-e04b94c1.js.map