@panneau/field-upload 3.0.79 → 3.0.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/index.js +37 -16
  2. package/lib/index.js +37 -16
  3. package/package.json +3 -3
package/es/index.js CHANGED
@@ -39,7 +39,7 @@ var propTypes = {
39
39
  withButton: PropTypes.bool,
40
40
  withFind: PropTypes.bool,
41
41
  addButtonLabel: PropTypes$1.label,
42
- searchButtonLabel: PropTypes$1.label,
42
+ findButtonLabel: PropTypes$1.label,
43
43
  confirmButtonLabel: PropTypes$1.label,
44
44
  allowMultipleUploads: PropTypes.bool,
45
45
  maxNumberOfFiles: PropTypes.number,
@@ -69,7 +69,7 @@ var defaultProps = {
69
69
  "value": "Add file"
70
70
  }]
71
71
  }),
72
- searchButtonLabel: /*#__PURE__*/React.createElement(FormattedMessage, {
72
+ findButtonLabel: /*#__PURE__*/React.createElement(FormattedMessage, {
73
73
  id: "une5WQ",
74
74
  defaultMessage: [{
75
75
  "type": 0,
@@ -103,7 +103,7 @@ var UploadField = function UploadField(_ref) {
103
103
  withButton = _ref.withButton,
104
104
  withFind = _ref.withFind,
105
105
  addButtonLabel = _ref.addButtonLabel,
106
- searchButtonLabel = _ref.searchButtonLabel,
106
+ findButtonLabel = _ref.findButtonLabel,
107
107
  confirmButtonLabel = _ref.confirmButtonLabel,
108
108
  allowMultipleUploads = _ref.allowMultipleUploads,
109
109
  maxNumberOfFiles = _ref.maxNumberOfFiles,
@@ -213,13 +213,14 @@ var UploadField = function UploadField(_ref) {
213
213
  var toggleResourceModal = useCallback(function () {
214
214
  setResourceModalOpen(!resourceModalOpen);
215
215
  }, [resourceModalOpen, setResourceModalOpen]);
216
- var closeResourceModal = useCallback(function () {
217
- setResourceModalOpen(false);
218
- }, [resourceModalOpen, setResourceModalOpen]);
219
216
  var _useState5 = useState([]),
220
217
  _useState6 = _slicedToArray(_useState5, 2),
221
218
  modalItems = _useState6[0],
222
219
  setModalItems = _useState6[1];
220
+ var closeResourceModal = useCallback(function () {
221
+ setResourceModalOpen(false);
222
+ setModalItems(null);
223
+ }, [resourceModalOpen, setResourceModalOpen, setModalItems]);
223
224
  var onClickSelect = useCallback(function (newValue) {
224
225
  if (allowMultipleUploads) {
225
226
  if (newValue !== null) {
@@ -227,19 +228,21 @@ var UploadField = function UploadField(_ref) {
227
228
  _ref2$id = _ref2.id,
228
229
  id = _ref2$id === void 0 ? null : _ref2$id;
229
230
  if (id !== null) {
230
- var previous = (modalItems || []).find(function (_ref3) {
231
- var _ref3$id = _ref3.id,
231
+ var previous = (modalItems || []).find(function () {
232
+ var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
233
+ _ref3$id = _ref3.id,
232
234
  itemId = _ref3$id === void 0 ? null : _ref3$id;
233
235
  return id === itemId;
234
236
  });
235
237
  if (previous) {
236
- setModalItems((modalItems || []).filter(function (_ref4) {
237
- var _ref4$id = _ref4.id,
238
+ setModalItems((modalItems || []).filter(function () {
239
+ var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
240
+ _ref4$id = _ref4.id,
238
241
  itemId = _ref4$id === void 0 ? null : _ref4$id;
239
242
  return id !== itemId;
240
243
  }));
241
244
  } else {
242
- setModalItems([].concat(_toConsumableArray(modalItems), [newValue]));
245
+ setModalItems([].concat(_toConsumableArray(modalItems || []), [newValue]));
243
246
  }
244
247
  }
245
248
  }
@@ -249,11 +252,13 @@ var UploadField = function UploadField(_ref) {
249
252
  }
250
253
  }, [onChange, setResourceModalOpen, allowMultipleUploads, modalItems, setModalItems]);
251
254
  var confirmResourceModal = useCallback(function () {
255
+ console.log('confirm', modalItems, onChange);
252
256
  if (onChange !== null) {
253
257
  onChange(modalItems);
254
258
  setResourceModalOpen(false);
259
+ setModalItems(null);
255
260
  }
256
- }, [onChange, setResourceModalOpen, allowMultipleUploads]);
261
+ }, [onChange, setResourceModalOpen, modalItems, allowMultipleUploads, setModalItems]);
257
262
  var initialQuery = useMemo(function () {
258
263
  return {
259
264
  types: types
@@ -371,7 +376,7 @@ var UploadField = function UploadField(_ref) {
371
376
  onClick: toggleResourceModal,
372
377
  disabled: disabled,
373
378
  outline: true
374
- }, /*#__PURE__*/React.createElement(Label, null, searchButtonLabel))) : null) : null, !showResourceModal && !disabled && !hasMedia && !withButton && uppy !== null ? /*#__PURE__*/React.createElement("div", {
379
+ }, /*#__PURE__*/React.createElement(Label, null, findButtonLabel))) : null) : null, !showResourceModal && !disabled && !hasMedia && !withButton && uppy !== null ? /*#__PURE__*/React.createElement("div", {
375
380
  className: styles.dashboard
376
381
  }, /*#__PURE__*/React.createElement(Dashboard, Object.assign({
377
382
  uppy: uppy
@@ -427,7 +432,7 @@ var UploadField = function UploadField(_ref) {
427
432
  // />
428
433
  // </Dialog>
429
434
  null, showResourceModal ? /*#__PURE__*/React.createElement(Dialog, {
430
- title: /*#__PURE__*/React.createElement(Label, null, searchButtonLabel),
435
+ title: /*#__PURE__*/React.createElement(Label, null, findButtonLabel),
431
436
  size: "lg",
432
437
  onClose: closeResourceModal
433
438
  }, /*#__PURE__*/React.createElement(ResourceItemsList, {
@@ -444,13 +449,29 @@ var UploadField = function UploadField(_ref) {
444
449
  },
445
450
  withoutActionsColumn: true
446
451
  }
447
- }), allowMultipleUploads ? /*#__PURE__*/React.createElement(Button, {
452
+ }), allowMultipleUploads ? /*#__PURE__*/React.createElement("div", {
453
+ className: "d-flex"
454
+ }, modalItems !== null && modalItems.length > 0 ? /*#__PURE__*/React.createElement("span", {
455
+ className: "me-2"
456
+ }, /*#__PURE__*/React.createElement(FormattedMessage, {
457
+ id: "ZHvvZx",
458
+ defaultMessage: [{
459
+ "type": 1,
460
+ "value": "count"
461
+ }, {
462
+ "type": 0,
463
+ "value": " items selected"
464
+ }],
465
+ value: {
466
+ count: modalItems.length
467
+ }
468
+ })) : null, /*#__PURE__*/React.createElement(Button, {
448
469
  type: "button",
449
470
  theme: "primary",
450
471
  onClick: confirmResourceModal,
451
472
  disabled: disabled,
452
473
  className: "d-block ms-auto mt-2"
453
- }, /*#__PURE__*/React.createElement(Label, null, confirmButtonLabel)) : null) : null);
474
+ }, /*#__PURE__*/React.createElement(Label, null, confirmButtonLabel))) : null) : null);
454
475
  };
455
476
  UploadField.propTypes = propTypes;
456
477
  UploadField.defaultProps = defaultProps;
package/lib/index.js CHANGED
@@ -61,7 +61,7 @@ var propTypes = {
61
61
  withButton: PropTypes__default["default"].bool,
62
62
  withFind: PropTypes__default["default"].bool,
63
63
  addButtonLabel: core.PropTypes.label,
64
- searchButtonLabel: core.PropTypes.label,
64
+ findButtonLabel: core.PropTypes.label,
65
65
  confirmButtonLabel: core.PropTypes.label,
66
66
  allowMultipleUploads: PropTypes__default["default"].bool,
67
67
  maxNumberOfFiles: PropTypes__default["default"].number,
@@ -91,7 +91,7 @@ var defaultProps = {
91
91
  "value": "Add file"
92
92
  }]
93
93
  }),
94
- searchButtonLabel: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
94
+ findButtonLabel: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
95
95
  id: "une5WQ",
96
96
  defaultMessage: [{
97
97
  "type": 0,
@@ -125,7 +125,7 @@ var UploadField = function UploadField(_ref) {
125
125
  withButton = _ref.withButton,
126
126
  withFind = _ref.withFind,
127
127
  addButtonLabel = _ref.addButtonLabel,
128
- searchButtonLabel = _ref.searchButtonLabel,
128
+ findButtonLabel = _ref.findButtonLabel,
129
129
  confirmButtonLabel = _ref.confirmButtonLabel,
130
130
  allowMultipleUploads = _ref.allowMultipleUploads,
131
131
  maxNumberOfFiles = _ref.maxNumberOfFiles,
@@ -235,13 +235,14 @@ var UploadField = function UploadField(_ref) {
235
235
  var toggleResourceModal = React.useCallback(function () {
236
236
  setResourceModalOpen(!resourceModalOpen);
237
237
  }, [resourceModalOpen, setResourceModalOpen]);
238
- var closeResourceModal = React.useCallback(function () {
239
- setResourceModalOpen(false);
240
- }, [resourceModalOpen, setResourceModalOpen]);
241
238
  var _useState5 = React.useState([]),
242
239
  _useState6 = _slicedToArray__default["default"](_useState5, 2),
243
240
  modalItems = _useState6[0],
244
241
  setModalItems = _useState6[1];
242
+ var closeResourceModal = React.useCallback(function () {
243
+ setResourceModalOpen(false);
244
+ setModalItems(null);
245
+ }, [resourceModalOpen, setResourceModalOpen, setModalItems]);
245
246
  var onClickSelect = React.useCallback(function (newValue) {
246
247
  if (allowMultipleUploads) {
247
248
  if (newValue !== null) {
@@ -249,19 +250,21 @@ var UploadField = function UploadField(_ref) {
249
250
  _ref2$id = _ref2.id,
250
251
  id = _ref2$id === void 0 ? null : _ref2$id;
251
252
  if (id !== null) {
252
- var previous = (modalItems || []).find(function (_ref3) {
253
- var _ref3$id = _ref3.id,
253
+ var previous = (modalItems || []).find(function () {
254
+ var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
255
+ _ref3$id = _ref3.id,
254
256
  itemId = _ref3$id === void 0 ? null : _ref3$id;
255
257
  return id === itemId;
256
258
  });
257
259
  if (previous) {
258
- setModalItems((modalItems || []).filter(function (_ref4) {
259
- var _ref4$id = _ref4.id,
260
+ setModalItems((modalItems || []).filter(function () {
261
+ var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
262
+ _ref4$id = _ref4.id,
260
263
  itemId = _ref4$id === void 0 ? null : _ref4$id;
261
264
  return id !== itemId;
262
265
  }));
263
266
  } else {
264
- setModalItems([].concat(_toConsumableArray__default["default"](modalItems), [newValue]));
267
+ setModalItems([].concat(_toConsumableArray__default["default"](modalItems || []), [newValue]));
265
268
  }
266
269
  }
267
270
  }
@@ -271,11 +274,13 @@ var UploadField = function UploadField(_ref) {
271
274
  }
272
275
  }, [onChange, setResourceModalOpen, allowMultipleUploads, modalItems, setModalItems]);
273
276
  var confirmResourceModal = React.useCallback(function () {
277
+ console.log('confirm', modalItems, onChange);
274
278
  if (onChange !== null) {
275
279
  onChange(modalItems);
276
280
  setResourceModalOpen(false);
281
+ setModalItems(null);
277
282
  }
278
- }, [onChange, setResourceModalOpen, allowMultipleUploads]);
283
+ }, [onChange, setResourceModalOpen, modalItems, allowMultipleUploads, setModalItems]);
279
284
  var initialQuery = React.useMemo(function () {
280
285
  return {
281
286
  types: types
@@ -393,7 +398,7 @@ var UploadField = function UploadField(_ref) {
393
398
  onClick: toggleResourceModal,
394
399
  disabled: disabled,
395
400
  outline: true
396
- }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, searchButtonLabel))) : null) : null, !showResourceModal && !disabled && !hasMedia && !withButton && uppy$1 !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
401
+ }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, findButtonLabel))) : null) : null, !showResourceModal && !disabled && !hasMedia && !withButton && uppy$1 !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
397
402
  className: styles.dashboard
398
403
  }, /*#__PURE__*/React__default["default"].createElement(react.Dashboard, Object.assign({
399
404
  uppy: uppy$1
@@ -449,7 +454,7 @@ var UploadField = function UploadField(_ref) {
449
454
  // />
450
455
  // </Dialog>
451
456
  null, showResourceModal ? /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
452
- title: /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, searchButtonLabel),
457
+ title: /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, findButtonLabel),
453
458
  size: "lg",
454
459
  onClose: closeResourceModal
455
460
  }, /*#__PURE__*/React__default["default"].createElement(ResourceItemsList__default["default"], {
@@ -466,13 +471,29 @@ var UploadField = function UploadField(_ref) {
466
471
  },
467
472
  withoutActionsColumn: true
468
473
  }
469
- }), allowMultipleUploads ? /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
474
+ }), allowMultipleUploads ? /*#__PURE__*/React__default["default"].createElement("div", {
475
+ className: "d-flex"
476
+ }, modalItems !== null && modalItems.length > 0 ? /*#__PURE__*/React__default["default"].createElement("span", {
477
+ className: "me-2"
478
+ }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
479
+ id: "ZHvvZx",
480
+ defaultMessage: [{
481
+ "type": 1,
482
+ "value": "count"
483
+ }, {
484
+ "type": 0,
485
+ "value": " items selected"
486
+ }],
487
+ value: {
488
+ count: modalItems.length
489
+ }
490
+ })) : null, /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
470
491
  type: "button",
471
492
  theme: "primary",
472
493
  onClick: confirmResourceModal,
473
494
  disabled: disabled,
474
495
  className: "d-block ms-auto mt-2"
475
- }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, confirmButtonLabel)) : null) : null);
496
+ }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, confirmButtonLabel))) : null) : null);
476
497
  };
477
498
  UploadField.propTypes = propTypes;
478
499
  UploadField.defaultProps = defaultProps;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/field-upload",
3
- "version": "3.0.79",
3
+ "version": "3.0.82",
4
4
  "description": "An Upload field",
5
5
  "keywords": [
6
6
  "javascript"
@@ -61,7 +61,7 @@
61
61
  "@panneau/element-button": "^3.0.55",
62
62
  "@panneau/element-card": "^3.0.75",
63
63
  "@panneau/element-label": "^3.0.45",
64
- "@panneau/list-resource-items": "^3.0.75",
64
+ "@panneau/list-resource-items": "^3.0.82",
65
65
  "@panneau/modal-dialog": "^3.0.77",
66
66
  "@panneau/themes": "^3.0.55",
67
67
  "@panneau/uppy": "^3.0.59",
@@ -82,5 +82,5 @@
82
82
  "publishConfig": {
83
83
  "access": "public"
84
84
  },
85
- "gitHead": "cbcafea046653fef8b48a8f877d9a8521cd4261e"
85
+ "gitHead": "df473487364613d69eefe6318a940f98f9b93f6c"
86
86
  }