4.0.2 (#252)

* Update packaging

* Update version

* Make tests work again

* Try to improve score

* Fix crash with highlight regions out of bounds horizontally

* Fix another crash

* Fix security issues

* 4.0.2-beta1

* Add basic menu story

* Prep for 4.0.2

Author: jassmith

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "root",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "scripts": {
         "start": "npm run storybook",
         "bootstrap": "./bootstrap.sh",

package.json

@@ -1,10 +1,12 @@
 {
   "name": "@glideapps/glide-data-grid-cells",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Extra cells for glide-data-grid",
   "sideEffects": false,
   "type": "module",
-  "main": "dist/js/index.js",
+  "browser": "dist/js/index.js",
+  "main": "dist/cjs/index.js",
+  "module": "dist/js/index.js",
   "types": "dist/ts/index.d.ts",
   "exports": {
     "import": "./dist/js/index.js",
@@ -14,7 +16,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "npm run build-js && npm run build-types",
+    "build": "npm run build-js && npm run build-cjs && npm run build-types",
     "build-js": "babel --config-file ../../babel.config.json ./src -d dist/js --ignore '**/*.stories.tsx','src/stories/*.tsx' --extensions .ts,.tsx && tsc-esm-fix --target='dist/js'",
     "build-cjs": "babel --config-file ../../babel.cjs.json ./src -d dist/cjs --ignore '**/*.stories.tsx','src/stories/*.tsx' --extensions .ts,.tsx",
     "build-types": "tsc -p tsconfig.types.json",
@@ -41,7 +43,7 @@
     "canvas"
   ],
   "dependencies": {
-    "@glideapps/glide-data-grid": "4.0.1",
+    "@glideapps/glide-data-grid": "4.0.2",
     "@toast-ui/editor": "^3.1.3",
     "@toast-ui/react-editor": "^3.1.3",
     "react-select": "^5.2.2"

packages/cells/package-lock.json

@@ -1,8 +1,3 @@
 src
-package-lock.json
-.eslintrc
-.eslintignore
-tsconfig.json
-tsconfig.types.json
-jest.config.js
-API.md
+tsconfig*
+coverage/*

packages/cells/package.json

@@ -1,19 +1,17 @@
 {
   "name": "@glideapps/glide-data-grid",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Super fast, pure canvas Data Grid Editor",
   "sideEffects": false,
   "type": "module",
-  "main": "dist/js/index.js",
+  "browser": "dist/js/index.js",
+  "main": "dist/cjs/index.js",
+  "module": "dist/js/index.js",
+  "types": "dist/ts/index.d.ts",
   "exports": {
     "import": "./dist/js/index.js",
     "require": "./dist/cjs/index.js"
   },
-  "files": [
-    "dist",
-    "CHANGELOG.md"
-  ],
-  "types": "dist/ts/index.d.ts",
   "scripts": {
     "build": "npm run build-js && npm run build-cjs && npm run build-types",
     "build-js": "babel --config-file ../../babel.config.json ./src -d dist/js --ignore 'src/setupTests.ts','src/docs','**/*.test.ts','**/*.test.tsx','**/*.stories.tsx','src/stories/*.tsx','**/*.d.ts' --extensions .ts,.tsx && tsc-esm-fix --target='dist/js'",

packages/core/.npmignore

@@ -477,18 +477,6 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
         abortControllerRef.current
     );
 
-    const highlightRegions = React.useMemo(() => {
-        if (highlightRegionsIn === undefined) return undefined;
-        if (rowMarkerOffset === 0) return highlightRegionsIn;
-        return highlightRegionsIn.map(r => ({
-            color: r.color,
-            range: {
-                ...r.range,
-                x: r.range.x + rowMarkerOffset,
-            },
-        }));
-    }, [highlightRegionsIn, rowMarkerOffset]);
-
     const enableGroups = React.useMemo(() => {
         return columns.some(c => c.group !== undefined);
     }, [columns]);
@@ -549,6 +537,26 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
         ];
     }, [columns, rowMarkerWidth, rowMarkers]);
 
+    const highlightRegions = React.useMemo(() => {
+        if (highlightRegionsIn === undefined) return undefined;
+        if (rowMarkerOffset === 0) return highlightRegionsIn;
+
+        return highlightRegionsIn
+            .map(r => {
+                const maxWidth = mangledCols.length - r.range.x - rowMarkerOffset;
+                if (maxWidth <= 0) return undefined;
+                return {
+                    color: r.color,
+                    range: {
+                        ...r.range,
+                        x: r.range.x + rowMarkerOffset,
+                        width: Math.min(maxWidth, r.range.width),
+                    },
+                };
+            })
+            .filter(x => x !== undefined) as typeof highlightRegionsIn;
+    }, [highlightRegionsIn, mangledCols.length, rowMarkerOffset]);
+
     const visibleRegionRef = React.useRef(visibleRegion);
     const getMangledCellContent = React.useCallback(
         ([col, row]: Item): InnerGridCell => {