Merge branch 'develop'

silevis · Jan 17, 2025 · 907ea34 · 907ea34
2 parents e1a37a5 + f296b7e
commit 907ea34
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@silevis/reactgrid",
   "description": "Add spreadsheet-like behavior to your React app.",
-  "version": "4.1.13",
+  "version": "4.1.14",
   "homepage": "https://reactgrid.com",
   "license": "MIT",
   "author": "Silevis Software",
@@ -91,4 +91,4 @@
     "sass": "^1.62.1",
     "tslib": "^2.5.2"
   }
-}
+}
diff --git a/src/lib/Components/RowRenderer.tsx b/src/lib/Components/RowRenderer.tsx
@@ -39,7 +39,7 @@ const MappedColumns: React.FC<RowRendererProps> = ({ columns, row, cellRenderer,
                     borders={{
                         ...borders,
                         left: borders.left && column.left === 0,
-                        right: (borders.right && column.idx === lastColIdx) || !(state.cellMatrix.scrollableRange.last.column.idx === location.column.idx)
+                        right: (borders.right && column.idx === lastColIdx) || !(state.cellMatrix.scrollableRange.last.column?.idx === location.column.idx)
                     }}
                     state={state}
                     location={location}

diff --git a/src/lib/Functions/handlePaste.ts b/src/lib/Functions/handlePaste.ts
@@ -41,9 +41,16 @@ export function handlePaste(event: ClipboardEvent, state: State): State {
         .getData("text/plain")
         .replace(/(\r\n)$/, '')
         .split("\n")
-        .map((line: string) => line.split("\t").map((t) => ({ type: "text", text: t, value: parseLocaleNumber(t) })));
+        .map((line: string) => line.split("\t").map((t) => {
+          const parsedDate = parseExcelDate(t);
+          return parsedDate ? { type: "date", text: t, value: parsedDate.getTime() } : { type: "text", text: t, value: parseLocaleNumber(t) };
+      }));
     }
     event.preventDefault();
     return { ...pasteData(state, pastedRows) };
   }
-
+
+function parseExcelDate(excelDate: string): Date | null {
+    const timestamp = Date.parse(excelDate);
+    return isNaN(timestamp) ? null : new Date(timestamp);
+}