svelte/src/datum-editor-common.svelte.ts

@@ -1,12 +0,0 @@
-/**
- * Propagating blur events upwards from the `<DatumEditor>` component is
- * debounced so that switching focus between elements does not cause spurious
- * `on_blur()` calls.
- *
- * The `<TableViewer>` component must wait at least 1 tick longer than this
- * before updating selections on cell click, or any updates to the previous
- * selection may be applied to the new selection instead. (This approach is not
- * technically airtight if click events are happening very quickly, but it's
- * plenty close enough when we're working with a human user.)
- */
-export const BLUR_DEBOUNCE_MS = 100;

svelte/src/datum-editor.svelte

@@ -86,7 +86,7 @@ example within the `<TableViewer />` or `<ExpressionEditor />`.
   }
 
   function handle_blur(ev: FocusEvent) {
-    // Propagating blur events upwards is debounced so that switching focus
+    // Propagating of blur events upwards is debounced, so that switching focus
     // between elements does not cause spurious `on_blur()` calls.
     if (blur_timeout !== undefined) {
       clearTimeout(blur_timeout);
@@ -145,17 +145,6 @@ example within the `<TableViewer />` or `<ExpressionEditor />`.
       // Cancel edit before blurring, or else the table will try to commit it.
       on_cancel_edit?.();
       on_restore_focus?.();
-    } else if (ev.key === "Backspace") {
-      if (
-        editor_state &&
-        ["Dropdown", "Numeric", "Text", "Uuid"].includes(
-          current_presentation.t ?? "",
-        ) &&
-        editor_state.text_value === ""
-      ) {
-        editor_state.is_null = !editor_state.is_null;
-        handle_input();
-      }
     } else if (
       current_presentation.t === "Dropdown" &&
       filtered_dropdown_options.length > 0

svelte/src/table-viewer.webc.svelte

@@ -24,7 +24,6 @@
     parse_datum_from_text,
   } from "./datum.svelte";
   import DatumEditor from "./datum-editor.svelte";
-  import { BLUR_DEBOUNCE_MS } from "./datum-editor-common.svelte";
   import { type Row, type FieldInfo, field_info_schema } from "./field.svelte";
   import FieldAdder from "./field-adder.svelte";
   import FieldHeader from "./field-header.svelte";
@@ -394,7 +393,7 @@
       !ev.altKey &&
       !ev.ctrlKey &&
       !ev.metaKey &&
-      /^([a-zA-Z0-9`~!@#$%^&*()_=+[\]{}\\|;:'",<.>/?-]|Backspace)$/.test(ev.key)
+      /^[a-zA-Z0-9`~!@#$%^&*()_=+[\]{}\\|;:'",<.>/?-]$/.test(ev.key)
     ) {
       const sel = selections[0];
       if (sel) {
@@ -402,7 +401,6 @@
           lazy_data.fields[sel.coords.field_idx].field.presentation,
         );
         datum_editor?.focus();
-        try_sync_edit_to_cells();
       }
     } else if (ev.key === "Enter") {
       if (ev.shiftKey) {
@@ -673,23 +671,18 @@
             region: "main",
             rows: lazy_data.rows,
             on_cell_click: (ev: MouseEvent, coords: Coords) => {
-              // Must wait out `BLUR_DEBOUNCE_MS` before switching selection to
+              if (ev.metaKey || ev.ctrlKey) {
-              // avoid committing updates to the wrong cells. Refer to docs for
+                set_selections([
-              // `BLUR_DEBOUNCE_MS`.
+                  coords,
-              setTimeout(() => {
+                  ...selections
-                if (ev.metaKey || ev.ctrlKey) {
+                    .filter((sel) => !coords_eq(sel.coords, coords))
-                  set_selections([
+                    .map((sel) => sel.coords),
-                    coords,
+                ]);
-                    ...selections
+              } else if (ev.shiftKey) {
-                      .filter((sel) => !coords_eq(sel.coords, coords))
+                move_cursor(coords, { additive: true });
-                      .map((sel) => sel.coords),
+              } else {
-                  ]);
+                move_cursor(coords);
-                } else if (ev.shiftKey) {
+              }
-                  move_cursor(coords, { additive: true });
-                } else {
-                  move_cursor(coords);
-                }
-              }, BLUR_DEBOUNCE_MS + 1);
             },
           })}
         </div>
@@ -711,23 +704,18 @@
               region: "inserter",
               rows: inserter_rows,
               on_cell_click: (ev: MouseEvent, coords: Coords) => {
-                // Must wait out `BLUR_DEBOUNCE_MS` before switching selection
+                if (ev.metaKey || ev.ctrlKey) {
-                // to avoid committing updates to the wrong cells. Refer to docs
+                  set_selections([
-                // for `BLUR_DEBOUNCE_MS`.
+                    coords,
-                setTimeout(() => {
+                    ...selections
-                  if (ev.metaKey || ev.ctrlKey) {
+                      .filter((sel) => !coords_eq(sel.coords, coords))
-                    set_selections([
+                      .map((sel) => sel.coords),
-                      coords,
+                  ]);
-                      ...selections
+                } else if (ev.shiftKey) {
-                        .filter((sel) => !coords_eq(sel.coords, coords))
+                  move_cursor(coords, { additive: true });
-                        .map((sel) => sel.coords),
+                } else {
-                    ]);
+                  move_cursor(coords);
-                  } else if (ev.shiftKey) {
+                }
-                    move_cursor(coords, { additive: true });
-                  } else {
-                    move_cursor(coords);
-                  }
-                }, BLUR_DEBOUNCE_MS + 1);
               },
             })}
           </div>