Merge pull request #1627 from ProjectMirador/1623-spread-not-assign

Replace Object.assign with the spread operator (implements #1623)

src/actions/window.js

@@ -29,7 +29,7 @@ export function addWindow(options) {
     xywh: [0, 0, 400, 400],
     rotation: null,
   };
-  return { type: ActionTypes.ADD_WINDOW, payload: Object.assign({}, defaultOptions, options) };
+  return { type: ActionTypes.ADD_WINDOW, payload: { ...defaultOptions, ...options } };
 }
 
 /**

src/reducers/infoResponses.js

@@ -6,25 +6,23 @@ import ActionTypes from '../action-types';
 const infoResponsesReducer = (state = {}, action) => {
   switch (action.type) {
     case ActionTypes.REQUEST_INFO_RESPONSE:
-      return Object.assign({}, state, {
-        [action.infoId]: {
-          isFetching: true,
-        },
-      });
+      return { ...state, [action.infoId]: { isFetching: true } };
     case ActionTypes.RECEIVE_INFO_RESPONSE:
-      return Object.assign({}, state, {
+      return {
+        ...state,
         [action.infoId]: {
           json: action.infoJson,
           isFetching: false,
         },
-      });
+      };
     case ActionTypes.RECEIVE_INFO_RESPONSE_FAILURE:
-      return Object.assign({}, state, {
+      return {
+        ...state,
         [action.infoId]: {
           error: action.error,
           isFetching: false,
         },
-      });
+      };
     case ActionTypes.REMOVE_INFO_RESPONSE:
       return Object.keys(state).reduce((object, key) => {
         if (key !== action.infoId) {

src/reducers/manifests.js

@@ -7,25 +7,28 @@ import ActionTypes from '../action-types';
 const manifestsReducer = (state = {}, action) => {
   switch (action.type) {
     case ActionTypes.REQUEST_MANIFEST:
-      return Object.assign({}, state, {
+      return {
+        ...state,
         [action.manifestId]: {
           isFetching: true,
         },
-      });
+      };
     case ActionTypes.RECEIVE_MANIFEST:
-      return Object.assign({}, state, {
+      return {
+        ...state,
         [action.manifestId]: {
           manifestation: manifesto.create(action.manifestJson),
           isFetching: false,
         },
-      });
+      };
     case ActionTypes.RECEIVE_MANIFEST_FAILURE:
-      return Object.assign({}, state, {
+      return {
+        ...state,
         [action.manifestId]: {
           error: action.error,
           isFetching: false,
         },
-      });
+      };
     case ActionTypes.REMOVE_MANIFEST:
       return Object.keys(state).reduce((object, key) => {
         if (key !== action.manifestId) {

src/reducers/windows.js

@@ -6,20 +6,20 @@ import ActionTypes from '../action-types';
 const windowsReducer = (state = [], action) => {
   switch (action.type) {
     case ActionTypes.ADD_WINDOW:
-      return state.concat(Object.assign({}, action.payload));
+      return state.concat({ ...action.payload });
     case ActionTypes.REMOVE_WINDOW:
       return state.filter(window => window.id !== action.windowId);
     case ActionTypes.NEXT_CANVAS:
       return state.map((window) => {
         if (window.id === action.windowId) {
-          return Object.assign({}, window, { canvasIndex: window.canvasIndex + 1 });
+          return { ...window, canvasIndex: window.canvasIndex + 1 };
         }
         return window;
       });
     case ActionTypes.PREVIOUS_CANVAS:
       return state.map((window) => {
         if (window.id === action.windowId) {
-          return Object.assign({}, window, { canvasIndex: window.canvasIndex - 1 });
+          return { ...window, canvasIndex: window.canvasIndex - 1 };
         }
         return window;
       });

src/reducers/workspace.js

@@ -6,7 +6,7 @@ import ActionTypes from '../action-types';
 const workspaceReducer = (state = {}, action) => {
   switch (action.type) {
     case ActionTypes.FOCUS_WINDOW:
-      return Object.assign({}, state, { focusedWindowId: action.windowId });
+      return { ...state, focusedWindowId: action.windowId };
     default:
       return state;
   }