@panneau/core 2.0.93 → 3.0.0

package/es/contexts.js

@@ -13,7 +13,8 @@ import { loadGoogleApi, loadGoogleMaps } from '@folklore/services';
 import { useIntl } from 'react-intl';
 import { getDisplayName } from '@panneau/core/utils';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { generatePath, useNavigate } from 'react-router';
+import { useUrlGenerator, useLocation } from '@folklore/routes';
+export { RoutesContext, RoutesProvider, useRoutes, useUrlGenerator } from '@folklore/routes';
 import { TrackingContext, TrackingContainer } from '@folklore/tracking';
 export { TrackingContext } from '@folklore/tracking';
 import slugify from 'slugify';
@@ -214,13 +215,13 @@ var useAppComponent = function useAppComponent(name) {
 /**
  * Provider
  */
-var propTypes$f = {
+var propTypes$e = {
   children: PropTypes.node.isRequired,
   namespace: PropTypes.string,
   manager: PropTypes.instanceOf(ComponentsManager),
   components: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.object, PropTypes.func]))
 };
-var defaultProps$f = {
+var defaultProps$e = {
   namespace: null,
   components: {},
   manager: null
@@ -238,8 +239,8 @@ var ComponentsProvider = function ComponentsProvider(_ref) {
     value: finalManager
   }, children);
 };
