@@ -1570,7 +1570,7 @@ export function TableGrid({
15701570 const handleFindCloseRef = useRef ( handleFindClose )
15711571 handleFindCloseRef . current = handleFindClose
15721572
1573- const [ renameError , setRenameError ] = useState ( false )
1573+ const [ renameErrorColumnId , setRenameErrorColumnId ] = useState < string | null > ( null )
15741574
15751575 const columnRename = useInlineRename ( {
15761576 // `columnName` is the column id; record the prior display name + id so undo
@@ -1585,7 +1585,7 @@ export function TableGrid({
15851585 if ( isValidationError ( error ) ) {
15861586 toast . error ( extractValidationIssues ( error ) [ 0 ] ?. message ?? getErrorMessage ( error ) )
15871587 }
1588- setRenameError ( true )
1588+ setRenameErrorColumnId ( columnName )
15891589 throw error
15901590 } )
15911591 } ,
@@ -1594,7 +1594,7 @@ export function TableGrid({
15941594 columnRenameRef . current = columnRename
15951595
15961596 const handleRenameValueChange = useCallback ( ( value : string ) => {
1597- setRenameError ( false )
1597+ setRenameErrorColumnId ( null )
15981598 columnRenameRef . current . setEditValue ( value )
15991599 } , [ ] )
16001600
@@ -1603,7 +1603,7 @@ export function TableGrid({
16031603 const { editingId, editValue, submitRename } = columnRenameRef . current
16041604 const trimmedName = editValue . trim ( )
16051605 const currentColumn = columnsRef . current . find ( ( column ) => column . key === editingId )
1606- if ( trimmedName && currentColumn && trimmedName !== currentColumn . name ) {
1606+ if ( currentColumn && trimmedName !== currentColumn . name ) {
16071607 const issue = columnNameIssue (
16081608 trimmedName ,
16091609 schemaColumnsRef . current
@@ -1612,16 +1612,16 @@ export function TableGrid({
16121612 )
16131613 if ( issue ) {
16141614 toast . error ( issue )
1615- setRenameError ( true )
1615+ setRenameErrorColumnId ( editingId )
16161616 return
16171617 }
16181618 }
1619- setRenameError ( false )
1619+ setRenameErrorColumnId ( null )
16201620 void submitRename ( )
16211621 } , [ ] )
16221622
16231623 const handleRenameCancel = useCallback ( ( ) => {
1624- setRenameError ( false )
1624+ setRenameErrorColumnId ( null )
16251625 columnRenameRef . current . cancelRename ( )
16261626 } , [ ] )
16271627
@@ -4119,7 +4119,7 @@ export function TableGrid({
41194119
41204120 const handleRenameColumn = useCallback (
41214121 ( columnName : string ) => {
4122- setRenameError ( false )
4122+ setRenameErrorColumnId ( null )
41234123 const column = columnsRef . current . find ( ( candidate ) => candidate . key === columnName )
41244124 columnRename . startRename ( columnName , column ?. name ?? columnName )
41254125 } ,
@@ -5016,7 +5016,7 @@ export function TableGrid({
50165016 renameValue = {
50175017 columnRename . editingId === column . key ? columnRename . editValue : ''
50185018 }
5019- renameError = { renameError && columnRename . editingId === column . key }
5019+ renameError = { renameErrorColumnId === column . key }
50205020 onRenameValueChange = { handleRenameValueChange }
50215021 onRenameSubmit = { handleRenameSubmit }
50225022 onRenameCancel = { handleRenameCancel }
0 commit comments