@panneau/field-resource-item 3.0.310 → 4.0.0

package/es/index.js

@@ -6,12 +6,10 @@ import classNames from 'classnames';
 import isArray from 'lodash-es/isArray';
 import isEmpty from 'lodash-es/isEmpty';
 import uniqBy from 'lodash-es/uniqBy';
-import PropTypes from 'prop-types';
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
 import { useIntl, FormattedMessage } from 'react-intl';
-import { PropTypes as PropTypes$1 } from '@panneau/core';
 import { usePanneauResource } from '@panneau/core/contexts';
-import { isMessage, getPathValue } from '@panneau/core/utils';
+import { getPathValue, isMessage } from '@panneau/core/utils';
 import { useResourceItems } from '@panneau/data';
 import Button from '@panneau/element-button';
 import ResourceCard from '@panneau/element-resource-card';
@@ -23,109 +21,69 @@ import ResourceItemsModal from '@panneau/modal-resource-items';
 
 // TODO: improve the modals (esc key) and switch to FormModal
 
-var propTypes = {
-  name: PropTypes.string,
-  value: PropTypes.object,
-  // eslint-disable-line react/forbid-prop-types
-  errors: PropTypes$1.formErrors,
-  resource: PropTypes.string,
-  resourceType: PropTypes.string,
-  paginated: PropTypes.bool,
-  query: PropTypes.object,
-  // eslint-disable-line react/forbid-prop-types
-  page: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  // eslint-disable-line react/forbid-prop-types
-  count: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  // eslint-disable-line react/forbid-prop-types
-  options: PropTypes.object,
-  // eslint-disable-line react/forbid-prop-types
-  searchParamName: PropTypes.string,
-  getItemLabel: PropTypes.func,
-  getItemDescription: PropTypes.func,
-  getItemImage: PropTypes.func,
-  itemLabelPath: PropTypes.string,
-  itemDescriptionPath: PropTypes.string,
-  itemImagePath: PropTypes.string,
-  itemLabelWithId: PropTypes.bool,
-  placeholder: PropTypes.string,
-  canCreate: PropTypes.bool,
-  canEdit: PropTypes.bool,
-  canFind: PropTypes.bool,
-  withoutModal: PropTypes.bool,
-  createButtonLabel: PropTypes$1.message,
-  editButtonLabel: PropTypes$1.message,
-  findButtonLabel: PropTypes$1.message,
-  multiple: PropTypes.bool,
-  disabled: PropTypes.bool,
-  className: PropTypes.string,
-  inputClassName: PropTypes.string,
-  onChange: PropTypes.func
-};
-var defaultProps = {
-  name: null,
-  value: null,
-  errors: null,
-  resource: null,
-  resourceType: null,
-  paginated: true,
-  query: null,
-  page: null,
-  count: null,
-  options: null,
-  searchParamName: 'search',
-  getItemLabel: getPathValue,
-  getItemDescription: getPathValue,
-  getItemImage: getPathValue,
-  itemLabelPath: 'label',
-  itemDescriptionPath: null,
-  itemImagePath: 'image.thumbnail_url',
-  itemLabelWithId: false,
-  placeholder: null,
-  canCreate: false,
-  canEdit: false,
-  canFind: false,
-  withoutModal: false,
-  createButtonLabel: null,
-  editButtonLabel: null,
-  findButtonLabel: null,
-  multiple: false,
-  disabled: false,
-  className: null,
-  inputClassName: null,
-  onChange: null
-};
-var ResourceItemField = function ResourceItemField(_ref) {
-  var name = _ref.name,
-    value = _ref.value,
-    errors = _ref.errors,
-    resourceId = _ref.resource,
-    resourceType = _ref.resourceType,
-    paginated = _ref.paginated,
-    initialQuery = _ref.query,
-    initialPage = _ref.page,
-    initialCount = _ref.count,
-    initialOptions = _ref.options,
-    searchParamName = _ref.searchParamName,
-    initialGetItemLabel = _ref.getItemLabel,
-    getItemDescription = _ref.getItemDescription,
-    getItemImage = _ref.getItemImage,
-    itemLabelPath = _ref.itemLabelPath,
-    itemDescriptionPath = _ref.itemDescriptionPath,
-    itemImagePath = _ref.itemImagePath,
-    itemLabelWithId = _ref.itemLabelWithId,
-    placeholder = _ref.placeholder,
-    canCreate = _ref.canCreate,
-    canEdit = _ref.canEdit,
-    canFind = _ref.canFind,
-    withoutModal = _ref.withoutModal,
-    createButtonLabel = _ref.createButtonLabel,
-    editButtonLabel = _ref.editButtonLabel,
-    findButtonLabel = _ref.findButtonLabel,
-    multiple = _ref.multiple,
-    disabled = _ref.disabled,
-    className = _ref.className,
-    inputClassName = _ref.inputClassName,
-    onChange = _ref.onChange;
+function ResourceItemField(_ref) {
+  var _ref$name = _ref.name,
+    name = _ref$name === void 0 ? null : _ref$name,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? null : _ref$value,
+    _ref$errors = _ref.errors,
+    errors = _ref$errors === void 0 ? null : _ref$errors,
+    _ref$resource = _ref.resource,
+    resourceId = _ref$resource === void 0 ? null : _ref$resource,
+    _ref$resourceType = _ref.resourceType,
+    resourceType = _ref$resourceType === void 0 ? null : _ref$resourceType,
+    _ref$paginated = _ref.paginated,
+    paginated = _ref$paginated === void 0 ? true : _ref$paginated,
+    _ref$query = _ref.query,
+    initialQuery = _ref$query === void 0 ? null : _ref$query,
+    _ref$page = _ref.page,
+    initialPage = _ref$page === void 0 ? null : _ref$page,
+    _ref$count = _ref.count,
+    initialCount = _ref$count === void 0 ? null : _ref$count,
+    _ref$options = _ref.options,
+    initialOptions = _ref$options === void 0 ? null : _ref$options,
+    _ref$searchParamName = _ref.searchParamName,
+    searchParamName = _ref$searchParamName === void 0 ? 'search' : _ref$searchParamName,
+    _ref$getItemLabel = _ref.getItemLabel,
+    initialGetItemLabel = _ref$getItemLabel === void 0 ? getPathValue : _ref$getItemLabel,
+    _ref$getItemDescripti = _ref.getItemDescription,
+    getItemDescription = _ref$getItemDescripti === void 0 ? getPathValue : _ref$getItemDescripti,
+    _ref$getItemImage = _ref.getItemImage,
+    getItemImage = _ref$getItemImage === void 0 ? getPathValue : _ref$getItemImage,
+    _ref$itemLabelPath = _ref.itemLabelPath,
+    itemLabelPath = _ref$itemLabelPath === void 0 ? 'label' : _ref$itemLabelPath,
+    _ref$itemDescriptionP = _ref.itemDescriptionPath,
+    itemDescriptionPath = _ref$itemDescriptionP === void 0 ? null : _ref$itemDescriptionP,
+    _ref$itemImagePath = _ref.itemImagePath,
+    itemImagePath = _ref$itemImagePath === void 0 ? 'image.thumbnail_url' : _ref$itemImagePath,
+    _ref$itemLabelWithId = _ref.itemLabelWithId,
+    itemLabelWithId = _ref$itemLabelWithId === void 0 ? false : _ref$itemLabelWithId,
+    _ref$placeholder = _ref.placeholder,
+    placeholder = _ref$placeholder === void 0 ? null : _ref$placeholder,
+    _ref$canCreate = _ref.canCreate,
+    canCreate = _ref$canCreate === void 0 ? false : _ref$canCreate,
+    _ref$canEdit = _ref.canEdit,
+    canEdit = _ref$canEdit === void 0 ? false : _ref$canEdit,
+    _ref$canFind = _ref.canFind,
+    canFind = _ref$canFind === void 0 ? false : _ref$canFind,
+    _ref$withoutModal = _ref.withoutModal,
+    withoutModal = _ref$withoutModal === void 0 ? false : _ref$withoutModal,
+    _ref$createButtonLabe = _ref.createButtonLabel,
+    createButtonLabel = _ref$createButtonLabe === void 0 ? null : _ref$createButtonLabe,
+    _ref$editButtonLabel = _ref.editButtonLabel,
+    editButtonLabel = _ref$editButtonLabel === void 0 ? null : _ref$editButtonLabel,
+    _ref$findButtonLabel = _ref.findButtonLabel,
+    findButtonLabel = _ref$findButtonLabel === void 0 ? null : _ref$findButtonLabel,
+    _ref$multiple = _ref.multiple,
+    multiple = _ref$multiple === void 0 ? false : _ref$multiple,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? null : _ref$className,
+    _ref$inputClassName = _ref.inputClassName,
+    inputClassName = _ref$inputClassName === void 0 ? null : _ref$inputClassName,
+    _ref$onChange = _ref.onChange,
+    onChange = _ref$onChange === void 0 ? null : _ref$onChange;
   var intl = useIntl();
   var resource = usePanneauResource(resourceId);
   var resourceValues = useResourceValues(resource);
@@ -196,7 +154,7 @@ var ResourceItemField = function ResourceItemField(_ref) {
     return _objectSpread(_objectSpread(_objectSpread({}, query), !isEmpty(queryTextValue) ? _defineProperty({}, searchParamName, queryTextValue) : null), {}, {
       paginated: paginated
     });
-  }, [queryTextValue, paginated]);
+  }, [queryTextValue, paginated, query, searchParamName]);
   var _useResourceItems = useResourceItems(queryResource, finalQuery, paginated ? page : null, paginated ? count : null, resourceOptions),
     _useResourceItems$all = _useResourceItems.allItems,
     partialItems = _useResourceItems$all === void 0 ? null : _useResourceItems$all,
