@zengenti/contensis-react-base 4.0.0-beta.15 → 4.0.0-beta.17

package/cjs/client.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('isomorphic-fetch');
 var React = require('react');
-var require$$0 = require('react-dom');
+var client = require('react-dom/client');
 var reactRedux = require('react-redux');
 var reactRouterDom = require('react-router-dom');
 var component = require('@loadable/component');
@@ -36,43 +36,6 @@ require('immer');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
-var require$$0__default = /*#__PURE__*/_interopDefault(require$$0);
-
-var client = {};
-
-var hasRequiredClient;
-
-function requireClient () {
-	if (hasRequiredClient) return client;
-	hasRequiredClient = 1;
-
-	var m = require$$0__default.default;
-	if (process.env.NODE_ENV === 'production') {
-	  client.createRoot = m.createRoot;
-	  client.hydrateRoot = m.hydrateRoot;
-	} else {
-	  var i = m.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-	  client.createRoot = function(c, o) {
-	    i.usingClientEntryPoint = true;
-	    try {
-	      return m.createRoot(c, o);
-	    } finally {
-	      i.usingClientEntryPoint = false;
-	    }
-	  };
-	  client.hydrateRoot = function(c, h, o) {
-	    i.usingClientEntryPoint = true;
-	    try {
-	      return m.hydrateRoot(c, h, o);
-	    } finally {
-	      i.usingClientEntryPoint = false;
-	    }
-	  };
-	}
-	return client;
-}
-
-var clientExports = requireClient();
 
 class ClientApp {
   constructor(ReactApp, config) {
@@ -109,14 +72,14 @@ class ClientApp {
      */
     const HMRRenderer = Component => {
       if (shouldHydrate) component.loadableReady(() => {
-        clientExports.hydrateRoot(documentRoot, Component, {
+        client.hydrateRoot(documentRoot, Component, {
           onRecoverableError(error) {
             console.warn('Hydration warning:', error);
           }
         });
       }, {
         namespace: 'modern'
-      });else clientExports.createRoot(documentRoot).render(Component);
+      });else client.createRoot(documentRoot).render(Component);
     };
     const hmr = store => {
       // webpack Hot Module Replacement API

package/cjs/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sources":["../node_modules/react-dom/client.js","../src/client/client.tsx"],"sourcesContent":["'use strict';\n\nvar m = require('react-dom');\nif (process.env.NODE_ENV === 'production') {\n  exports.createRoot = m.createRoot;\n  exports.hydrateRoot = m.hydrateRoot;\n} else {\n  var i = m.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;\n  exports.createRoot = function(c, o) {\n    i.usingClientEntryPoint = true;\n    try {\n      return m.createRoot(c, o);\n    } finally {\n      i.usingClientEntryPoint = false;\n    }\n  };\n  exports.hydrateRoot = function(c, h, o) {\n    i.usingClientEntryPoint = true;\n    try {\n      return m.hydrateRoot(c, h, o);\n    } finally {\n      i.usingClientEntryPoint = false;\n    }\n  };\n}\n","import 'isomorphic-fetch';\nimport React from 'react';\nimport { createRoot, hydrateRoot } from 'react-dom/client';\nimport { Provider as ReduxProvider } from 'react-redux';\nimport { unstable_HistoryRouter as HistoryRouter } from 'react-router-dom';\nimport { loadableReady } from '@loadable/component';\nimport { parse } from 'query-string';\nimport { CookiesProvider } from 'react-cookie';\n\nimport { selectVersionStatus } from '~/redux/selectors/version';\nimport { setVersionStatus } from '~/redux/actions/version';\nimport rootSaga from '~/redux/sagas';\nimport { browserHistory as history } from '~/redux/store/history';\nimport createStore from '~/redux/store/store';\n\nimport { setCurrentProject } from '~/routing/redux/actions';\n\nimport { deliveryApi } from '~/util/ContensisDeliveryApi';\nimport pickProject from '~/util/pickProject';\nimport { SSRContextProvider } from '~/util/SSRContext';\n\nimport { AppConfig, AppState } from '~/models';\n\ndeclare let window: typeof globalThis & {\n  isDynamic: boolean;\n  REDUX_DATA: AppState;\n  __USE_HYDRATE__: boolean;\n};\n\ntype ReactAppProps = { routes: any; withEvents: any };\n\nclass ClientApp {\n  constructor(ReactApp: React.ComponentType<ReactAppProps>, config: AppConfig) {\n    const documentRoot = document.getElementById('root') as HTMLElement;\n\n    const {\n      // stateType = 'immutable', // changed default in v4\n      stateType = 'js',\n      routes,\n      withReducers,\n      withSagas,\n      withEvents,\n    } = config;\n\n    const GetClientJSX = store => {\n      const ClientJsx = (\n        <CookiesProvider>\n          <ReduxProvider store={store}>\n            <HistoryRouter\n              history={history as any}\n              future={{\n                v7_relativeSplatPath: true,\n                v7_startTransition: true,\n              }}\n            >\n              <SSRContextProvider>\n                <ReactApp routes={routes} withEvents={withEvents} />\n              </SSRContextProvider>\n            </HistoryRouter>\n          </ReduxProvider>\n        </CookiesProvider>\n      );\n      return ClientJsx;\n    };\n\n    const isDev = process.env.NODE_ENV !== 'production';\n    // const isProduction = !isDev;\n    const shouldHydrate = window.__USE_HYDRATE__ && !window.isDynamic;\n\n    /**\n     * Webpack HMR Setup.\n     */\n    const HMRRenderer = Component => {\n      if (shouldHydrate)\n        loadableReady(\n          () => {\n            hydrateRoot(documentRoot, Component, {\n              onRecoverableError(error) {\n                console.warn('Hydration warning:', error);\n              },\n            });\n          },\n          { namespace: 'modern' }\n        );\n      else createRoot(documentRoot).render(Component);\n    };\n\n    const hmr = store => {\n      // webpack Hot Module Replacement API\n      if (module.hot) {\n        module.hot.accept(ReactApp as unknown as string, () => {\n          // if you are using harmony modules ({modules:false})\n          HMRRenderer(GetClientJSX(store));\n        });\n      }\n    };\n\n    const qs = parse(window.location.search);\n    const versionStatus = deliveryApi.getClientSideVersionStatus();\n\n    if (isDev || window.isDynamic || window.REDUX_DATA) {\n      createStore(withReducers, window.REDUX_DATA, history, stateType).then(\n        store => {\n          const state = store.getState();\n          const ssrVersionStatus = selectVersionStatus(state);\n          if (!ssrVersionStatus)\n            store.dispatch(setVersionStatus(versionStatus));\n\n          console.log('Hydrating from inline Redux');\n\n          store.runSaga(rootSaga(withSagas));\n          store.dispatch(\n            setCurrentProject(\n              pickProject(window.location.hostname, qs),\n              [],\n              window.location.hostname\n            )\n          );\n\n          delete (window as any).REDUX_DATA;\n          HMRRenderer(GetClientJSX(store));\n\n          hmr(store);\n        }\n      );\n    } else {\n      fetch(`${window.location.pathname}?redux=true`)\n        .then(response => response.json())\n        .then(data => {\n          const ssRedux = JSON.parse(data);\n          createStore(withReducers, ssRedux, history, stateType).then(store => {\n            store.dispatch(setVersionStatus(versionStatus));\n\n            store.runSaga(rootSaga(withSagas));\n            store.dispatch(\n              setCurrentProject(\n                pickProject(window.location.hostname, qs),\n                [],\n                window.location.hostname\n              )\n            );\n\n            HMRRenderer(GetClientJSX(store));\n\n            hmr(store);\n          });\n        });\n    }\n  }\n}\n\nexport default ClientApp;\n"],"names":["require$$0","ClientApp","constructor","ReactApp","config","documentRoot","document","getElementById","stateType","routes","withReducers","withSagas","withEvents","GetClientJSX","store","ClientJsx","React","createElement","CookiesProvider","ReduxProvider","HistoryRouter","history","future","v7_relativeSplatPath","v7_startTransition","SSRContextProvider","isDev","process","env","NODE_ENV","shouldHydrate","window","__USE_HYDRATE__","isDynamic","HMRRenderer","Component","loadableReady","hydrateRoot","onRecoverableError","error","console","warn","namespace","createRoot","render","hmr","module","hot","accept","qs","parse","location","search","versionStatus","deliveryApi","getClientSideVersionStatus","REDUX_DATA","createStore","then","state","getState","ssrVersionStatus","selectVersionStatus","dispatch","setVersionStatus","log","runSaga","rootSaga","setCurrentProject","pickProject","hostname","fetch","pathname","response","json","data","ssRedux","JSON"],"mappings":"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","x_google_ignoreList":[0]}
+{"version":3,"file":"client.js","sources":["../src/client/client.tsx"],"sourcesContent":["import 'isomorphic-fetch';\nimport React from 'react';\nimport { createRoot, hydrateRoot } from 'react-dom/client';\nimport { Provider as ReduxProvider } from 'react-redux';\nimport { unstable_HistoryRouter as HistoryRouter } from 'react-router-dom';\nimport { loadableReady } from '@loadable/component';\nimport { parse } from 'query-string';\nimport { CookiesProvider } from 'react-cookie';\n\nimport { selectVersionStatus } from '~/redux/selectors/version';\nimport { setVersionStatus } from '~/redux/actions/version';\nimport rootSaga from '~/redux/sagas';\nimport { browserHistory as history } from '~/redux/store/history';\nimport createStore from '~/redux/store/store';\n\nimport { setCurrentProject } from '~/routing/redux/actions';\n\nimport { deliveryApi } from '~/util/ContensisDeliveryApi';\nimport pickProject from '~/util/pickProject';\nimport { SSRContextProvider } from '~/util/SSRContext';\n\nimport { AppConfig, AppState } from '~/models';\n\ndeclare let window: typeof globalThis & {\n  isDynamic: boolean;\n  REDUX_DATA: AppState;\n  __USE_HYDRATE__: boolean;\n};\n\ntype ReactAppProps = { routes: any; withEvents: any };\n\nclass ClientApp {\n  constructor(ReactApp: React.ComponentType<ReactAppProps>, config: AppConfig) {\n    const documentRoot = document.getElementById('root') as HTMLElement;\n\n    const {\n      // stateType = 'immutable', // changed default in v4\n      stateType = 'js',\n      routes,\n      withReducers,\n      withSagas,\n      withEvents,\n    } = config;\n\n    const GetClientJSX = store => {\n      const ClientJsx = (\n        <CookiesProvider>\n          <ReduxProvider store={store}>\n            <HistoryRouter\n              history={history as any}\n              future={{\n                v7_relativeSplatPath: true,\n                v7_startTransition: true,\n              }}\n            >\n              <SSRContextProvider>\n                <ReactApp routes={routes} withEvents={withEvents} />\n              </SSRContextProvider>\n            </HistoryRouter>\n          </ReduxProvider>\n        </CookiesProvider>\n      );\n      return ClientJsx;\n    };\n\n    const isDev = process.env.NODE_ENV !== 'production';\n    // const isProduction = !isDev;\n    const shouldHydrate = window.__USE_HYDRATE__ && !window.isDynamic;\n\n    /**\n     * Webpack HMR Setup.\n     */\n    const HMRRenderer = Component => {\n      if (shouldHydrate)\n        loadableReady(\n          () => {\n            hydrateRoot(documentRoot, Component, {\n              onRecoverableError(error) {\n                console.warn('Hydration warning:', error);\n              },\n            });\n          },\n          { namespace: 'modern' }\n        );\n      else createRoot(documentRoot).render(Component);\n    };\n\n    const hmr = store => {\n      // webpack Hot Module Replacement API\n      if (module.hot) {\n        module.hot.accept(ReactApp as unknown as string, () => {\n          // if you are using harmony modules ({modules:false})\n          HMRRenderer(GetClientJSX(store));\n        });\n      }\n    };\n\n    const qs = parse(window.location.search);\n    const versionStatus = deliveryApi.getClientSideVersionStatus();\n\n    if (isDev || window.isDynamic || window.REDUX_DATA) {\n      createStore(withReducers, window.REDUX_DATA, history, stateType).then(\n        store => {\n          const state = store.getState();\n          const ssrVersionStatus = selectVersionStatus(state);\n          if (!ssrVersionStatus)\n            store.dispatch(setVersionStatus(versionStatus));\n\n          console.log('Hydrating from inline Redux');\n\n          store.runSaga(rootSaga(withSagas));\n          store.dispatch(\n            setCurrentProject(\n              pickProject(window.location.hostname, qs),\n              [],\n              window.location.hostname\n            )\n          );\n\n          delete (window as any).REDUX_DATA;\n          HMRRenderer(GetClientJSX(store));\n\n          hmr(store);\n        }\n      );\n    } else {\n      fetch(`${window.location.pathname}?redux=true`)\n        .then(response => response.json())\n        .then(data => {\n          const ssRedux = JSON.parse(data);\n          createStore(withReducers, ssRedux, history, stateType).then(store => {\n            store.dispatch(setVersionStatus(versionStatus));\n\n            store.runSaga(rootSaga(withSagas));\n            store.dispatch(\n              setCurrentProject(\n                pickProject(window.location.hostname, qs),\n                [],\n                window.location.hostname\n              )\n            );\n\n            HMRRenderer(GetClientJSX(store));\n\n            hmr(store);\n          });\n        });\n    }\n  }\n}\n\nexport default ClientApp;\n"],"names":["ClientApp","constructor","ReactApp","config","documentRoot","document","getElementById","stateType","routes","withReducers","withSagas","withEvents","GetClientJSX","store","ClientJsx","React","createElement","CookiesProvider","ReduxProvider","HistoryRouter","history","future","v7_relativeSplatPath","v7_startTransition","SSRContextProvider","isDev","process","env","NODE_ENV","shouldHydrate","window","__USE_HYDRATE__","isDynamic","HMRRenderer","Component","loadableReady","hydrateRoot","onRecoverableError","error","console","warn","namespace","createRoot","render","hmr","module","hot","accept","qs","parse","location","search","versionStatus","deliveryApi","getClientSideVersionStatus","REDUX_DATA","createStore","then","state","getState","ssrVersionStatus","selectVersionStatus","dispatch","setVersionStatus","log","runSaga","rootSaga","setCurrentProject","pickProject","hostname","fetch","pathname","response","json","data","ssRedux","JSON"],"mappings":"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"}

package/cjs/contensis-react-base.js

@@ -7,7 +7,7 @@ var contensisDeliveryApi = require('contensis-delivery-api');
 var React = require('react');
 var reactRedux = require('react-redux');
 var mapJson = require('jsonpath-mapper');
-var sagas = require('./sagas-BtPnqKAF.js');
+var sagas = require('./sagas-C0t6j-SQ.js');
 require('reselect');
 require('immer');
 require('deep-equal');

package/cjs/{sagas-BtPnqKAF.js → sagas-C0t6j-SQ.js}

@@ -262,9 +262,13 @@ const getListing$1 = (state, listing = '') => {
   const currentListing = listing || getCurrentListing(state);
   return getImmutableOrJS(state, ['search', Context.listings, currentListing], {});
 };
+
+/** Return filter state for the current (or provided) facet */
 const getFilters = (state, facet, context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent$2(state, context), 'filters'], {}, returnType);
 };
+
+/** Return filter state for the current (or provided) facet, excluding filters configured as `renderable: false` */
 const getRenderableFilters$2 = (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);
@@ -275,16 +279,30 @@ const getFiltersToLoad = (state, facet, context = Context.facets, returnType) =>
   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 = Context.facets, returnType) => {
-  const filters = getFilters(state, facet, context, 'js');
+/** Reduce filters state to a simple object containing all filter keys and the selected values */
+const reduceSelectedFilters = filters => {
   const selectedFilters = Object.fromEntries(Object.entries(filters).map(([key, filter = {}]) => [key, (filter.items || []).filter(item => !!(item.isSelected || false)).map(item => {
     const key = (item === null || item === void 0 ? void 0 : item.key) || '';
     return key;
   })]));
+  return selectedFilters;
+};
+
+/** Return keyed object for all filters in the current facet with all selected values for each filter */
+const getSelectedFilters = (state, facet = '', context = Context.facets, returnType) => {
+  const filters = getFilters(state, facet, context, 'js');
+  const selectedFilters = reduceSelectedFilters(filters);
   const fromJS = makeFromJS(returnType);
   return fromJS(selectedFilters);
 };
+
+/** Return keyed object for all _renderable_ filters in the current facet with all selected values for each filter */
+const getRenderableSelectedFilters = (state, facet = '', context = Context.facets) => {
+  const filters = getRenderableFilters$2(state, facet, context);
+
+  // new in CRB4: intended no support for immutable state type
+  return reduceSelectedFilters(filters);
+};
 const getResults = (state, current = '', context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'results'], [], returnType);
 };
@@ -476,6 +494,7 @@ var selectors = /*#__PURE__*/Object.freeze({
   getQueryParameter: getQueryParameter$2,
   getQueryParams: getQueryParams,
   getRenderableFilters: getRenderableFilters$2,
+  getRenderableSelectedFilters: getRenderableSelectedFilters,
   getResults: getResults,
   getSearchContext: getSearchContext,
   getSearchTabs: getSearchTabs,
@@ -522,7 +541,7 @@ const searchUriTemplate = {
     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 stateFilters = term ? {} : Object.fromEntries(Object.entries(getRenderableSelectedFilters(state, facet, searchContext)).map(([k, f]) => [k, f === null || f === void 0 ? void 0 : f.join(',')]));
     const currentSearch = !term && getImmutableOrJS(state, ['routing', 'location', 'search']);
     const currentQs = util.removeEmptyAttributes(queryString.parse(currentSearch));
     if (orderBy) currentQs.orderBy = orderBy;
@@ -5758,4 +5777,4 @@ exports.updateSortOrder = updateSortOrder$1;
 exports.useFacets = useFacets;
 exports.useListing = useListing;
 exports.withMappers = withMappers;
-//# sourceMappingURL=sagas-BtPnqKAF.js.map
+//# sourceMappingURL=sagas-C0t6j-SQ.js.map