Extract and test getCopiedRange from Copied

Author: iddan

src/Copied.tsx

@@ -1,9 +1,7 @@
 import * as React from "react";
 import { connect } from "unistore/react";
 import * as Types from "./types";
-import * as PointSet from "./point-set";
-import * as PointMap from "./point-map";
-import { getRangeDimensions } from "./util";
+import { getCopiedRange, getRangeDimensions } from "./util";
 import FloatingRect, {
   Props as FloatingRectProps,
   StateProps,
@@ -12,19 +10,13 @@ import FloatingRect, {
 type Props = Omit<FloatingRectProps, "variant">;
 
 const Copied: React.FC<Props> = (props) => (
-  <FloatingRect {...props} variant="copied" />
+  <FloatingRect {...props} variant="copied" dragging={false} />
 );
 
 export default connect<{}, {}, Types.StoreState, StateProps>((state) => {
-  const cells = state.hasPasted
-    ? PointSet.from([])
-    : PointMap.map(() => true, state.copied);
-  const hidden = PointSet.size(cells) === 0;
+  const range = getCopiedRange(state.copied, state.hasPasted);
   return {
-    dimensions: hidden
-      ? null
-      : getRangeDimensions(state, PointSet.toRange(cells)),
-    hidden,
-    dragging: false,
+    dimensions: range && getRangeDimensions(state, range),
+    hidden: range === null,
   };
 })(Copied);

src/util.test.ts

@@ -27,6 +27,7 @@ import {
   getOffsetRect,
   readTextFromClipboard,
   normalizeSelected,
+  getCopiedRange,
 } from "./util";
 
 const EXAMPLE_INPUT_VALUE = "EXAMPLE_INPUT_VALUE";
@@ -95,6 +96,8 @@ const MOCK_FORMULA_PARSER = {
 } as unknown as FormulaParser;
 const EXAMPLE_FORMULA_RESULT = true;
 const EXAMPLE_FORMULA_ERROR = "EXAMPLE_ERROR";
+const EXAMPLE_EMPTY_COPIED = PointMap.from<Types.CellBase>([]);
+const EXAMPLE_COPIED = PointMap.from([[Point.ORIGIN, EXAMPLE_CELL]]);
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -449,3 +452,19 @@ describe("normalizeSelected()", () => {
     );
   });
 });
+
+describe("getCopiedRange()", () => {
+  const cases = [
+    [
+      "Returns range of copied cells",
+      EXAMPLE_COPIED,
+      false,
+      PointRange.create(Point.ORIGIN, Point.ORIGIN),
+    ],
+    ["Returns null if none is copied", EXAMPLE_EMPTY_COPIED, false, null],
+    ["Returns null if hasPasted is true", EXAMPLE_COPIED, true, null],
+  ] as const;
+  test.each(cases)("%s", (name, copied, hasPasted, expected) => {
+    expect(getCopiedRange(copied, hasPasted)).toEqual(expected);
+  });
+});

src/util.ts

@@ -3,6 +3,8 @@ import * as Types from "./types";
 import * as Matrix from "./matrix";
 import * as Point from "./point";
 import * as PointRange from "./point-range";
+import * as PointMap from "./point-map";
+import * as PointSet from "./point-set";
 import * as Formula from "./formula";
 
 export { createEmpty as createEmptyMatrix } from "./matrix";
@@ -204,3 +206,15 @@ export function calculateSpreadsheetSize(
     columns: columnLabels ? Math.max(columns, columnLabels.length) : columns,
   };
 }
+
+/** Get the range of copied cells. If none are copied return null */
+export function getCopiedRange(
+  copied: Types.StoreState["copied"],
+  hasPasted: boolean
+): PointRange.PointRange | null {
+  if (hasPasted || PointMap.isEmpty(copied)) {
+    return null;
+  }
+  const set: PointSet.PointSet = PointMap.map(() => true, copied);
+  return PointSet.toRange(set);
+}