@@ -215,10 +173,10 @@ var ResourceItemField = function ResourceItemField(_ref) {
     return id;
   });
   var onScrollEnd = useCallback(function () {
-    if (page !== null && page >= lastPage) {
+    if (page !== null && typeof page === 'number' && typeof lastPage === 'number' && page >= lastPage) {
       return;
     }
-    if (paginated) {
+    if (paginated && typeof page === 'number') {
       setPage(page + 1);
     }
   }, [paginated, page, setPage, lastPage]);
@@ -256,14 +214,14 @@ var ResourceItemField = function ResourceItemField(_ref) {
   });
   var onValueChange = useCallback(function (newId) {
     if (onChange === null) return;
-    if (multiple) {
+    if (multiple && isArray(newId)) {
       var newValue = items.filter(function (_ref8) {
         var _ref8$id = _ref8.id,
           id = _ref8$id === void 0 ? null : _ref8$id;
         return newId.indexOf(id) !== -1;
       }) || [];
       onChange(newValue);
-    } else {
+    } else if (!isArray(newId)) {
       var _newValue = items.filter(function (_ref9) {
         var _ref9$id = _ref9.id,
           id = _ref9$id === void 0 ? null : _ref9$id;
@@ -293,7 +251,7 @@ var ResourceItemField = function ResourceItemField(_ref) {
       onChange(finalNewValue);
     }
     setFormOpen(false);
-  }, [onChange, multiple, value, setFormOpen, resourceType, paginated, initialPage]);
+  }, [onChange, multiple, value, setFormOpen, resourceType]);
   var onOpenList = useCallback(function () {
     setListOpen(false); // TODO: fix this
   }, [setListOpen]);
@@ -322,9 +280,9 @@ var ResourceItemField = function ResourceItemField(_ref) {
     // Clear the page and be good
     if (paginated) {
       setPage(defaultPage);
-      reload();
+      if (reload) reload();
     } else {
-      reload();
+      if (reload) reload();
     }
   }, [onChange, paginated, defaultPage, reload]);
   var form = formOpen ? /*#__PURE__*/React.createElement(ResourceForm, {
@@ -430,9 +388,7 @@ var ResourceItemField = function ResourceItemField(_ref) {
       }
     }
   }) : null);
