From 9b9e6d7a432dac33137abcf8289ebdfe74476b82 Mon Sep 17 00:00:00 2001 From: Joshen Lim Date: Tue, 25 Apr 2023 01:18:46 +0800 Subject: [PATCH 1/3] Prevent setting value to NULL when hitting Enter while highlighting cell in table editor thats of text type and nullable --- studio/components/grid/components/editor/TextEditor.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/studio/components/grid/components/editor/TextEditor.tsx b/studio/components/grid/components/editor/TextEditor.tsx index 09b98506491..e65ad5db455 100644 --- a/studio/components/grid/components/editor/TextEditor.tsx +++ b/studio/components/grid/components/editor/TextEditor.tsx @@ -22,6 +22,7 @@ export function TextEditor({ }, []) const saveChanges = useCallback((newValue: string | null) => { + console.log('saveChanges') onRowChange({ ...row, [column.key]: newValue }, true) setIsPopoverOpen(false) }, []) @@ -62,7 +63,13 @@ export function TextEditor({
{isNullable && ( - )} From 106736357861f3b76e9761af1de91aeedcc813c3 Mon Sep 17 00:00:00 2001 From: Joshen Lim Date: Tue, 25 Apr 2023 01:20:46 +0800 Subject: [PATCH 2/3] Remove unnecessary prop --- studio/components/grid/components/editor/TextEditor.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio/components/grid/components/editor/TextEditor.tsx b/studio/components/grid/components/editor/TextEditor.tsx index e65ad5db455..8d156da7c28 100644 --- a/studio/components/grid/components/editor/TextEditor.tsx +++ b/studio/components/grid/components/editor/TextEditor.tsx @@ -68,7 +68,7 @@ export function TextEditor({ htmlType="button" type="default" size="tiny" - onClick={(event) => saveChanges(null)} + onClick={() => saveChanges(null)} > Set to NULL From c6ffaefb199066ab8aab2dbac92538b82b3c86cd Mon Sep 17 00:00:00 2001 From: Joshen Lim Date: Tue, 25 Apr 2023 01:24:21 +0800 Subject: [PATCH 3/3] Remove log --- studio/components/grid/components/editor/TextEditor.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/studio/components/grid/components/editor/TextEditor.tsx b/studio/components/grid/components/editor/TextEditor.tsx index 8d156da7c28..e24ed650b79 100644 --- a/studio/components/grid/components/editor/TextEditor.tsx +++ b/studio/components/grid/components/editor/TextEditor.tsx @@ -22,7 +22,6 @@ export function TextEditor({ }, []) const saveChanges = useCallback((newValue: string | null) => { - console.log('saveChanges') onRowChange({ ...row, [column.key]: newValue }, true) setIsPopoverOpen(false) }, [])