Share more cod in reducer and test

Author: iddan

src/reducer.test.ts

@@ -2,7 +2,11 @@ import * as React from "react";
 import { Action } from "@reduxjs/toolkit";
 import * as Types from "./types";
 import * as Actions from "./actions";
-import reducer, { INITIAL_STATE, hasKeyDownHandler } from "./reducer";
+import reducer, {
+  INITIAL_STATE,
+  hasKeyDownHandler,
+  isActiveReadOnly,
+} from "./reducer";
 import { createEmptyMatrix } from "./util";
 import * as Point from "./point";
 import * as Matrix from "./matrix";
@@ -137,3 +141,28 @@ describe("hasKeyDownHandler", () => {
     );
   });
 });
+
+describe("isActiveReadOnly", () => {
+  const cases = [
+    ["returns false if no active", INITIAL_STATE, false],
+    [
+      "returns false if active is not read only",
+      { ...INITIAL_STATE, active: Point.ORIGIN },
+      false,
+    ],
+    [
+      "returns true if active is read only",
+      {
+        ...INITIAL_STATE,
+        data: [
+          [{ readOnly: true, value: undefined }],
+        ] as Matrix.Matrix<Types.CellBase>,
+        active: Point.ORIGIN,
+      },
+      true,
+    ],
+  ] as const;
+  test.each(cases)("%s", (name, state, expected) => {
+    expect(isActiveReadOnly(state)).toBe(expected);
+  });
+});

src/reducer.ts

@@ -178,49 +178,17 @@ const reducer = createReducer(INITIAL_STATE, (builder) => {
       lastCommit: commit,
     };
   });
-  builder.addCase(Actions.edit, (state) => {
-    if (isActiveReadOnly(state)) {
-      return;
-    }
-    return { ...state, mode: "edit" };
-  });
-  builder.addCase(Actions.view, (state) => {
-    return { ...state, mode: "view" };
-  });
-  builder.addCase(Actions.clear, (state) => {
-    if (!state.active) {
-      return;
-    }
-    const selectedPoints = state.selected
-      ? Array.from(PointRange.iterate(state.selected))
-      : [];
-    const changes = selectedPoints.map((point) => {
-      const cell = Matrix.get(point, state.data);
-      return {
-        ...state,
-        prevCell: cell || null,
-        nextCell: null,
-      };
-    });
-    return {
-      ...state,
-      data: selectedPoints.reduce(
-        (acc, point) => Matrix.set(point, undefined, acc),
-        state.data
-      ),
-      ...commit(changes),
-    };
-  });
-  builder.addCase(Actions.blur, (state) => {
-    return { ...state, active: null };
-  });
+  builder.addCase(Actions.edit, edit);
+  builder.addCase(Actions.view, view);
+  builder.addCase(Actions.clear, clear);
+  builder.addCase(Actions.blur, blur);
   builder.addCase(Actions.keyPress, (state, action) => {
     const { event } = action.payload;
     if (isActiveReadOnly(state) || event.metaKey) {
       return;
     }
     if (state.mode === "view" && state.active) {
-      return { ...state, mode: "edit" };
+      return edit(state);
     }
     return;
   });
@@ -447,14 +415,16 @@ export function hasKeyDownHandler(
   return getKeyDownHandler(state, event) !== undefined;
 }
 
-function getActive<Cell extends Types.CellBase>(
+/** Returns whether the active cell is read only */
+export function isActiveReadOnly(state: Types.StoreState): boolean {
+  const activeCell = getActive(state);
+  return Boolean(activeCell?.readOnly);
+}
+
+/** Gets active cell from given state */
+export function getActive<Cell extends Types.CellBase>(
   state: Types.StoreState<Cell>
 ): Cell | null {
   const activeCell = state.active && Matrix.get(state.active, state.data);
   return activeCell || null;
 }
-
-const isActiveReadOnly = (state: Types.StoreState<Types.CellBase>): boolean => {
-  const activeCell = getActive(state);
-  return Boolean(activeCell && activeCell.readOnly);
-};