@panneau/core 3.0.193 → 3.0.194

package/es/contexts.js

@@ -869,14 +869,12 @@ var ModalProvider = function ModalProvider(_ref) {
     }
   }, [modals, setModals]);
   var closeLastModal = useCallback(function () {
-    var _modalsRef$current3 = modalsRef.current,
-      currentModals = _modalsRef$current3 === void 0 ? [] : _modalsRef$current3;
-    var lastModal = currentModals.pop() || null;
+    var lastModal = modals.pop() || null;
     if (lastModal !== null) {
       var _ref4 = lastModal || {},
         _ref4$id = _ref4.id,
         lastModalId = _ref4$id === void 0 ? null : _ref4$id;
-      var newModals = currentModals.filter(function (_ref5) {
+      var newModals = modals.filter(function (_ref5) {
         var modalId = _ref5.id;
         return modalId !== lastModalId;
       });

package/es/hooks.js

@@ -1,6 +1,8 @@
+import get from 'lodash/get';
+import isArray from 'lodash/isArray';
+import { useMemo, useRef, useEffect, useCallback, useState } from 'react';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import isString from 'lodash/isString';
-import { useRef, useEffect, useCallback, useState, useMemo } from 'react';
 import { EventsManager, MediasParser } from '@panneau/core';
 import { createUseEvent, loadPackage } from '@panneau/core/utils';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
@@ -8,14 +10,61 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { getCsrfToken, postJSON, getCSRFHeaders } from '@folklore/fetch';
-import get from 'lodash/get';
-import isArray from 'lodash/isArray';
 import isObject from 'lodash/isObject';
 import { useFieldsManager, usePanneauResources, useResource, useUrlGenerator } from '@panneau/core/contexts';
 import { useIntl } from 'react-intl';
 import dayjs from 'dayjs';
 import { match } from 'css-mediaquery';
 
+var useActionProps = function useActionProps(action, value) {
+  var labelPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var values = useMemo(function () {
+    if (value === null) {
+      return null;
+    }
+    if (isArray(value)) {
+      return value;
+    }
+    return value || null;
+  }, [value]);
+  var ids = useMemo(function () {
+    if (value === null) {
+      return null;
+    }
+    if (isArray(value)) {
+      return value.map(function () {
+        var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref$id = _ref.id,
+          id = _ref$id === void 0 ? null : _ref$id;
+        return id;
+      }).filter(function (id) {
+        return id !== null;
+      });
+    }
+    return value !== null && typeof value.id !== 'undefined' ? [value.id] : null;
+  }, [value]);
+  var idKeys = useMemo(function () {
+    return (ids || []).map(function (id) {
+      return "".concat(id);
+    }).join('-');
+  }, [ids]);
+  var idLabels = useMemo(function () {
+    return (values || []).map(function (it) {
+      return "#".concat(get(it, 'id', '')).concat(labelPath !== null ? " ".concat(get(it, labelPath, '')) : '');
+    }).join(', ');
+  }, [ids]);
+  var modalKey = useMemo(function () {
+    return "".concat(action, "-").concat(idKeys);
+  }, [idKeys]);
+  return {
+    ids: ids,
+    idKeys: idKeys,
+    idLabels: idLabels,
+    modalKey: modalKey
+  };
+};
+var useActionProps$1 = useActionProps;
+
 // For backwards compatibility with the old actions element
 
 var useActions = function useActions() {
@@ -50,7 +99,7 @@ var useActions = function useActions() {
     _ref$preferEditModal = _ref.preferEditModal,
     preferEditModal = _ref$preferEditModal === void 0 ? false : _ref$preferEditModal,
     _ref$preferDeleteModa = _ref.preferDeleteModal,
-    preferDeleteModal = _ref$preferDeleteModa === void 0 ? true : _ref$preferDeleteModa;
+    preferDeleteModal = _ref$preferDeleteModa === void 0 ? false : _ref$preferDeleteModa;
   var _ref2 = item || {},
     id = _ref2.id,
     _ref2$url = _ref2.url,
@@ -1263,4 +1312,4 @@ var eventsManager = typeof window !== 'undefined' ? new EventsManager(window) :
 var useWindowEvent = createUseEvent(eventsManager);
 var useWindowEvent$1 = useWindowEvent;
 
-export { KEYCODES, getObserver, useActions$1 as useActions, useAnimationFrame$1 as useAnimationFrame, useDocumentEvent$1 as useDocumentEvent, useForm$1 as useForm, useFormattedDate, useFormattedTime, useIntersectionObserver, useIsVisible$1 as useIsVisible, useKeyboardKeys$1 as useKeyboardKeys, useLoadedFonts$1 as useLoadedFonts, useMediaApi$1 as useMediaApi, useMediasParser$1 as useMediasParser, useObserver, useQuery$1 as useQuery, useResizeObserver, useResourceTypeName$1 as useResourceTypeName, useResourceUrlGenerator$1 as useResourceUrlGenerator, useScreenSizeFromElement, useScreenSizeFromWindow, useWindowEvent$1 as useWindowEvent };
+export { KEYCODES, getObserver, useActionProps$1 as useActionProps, useActions$1 as useActions, useAnimationFrame$1 as useAnimationFrame, useDocumentEvent$1 as useDocumentEvent, useForm$1 as useForm, useFormattedDate, useFormattedTime, useIntersectionObserver, useIsVisible$1 as useIsVisible, useKeyboardKeys$1 as useKeyboardKeys, useLoadedFonts$1 as useLoadedFonts, useMediaApi$1 as useMediaApi, useMediasParser$1 as useMediasParser, useObserver, useQuery$1 as useQuery, useResizeObserver, useResourceTypeName$1 as useResourceTypeName, useResourceUrlGenerator$1 as useResourceUrlGenerator, useScreenSizeFromElement, useScreenSizeFromWindow, useWindowEvent$1 as useWindowEvent };

package/lib/contexts.js

@@ -890,14 +890,12 @@ var ModalProvider = function ModalProvider(_ref) {
     }
   }, [modals, setModals]);
   var closeLastModal = React.useCallback(function () {
-    var _modalsRef$current3 = modalsRef.current,
-      currentModals = _modalsRef$current3 === void 0 ? [] : _modalsRef$current3;
-    var lastModal = currentModals.pop() || null;
+    var lastModal = modals.pop() || null;
     if (lastModal !== null) {
       var _ref4 = lastModal || {},
         _ref4$id = _ref4.id,
         lastModalId = _ref4$id === void 0 ? null : _ref4$id;
-      var newModals = currentModals.filter(function (_ref5) {
+      var newModals = modals.filter(function (_ref5) {
         var modalId = _ref5.id;
         return modalId !== lastModalId;
       });

package/lib/hooks.js

@@ -1,8 +1,10 @@
 'use strict';
 
+var get = require('lodash/get');
+var isArray = require('lodash/isArray');
+var react = require('react');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var isString = require('lodash/isString');
-var react = require('react');
 var core = require('@panneau/core');
 var utils = require('@panneau/core/utils');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
@@ -10,14 +12,61 @@ var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var fetch = require('@folklore/fetch');
-var get = require('lodash/get');
-var isArray = require('lodash/isArray');
 var isObject = require('lodash/isObject');
 var contexts = require('@panneau/core/contexts');
 var reactIntl = require('react-intl');
 var dayjs = require('dayjs');
 var cssMediaquery = require('css-mediaquery');
 
+var useActionProps = function useActionProps(action, value) {
+  var labelPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var values = react.useMemo(function () {
+    if (value === null) {
+      return null;
+    }
+    if (isArray(value)) {
+      return value;
+    }
+    return value || null;
+  }, [value]);
+  var ids = react.useMemo(function () {
+    if (value === null) {
+      return null;
+    }
+    if (isArray(value)) {
+      return value.map(function () {
+        var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref$id = _ref.id,
+          id = _ref$id === void 0 ? null : _ref$id;
+        return id;
+      }).filter(function (id) {
+        return id !== null;
+      });
+    }
+    return value !== null && typeof value.id !== 'undefined' ? [value.id] : null;
+  }, [value]);
+  var idKeys = react.useMemo(function () {
+    return (ids || []).map(function (id) {
+      return "".concat(id);
+    }).join('-');
+  }, [ids]);
+  var idLabels = react.useMemo(function () {
+    return (values || []).map(function (it) {
+      return "#".concat(get(it, 'id', '')).concat(labelPath !== null ? " ".concat(get(it, labelPath, '')) : '');
+    }).join(', ');
+  }, [ids]);
+  var modalKey = react.useMemo(function () {
+    return "".concat(action, "-").concat(idKeys);
+  }, [idKeys]);
+  return {
+    ids: ids,
+    idKeys: idKeys,
+    idLabels: idLabels,
+    modalKey: modalKey
+  };
+};
+var useActionProps$1 = useActionProps;
+
 // For backwards compatibility with the old actions element
 
 var useActions = function useActions() {
@@ -52,7 +101,7 @@ var useActions = function useActions() {
     _ref$preferEditModal = _ref.preferEditModal,
     preferEditModal = _ref$preferEditModal === void 0 ? false : _ref$preferEditModal,
     _ref$preferDeleteModa = _ref.preferDeleteModal,
-    preferDeleteModal = _ref$preferDeleteModa === void 0 ? true : _ref$preferDeleteModa;
+    preferDeleteModal = _ref$preferDeleteModa === void 0 ? false : _ref$preferDeleteModa;
   var _ref2 = item || {},
     id = _ref2.id,
     _ref2$url = _ref2.url,
@@ -1267,6 +1316,7 @@ var useWindowEvent$1 = useWindowEvent;
 
 exports.KEYCODES = KEYCODES;
 exports.getObserver = getObserver;
+exports.useActionProps = useActionProps$1;
 exports.useActions = useActions$1;
 exports.useAnimationFrame = useAnimationFrame$1;
 exports.useDocumentEvent = useDocumentEvent$1;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "3.0.193",
+    "version": "3.0.194",
     "description": "",
     "keywords": [
         "javascript"
@@ -111,5 +111,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "cd6f69216ddbee75b352f3bd1d39352ff3332848"
+    "gitHead": "6d49da8ecbe43b3a5c11dc9ddb9553ef64e58c83"
 }