-ComponentsProvider.propTypes = propTypes$f;
-ComponentsProvider.defaultProps = defaultProps$f;
+ComponentsProvider.propTypes = propTypes$e;
+ComponentsProvider.defaultProps = defaultProps$e;
 
 var message = PropTypes.shape({
   id: PropTypes.string.isRequired,
@@ -402,11 +403,11 @@ var useDefinition = function useDefinition() {
     definition = _useDefinitionContext2 === void 0 ? null : _useDefinitionContext2;
   return definition;
 };
-var propTypes$e = {
+var propTypes$d = {
   definition: definition.isRequired,
   children: PropTypes.node.isRequired
 };
-var defaultProps$e = {};
+var defaultProps$d = {};
 var DefinitionProvider = function DefinitionProvider(_ref) {
   var definition = _ref.definition,
     children = _ref.children;
@@ -414,8 +415,8 @@ var DefinitionProvider = function DefinitionProvider(_ref) {
     value: definition
   }, children);
 };
-DefinitionProvider.propTypes = propTypes$e;
-DefinitionProvider.defaultProps = defaultProps$e;
+DefinitionProvider.propTypes = propTypes$d;
+DefinitionProvider.defaultProps = defaultProps$d;
 
 var FieldsContext = /*#__PURE__*/React.createContext(null);
 var useFieldsManager = function useFieldsManager() {
@@ -429,12 +430,12 @@ var useFields = function useFields() {
   var manager = useFieldsManager();
   return manager.getDefinitions();
 };
-var propTypes$d = {
+var propTypes$c = {
   fields: PropTypes$1.fields,
   manager: PropTypes.instanceOf(FieldsManager),
   children: PropTypes.node.isRequired
 };
-var defaultProps$d = {
+var defaultProps$c = {
   fields: null,
   manager: null
 };
@@ -464,8 +465,8 @@ var FieldsProvider = function FieldsProvider(_ref) {
     components: components
   }, children));
 };
-FieldsProvider.propTypes = propTypes$d;
-FieldsProvider.defaultProps = defaultProps$d;
+FieldsProvider.propTypes = propTypes$c;
+FieldsProvider.defaultProps = defaultProps$c;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var GoogleKeysContext = /*#__PURE__*/React.createContext({
@@ -474,12 +475,12 @@ var GoogleKeysContext = /*#__PURE__*/React.createContext({
 var useGoogleKeys = function useGoogleKeys() {
   return useContext(GoogleKeysContext);
 };
-var propTypes$c = {
+var propTypes$b = {
   children: PropTypes.node.isRequired,
   apiKey: PropTypes.string // .isRequired,
 };
 
-var defaultProps$c = {
+var defaultProps$b = {
   apiKey: null
 };
 var GoogleKeysProvider = function GoogleKeysProvider(_ref) {
@@ -496,8 +497,8 @@ var GoogleKeysProvider = function GoogleKeysProvider(_ref) {
     value: value
   }, children);
 };
-GoogleKeysProvider.propTypes = propTypes$c;
-GoogleKeysProvider.defaultProps = defaultProps$c;
+GoogleKeysProvider.propTypes = propTypes$b;
+GoogleKeysProvider.defaultProps = defaultProps$b;
 
 var FontsContext = /*#__PURE__*/React.createContext({
   systemFonts: null,
@@ -570,12 +571,12 @@ var useFonts = function useFonts() {
   }, [systemFonts, googleFonts, customFonts]);
   return fonts;
 };
-var propTypes$b = {
+var propTypes$a = {
   children: PropTypes.node.isRequired,
   systemFonts: PropTypes$1.fonts,
   customFonts: PropTypes$1.fonts
 };
-var defaultProps$b = {
+var defaultProps$a = {
   systemFonts: ['Arial', 'Courier', 'Georgia', 'Times New Roman', 'Verdana'],
   customFonts: null
 };
@@ -611,8 +612,8 @@ var FontsProvider = function FontsProvider(_ref4) {
     value: fonts
   }, children);
 };
-FontsProvider.propTypes = propTypes$b;
-FontsProvider.defaultProps = defaultProps$b;
+FontsProvider.propTypes = propTypes$a;
+FontsProvider.defaultProps = defaultProps$a;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var FormContext = /*#__PURE__*/React.createContext(null);
@@ -629,13 +630,13 @@ var useFormSetValue = function useFormSetValue() {
     setValue = _useForm2.setValue;
   return setValue;
 };
-var propTypes$a = {
+var propTypes$9 = {
   value: PropTypes.object.isRequired,
   // eslint-disable-line react/forbid-prop-types
   setValue: PropTypes.func.isRequired,
   children: PropTypes.node.isRequired
 };
-var defaultProps$a = {};
+var defaultProps$9 = {};
 var FormProvider = function FormProvider(_ref) {
   var value = _ref.value,
     setValue = _ref.setValue,
@@ -650,8 +651,8 @@ var FormProvider = function FormProvider(_ref) {
     value: values
   }, children);
 };
-FormProvider.propTypes = propTypes$a;
-FormProvider.defaultProps = defaultProps$a;
+FormProvider.propTypes = propTypes$9;
+FormProvider.defaultProps = defaultProps$9;
 
 var GoogleApiClientContext = /*#__PURE__*/React.createContext(null);
 var useGoogleApiClient = function useGoogleApiClient() {
@@ -675,10 +676,10 @@ var withGoogleApiClient = function withGoogleApiClient(WrappedComponent) {
   WithGoogleApiClientComponent.displayName = "WithGoogleApiClient(".concat(getDisplayName(WrappedComponent), ")");
   return WithGoogleApiClientComponent;
 };
-var propTypes$9 = {
+var propTypes$8 = {
   children: PropTypes.node.isRequired
 };
-var defaultProps$9 = {};
+var defaultProps$8 = {};
 var GoogleApiClientProvider = function GoogleApiClientProvider(_ref2) {
   var children = _ref2.children;
   var _useGoogleKeys = useGoogleKeys(),
@@ -702,8 +703,8 @@ var GoogleApiClientProvider = function GoogleApiClientProvider(_ref2) {
     value: client
   }, children);
 };
-GoogleApiClientProvider.propTypes = propTypes$9;
-GoogleApiClientProvider.defaultProps = defaultProps$9;
+GoogleApiClientProvider.propTypes = propTypes$8;
+GoogleApiClientProvider.defaultProps = defaultProps$8;
 
 var GoogleMapsClientContext = /*#__PURE__*/React.createContext(null);
 var useGoogleMapsClient = function useGoogleMapsClient() {
@@ -727,12 +728,12 @@ var withGoogleMapsClient = function withGoogleMapsClient(WrappedComponent) {
   WithGoogleMapsClientComponent.displayName = "WithGoogleMapsClient(".concat(getDisplayName(WrappedComponent), ")");
   return WithGoogleMapsClientComponent;
 };
-var propTypes$8 = {
+var propTypes$7 = {
   children: PropTypes.node.isRequired,
   locale: PropTypes.string,
   libraries: PropTypes.arrayOf(PropTypes.string)
 };
-var defaultProps$8 = {
+var defaultProps$7 = {
   locale: 'fr',
   libraries: null
 };
@@ -762,8 +763,8 @@ var GoogleMapsClientProvider = function GoogleMapsClientProvider(_ref2) {
     value: client
   }, children);
 };
-GoogleMapsClientProvider.propTypes = propTypes$8;
-GoogleMapsClientProvider.defaultProps = defaultProps$8;
+GoogleMapsClientProvider.propTypes = propTypes$7;
+GoogleMapsClientProvider.defaultProps = defaultProps$7;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var defaultLocales = ['en', 'fr'];
@@ -787,11 +788,11 @@ var useOtherLocales = function useOtherLocales() {
   }, [locales, locale]);
   return otherLocales;
 };
-var propTypes$7 = {
+var propTypes$6 = {
   locales: PropTypes.arrayOf(PropTypes.string),
   children: PropTypes.node.isRequired
 };
-var defaultProps$7 = {
+var defaultProps$6 = {
   locales: []
 };
 var LocalesProvider = function LocalesProvider(_ref) {
@@ -806,8 +807,8 @@ var LocalesProvider = function LocalesProvider(_ref) {
     value: value
   }, children);
 };
-LocalesProvider.propTypes = propTypes$7;
-LocalesProvider.defaultProps = defaultProps$7;
+LocalesProvider.propTypes = propTypes$6;
+LocalesProvider.defaultProps = defaultProps$6;
 
 // import { getDisplayName } from '../utils';
 
@@ -815,12 +816,12 @@ var ModalContext = /*#__PURE__*/React.createContext(null);
 var useModal = function useModal() {
   return useContext(ModalContext) || {};
 };
-var propTypes$6 = {
+var propTypes$5 = {
   children: PropTypes.node.isRequired,
   container: PropTypes.object // eslint-disable-line
 };
 
-var defaultProps$6 = {
+var defaultProps$5 = {
   container: null
 };
 var ModalProvider = function ModalProvider(_ref) {
@@ -872,8 +873,8 @@ var ModalProvider = function ModalProvider(_ref) {
     value: value
   }, children);
 };
-ModalProvider.propTypes = propTypes$6;
-ModalProvider.defaultProps = defaultProps$6;
+ModalProvider.propTypes = propTypes$5;
+ModalProvider.defaultProps = defaultProps$5;
 
 var PanelsContext = /*#__PURE__*/React.createContext({
   container: null
@@ -901,12 +902,12 @@ var withPanels = function withPanels(WrappedComponent) {
   WithPanelsComponent.displayName = "WithPanels(".concat(getDisplayName(WrappedComponent), ")");
   return WithPanelsComponent;
 };
-var propTypes$5 = {
+var propTypes$4 = {
   children: PropTypes.node.isRequired,
   container: PropTypes.object // eslint-disable-line
 };
 
-var defaultProps$5 = {
+var defaultProps$4 = {
   container: null
 };
 var PanelsProvider = function PanelsProvider(_ref2) {
@@ -958,8 +959,8 @@ var PanelsProvider = function PanelsProvider(_ref2) {
     value: value
   }, children);
 };
-PanelsProvider.propTypes = propTypes$5;
-PanelsProvider.defaultProps = defaultProps$5;
+PanelsProvider.propTypes = propTypes$4;
+PanelsProvider.defaultProps = defaultProps$4;
 
 var _excluded$3 = ["component"];
 var PanneauContext = /*#__PURE__*/React.createContext(null);
@@ -1037,11 +1038,11 @@ var usePanneauSettings = function usePanneauSettings() {
     settings = _ref7$settings === void 0 ? {} : _ref7$settings;
   return settings;
 };
-var propTypes$4 = {
+var propTypes$3 = {
   definition: panneauDefinition.isRequired,
   children: PropTypes.node.isRequired
 };
-var defaultProps$4 = {};
+var defaultProps$3 = {};
 var PanneauProvider = function PanneauProvider(_ref8) {
   var definition = _ref8.definition,
     children = _ref8.children;
@@ -1049,19 +1050,19 @@ var PanneauProvider = function PanneauProvider(_ref8) {
     value: definition
   }, children);
 };
-PanneauProvider.propTypes = propTypes$4;
-PanneauProvider.defaultProps = defaultProps$4;
+PanneauProvider.propTypes = propTypes$3;
+PanneauProvider.defaultProps = defaultProps$3;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var ResourceContext = /*#__PURE__*/React.createContext(null);
 var useResource = function useResource() {
   return useContext(ResourceContext);
 };
-var propTypes$3 = {
+var propTypes$2 = {
   resource: resource.isRequired,
   children: PropTypes.node.isRequired
 };
-var defaultProps$3 = {};
+var defaultProps$2 = {};
 var ResourceProvider = function ResourceProvider(_ref) {
   var resource = _ref.resource,
     children = _ref.children;
@@ -1069,31 +1070,14 @@ var ResourceProvider = function ResourceProvider(_ref) {
     value: resource
   }, children);
 };
-ResourceProvider.propTypes = propTypes$3;
-ResourceProvider.defaultProps = defaultProps$3;
+ResourceProvider.propTypes = propTypes$2;
+ResourceProvider.defaultProps = defaultProps$2;
 
-/* eslint-disable react/jsx-props-no-spreading */
-var RoutesContext = /*#__PURE__*/React.createContext(null);
-var useRoutes = function useRoutes() {
-  var _useContext = useContext(RoutesContext),
-    routes = _useContext.routes;
-  return routes;
-};
-var useUrlGenerator = function useUrlGenerator() {
-  var _useContext2 = useContext(RoutesContext),
-    routes = _useContext2.routes,
-    basePath = _useContext2.basePath;
-  var urlGenerator = useCallback(function (key, data) {
-    // console.log('urlGenerator', basePath, routes, routes[key], data);
-    var url = generatePath(routes[key], data);
-    // console.log('url', url);
-    return basePath !== null ? "".concat(basePath.replace(/\/$/, ''), "/").concat(url.replace(/^\//, '')) : url;
-  }, [generatePath, routes, basePath]);
-  return urlGenerator;
-};
 var useRoutePush = function useRoutePush() {
   var url = useUrlGenerator();
-  var navigate = useNavigate();
+  var _useLocation = useLocation(),
+    _useLocation2 = _slicedToArray(_useLocation, 2),
+    navigate = _useLocation2[1];
   var push = useCallback(function (route, data) {
     for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
       args[_key - 2] = arguments[_key];
@@ -1106,52 +1090,21 @@ var useRoutePush = function useRoutePush() {
         pathname = _ref$pathname === void 0 ? null : _ref$pathname,
         _ref$search = _ref.search,
         search = _ref$search === void 0 ? null : _ref$search;
-      // TODO: test this
-      navigate.apply(void 0, [{
-        pathname: url(pathname, data),
-        search: search
-      }].concat(args));
+      navigate.apply(void 0, ["".concat(url(pathname, data)).concat(search !== null ? "?".concat(search) : '')].concat(args));
     }
   }, [navigate, url]);
   return push;
 };
 var useRouteBack = function useRouteBack() {
   var url = useUrlGenerator();
-  var navigate = useNavigate();
+  var _useLocation3 = useLocation(),
+    _useLocation4 = _slicedToArray(_useLocation3, 2),
+    navigate = _useLocation4[1];
   var back = useCallback(function () {
     return navigate(-1);
   }, [navigate, url]);
   return back;
 };
-var propTypes$2 = {
-  children: PropTypes.node.isRequired,
-  routes: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.string, PropTypes.shape({
-    path: PropTypes.string,
-    component: PropTypes.string
-  })])),
-  basePath: PropTypes.string
-};
-var defaultProps$2 = {
-  routes: null,
-  basePath: null
-};
-var RoutesProvider = function RoutesProvider(_ref2) {
-  var routes = _ref2.routes,
-    basePath = _ref2.basePath,
-    children = _ref2.children;
-  var value = useMemo(function () {
-    return {
-      routes: routes,
-      basePath: basePath
-    };
-  }, [routes, basePath]);
-  // console.log('routes context', routes, basePath);
-  return /*#__PURE__*/React.createElement(RoutesContext.Provider, {
-    value: value
-  }, children);
-};
-RoutesProvider.propTypes = propTypes$2;
-RoutesProvider.defaultProps = defaultProps$2;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var useTracking = function useTracking() {
@@ -1772,4 +1725,4 @@ var UppyProvider = function UppyProvider(_ref6) {
 UppyProvider.propTypes = propTypes;
 UppyProvider.defaultProps = defaultProps;
 
-export { ACTIONS_NAMESPACE, APP_NAMESPACE, BUTTONS_NAMESPACE, ComponentsContext, ComponentsProvider, DISPLAYS_NAMESPACE, DefinitionProvider, FIELDS_NAMESPACE, FILTERS_NAMESPACE, FORMS_NAMESPACE, FieldsContext, FieldsProvider, FontsContext, FontsProvider, FormProvider, GoogleApiClientContext, GoogleApiClientProvider, GoogleKeysContext, GoogleKeysProvider, GoogleMapsClientContext, GoogleMapsClientProvider, LISTS_NAMESPACE, LocalesContext, LocalesProvider, MODALS_NAMESPACE, ModalContext, ModalProvider, PAGES_NAMESPACE, PanelsContext, PanelsProvider, PanneauProvider, ResourceProvider, RoutesContext, RoutesProvider, TrackingProvider, UppyContext, UppyProvider, useActionComponent, useActionsComponents, useActionsComponentsManager, useAppComponent, useAppComponents, useAppComponentsManager, useButtonComponent, useButtonsComponents, useButtonsComponentsManager, useComponent, useComponents, useComponentsManager, useDefinition, useDefinitionContext, useDisplayComponent, useDisplaysComponents, useDisplaysComponentsManager, useField, useFieldComponent, useFields, useFieldsComponents, useFieldsComponentsManager, useFieldsManager, useFilterComponent, useFiltersComponents, useFiltersComponentsManager, useFonts, useForm, useFormComponent, useFormSetValue, useFormValue, useFormsComponents, useFormsComponentsManager, useGoogleApiClient, useGoogleFonts, useGoogleKeys, useGoogleMapsClient, useListComponent, useListsComponents, useListsComponentsManager, useLocales, useModal, useModalComponent, useModalsComponents, useModalsComponentsManager, useOtherLocales, usePageComponent, usePagesComponents, usePagesComponentsManager, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useRoutes, useTracking, useUppy, useUrlGenerator, withGoogleApiClient, withGoogleMapsClient, withPanels };
+export { ACTIONS_NAMESPACE, APP_NAMESPACE, BUTTONS_NAMESPACE, ComponentsContext, ComponentsProvider, DISPLAYS_NAMESPACE, DefinitionProvider, FIELDS_NAMESPACE, FILTERS_NAMESPACE, FORMS_NAMESPACE, FieldsContext, FieldsProvider, FontsContext, FontsProvider, FormProvider, GoogleApiClientContext, GoogleApiClientProvider, GoogleKeysContext, GoogleKeysProvider, GoogleMapsClientContext, GoogleMapsClientProvider, LISTS_NAMESPACE, LocalesContext, LocalesProvider, MODALS_NAMESPACE, ModalContext, ModalProvider, PAGES_NAMESPACE, PanelsContext, PanelsProvider, PanneauProvider, ResourceProvider, TrackingProvider, UppyContext, UppyProvider, useActionComponent, useActionsComponents, useActionsComponentsManager, useAppComponent, useAppComponents, useAppComponentsManager, useButtonComponent, useButtonsComponents, useButtonsComponentsManager, useComponent, useComponents, useComponentsManager, useDefinition, useDefinitionContext, useDisplayComponent, useDisplaysComponents, useDisplaysComponentsManager, useField, useFieldComponent, useFields, useFieldsComponents, useFieldsComponentsManager, useFieldsManager, useFilterComponent, useFiltersComponents, useFiltersComponentsManager, useFonts, useForm, useFormComponent, useFormSetValue, useFormValue, useFormsComponents, useFormsComponentsManager, useGoogleApiClient, useGoogleFonts, useGoogleKeys, useGoogleMapsClient, useListComponent, useListsComponents, useListsComponentsManager, useLocales, useModal, useModalComponent, useModalsComponents, useModalsComponentsManager, useOtherLocales, usePageComponent, usePagesComponents, usePagesComponentsManager, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useTracking, useUppy, withGoogleApiClient, withGoogleMapsClient, withPanels };

package/lib/contexts.js

@@ -17,7 +17,7 @@ var services = require('@folklore/services');
 var reactIntl = require('react-intl');
 var utils = require('@panneau/core/utils');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var reactRouter = require('react-router');
+var routes$1 = require('@folklore/routes');
 var tracking = require('@folklore/tracking');
 var slugify = require('slugify');
 var uuid = require('uuid');
@@ -250,13 +250,13 @@ var useAppComponent = function useAppComponent(name) {
 /**
  * Provider
  */
-var propTypes$f = {
+var propTypes$e = {
   children: PropTypes__default["default"].node.isRequired,
   namespace: PropTypes__default["default"].string,
   manager: PropTypes__default["default"].instanceOf(core.ComponentsManager),
   components: PropTypes__default["default"].objectOf(PropTypes__default["default"].oneOfType([PropTypes__default["default"].object, PropTypes__default["default"].func]))
 };
-var defaultProps$f = {
+var defaultProps$e = {
   namespace: null,
   components: {},
   manager: null
@@ -274,8 +274,8 @@ var ComponentsProvider = function ComponentsProvider(_ref) {
     value: finalManager
   }, children);
 };
-ComponentsProvider.propTypes = propTypes$f;
-ComponentsProvider.defaultProps = defaultProps$f;
+ComponentsProvider.propTypes = propTypes$e;
+ComponentsProvider.defaultProps = defaultProps$e;
 
 var message = PropTypes__default["default"].shape({
   id: PropTypes__default["default"].string.isRequired,
@@ -438,11 +438,11 @@ var useDefinition = function useDefinition() {
     definition = _useDefinitionContext2 === void 0 ? null : _useDefinitionContext2;
   return definition;
 };
-var propTypes$e = {
+var propTypes$d = {
   definition: definition.isRequired,
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$e = {};
+var defaultProps$d = {};
 var DefinitionProvider = function DefinitionProvider(_ref) {
   var definition = _ref.definition,
     children = _ref.children;
@@ -450,8 +450,8 @@ var DefinitionProvider = function DefinitionProvider(_ref) {
     value: definition
   }, children);
 };
-DefinitionProvider.propTypes = propTypes$e;
-DefinitionProvider.defaultProps = defaultProps$e;
+DefinitionProvider.propTypes = propTypes$d;
+DefinitionProvider.defaultProps = defaultProps$d;
 
 var FieldsContext = /*#__PURE__*/React__default["default"].createContext(null);
 var useFieldsManager = function useFieldsManager() {
@@ -465,12 +465,12 @@ var useFields = function useFields() {
   var manager = useFieldsManager();
   return manager.getDefinitions();
 };
-var propTypes$d = {
+var propTypes$c = {
   fields: core.PropTypes.fields,
   manager: PropTypes__default["default"].instanceOf(core.FieldsManager),
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$d = {
+var defaultProps$c = {
   fields: null,
   manager: null
 };
@@ -500,8 +500,8 @@ var FieldsProvider = function FieldsProvider(_ref) {
     components: components
   }, children));
 };
-FieldsProvider.propTypes = propTypes$d;
-FieldsProvider.defaultProps = defaultProps$d;
+FieldsProvider.propTypes = propTypes$c;
+FieldsProvider.defaultProps = defaultProps$c;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var GoogleKeysContext = /*#__PURE__*/React__default["default"].createContext({
@@ -510,12 +510,12 @@ var GoogleKeysContext = /*#__PURE__*/React__default["default"].createContext({
 var useGoogleKeys = function useGoogleKeys() {
   return React.useContext(GoogleKeysContext);
 };
-var propTypes$c = {
+var propTypes$b = {
   children: PropTypes__default["default"].node.isRequired,
   apiKey: PropTypes__default["default"].string // .isRequired,
 };
 
-var defaultProps$c = {
+var defaultProps$b = {
   apiKey: null
 };
 var GoogleKeysProvider = function GoogleKeysProvider(_ref) {
@@ -532,8 +532,8 @@ var GoogleKeysProvider = function GoogleKeysProvider(_ref) {
     value: value
   }, children);
 };
-GoogleKeysProvider.propTypes = propTypes$c;
-GoogleKeysProvider.defaultProps = defaultProps$c;
+GoogleKeysProvider.propTypes = propTypes$b;
+GoogleKeysProvider.defaultProps = defaultProps$b;
 
 var FontsContext = /*#__PURE__*/React__default["default"].createContext({
   systemFonts: null,
@@ -606,12 +606,12 @@ var useFonts = function useFonts() {
   }, [systemFonts, googleFonts, customFonts]);
   return fonts;
 };
-var propTypes$b = {
+var propTypes$a = {
   children: PropTypes__default["default"].node.isRequired,
   systemFonts: core.PropTypes.fonts,
   customFonts: core.PropTypes.fonts
 };
-var defaultProps$b = {
+var defaultProps$a = {
   systemFonts: ['Arial', 'Courier', 'Georgia', 'Times New Roman', 'Verdana'],
   customFonts: null
 };
@@ -647,8 +647,8 @@ var FontsProvider = function FontsProvider(_ref4) {
     value: fonts
   }, children);
 };
-FontsProvider.propTypes = propTypes$b;
-FontsProvider.defaultProps = defaultProps$b;
+FontsProvider.propTypes = propTypes$a;
+FontsProvider.defaultProps = defaultProps$a;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var FormContext = /*#__PURE__*/React__default["default"].createContext(null);
@@ -665,13 +665,13 @@ var useFormSetValue = function useFormSetValue() {
     setValue = _useForm2.setValue;
   return setValue;
 };
-var propTypes$a = {
+var propTypes$9 = {
   value: PropTypes__default["default"].object.isRequired,
   // eslint-disable-line react/forbid-prop-types
   setValue: PropTypes__default["default"].func.isRequired,
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$a = {};
+var defaultProps$9 = {};
 var FormProvider = function FormProvider(_ref) {
   var value = _ref.value,
     setValue = _ref.setValue,
@@ -686,8 +686,8 @@ var FormProvider = function FormProvider(_ref) {
     value: values
   }, children);
 };
-FormProvider.propTypes = propTypes$a;
-FormProvider.defaultProps = defaultProps$a;
+FormProvider.propTypes = propTypes$9;
+FormProvider.defaultProps = defaultProps$9;
 
 var GoogleApiClientContext = /*#__PURE__*/React__default["default"].createContext(null);
 var useGoogleApiClient = function useGoogleApiClient() {
@@ -711,10 +711,10 @@ var withGoogleApiClient = function withGoogleApiClient(WrappedComponent) {
   WithGoogleApiClientComponent.displayName = "WithGoogleApiClient(".concat(getDisplayName(WrappedComponent), ")");
   return WithGoogleApiClientComponent;
 };
-var propTypes$9 = {
+var propTypes$8 = {
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$9 = {};
+var defaultProps$8 = {};
 var GoogleApiClientProvider = function GoogleApiClientProvider(_ref2) {
   var children = _ref2.children;
   var _useGoogleKeys = useGoogleKeys(),
@@ -738,8 +738,8 @@ var GoogleApiClientProvider = function GoogleApiClientProvider(_ref2) {
     value: client
   }, children);
 };
-GoogleApiClientProvider.propTypes = propTypes$9;
-GoogleApiClientProvider.defaultProps = defaultProps$9;
+GoogleApiClientProvider.propTypes = propTypes$8;
+GoogleApiClientProvider.defaultProps = defaultProps$8;
 
 var GoogleMapsClientContext = /*#__PURE__*/React__default["default"].createContext(null);
 var useGoogleMapsClient = function useGoogleMapsClient() {
@@ -763,12 +763,12 @@ var withGoogleMapsClient = function withGoogleMapsClient(WrappedComponent) {
   WithGoogleMapsClientComponent.displayName = "WithGoogleMapsClient(".concat(getDisplayName(WrappedComponent), ")");
   return WithGoogleMapsClientComponent;
 };
-var propTypes$8 = {
+var propTypes$7 = {
   children: PropTypes__default["default"].node.isRequired,
   locale: PropTypes__default["default"].string,
   libraries: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string)
 };
-var defaultProps$8 = {
+var defaultProps$7 = {
   locale: 'fr',
   libraries: null
 };
@@ -798,8 +798,8 @@ var GoogleMapsClientProvider = function GoogleMapsClientProvider(_ref2) {
     value: client
   }, children);
 };
-GoogleMapsClientProvider.propTypes = propTypes$8;
-GoogleMapsClientProvider.defaultProps = defaultProps$8;
+GoogleMapsClientProvider.propTypes = propTypes$7;
+GoogleMapsClientProvider.defaultProps = defaultProps$7;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var defaultLocales = ['en', 'fr'];
@@ -823,11 +823,11 @@ var useOtherLocales = function useOtherLocales() {
   }, [locales, locale]);
   return otherLocales;
 };
-var propTypes$7 = {
+var propTypes$6 = {
   locales: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string),
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$7 = {
+var defaultProps$6 = {
   locales: []
 };
 var LocalesProvider = function LocalesProvider(_ref) {
@@ -842,8 +842,8 @@ var LocalesProvider = function LocalesProvider(_ref) {
     value: value
   }, children);
 };
-LocalesProvider.propTypes = propTypes$7;
-LocalesProvider.defaultProps = defaultProps$7;
+LocalesProvider.propTypes = propTypes$6;
+LocalesProvider.defaultProps = defaultProps$6;
 
 // import { getDisplayName } from '../utils';
 
@@ -851,12 +851,12 @@ var ModalContext = /*#__PURE__*/React__default["default"].createContext(null);
 var useModal = function useModal() {
   return React.useContext(ModalContext) || {};
 };
-var propTypes$6 = {
+var propTypes$5 = {
   children: PropTypes__default["default"].node.isRequired,
   container: PropTypes__default["default"].object // eslint-disable-line
 };
 
-var defaultProps$6 = {
+var defaultProps$5 = {
   container: null
 };
 var ModalProvider = function ModalProvider(_ref) {
@@ -908,8 +908,8 @@ var ModalProvider = function ModalProvider(_ref) {
     value: value
   }, children);
 };
-ModalProvider.propTypes = propTypes$6;
-ModalProvider.defaultProps = defaultProps$6;
+ModalProvider.propTypes = propTypes$5;
+ModalProvider.defaultProps = defaultProps$5;
 
 var PanelsContext = /*#__PURE__*/React__default["default"].createContext({
   container: null
@@ -937,12 +937,12 @@ var withPanels = function withPanels(WrappedComponent) {
   WithPanelsComponent.displayName = "WithPanels(".concat(utils.getDisplayName(WrappedComponent), ")");
   return WithPanelsComponent;
 };
-var propTypes$5 = {
+var propTypes$4 = {
   children: PropTypes__default["default"].node.isRequired,
   container: PropTypes__default["default"].object // eslint-disable-line
 };
 
-var defaultProps$5 = {
+var defaultProps$4 = {
   container: null
 };
 var PanelsProvider = function PanelsProvider(_ref2) {
@@ -994,8 +994,8 @@ var PanelsProvider = function PanelsProvider(_ref2) {
     value: value
   }, children);
 };
-PanelsProvider.propTypes = propTypes$5;
-PanelsProvider.defaultProps = defaultProps$5;
+PanelsProvider.propTypes = propTypes$4;
+PanelsProvider.defaultProps = defaultProps$4;
 
 var _excluded$3 = ["component"];
 var PanneauContext = /*#__PURE__*/React__default["default"].createContext(null);
@@ -1073,11 +1073,11 @@ var usePanneauSettings = function usePanneauSettings() {
     settings = _ref7$settings === void 0 ? {} : _ref7$settings;
   return settings;
 };
-var propTypes$4 = {
+var propTypes$3 = {
   definition: panneauDefinition.isRequired,
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$4 = {};
+var defaultProps$3 = {};
 var PanneauProvider = function PanneauProvider(_ref8) {
   var definition = _ref8.definition,
     children = _ref8.children;
@@ -1085,19 +1085,19 @@ var PanneauProvider = function PanneauProvider(_ref8) {
     value: definition
   }, children);
 };
-PanneauProvider.propTypes = propTypes$4;
-PanneauProvider.defaultProps = defaultProps$4;
+PanneauProvider.propTypes = propTypes$3;
+PanneauProvider.defaultProps = defaultProps$3;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var ResourceContext = /*#__PURE__*/React__default["default"].createContext(null);
 var useResource = function useResource() {
   return React.useContext(ResourceContext);
 };
-var propTypes$3 = {
+var propTypes$2 = {
   resource: resource.isRequired,
   children: PropTypes__default["default"].node.isRequired
 };
-var defaultProps$3 = {};
+var defaultProps$2 = {};
 var ResourceProvider = function ResourceProvider(_ref) {
   var resource = _ref.resource,
     children = _ref.children;
@@ -1105,31 +1105,14 @@ var ResourceProvider = function ResourceProvider(_ref) {
     value: resource
   }, children);
 };
-ResourceProvider.propTypes = propTypes$3;
-ResourceProvider.defaultProps = defaultProps$3;
+ResourceProvider.propTypes = propTypes$2;
+ResourceProvider.defaultProps = defaultProps$2;
 
-/* eslint-disable react/jsx-props-no-spreading */
-var RoutesContext = /*#__PURE__*/React__default["default"].createContext(null);
-var useRoutes = function useRoutes() {
-  var _useContext = React.useContext(RoutesContext),
-    routes = _useContext.routes;
-  return routes;
-};
-var useUrlGenerator = function useUrlGenerator() {
-  var _useContext2 = React.useContext(RoutesContext),
-    routes = _useContext2.routes,
-    basePath = _useContext2.basePath;
-  var urlGenerator = React.useCallback(function (key, data) {
-    // console.log('urlGenerator', basePath, routes, routes[key], data);
-    var url = reactRouter.generatePath(routes[key], data);
-    // console.log('url', url);
-    return basePath !== null ? "".concat(basePath.replace(/\/$/, ''), "/").concat(url.replace(/^\//, '')) : url;
-  }, [reactRouter.generatePath, routes, basePath]);
-  return urlGenerator;
-};
 var useRoutePush = function useRoutePush() {
-  var url = useUrlGenerator();
-  var navigate = reactRouter.useNavigate();
+  var url = routes$1.useUrlGenerator();
+  var _useLocation = routes$1.useLocation(),
+    _useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
+    navigate = _useLocation2[1];
   var push = React.useCallback(function (route, data) {
     for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
       args[_key - 2] = arguments[_key];
@@ -1142,52 +1125,21 @@ var useRoutePush = function useRoutePush() {
         pathname = _ref$pathname === void 0 ? null : _ref$pathname,
         _ref$search = _ref.search,
         search = _ref$search === void 0 ? null : _ref$search;
-      // TODO: test this
-      navigate.apply(void 0, [{
-        pathname: url(pathname, data),
-        search: search
-      }].concat(args));
+      navigate.apply(void 0, ["".concat(url(pathname, data)).concat(search !== null ? "?".concat(search) : '')].concat(args));
     }
   }, [navigate, url]);
   return push;
 };
 var useRouteBack = function useRouteBack() {
-  var url = useUrlGenerator();
-  var navigate = reactRouter.useNavigate();
+  var url = routes$1.useUrlGenerator();
+  var _useLocation3 = routes$1.useLocation(),
+    _useLocation4 = _slicedToArray__default["default"](_useLocation3, 2),
+    navigate = _useLocation4[1];
   var back = React.useCallback(function () {
     return navigate(-1);
   }, [navigate, url]);
   return back;
 };
-var propTypes$2 = {
-  children: PropTypes__default["default"].node.isRequired,
-  routes: PropTypes__default["default"].objectOf(PropTypes__default["default"].oneOfType([PropTypes__default["default"].string, PropTypes__default["default"].shape({
-    path: PropTypes__default["default"].string,
-    component: PropTypes__default["default"].string
-  })])),
-  basePath: PropTypes__default["default"].string
-};
-var defaultProps$2 = {
-  routes: null,
-  basePath: null
-};
-var RoutesProvider = function RoutesProvider(_ref2) {
-  var routes = _ref2.routes,
-    basePath = _ref2.basePath,
-    children = _ref2.children;
-  var value = React.useMemo(function () {
-    return {
-      routes: routes,
-      basePath: basePath
-    };
-  }, [routes, basePath]);
-  // console.log('routes context', routes, basePath);
-  return /*#__PURE__*/React__default["default"].createElement(RoutesContext.Provider, {
-    value: value
-  }, children);
-};
-RoutesProvider.propTypes = propTypes$2;
-RoutesProvider.defaultProps = defaultProps$2;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var useTracking = function useTracking() {
@@ -1808,6 +1760,22 @@ var UppyProvider = function UppyProvider(_ref6) {
 UppyProvider.propTypes = propTypes;
 UppyProvider.defaultProps = defaultProps;
 
+Object.defineProperty(exports, 'RoutesContext', {
+    enumerable: true,
+    get: function () { return routes$1.RoutesContext; }
+});
+Object.defineProperty(exports, 'RoutesProvider', {
+    enumerable: true,
+    get: function () { return routes$1.RoutesProvider; }
+});
+Object.defineProperty(exports, 'useRoutes', {
+    enumerable: true,
+    get: function () { return routes$1.useRoutes; }
+});
+Object.defineProperty(exports, 'useUrlGenerator', {
+    enumerable: true,
+    get: function () { return routes$1.useUrlGenerator; }
+});
 Object.defineProperty(exports, 'TrackingContext', {
     enumerable: true,
     get: function () { return tracking.TrackingContext; }
@@ -1844,8 +1812,6 @@ exports.PanelsContext = PanelsContext;
 exports.PanelsProvider = PanelsProvider;
 exports.PanneauProvider = PanneauProvider;
 exports.ResourceProvider = ResourceProvider;
-exports.RoutesContext = RoutesContext;
-exports.RoutesProvider = RoutesProvider;
 exports.TrackingProvider = TrackingProvider;
 exports.UppyContext = UppyContext;
 exports.UppyProvider = UppyProvider;
@@ -1910,10 +1876,8 @@ exports.usePanneauSettings = usePanneauSettings;
 exports.useResource = useResource;
 exports.useRouteBack = useRouteBack;
 exports.useRoutePush = useRoutePush;
-exports.useRoutes = useRoutes;
 exports.useTracking = useTracking;
 exports.useUppy = useUppy;
-exports.useUrlGenerator = useUrlGenerator;
 exports.withGoogleApiClient = withGoogleApiClient;
 exports.withGoogleMapsClient = withGoogleMapsClient;
 exports.withPanels = withPanels;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "2.0.93",
+    "version": "3.0.0",
     "description": "",
     "keywords": [
         "javascript"
@@ -71,6 +71,7 @@
         "@babel/runtime": "^7.12.5",
         "@folklore/fetch": "^0.1.15",
         "@folklore/forms": "^0.0.10",
+        "@folklore/routes": "^0.2.6",
         "@folklore/services": "^0.1.24",
         "@folklore/tracking": "^0.0.9",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
@@ -101,18 +102,17 @@
         "react-helmet": "^6.1.0",
         "react-intl": "^5.15.8||^6.0.0",
         "react-is": "^17.0.2",
-        "react-router": "^6.2.1",
-        "react-router-dom": "^6.2.1",
         "react-use-gesture": "^9.0.0",
         "slugify": "^1.5.0",
         "snake-case": "^3.0.4",
         "tinycolor2": "^1.4.2",
         "uuid": "^8.3.2",
         "webfontloader": "^1.6.28",
-        "wolfy87-eventemitter": "^5.2.9"
+        "wolfy87-eventemitter": "^5.2.9",
+        "wouter": "^2.0.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "5bf00f0bb2bae3c20b20c8d529d388a6391d8219"
+    "gitHead": "b72d6fe6309ac3be6e2bef67e187f9aaa77b774e"
 }