feat: change order

gravity-ui · Aug 22, 2023 · b2162de · b2162de
1 parent eb27c04
commit b2162de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/components/controls/TextInput/TextInputControl.tsx b/src/components/controls/TextInput/TextInputControl.tsx
@@ -38,12 +38,13 @@ export function TextInputControl(props: Props) {
     const describedBy = React.useMemo(() => {
         const result = [];
         if (id) {
-            if (error) {
-                result.push(getControlErrorTextId(id));
-            }
             if (note) {
                 result.push(getControlNoteId(id));
             }
+
+            if (error) {
+                result.push(getControlErrorTextId(id));
+            }
         }
         return result.join(' ');
     }, [error, note, id]);

diff --git a/src/components/controls/TextInput/__tests__/TextInput.input.test.tsx b/src/components/controls/TextInput/__tests__/TextInput.input.test.tsx
@@ -144,7 +144,7 @@ describe('TextInput input', () => {
                 const noteTextElement = container.querySelector(`#${getControlNoteId(inputId)}`);
 
                 expect(input.getAttribute('aria-describedby')).toBe(
-                    `${getControlErrorTextId(inputId)} ${getControlNoteId(inputId)}`,
+                    `${getControlNoteId(inputId)} ${getControlErrorTextId(inputId)}`,
                 );
                 expect(errorTextElement?.textContent).toBe(errorText);
                 expect(noteTextElement?.textContent).toBe(noteText);