Merge branch 'main' into CHARTS-11752

Author: kuzmadom

src/ui/components/FieldEditor/components/Settings.tsx

@@ -46,7 +46,6 @@ export const Settings: React.FC<SettingsProps> = ({
     isNewField,
 }) => {
     const inputRef = React.useRef<HTMLInputElement>(null);
-    const [titleEditMode, setTitleEditMode] = React.useState(!title);
 
     const {AdditionalButtonsWrapper} = registry.fieldEditor.components.getAll();
 
@@ -77,6 +76,8 @@ export const Settings: React.FC<SettingsProps> = ({
     const errorMessageKey = getErrorMessageKey([DUPLICATE_TITLE, EMPTY_TITLE], errors);
     const showDocButton = isEnabledFeature(Feature.FieldEditorDocSection) && calcMode === 'formula';
 
+    const [titleEditMode, setTitleEditMode] = React.useState(!title || Boolean(errorMessageKey));
+
     const handleStartEditTitle = React.useCallback(() => {
         setTitleEditMode(true);
         setTimeout(() => {
@@ -85,10 +86,16 @@ export const Settings: React.FC<SettingsProps> = ({
     }, []);
 
     const handleStopEditTitle = React.useCallback(() => {
-        if (inputTitle) {
+        if (inputTitle && !errorMessageKey) {
             setTitleEditMode(false);
         }
-    }, [inputTitle]);
+    }, [inputTitle, errorMessageKey]);
+
+    React.useEffect(() => {
+        if (errorMessageKey) {
+            setTitleEditMode(true);
+        }
+    }, [errorMessageKey]);
 
     return (
         <React.Fragment>