cleaner 'lastAction'

Author: shakyShane

special-pages/pages/history/app/global/hooks/useSelectionState.js

@@ -54,6 +54,7 @@ export function useSelectionStateApi() {
      */
     function dispatcher(evt) {
         const next = reducer(state.value, evt);
+        next.lastAction = evt.kind;
         state.value = next;
     }
     const dispatch = useCallback(dispatcher, [state, selected]);
@@ -70,7 +71,6 @@ export function reducer(prev, evt) {
         case 'reset': {
             return {
                 ...defaultState,
-                lastAction: evt.kind,
             };
         }
         case 'move-selection': {
@@ -82,21 +82,21 @@ export function reducer(prev, evt) {
             const newIndex = Math.max(0, max);
             const newSelected = new Set([newIndex]);
             return {
+                ...prev,
                 anchorIndex: newIndex,
                 focusedIndex: newIndex,
                 lastShiftRange: { start: null, end: null },
                 selected: newSelected,
-                lastAction: evt.kind,
             };
         }
         case 'select-index': {
             const newSelected = new Set([evt.index]);
             return {
+                ...prev,
                 anchorIndex: evt.index,
                 focusedIndex: evt.index,
                 lastShiftRange: { start: null, end: null },
                 selected: newSelected,
-                lastAction: evt.kind,
             };
         }
         case 'toggle-index': {
@@ -107,11 +107,11 @@ export function reducer(prev, evt) {
                 newSelected.add(evt.index);
             }
             return {
+                ...prev,
                 anchorIndex: evt.index,
                 lastShiftRange: { start: null, end: null },
                 focusedIndex: evt.index,
                 selected: newSelected,
-                lastAction: evt.kind,
             };
         }
         case 'expand-selected-to-index': {
@@ -139,7 +139,6 @@ export function reducer(prev, evt) {
                 lastShiftRange: { start, end },
                 focusedIndex: evt.index,
                 selected: newSelected,
-                lastAction: evt.kind,
             };
         }
         case 'inc-or-dec-selected': {
@@ -163,11 +162,11 @@ export function reducer(prev, evt) {
                 newSelected.add(i);
             }
             return {
+                ...prev,
                 focusedIndex: evt.nextIndex,
                 lastShiftRange: { start, end },
                 anchorIndex: anchorIndex === null ? evt.nextIndex : anchorIndex,
                 selected: newSelected,
-                lastAction: evt.kind,
             };
         }
         case 'increment-selection': {
@@ -195,11 +194,11 @@ export function reducer(prev, evt) {
                 newSelected.add(i);
             }
             return {
+                ...prev,
                 focusedIndex: newIndex,
                 lastShiftRange: { start, end },
                 anchorIndex: anchorIndex === null ? newIndex : anchorIndex,
                 selected: newSelected,
-                lastAction: evt.kind,
             };
         }
         default: