@panneau/field-upload 3.0.85 → 3.0.86

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 +35 -18
  2. package/lib/index.js +35 -18
  3. package/package.json +2 -2
package/es/index.js CHANGED
@@ -40,7 +40,9 @@ var propTypes = {
40
40
  withFind: PropTypes.bool,
41
41
  addButtonLabel: PropTypes$1.label,
42
42
  findButtonLabel: PropTypes$1.label,
43
+ countLabel: PropTypes$1.label,
43
44
  confirmButtonLabel: PropTypes$1.label,
45
+ cancelButtonLabel: PropTypes$1.label,
44
46
  allowMultipleUploads: PropTypes.bool,
45
47
  maxNumberOfFiles: PropTypes.number,
46
48
  namePath: PropTypes.string,
@@ -76,6 +78,13 @@ var defaultProps = {
76
78
  "value": "Find a file"
77
79
  }]
78
80
  }),
81
+ countLabel: /*#__PURE__*/React.createElement(FormattedMessage, {
82
+ id: "XLOebh",
83
+ defaultMessage: [{
84
+ "type": 0,
85
+ "value": "items selected"
86
+ }]
87
+ }),
79
88
  confirmButtonLabel: /*#__PURE__*/React.createElement(FormattedMessage, {
80
89
  id: "UaVu03",
81
90
  defaultMessage: [{
@@ -83,6 +92,13 @@ var defaultProps = {
83
92
  "value": "Confirm"
84
93
  }]
85
94
  }),
95
+ cancelButtonLabel: /*#__PURE__*/React.createElement(FormattedMessage, {
96
+ id: "PyxZY2",
97
+ defaultMessage: [{
98
+ "type": 0,
99
+ "value": "Cancel"
100
+ }]
101
+ }),
86
102
  allowMultipleUploads: false,
87
103
  maxNumberOfFiles: 1,
88
104
  namePath: null,
@@ -104,7 +120,9 @@ var UploadField = function UploadField(_ref) {
104
120
  withFind = _ref.withFind,
105
121
  addButtonLabel = _ref.addButtonLabel,
106
122
  findButtonLabel = _ref.findButtonLabel,
123
+ countLabel = _ref.countLabel,
107
124
  confirmButtonLabel = _ref.confirmButtonLabel,
125
+ cancelButtonLabel = _ref.cancelButtonLabel,
108
126
  allowMultipleUploads = _ref.allowMultipleUploads,
109
127
  maxNumberOfFiles = _ref.maxNumberOfFiles,
110
128
  namePath = _ref.namePath,
@@ -183,13 +201,18 @@ var UploadField = function UploadField(_ref) {
183
201
  }, [setModalOpened]);
184
202
  var closeModal = useCallback(function () {
185
203
  setModalOpened(false);
186
- }, [setModalOpened]);
187
- useCallback(function () {
188
- closeModal();
189
204
  if (uppy !== null) {
190
205
  uppy.cancelAll();
191
206
  }
192
- }, [uppy, closeModal]);
207
+ }, [uppy, setModalOpened]);
208
+
209
+ // const closeModalAndClear = useCallback(() => {
210
+ // closeModal();
211
+ // if (uppy !== null) {
212
+ // uppy.cancelAll();
213
+ // }
214
+ // }, [uppy, closeModal]);
215
+
193
216
  var onClickRemove = useCallback(function (idx) {
194
217
  if (onChange !== null && isArray(value) && value.length > 1) {
195
218
  onChange(value.filter(function (v, i) {
@@ -468,23 +491,17 @@ var UploadField = function UploadField(_ref) {
468
491
  className: "d-flex"
469
492
  }, modalItems !== null && modalItems.length > 0 ? /*#__PURE__*/React.createElement("span", {
470
493
  className: "me-2"
471
- }, /*#__PURE__*/React.createElement(FormattedMessage, {
472
- id: "ZHvvZx",
473
- defaultMessage: [{
474
- "type": 1,
475
- "value": "count"
476
- }, {
477
- "type": 0,
478
- "value": " items selected"
479
- }],
480
- value: {
481
- count: modalItems.length
482
- }
483
- })) : null, /*#__PURE__*/React.createElement(Button, {
494
+ }, modalItems.length, " ", countLabel) : null, /*#__PURE__*/React.createElement(Button, {
495
+ type: "button",
496
+ theme: "warning",
497
+ onClick: closeResourceModal,
498
+ disabled: disabled,
499
+ className: "d-block ms-auto mt-2 me-2"
500
+ }, /*#__PURE__*/React.createElement(Label, null, cancelButtonLabel)), /*#__PURE__*/React.createElement(Button, {
484
501
  type: "button",
485
502
  theme: "primary",
486
503
  onClick: confirmResourceModal,
487
- disabled: disabled,
504
+ disabled: disabled || modalItems !== null && modalItems.length === 0,
488
505
  className: "d-block ms-auto mt-2"
489
506
  }, /*#__PURE__*/React.createElement(Label, null, confirmButtonLabel))) : null) : null);
490
507
  };
package/lib/index.js CHANGED
@@ -62,7 +62,9 @@ var propTypes = {
62
62
  withFind: PropTypes__default["default"].bool,
63
63
  addButtonLabel: core.PropTypes.label,
64
64
  findButtonLabel: core.PropTypes.label,
65
+ countLabel: core.PropTypes.label,
65
66
  confirmButtonLabel: core.PropTypes.label,
67
+ cancelButtonLabel: core.PropTypes.label,
66
68
  allowMultipleUploads: PropTypes__default["default"].bool,
67
69
  maxNumberOfFiles: PropTypes__default["default"].number,
68
70
  namePath: PropTypes__default["default"].string,
@@ -98,6 +100,13 @@ var defaultProps = {
98
100
  "value": "Find a file"
99
101
  }]
100
102
  }),
