@@ -1504,7 +1504,7 @@ export function TableGrid({
15041504 const handleFindCloseRef = useRef ( handleFindClose )
15051505 handleFindCloseRef . current = handleFindClose
15061506
1507- const [ renameError , setRenameError ] = useState ( false )
1507+ const [ renameErrorColumnId , setRenameErrorColumnId ] = useState < string | null > ( null )
15081508
15091509 const columnRename = useInlineRename ( {
15101510 // `columnName` is the column id; record the prior display name + id so undo
@@ -1519,7 +1519,7 @@ export function TableGrid({
15191519 if ( isValidationError ( error ) ) {
15201520 toast . error ( extractValidationIssues ( error ) [ 0 ] ?. message ?? getErrorMessage ( error ) )
15211521 }
1522- setRenameError ( true )
1522+ setRenameErrorColumnId ( columnName )
15231523 throw error
15241524 } )
15251525 } ,
@@ -1528,7 +1528,7 @@ export function TableGrid({
15281528 columnRenameRef . current = columnRename
15291529
15301530 const handleRenameValueChange = useCallback ( ( value : string ) => {
1531- setRenameError ( false )
1531+ setRenameErrorColumnId ( null )
15321532 columnRenameRef . current . setEditValue ( value )
15331533 } , [ ] )
15341534
@@ -1537,7 +1537,7 @@ export function TableGrid({
15371537 const { editingId, editValue, submitRename } = columnRenameRef . current
15381538 const trimmedName = editValue . trim ( )
15391539 const currentColumn = columnsRef . current . find ( ( column ) => column . key === editingId )
1540- if ( trimmedName && currentColumn && trimmedName !== currentColumn . name ) {
1540+ if ( currentColumn && trimmedName !== currentColumn . name ) {
15411541 const issue = columnNameIssue (
15421542 trimmedName ,
15431543 schemaColumnsRef . current
@@ -1546,16 +1546,16 @@ export function TableGrid({
15461546 )
15471547 if ( issue ) {
15481548 toast . error ( issue )
1549- setRenameError ( true )
1549+ setRenameErrorColumnId ( editingId )
15501550 return
15511551 }
15521552 }
1553- setRenameError ( false )
1553+ setRenameErrorColumnId ( null )
15541554 void submitRename ( )
15551555 } , [ ] )
15561556
15571557 const handleRenameCancel = useCallback ( ( ) => {
1558- setRenameError ( false )
1558+ setRenameErrorColumnId ( null )
15591559 columnRenameRef . current . cancelRename ( )
15601560 } , [ ] )
15611561
@@ -4035,7 +4035,7 @@ export function TableGrid({
40354035
40364036 const handleRenameColumn = useCallback (
40374037 ( columnName : string ) => {
4038- setRenameError ( false )
4038+ setRenameErrorColumnId ( null )
40394039 const column = columnsRef . current . find ( ( candidate ) => candidate . key === columnName )
40404040 columnRename . startRename ( columnName , column ?. name ?? columnName )
40414041 } ,
@@ -4932,7 +4932,7 @@ export function TableGrid({
49324932 renameValue = {
49334933 columnRename . editingId === column . key ? columnRename . editValue : ''
49344934 }
4935- renameError = { renameError && columnRename . editingId === column . key }
4935+ renameError = { renameErrorColumnId === column . key }
49364936 onRenameValueChange = { handleRenameValueChange }
49374937 onRenameSubmit = { handleRenameSubmit }
49384938 onRenameCancel = { handleRenameCancel }
0 commit comments