-};
-ResourceItemField.propTypes = propTypes;
-ResourceItemField.defaultProps = defaultProps;
+}
 
 var definition = {
   id: 'resource-item',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/field-resource-item",
-    "version": "3.0.310",
+    "version": "4.0.0",
     "description": "An item mapping a resource",
     "keywords": [
         "javascript"
@@ -49,23 +49,23 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@panneau/core": "^3.0.307",
-        "@panneau/data": "^3.0.307",
-        "@panneau/element-button": "^3.0.308",
-        "@panneau/element-resource-card": "^3.0.308",
-        "@panneau/element-select": "^3.0.310",
-        "@panneau/form-resource": "^3.0.308",
-        "@panneau/intl": "^3.0.307",
-        "@panneau/modal-dialog": "^3.0.308",
-        "@panneau/modal-resource-form": "^3.0.308",
-        "@panneau/modal-resource-items": "^3.0.308",
+        "@panneau/core": "^4.0.0",
+        "@panneau/data": "^4.0.0",
+        "@panneau/element-button": "^4.0.0",
+        "@panneau/element-resource-card": "^4.0.0",
+        "@panneau/element-select": "^4.0.0",
+        "@panneau/form-resource": "^4.0.0",
+        "@panneau/intl": "^4.0.0",
+        "@panneau/modal-dialog": "^4.0.0",
+        "@panneau/modal-resource-form": "^4.0.0",
+        "@panneau/modal-resource-items": "^4.0.0",
         "classnames": "^2.5.1",
         "lodash-es": "^4.17.21",
         "prop-types": "^15.7.2",
-        "react-intl": "^5.15.8||^6.0.0"
+        "react-intl": "^5.15.8 || ^6.0.0 || ^7.0.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d7d8937d48a4f972a8fa742256267f6b4aaf3f4f"
+    "gitHead": "2cca874e0388b4a20c39aadb205c0e67d5a946fc"
 }