fix(tables): resolve highlighted option on blur, carry newOptions through type-change redo

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/inline-editors.tsx

@@ -198,6 +198,14 @@ function InlineSelectEditor({
     [draft, onSave]
   )
 
+  // The option Enter/Tab/blur should apply: the highlighted one once the user
+  // has arrow-navigated or typed a non-empty filter, else the raw draft.
+  const resolvePick = useCallback(
+    () =>
+      highlighted !== undefined && (navigated || (typed && query !== '')) ? highlighted : undefined,
+    [highlighted, navigated, typed, query]
+  )
+
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
       if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
@@ -209,21 +217,20 @@ function InlineSelectEditor({
       } else if (e.key === 'Enter' || e.key === 'Tab') {
         e.preventDefault()
         const reason: SaveReason = e.key === 'Tab' ? (e.shiftKey ? 'shift-tab' : 'tab') : 'enter'
-        const pick = highlighted !== undefined && (navigated || (typed && query !== ''))
-        doSave(reason, pick ? highlighted : undefined)
+        doSave(reason, resolvePick())
       } else if (e.key === 'Escape') {
         e.preventDefault()
         doneRef.current = true
         clearTimeout(blurTimeoutRef.current)
         onCancel()
       }
     },
-    [doSave, onCancel, filtered.length, highlighted, query, typed, navigated]
+    [doSave, onCancel, filtered.length, resolvePick]
   )
 
   const handleBlur = useCallback(() => {
-    blurTimeoutRef.current = setTimeout(() => doSave('blur'), 200)
-  }, [doSave])
+    blurTimeoutRef.current = setTimeout(() => doSave('blur', resolvePick()), 200)
+  }, [doSave, resolvePick])
 
   return (
     <Popover open>

apps/sim/hooks/use-table-undo.ts

@@ -384,11 +384,11 @@ export function useTableUndo({
 
           case 'update-column-type': {
             const type = direction === 'undo' ? action.previousType : action.newType
-            const restoreOptions =
-              direction === 'undo' && type === 'select' && action.previousOptions !== undefined
+            const options = direction === 'undo' ? action.previousOptions : action.newOptions
+            const restoreOptions = type === 'select' && options !== undefined
             updateColumnMutation.mutate({
               columnName: action.columnName,
-              updates: { type, ...(restoreOptions ? { options: action.previousOptions } : {}) },
+              updates: { type, ...(restoreOptions ? { options } : {}) },
             })
             break
           }

apps/sim/stores/table/types.ts

@@ -74,6 +74,8 @@ export type TableUndoAction =
       /** Options to restore when undoing back to a select column (the server
        *  strips them on the way out of select). */
       previousOptions?: string[]
+      /** Options to re-apply when redoing a change to a select column. */
+      newOptions?: string[]
     }
   | {
       type: 'toggle-column-constraint'