Merge branch 'main' of github.com:clidey/whodb into release

clidey · Aug 19, 2024 · 972678c · 972678c
2 parents 991add8 + ebb637c
commit 972678c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/frontend/src/components/table.tsx b/frontend/src/components/table.tsx
@@ -182,6 +182,9 @@ const TData: FC<ITDataProps> = ({ cell, onCellUpdate, checked, onRowCheck, disab
     }, [changed, handleCancel, escapeAttempted]);
 
     const language = useMemo(() => {
+        if (editedData == null) {
+            return;
+        }
         if (isValidJSON(editedData)) {
             return "json";
         }
@@ -521,13 +524,13 @@ export const Table: FC<ITableProps> = ({ className, columns: actualColumns, rows
         if (onRowUpdate == null) {
             return Promise.resolve();
         }
+        delete row["#"];
         return onRowUpdate(row).then(() => {
             setData(value => {
                 const newValue = clone(value);
                 newValue[index] = clone(row);
                 return newValue;
             });
-            delete row["#"];
         });
     }, [onRowUpdate]);