fix: resolve conflicts

gravity-ui · Sep 5, 2023 · 30eb07a · 30eb07a
1 parent f28d7b2
commit 30eb07a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/src/components/controls/TextArea/TextArea.tsx b/src/components/controls/TextArea/TextArea.tsx
@@ -11,12 +11,7 @@ import type {
     InputControlSize,
     InputControlView,
 } from '../types';
-import {
-    CONTROL_ERROR_MESSAGE_QA,
-    errorPropsMapper,
-    getInputControlState,
-    prepareAutoComplete,
-} from '../utils';
+import {errorPropsMapper, getInputControlState, prepareAutoComplete} from '../utils';
 
 import {TextAreaControl} from './TextAreaControl';
 
@@ -188,16 +183,12 @@ export const TextArea = React.forwardRef<HTMLSpanElement, TextAreaProps>(functio
                     />
                 )}
             </span>
-            {(isErrorMsgVisible || note) && (
-                <div className={b('outer-additional-content')}>
-                    {isErrorMsgVisible && (
-                        <div className={b('error')} data-qa={CONTROL_ERROR_MESSAGE_QA}>
-                            {errorMessage}
-                        </div>
-                    )}
-                    {note && <div className={b('note')}>{note}</div>}
-                </div>
-            )}
+            <OuterAdditionalContent
+                errorMessage={errorMessage}
+                errorMessageId={errorMessageId}
+                note={note}
+                noteId={noteId}
+            />
         </span>
     );
 });
diff --git a/src/components/controls/TextInput/TextInput.tsx b/src/components/controls/TextInput/TextInput.tsx
@@ -258,9 +258,9 @@ export const TextInput = React.forwardRef<HTMLSpanElement, TextInputProps>(funct
             </span>
             <OuterAdditionalContent
                 note={note}
-                error={errorMessage}
-                isVisible={isErrorMsgVisible}
-                controlId={id}
+                errorMessage={errorMessage}
+                noteId={noteId}
+                errorMessageId={errorMessageId}
             />
         </span>
     );

diff --git a/src/components/controls/common/OuterAdditionalContent/OuterAdditionalContent.tsx b/src/components/controls/common/OuterAdditionalContent/OuterAdditionalContent.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import {block} from '../../../utils/cn';
+import {CONTROL_ERROR_MESSAGE_QA} from '../../utils';
 
 import './OuterAdditionalContent.scss';
 
@@ -22,7 +23,7 @@ export const OuterAdditionalContent = ({
     return errorMessage || note ? (
         <div className={b()}>
             {errorMessage && (
-                <div className={b('error')} id={errorMessageId}>
+                <div className={b('error')} id={errorMessageId} data-qa={CONTROL_ERROR_MESSAGE_QA}>
                     {errorMessage}
                 </div>
             )}