Merge branch 'master' into feature/entire-selection

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: Cache node modules
         uses: actions/cache@v2
         with:

.github/workflows/website.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "14.x"
       - name: Test Build
         run: |
           yarn install --frozen-lockfile;
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "14.x"
       - uses: webfactory/ssh-agent@v0.5.0
         with:
           ssh-private-key: ${{ secrets.GH_PAGES_DEPLOY }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-spreadsheet",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Simple, customizable yet performant spreadsheet for React",
   "author": "Iddan Aaronsohn <mail@aniddan.com> (https://aniddan.com)",
   "keywords": [
@@ -41,6 +41,7 @@
     "use-context-selector": "^1.3.7"
   },
   "devDependencies": {
+    "jest-transform-css": "^3.0.0",
     "@babel/core": "^7.16.5",
     "@storybook/addon-actions": "^6.4.9",
     "@storybook/addon-essentials": "^6.4.9",
@@ -94,12 +95,12 @@
     "testPathIgnorePatterns": [
       "dist"
     ],
-    "moduleNameMapper": {
-      "\\.css$": "<rootDir>/src/__mocks__/style-mock.ts"
-    },
     "setupFilesAfterEnv": [
       "<rootDir>/src/jest-setup.ts"
-    ]
+    ],
+    "transform": {
+      "^.+\\.css$": "jest-transform-css"
+    }
   },
   "eslintConfig": {
     "parser": "@typescript-eslint/parser",

src/matrix.test.ts

@@ -177,9 +177,32 @@ describe("Matrix.toArray()", () => {
     ...EXAMPLE_MATRIX[1],
     ...EXAMPLE_MATRIX[2],
   ];
-  test("Flattens matrix values to an array", () => {
+  test("Flattens square matrix values to an array", () => {
     expect(Matrix.toArray(EXAMPLE_MATRIX)).toEqual(flattedMatrix);
   });
+  test("Flattens horizontal matrix values to an array", () => {
+    expect(
+      Matrix.toArray([
+        [1, 2, 3],
+        [4, 5, 6],
+      ])
+    ).toEqual([1, 2, 3, 4, 5, 6]);
+  });
+  test("Flattens vertical matrix values to an array", () => {
+    expect(
+      Matrix.toArray([
+        [1, 2],
+        [3, 4],
+        [5, 6],
+      ])
+    ).toEqual([1, 2, 3, 4, 5, 6]);
+  });
+  test("Flattens column matrix values to an array", () => {
+    expect(Matrix.toArray([[1], [2], [3]])).toEqual([1, 2, 3]);
+  });
+  test("Flattens row matrix values to an array", () => {
+    expect(Matrix.toArray([[1, 2, 3]])).toEqual([1, 2, 3]);
+  });
   test("Transforms matrix values and collects them to an array", () => {
     const transform = (value: number | undefined) => value && value * 2;
     expect(

src/matrix.ts

@@ -246,7 +246,7 @@ export function toArray<T1, T2>(
 ) {
   const array = [];
   for (let row = 0; row < matrix.length; row++) {
-    for (let column = 0; column < matrix.length; column++) {
+    for (let column = 0; column < matrix[row].length; column++) {
       const value = matrix[row][column];
       array.push(transform ? transform(value, { row, column }) : value);
     }

typedoc.json

@@ -1,6 +1,7 @@
 {
-  "entryPoints": ["src/index.ts"],
+  "entryPoints": ["./src/index.ts"],
   "out": "reference",
   "readme": "none",
-  "excludeNotDocumented": true
+  "excludeNotDocumented": true,
+  "exclude": ["**/*.test.ts", "**/*.test.tsx", "**/*.stories.tsx"]
 }

website/docs/sidebars.js

@@ -4,5 +4,10 @@ module.exports = {
       type: "autogenerated",
       dirName: ".", // generate sidebar slice from the docs folder (or versioned_docs/<version>)
     },
+    {
+      type: "link",
+      label: "API",
+      href: "/docs/api",
+    },
   ],
 };

website/docusaurus.config.js

@@ -60,6 +60,8 @@ module.exports = {
         readme: "none",
         excludeNotDocumented: true,
         plugin: ["typedoc-plugin-rename-defaults"],
+        exclude: ["**/*.test.ts", "**/*.test.tsx", "**/*.stories.tsx"],
+        readmeTitle: "API",
       },
     ],
   ],

website/package.json

@@ -20,24 +20,24 @@
   },
   "dependencies": {
     "@algolia/client-search": "^4.9.1",
-    "@docusaurus/core": "^2.0.0-beta.6",
-    "@docusaurus/preset-classic": "^2.0.0-beta.6",
+    "@docusaurus/core": "^2.0.0-beta.15",
+    "@docusaurus/preset-classic": "^2.0.0-beta.15",
     "@mdx-js/react": "^1.6.21",
     "@rehooks/component-size": "^1.0.3",
     "@svgr/webpack": "^5.5.0",
     "@types/react": "^17.0.19",
     "clsx": "^1.1.1",
-    "docusaurus-plugin-typedoc": "^0.15.3",
+    "docusaurus-plugin-typedoc": "^0.16.9",
     "file-loader": "^6.2.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-spreadsheet": "^0.5.9",
-    "typedoc": "^0.21.6",
-    "typedoc-plugin-markdown": "^3.10.4",
-    "typedoc-plugin-rename-defaults": "^0.3.0",
+    "typedoc": "^0.22.11",
+    "typedoc-plugin-markdown": "^3.11.13",
+    "typedoc-plugin-rename-defaults": "^0.4.0",
     "typescript": "^4.3.5",
     "url-loader": "^4.1.1",
-    "webpack": "^5.51.1"
+    "webpack": "^5.68.0"
   },
   "devDependencies": {
     "@babel/core": "^7.15.0",