@panneau/core 3.0.7 → 3.0.14
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.
- package/es/contexts.js +1 -1
- package/es/hooks.js +17 -1
- package/lib/contexts.js +1 -1
- package/lib/hooks.js +17 -1
- package/package.json +2 -2
package/es/contexts.js
CHANGED
|
@@ -1542,7 +1542,7 @@ var useUppy = function useUppy() {
|
|
|
1542
1542
|
ids = _ref5$fileIDs === void 0 ? [] : _ref5$fileIDs;
|
|
1543
1543
|
ids.forEach(function (id) {
|
|
1544
1544
|
var file = uppy.getFile(id);
|
|
1545
|
-
console.log('file', id, file);
|
|
1545
|
+
// console.log('file', id, file);
|
|
1546
1546
|
var newName = null;
|
|
1547
1547
|
if (withUUID) {
|
|
1548
1548
|
newName = getFileNameWithUUID(file);
|
package/es/hooks.js
CHANGED
|
@@ -199,12 +199,26 @@ var useForm = function useForm() {
|
|
|
199
199
|
var hasProvidedGeneralError = setProvidedGeneralError !== null;
|
|
200
200
|
var generalError = hasProvidedGeneralError ? providedGeneralError : stateGeneralError;
|
|
201
201
|
var setGeneralError = hasProvidedGeneralError ? setProvidedGeneralError : setStateGeneralError;
|
|
202
|
-
var fieldsKey = [value, errors, locales].concat(fields);
|
|
202
|
+
var fieldsKey = [value, errors, requestState, locales].concat(fields);
|
|
203
203
|
var onFieldChange = useCallback(function (fieldName, fieldValue) {
|
|
204
|
+
var _ref3 = requestState || {},
|
|
205
|
+
_ref3$loading = _ref3.loading,
|
|
206
|
+
loading = _ref3$loading === void 0 ? false : _ref3$loading,
|
|
207
|
+
_ref3$success = _ref3.success,
|
|
208
|
+
success = _ref3$success === void 0 ? false : _ref3$success,
|
|
209
|
+
_ref3$error = _ref3.error,
|
|
210
|
+
error = _ref3$error === void 0 ? false : _ref3$error;
|
|
204
211
|
var fieldErrors = errors !== null ? errors[fieldName] || null : null;
|
|
205
212
|
if (fieldErrors !== null) {
|
|
206
213
|
setErrors(_objectSpread(_objectSpread({}, errors), {}, _defineProperty({}, fieldName, null)));
|
|
207
214
|
}
|
|
215
|
+
if (!loading && (success !== false || error !== false)) {
|
|
216
|
+
setRequestState({
|
|
217
|
+
success: false,
|
|
218
|
+
loading: false,
|
|
219
|
+
error: false
|
|
220
|
+
});
|
|
221
|
+
}
|
|
208
222
|
setValue(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, fieldName, fieldValue)));
|
|
209
223
|
}, fieldsKey);
|
|
210
224
|
var fieldsProps = useMemo(function () {
|
|
@@ -214,6 +228,8 @@ var useForm = function useForm() {
|
|
|
214
228
|
onChange: onFieldChange
|
|
215
229
|
}, locales);
|
|
216
230
|
}, fieldsKey);
|
|
231
|
+
// console.log('fk', fieldsKey);
|
|
232
|
+
|
|
217
233
|
var csrfToken = useMemo(function () {
|
|
218
234
|
return getCsrfToken();
|
|
219
235
|
}, []);
|
package/lib/contexts.js
CHANGED
|
@@ -1577,7 +1577,7 @@ var useUppy = function useUppy() {
|
|
|
1577
1577
|
ids = _ref5$fileIDs === void 0 ? [] : _ref5$fileIDs;
|
|
1578
1578
|
ids.forEach(function (id) {
|
|
1579
1579
|
var file = uppy.getFile(id);
|
|
1580
|
-
console.log('file', id, file);
|
|
1580
|
+
// console.log('file', id, file);
|
|
1581
1581
|
var newName = null;
|
|
1582
1582
|
if (withUUID) {
|
|
1583
1583
|
newName = getFileNameWithUUID(file);
|
package/lib/hooks.js
CHANGED
|
@@ -234,12 +234,26 @@ var useForm = function useForm() {
|
|
|
234
234
|
var hasProvidedGeneralError = setProvidedGeneralError !== null;
|
|
235
235
|
var generalError = hasProvidedGeneralError ? providedGeneralError : stateGeneralError;
|
|
236
236
|
var setGeneralError = hasProvidedGeneralError ? setProvidedGeneralError : setStateGeneralError;
|
|
237
|
-
var fieldsKey = [value, errors, locales].concat(fields);
|
|
237
|
+
var fieldsKey = [value, errors, requestState, locales].concat(fields);
|
|
238
238
|
var onFieldChange = react.useCallback(function (fieldName, fieldValue) {
|
|
239
|
+
var _ref3 = requestState || {},
|
|
240
|
+
_ref3$loading = _ref3.loading,
|
|
241
|
+
loading = _ref3$loading === void 0 ? false : _ref3$loading,
|
|
242
|
+
_ref3$success = _ref3.success,
|
|
243
|
+
success = _ref3$success === void 0 ? false : _ref3$success,
|
|
244
|
+
_ref3$error = _ref3.error,
|
|
245
|
+
error = _ref3$error === void 0 ? false : _ref3$error;
|
|
239
246
|
var fieldErrors = errors !== null ? errors[fieldName] || null : null;
|
|
240
247
|
if (fieldErrors !== null) {
|
|
241
248
|
setErrors(_objectSpread__default["default"](_objectSpread__default["default"]({}, errors), {}, _defineProperty__default["default"]({}, fieldName, null)));
|
|
242
249
|
}
|
|
250
|
+
if (!loading && (success !== false || error !== false)) {
|
|
251
|
+
setRequestState({
|
|
252
|
+
success: false,
|
|
253
|
+
loading: false,
|
|
254
|
+
error: false
|
|
255
|
+
});
|
|
256
|
+
}
|
|
243
257
|
setValue(_objectSpread__default["default"](_objectSpread__default["default"]({}, value), {}, _defineProperty__default["default"]({}, fieldName, fieldValue)));
|
|
244
258
|
}, fieldsKey);
|
|
245
259
|
var fieldsProps = react.useMemo(function () {
|
|
@@ -249,6 +263,8 @@ var useForm = function useForm() {
|
|
|
249
263
|
onChange: onFieldChange
|
|
250
264
|
}, locales);
|
|
251
265
|
}, fieldsKey);
|
|
266
|
+
// console.log('fk', fieldsKey);
|
|
267
|
+
|
|
252
268
|
var csrfToken = react.useMemo(function () {
|
|
253
269
|
return fetch.getCsrfToken();
|
|
254
270
|
}, []);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@panneau/core",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.14",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"javascript"
|
|
@@ -114,5 +114,5 @@
|
|
|
114
114
|
"publishConfig": {
|
|
115
115
|
"access": "public"
|
|
116
116
|
},
|
|
117
|
-
"gitHead": "
|
|
117
|
+
"gitHead": "1af0f350c8f550f2e93d7f0eb1e7ec73d51afe2c"
|
|
118
118
|
}
|