@norges-domstoler/dds-components 10.3.0 → 10.3.2

package/dist/components/FileUploader/fileUploaderReducer.d.ts

@@ -4,10 +4,6 @@ export type FileUploaderFile = {
     file: FileWithPath;
     errors: string[];
 };
-type FileChangePayload = {
-    rootErrors: RootErrorList;
-    files: FileUploaderFile[];
-};
 export type RootErrorList = string[];
 export type FileUploaderAction = {
     type: 'focus';
@@ -19,10 +15,13 @@ export type FileUploaderAction = {
     type: 'dragLeave';
 } | {
     type: 'onSetFiles';
-    payload: FileChangePayload;
+    payload: FileUploaderFile[];
 } | {
     type: 'onRemoveFile';
-    payload: FileChangePayload;
+    payload: FileUploaderFile[];
+} | {
+    type: 'setRootErrors';
+    payload: RootErrorList;
 };
 export type FileUploaderState = {
     files: FileUploaderFile[];
@@ -32,4 +31,3 @@ export type FileUploaderState = {
     rootErrors: string[];
 };
 export declare const fileUploaderReducer: Reducer<FileUploaderState, FileUploaderAction>;
-export {};

package/dist/components/FileUploader/fileUploaderReducer.js

@@ -19,13 +19,15 @@ var fileUploaderReducer = function fileUploaderReducer(state, action) {
     case 'onSetFiles':
       return Object.assign(Object.assign({}, state), {
         isDragActive: false,
-        rootErrors: action.payload.rootErrors,
-        files: action.payload.files
+        files: action.payload
       });
     case 'onRemoveFile':
       return Object.assign(Object.assign({}, state), {
-        rootErrors: action.payload.rootErrors,
-        files: action.payload.files
+        files: action.payload
+      });
+    case 'setRootErrors':
+      return Object.assign(Object.assign({}, state), {
+        rootErrors: action.payload
       });
     default:
       return state;

package/dist/components/FileUploader/useFileUploader.js

@@ -1,6 +1,6 @@
 import { slicedToArray as _slicedToArray, regeneratorRuntime as _regeneratorRuntime, toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import { __awaiter } from 'tslib';
-import { useRef, useReducer, useCallback } from 'react';
+import { useRef, useMemo, useReducer, useEffect, useCallback } from 'react';
 import { fileUploaderReducer } from './fileUploaderReducer.js';
 import { fromEvent } from 'file-selector';
 import { preventDefaults, isEventWithFiles, isFileAccepted, getInvalidFileTypeErrorMessage, getTooManyFilesErrorMessage } from './utils.js';
@@ -16,8 +16,7 @@ var calcRootErrors = function calcRootErrors(files, maxFiles, errorMessage) {
   return errors;
 };
 var useFileUploader = function useFileUploader(props) {
-  var _props$initialFiles = props.initialFiles,
-    initialFiles = _props$initialFiles === void 0 ? [] : _props$initialFiles,
+  var initialFiles = props.initialFiles,
     accept = props.accept,
     maxFiles = props.maxFiles,
     disabled = props.disabled,
@@ -25,12 +24,14 @@ var useFileUploader = function useFileUploader(props) {
   var rootRef = useRef(null);
   var inputRef = useRef(null);
   var buttonRef = useRef(null);
-  var initialFileUploaderFiles = initialFiles.map(function (f) {
-    return {
-      file: f,
-      errors: []
-    };
-  });
+  var initialFileUploaderFiles = useMemo(function () {
+    return (initialFiles !== null && initialFiles !== void 0 ? initialFiles : []).map(function (f) {
+      return {
+        file: f,
+        errors: []
+      };
+    });
+  }, [initialFiles]);
   var _useReducer = useReducer(fileUploaderReducer, {
       files: initialFileUploaderFiles,
       isFocused: false,
@@ -42,6 +43,12 @@ var useFileUploader = function useFileUploader(props) {
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   var stateFiles = state.files;
+  useEffect(function () {
+    dispatch({
+      type: 'setRootErrors',
+      payload: calcRootErrors(stateFiles, maxFiles, errorMessage)
+    });
+  }, [dispatch, stateFiles, maxFiles, errorMessage]);
   var onRootFocus = useCallback(function () {
     return dispatch({
       type: 'focus'
@@ -104,14 +111,14 @@ var useFileUploader = function useFileUploader(props) {
   }, [dispatch]);
   var setFiles = useCallback(function (evt) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var existingFileNames, filesFromEvent, newFiles, rootErrors;
+      var existingFileNames, filesFromEvent, newFiles;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               evt.preventDefault();
               if (!isEventWithFiles(evt)) {
-                _context2.next = 9;
+                _context2.next = 8;
                 break;
               }
               existingFileNames = stateFiles.map(function (f) {
@@ -130,15 +137,11 @@ var useFileUploader = function useFileUploader(props) {
                   errors: accepted ? [] : [getInvalidFileTypeErrorMessage()]
                 };
               }).concat(stateFiles);
-              rootErrors = calcRootErrors(newFiles, maxFiles, errorMessage);
               dispatch({
                 type: 'onSetFiles',
-                payload: {
-                  rootErrors: rootErrors,
-                  files: newFiles
-                }
+                payload: newFiles
               });
-            case 9:
+            case 8:
             case "end":
               return _context2.stop();
           }
@@ -155,13 +158,9 @@ var useFileUploader = function useFileUploader(props) {
   var removeFile = useCallback(function (file) {
     var newFiles = _toConsumableArray(stateFiles);
     newFiles.splice(stateFiles.indexOf(file), 1);
-    var rootErrors = calcRootErrors(newFiles, maxFiles, errorMessage);
     dispatch({
       type: 'onRemoveFile',
-      payload: {
-        rootErrors: rootErrors,
-        files: newFiles
-      }
+      payload: newFiles
     });
   }, [stateFiles, maxFiles, errorMessage]);
   var getRootProps = useCallback(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norges-domstoler/dds-components",
-  "version": "10.3.0",
+  "version": "10.3.2",
   "description": "React components used in Elsa - domstolenes designsystem",
   "author": "Elsa team",
   "license": "MIT",