@panneau/core 2.0.46 → 2.0.56

package/es/contexts.js

@@ -7,8 +7,8 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import uniqBy from 'lodash/uniqBy';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import isObject from 'lodash/isObject';
 import { getJSON } from '@folklore/fetch';
+import isObject from 'lodash/isObject';
 import { loadGoogleApi, loadGoogleMaps } from '@folklore/services';
 import { useIntl } from 'react-intl';
 import { getDisplayName } from '@panneau/core/utils';
@@ -383,6 +383,8 @@ var font = PropTypes.shape({
 });
 PropTypes.arrayOf(font);
 PropTypes.shape({});
+var modal = PropTypes.shape({});
+PropTypes.arrayOf(modal);
 
 /* eslint-disable react/jsx-props-no-spreading */
 var DefinitionContext = /*#__PURE__*/React.createContext(null);
@@ -480,10 +482,13 @@ var GoogleKeysProvider = function GoogleKeysProvider(_ref) {
     apiKey = _ref.apiKey;
   var _useGoogleKeys = useGoogleKeys(),
     previousApiKey = _useGoogleKeys.apiKey;
-  return /*#__PURE__*/React.createElement(GoogleKeysContext.Provider, {
-    value: {
+  var value = useMemo(function () {
+    return {
       apiKey: apiKey || previousApiKey
-    }
+    };
+  }, [previousApiKey, apiKey]);
+  return /*#__PURE__*/React.createElement(GoogleKeysContext.Provider, {
+    value: value
   }, children);
 };
 GoogleKeysProvider.propTypes = propTypes$c;
@@ -799,31 +804,11 @@ var LocalesProvider = function LocalesProvider(_ref) {
 LocalesProvider.propTypes = propTypes$7;
 LocalesProvider.defaultProps = defaultProps$7;
 
-var ModalsContext = /*#__PURE__*/React.createContext({
-  container: null
-});
-var useModals = function useModals() {
-  return useContext(ModalsContext) || {};
-};
-var withModals = function withModals(WrappedComponent) {
-  var WithModalsComponent = function WithModalsComponent(props) {
-    return /*#__PURE__*/React.createElement(ModalsContext.Consumer, null, function (_ref) {
-      var modals = _ref.modals,
-        container = _ref.container,
-        setContainer = _ref.setContainer,
-        register = _ref.register,
-        unregister = _ref.unregister;
-      return /*#__PURE__*/React.createElement(WrappedComponent, Object.assign({
-        modalsContainer: container,
-        setModalsContainer: setContainer,
-        modals: modals,
-        registerModal: register,
-        unregisterModal: unregister
-      }, props));
-    });
-  };
-  WithModalsComponent.displayName = "WithModals(".concat(getDisplayName(WrappedComponent), ")");
-  return WithModalsComponent;
+// import { getDisplayName } from '../utils';
+
+var ModalContext = /*#__PURE__*/React.createContext(null);
+var useModal = function useModal() {
+  return useContext(ModalContext) || {};
 };
 var propTypes$6 = {
   children: PropTypes.node.isRequired,
@@ -833,9 +818,9 @@ var propTypes$6 = {
 var defaultProps$6 = {
   container: null
 };
-var ModalsProvider = function ModalsProvider(_ref2) {
-  var children = _ref2.children,
-    initialContainer = _ref2.container;
+var ModalProvider = function ModalProvider(_ref) {
+  var children = _ref.children,
+    initialContainer = _ref.container;
   var _useState = useState(initialContainer),
     _useState2 = _slicedToArray(_useState, 2),
     container = _useState2[0],
@@ -856,31 +841,34 @@ var ModalsProvider = function ModalsProvider(_ref2) {
   }, [modals, setModals]);
   var unregister = useCallback(function (id) {
     var currentModals = modalsRef.current;
-    var foundIndex = currentModals.findIndex(function (_ref3) {
-      var modalId = _ref3.id;
+    var foundIndex = currentModals.findIndex(function (_ref2) {
+      var modalId = _ref2.id;
       return modalId === id;
     });
     if (foundIndex !== -1) {
-      var newModals = currentModals.filter(function (_ref4) {
-        var modalId = _ref4.id;
+      var newModals = currentModals.filter(function (_ref3) {
+        var modalId = _ref3.id;
         return modalId !== id;
       });
       setModals(newModals);
       modalsRef.current = newModals;
     }
   }, [modals, setModals]);
-  return /*#__PURE__*/React.createElement(ModalsContext.Provider, {
-    value: {
+  var value = useMemo(function () {
+    return {
       modals: modals,
       container: container,
       setContainer: setContainer,
       register: register,
       unregister: unregister
-    }
+    };
+  }, [modals, container, setContainer, register, unregister]);
+  return /*#__PURE__*/React.createElement(ModalContext.Provider, {
+    value: value
   }, children);
 };
-ModalsProvider.propTypes = propTypes$6;
-ModalsProvider.defaultProps = defaultProps$6;
+ModalProvider.propTypes = propTypes$6;
+ModalProvider.defaultProps = defaultProps$6;
 
 var PanelsContext = /*#__PURE__*/React.createContext({
   container: null
@@ -952,14 +940,17 @@ var PanelsProvider = function PanelsProvider(_ref2) {
       panelsRef.current = newPanels;
     }
   }, [panels, setPanels]);
-  return /*#__PURE__*/React.createElement(PanelsContext.Provider, {
-    value: {
+  var value = useMemo(function () {
+    return {
       panels: panels,
       setContainer: setContainer,
       container: container,
       register: register,
       unregister: unregister
-    }
+    };
+  }, [panels, setContainer, container, register, unregister]);
+  return /*#__PURE__*/React.createElement(PanelsContext.Provider, {
+    value: value
   }, children);
 };
 PanelsProvider.propTypes = propTypes$5;
@@ -1149,7 +1140,7 @@ var RoutesProvider = function RoutesProvider(_ref2) {
       basePath: basePath
     };
   }, [routes, basePath]);
-  // console.log(routes, basePath);
+  // console.log('routes context', routes, basePath);
   return /*#__PURE__*/React.createElement(RoutesContext.Provider, {
     value: value
   }, children);
@@ -1761,4 +1752,4 @@ var UppyProvider = function UppyProvider(_ref5) {
 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, ModalsContext, ModalsProvider, 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, useModalComponent, useModals, useModalsComponents, useModalsComponentsManager, useOtherLocales, usePageComponent, usePagesComponents, usePagesComponentsManager, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useRoutes, useTracking, useUppy, useUrlGenerator, withGoogleApiClient, withGoogleMapsClient, withModals, 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, 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 };

package/es/index.js

@@ -166,6 +166,8 @@ var font = PropTypes$1.shape({
 });
 var fonts = PropTypes$1.arrayOf(font);
 var trackingVariables = PropTypes$1.shape({});
+var modal = PropTypes$1.shape({});
+var modals = PropTypes$1.arrayOf(modal);
 
 var PropTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -215,7 +217,9 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     breadcrumbs: breadcrumbs,
     font: font,
     fonts: fonts,
-    trackingVariables: trackingVariables
+    trackingVariables: trackingVariables,
+    modal: modal,
+    modals: modals
 });
 
 var flattenComponents = function flattenComponents(components) {

package/lib/contexts.js

@@ -11,8 +11,8 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var uniqBy = require('lodash/uniqBy');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var isObject = require('lodash/isObject');
 var fetch = require('@folklore/fetch');
+var isObject = require('lodash/isObject');
 var services = require('@folklore/services');
 var reactIntl = require('react-intl');
 var utils = require('@panneau/core/utils');
@@ -418,6 +418,8 @@ var font = PropTypes__default["default"].shape({
 });
 PropTypes__default["default"].arrayOf(font);
 PropTypes__default["default"].shape({});
+var modal = PropTypes__default["default"].shape({});
+PropTypes__default["default"].arrayOf(modal);
 
 /* eslint-disable react/jsx-props-no-spreading */
 var DefinitionContext = /*#__PURE__*/React__default["default"].createContext(null);
@@ -515,10 +517,13 @@ var GoogleKeysProvider = function GoogleKeysProvider(_ref) {
     apiKey = _ref.apiKey;
   var _useGoogleKeys = useGoogleKeys(),
     previousApiKey = _useGoogleKeys.apiKey;
-  return /*#__PURE__*/React__default["default"].createElement(GoogleKeysContext.Provider, {
-    value: {
+  var value = React.useMemo(function () {
+    return {
       apiKey: apiKey || previousApiKey
-    }
+    };
+  }, [previousApiKey, apiKey]);
+  return /*#__PURE__*/React__default["default"].createElement(GoogleKeysContext.Provider, {
+    value: value
   }, children);
 };
 GoogleKeysProvider.propTypes = propTypes$c;
@@ -834,31 +839,11 @@ var LocalesProvider = function LocalesProvider(_ref) {
 LocalesProvider.propTypes = propTypes$7;
 LocalesProvider.defaultProps = defaultProps$7;
 
-var ModalsContext = /*#__PURE__*/React__default["default"].createContext({
-  container: null
-});
-var useModals = function useModals() {
-  return React.useContext(ModalsContext) || {};
-};
-var withModals = function withModals(WrappedComponent) {
-  var WithModalsComponent = function WithModalsComponent(props) {
-    return /*#__PURE__*/React__default["default"].createElement(ModalsContext.Consumer, null, function (_ref) {
-      var modals = _ref.modals,
-        container = _ref.container,
-        setContainer = _ref.setContainer,
-        register = _ref.register,
-        unregister = _ref.unregister;
-      return /*#__PURE__*/React__default["default"].createElement(WrappedComponent, Object.assign({
-        modalsContainer: container,
-        setModalsContainer: setContainer,
-        modals: modals,
-        registerModal: register,
-        unregisterModal: unregister
-      }, props));
-    });
-  };
-  WithModalsComponent.displayName = "WithModals(".concat(utils.getDisplayName(WrappedComponent), ")");
-  return WithModalsComponent;
+// import { getDisplayName } from '../utils';
+
+var ModalContext = /*#__PURE__*/React__default["default"].createContext(null);
+var useModal = function useModal() {
+  return React.useContext(ModalContext) || {};
 };
 var propTypes$6 = {
   children: PropTypes__default["default"].node.isRequired,
@@ -868,9 +853,9 @@ var propTypes$6 = {
 var defaultProps$6 = {
   container: null
 };
-var ModalsProvider = function ModalsProvider(_ref2) {
-  var children = _ref2.children,
-    initialContainer = _ref2.container;
+var ModalProvider = function ModalProvider(_ref) {
+  var children = _ref.children,
+    initialContainer = _ref.container;
   var _useState = React.useState(initialContainer),
     _useState2 = _slicedToArray__default["default"](_useState, 2),
     container = _useState2[0],
@@ -891,31 +876,34 @@ var ModalsProvider = function ModalsProvider(_ref2) {
   }, [modals, setModals]);
   var unregister = React.useCallback(function (id) {
     var currentModals = modalsRef.current;
-    var foundIndex = currentModals.findIndex(function (_ref3) {
-      var modalId = _ref3.id;
+    var foundIndex = currentModals.findIndex(function (_ref2) {
+      var modalId = _ref2.id;
       return modalId === id;
     });
     if (foundIndex !== -1) {
-      var newModals = currentModals.filter(function (_ref4) {
-        var modalId = _ref4.id;
+      var newModals = currentModals.filter(function (_ref3) {
+        var modalId = _ref3.id;
         return modalId !== id;
       });
       setModals(newModals);
       modalsRef.current = newModals;
     }
   }, [modals, setModals]);
-  return /*#__PURE__*/React__default["default"].createElement(ModalsContext.Provider, {
-    value: {
+  var value = React.useMemo(function () {
+    return {
       modals: modals,
       container: container,
       setContainer: setContainer,
       register: register,
       unregister: unregister
-    }
+    };
+  }, [modals, container, setContainer, register, unregister]);
+  return /*#__PURE__*/React__default["default"].createElement(ModalContext.Provider, {
+    value: value
   }, children);
 };
-ModalsProvider.propTypes = propTypes$6;
-ModalsProvider.defaultProps = defaultProps$6;
+ModalProvider.propTypes = propTypes$6;
+ModalProvider.defaultProps = defaultProps$6;
 
 var PanelsContext = /*#__PURE__*/React__default["default"].createContext({
   container: null
@@ -987,14 +975,17 @@ var PanelsProvider = function PanelsProvider(_ref2) {
       panelsRef.current = newPanels;
     }
   }, [panels, setPanels]);
-  return /*#__PURE__*/React__default["default"].createElement(PanelsContext.Provider, {
-    value: {
+  var value = React.useMemo(function () {
+    return {
       panels: panels,
       setContainer: setContainer,
       container: container,
       register: register,
       unregister: unregister
-    }
+    };
+  }, [panels, setContainer, container, register, unregister]);
+  return /*#__PURE__*/React__default["default"].createElement(PanelsContext.Provider, {
+    value: value
   }, children);
 };
 PanelsProvider.propTypes = propTypes$5;
@@ -1184,7 +1175,7 @@ var RoutesProvider = function RoutesProvider(_ref2) {
       basePath: basePath
     };
   }, [routes, basePath]);
-  // console.log(routes, basePath);
+  // console.log('routes context', routes, basePath);
   return /*#__PURE__*/React__default["default"].createElement(RoutesContext.Provider, {
     value: value
   }, children);
@@ -1825,8 +1816,8 @@ exports.LISTS_NAMESPACE = LISTS_NAMESPACE;
 exports.LocalesContext = LocalesContext;
 exports.LocalesProvider = LocalesProvider;
 exports.MODALS_NAMESPACE = MODALS_NAMESPACE;
-exports.ModalsContext = ModalsContext;
-exports.ModalsProvider = ModalsProvider;
+exports.ModalContext = ModalContext;
+exports.ModalProvider = ModalProvider;
 exports.PAGES_NAMESPACE = PAGES_NAMESPACE;
 exports.PanelsContext = PanelsContext;
 exports.PanelsProvider = PanelsProvider;
@@ -1878,8 +1869,8 @@ exports.useListComponent = useListComponent;
 exports.useListsComponents = useListsComponents;
 exports.useListsComponentsManager = useListsComponentsManager;
 exports.useLocales = useLocales;
+exports.useModal = useModal;
 exports.useModalComponent = useModalComponent;
-exports.useModals = useModals;
 exports.useModalsComponents = useModalsComponents;
 exports.useModalsComponentsManager = useModalsComponentsManager;
 exports.useOtherLocales = useOtherLocales;
@@ -1904,5 +1895,4 @@ exports.useUppy = useUppy;
 exports.useUrlGenerator = useUrlGenerator;
 exports.withGoogleApiClient = withGoogleApiClient;
 exports.withGoogleMapsClient = withGoogleMapsClient;
-exports.withModals = withModals;
 exports.withPanels = withPanels;

package/lib/index.js

@@ -188,6 +188,8 @@ var font = PropTypes__default["default"].shape({
 });
 var fonts = PropTypes__default["default"].arrayOf(font);
 var trackingVariables = PropTypes__default["default"].shape({});
+var modal = PropTypes__default["default"].shape({});
+var modals = PropTypes__default["default"].arrayOf(modal);
 
 var PropTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -237,7 +239,9 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     breadcrumbs: breadcrumbs,
     font: font,
     fonts: fonts,
-    trackingVariables: trackingVariables
+    trackingVariables: trackingVariables,
+    modal: modal,
+    modals: modals
 });
 
 var flattenComponents = function flattenComponents(components) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "2.0.46",
+    "version": "2.0.56",
     "description": "",
     "keywords": [
         "javascript"
@@ -114,5 +114,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "566fca41a31122cbbcda4b98cb8395e56eaf9336"
+    "gitHead": "edb76a5622f04136db62c1dd0c4b2e362de6878a"
 }