103
+ countLabel: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
104
+ id: "XLOebh",
105
+ defaultMessage: [{
106
+ "type": 0,
107
+ "value": "items selected"
108
+ }]
109
+ }),
101
110
  confirmButtonLabel: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
102
111
  id: "UaVu03",
103
112
  defaultMessage: [{
@@ -105,6 +114,13 @@ var defaultProps = {
105
114
  "value": "Confirm"
106
115
  }]
107
116
  }),
117
+ cancelButtonLabel: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
118
+ id: "PyxZY2",
119
+ defaultMessage: [{
120
+ "type": 0,
121
+ "value": "Cancel"
122
+ }]
123
+ }),
108
124
  allowMultipleUploads: false,
109
125
  maxNumberOfFiles: 1,
110
126
  namePath: null,
@@ -126,7 +142,9 @@ var UploadField = function UploadField(_ref) {
126
142
  withFind = _ref.withFind,
127
143
  addButtonLabel = _ref.addButtonLabel,
128
144
  findButtonLabel = _ref.findButtonLabel,
145
+ countLabel = _ref.countLabel,
129
146
  confirmButtonLabel = _ref.confirmButtonLabel,
147
+ cancelButtonLabel = _ref.cancelButtonLabel,
130
148
  allowMultipleUploads = _ref.allowMultipleUploads,
131
149
  maxNumberOfFiles = _ref.maxNumberOfFiles,
132
150
  namePath = _ref.namePath,
@@ -205,13 +223,18 @@ var UploadField = function UploadField(_ref) {
205
223
  }, [setModalOpened]);
206
224
  var closeModal = React.useCallback(function () {
207
225
  setModalOpened(false);
208
- }, [setModalOpened]);
209
- React.useCallback(function () {
210
- closeModal();
211
226
  if (uppy$1 !== null) {
212
227
  uppy$1.cancelAll();
213
228
  }
214
- }, [uppy$1, closeModal]);
229
+ }, [uppy$1, setModalOpened]);
230
+
231
+ // const closeModalAndClear = useCallback(() => {
232
+ // closeModal();
233
+ // if (uppy !== null) {
234
+ // uppy.cancelAll();
235
+ // }
236
+ // }, [uppy, closeModal]);
237
+
215
238
  var onClickRemove = React.useCallback(function (idx) {
216
239
  if (onChange !== null && isArray__default["default"](value) && value.length > 1) {
217
240
  onChange(value.filter(function (v, i) {
@@ -490,23 +513,17 @@ var UploadField = function UploadField(_ref) {
490
513
  className: "d-flex"
491
514
  }, modalItems !== null && modalItems.length > 0 ? /*#__PURE__*/React__default["default"].createElement("span", {
492
515
  className: "me-2"
493
- }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
494
- id: "ZHvvZx",
495
- defaultMessage: [{
496
- "type": 1,
497
- "value": "count"
498
- }, {
499
- "type": 0,
500
- "value": " items selected"
501
- }],
502
- value: {
503
- count: modalItems.length
504
- }
505
- })) : null, /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
516
+ }, modalItems.length, " ", countLabel) : null, /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
517
+ type: "button",
518
+ theme: "warning",
519
+ onClick: closeResourceModal,
520
+ disabled: disabled,
521
+ className: "d-block ms-auto mt-2 me-2"
522
+ }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, cancelButtonLabel)), /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
506
523
  type: "button",
507
524
  theme: "primary",
508
525
  onClick: confirmResourceModal,
509
- disabled: disabled,
526
+ disabled: disabled || modalItems !== null && modalItems.length === 0,
510
527
  className: "d-block ms-auto mt-2"
511
528
  }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, confirmButtonLabel))) : null) : null);
512
529
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/field-upload",
3
- "version": "3.0.85",
3
+ "version": "3.0.86",
4
4
  "description": "An Upload field",
5
5
  "keywords": [
6
6
  "javascript"
@@ -82,5 +82,5 @@
82
82
  "publishConfig": {
83
83
  "access": "public"
84
84
  },
85
- "gitHead": "2c99c317ed1eb582f3d0188488c60e4fd43300e5"
85
+ "gitHead": "58d37a69c6a9f5c672e57a711bd7e51c8585aa8e"
86
86
  }