@@ -1585,7 +1585,7 @@ export function TableGrid({
15851585 const handleFindCloseRef = useRef ( handleFindClose )
15861586 handleFindCloseRef . current = handleFindClose
15871587
1588- const [ renameError , setRenameError ] = useState ( false )
1588+ const [ renameErrorColumnId , setRenameErrorColumnId ] = useState < string | null > ( null )
15891589
15901590 const columnRename = useInlineRename ( {
15911591 // `columnName` is the column id; record the prior display name + id so undo
@@ -1600,7 +1600,7 @@ export function TableGrid({
16001600 if ( isValidationError ( error ) ) {
16011601 toast . error ( extractValidationIssues ( error ) [ 0 ] ?. message ?? getErrorMessage ( error ) )
16021602 }
1603- setRenameError ( true )
1603+ setRenameErrorColumnId ( columnName )
16041604 throw error
16051605 } )
16061606 } ,
@@ -1609,7 +1609,7 @@ export function TableGrid({
16091609 columnRenameRef . current = columnRename
16101610
16111611 const handleRenameValueChange = useCallback ( ( value : string ) => {
1612- setRenameError ( false )
1612+ setRenameErrorColumnId ( null )
16131613 columnRenameRef . current . setEditValue ( value )
16141614 } , [ ] )
16151615
@@ -1618,7 +1618,7 @@ export function TableGrid({
16181618 const { editingId, editValue, submitRename } = columnRenameRef . current
16191619 const trimmedName = editValue . trim ( )
16201620 const currentColumn = columnsRef . current . find ( ( column ) => column . key === editingId )
1621- if ( trimmedName && currentColumn && trimmedName !== currentColumn . name ) {
1621+ if ( currentColumn && trimmedName !== currentColumn . name ) {
16221622 const issue = columnNameIssue (
16231623 trimmedName ,
16241624 schemaColumnsRef . current
@@ -1627,16 +1627,16 @@ export function TableGrid({
16271627 )
16281628 if ( issue ) {
16291629 toast . error ( issue )
1630- setRenameError ( true )
1630+ setRenameErrorColumnId ( editingId )
16311631 return
16321632 }
16331633 }
1634- setRenameError ( false )
1634+ setRenameErrorColumnId ( null )
16351635 void submitRename ( )
16361636 } , [ ] )
16371637
16381638 const handleRenameCancel = useCallback ( ( ) => {
1639- setRenameError ( false )
1639+ setRenameErrorColumnId ( null )
16401640 columnRenameRef . current . cancelRename ( )
16411641 } , [ ] )
16421642
@@ -4173,7 +4173,7 @@ export function TableGrid({
41734173
41744174 const handleRenameColumn = useCallback (
41754175 ( columnName : string ) => {
4176- setRenameError ( false )
4176+ setRenameErrorColumnId ( null )
41774177 const column = columnsRef . current . find ( ( candidate ) => candidate . key === columnName )
41784178 columnRename . startRename ( columnName , column ?. name ?? columnName )
41794179 } ,
@@ -5076,7 +5076,7 @@ export function TableGrid({
50765076 renameValue = {
50775077 columnRename . editingId === column . key ? columnRename . editValue : ''
50785078 }
5079- renameError = { renameError && columnRename . editingId === column . key }
5079+ renameError = { renameErrorColumnId === column . key }
50805080 onRenameValueChange = { handleRenameValueChange }
50815081 onRenameSubmit = { handleRenameSubmit }
50825082 onRenameCancel = { handleRenameCancel }
0 commit comments