@panneau/modal-resource-items 2.0.79 → 2.0.83

package/es/index.js

@@ -1,12 +1,14 @@
+import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useResourceQuery } from '@panneau/core/hooks';
 import { useResourceValues } from '@panneau/intl';
 import ResourceItemsList from '@panneau/list-resource-items';
 import Dialog from '@panneau/modal-dialog';
 
-var _excluded = ["resource", "title", "query", "onPageChange", "onQueryChange", "onQueryReset", "onClose", "listProps", "className"];
+var _excluded = ["resource", "title", "query", "onClose", "listProps", "className"];
 var propTypes = {
   resource: PropTypes.string,
   title: PropTypes.string,
@@ -33,15 +35,25 @@ var defaultProps = {
 var ModalResourceItems = function ModalResourceItems(_ref) {
   var resource = _ref.resource,
     title = _ref.title,
-    query = _ref.query,
-    onPageChange = _ref.onPageChange,
-    onQueryChange = _ref.onQueryChange,
-    onQueryReset = _ref.onQueryReset,
+    initialQuery = _ref.query,
     onClose = _ref.onClose,
     listProps = _ref.listProps,
     className = _ref.className,
     props = _objectWithoutProperties(_ref, _excluded);
   var resourceValues = useResourceValues(resource);
+  var finalQuery = useMemo(function () {
+    return _objectSpread({}, initialQuery);
+  }, [initialQuery]);
+  var _useResourceQuery = useResourceQuery(finalQuery),
+    query = _useResourceQuery.query,
+    onPageChange = _useResourceQuery.onPageChange,
+    onQueryChange = _useResourceQuery.onQueryChange,
+    onQueryReset = _useResourceQuery.onQueryReset;
+
+  // TODO: add explicit component ?
+
+  // console.log('listProps', listProps);
+
   return /*#__PURE__*/React.createElement(Dialog, {
     title: title || /*#__PURE__*/React.createElement(FormattedMessage, {
       values: resourceValues,

package/lib/index.js

@@ -2,23 +2,26 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var PropTypes = require('prop-types');
 var React = require('react');
 var reactIntl = require('react-intl');
+var hooks = require('@panneau/core/hooks');
 var intl = require('@panneau/intl');
 var ResourceItemsList = require('@panneau/list-resource-items');
 var Dialog = require('@panneau/modal-dialog');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var ResourceItemsList__default = /*#__PURE__*/_interopDefaultLegacy(ResourceItemsList);
 var Dialog__default = /*#__PURE__*/_interopDefaultLegacy(Dialog);
 
-var _excluded = ["resource", "title", "query", "onPageChange", "onQueryChange", "onQueryReset", "onClose", "listProps", "className"];
+var _excluded = ["resource", "title", "query", "onClose", "listProps", "className"];
 var propTypes = {
   resource: PropTypes__default["default"].string,
   title: PropTypes__default["default"].string,
@@ -45,15 +48,25 @@ var defaultProps = {
 var ModalResourceItems = function ModalResourceItems(_ref) {
   var resource = _ref.resource,
     title = _ref.title,
-    query = _ref.query,
-    onPageChange = _ref.onPageChange,
-    onQueryChange = _ref.onQueryChange,
-    onQueryReset = _ref.onQueryReset,
+    initialQuery = _ref.query,
     onClose = _ref.onClose,
     listProps = _ref.listProps,
     className = _ref.className,
     props = _objectWithoutProperties__default["default"](_ref, _excluded);
   var resourceValues = intl.useResourceValues(resource);
+  var finalQuery = React.useMemo(function () {
+    return _objectSpread__default["default"]({}, initialQuery);
+  }, [initialQuery]);
+  var _useResourceQuery = hooks.useResourceQuery(finalQuery),
+    query = _useResourceQuery.query,
+    onPageChange = _useResourceQuery.onPageChange,
+    onQueryChange = _useResourceQuery.onQueryChange,
+    onQueryReset = _useResourceQuery.onQueryReset;
+
+  // TODO: add explicit component ?
+
+  // console.log('listProps', listProps);
+
   return /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
     title: title || /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
       values: resourceValues,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/modal-resource-items",
-    "version": "2.0.79",
+    "version": "2.0.83",
     "description": "Resource items modal",
     "keywords": [
         "javascript"
@@ -45,11 +45,11 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@panneau/core": "^2.0.75",
-        "@panneau/intl": "^2.0.79",
-        "@panneau/list-resource-items": "^2.0.79",
-        "@panneau/modal-dialog": "^2.0.79",
-        "@panneau/themes": "^2.0.75",
+        "@panneau/core": "^2.0.83",
+        "@panneau/intl": "^2.0.83",
+        "@panneau/list-resource-items": "^2.0.83",
+        "@panneau/modal-dialog": "^2.0.83",
+        "@panneau/themes": "^2.0.83",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -58,5 +58,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b3bfbc84de833d32a4939542aba6e010d3672ffa"
+    "gitHead": "2f2300a3f55d94d6913eb25cde7f035b3c8e0915"
 }