Merge pull request #66 from yakupozbaydar/error-border-fix

fix(textarea): bordercolor
Trendyol · Nov 29, 2024 · 06bb51e · 06bb51e
2 parents 0d5b0cf + 4d979d2
commit 06bb51e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/TextArea/utils.test.ts b/src/components/TextArea/utils.test.ts
@@ -317,7 +317,7 @@ describe('TextArea Utils', () => {
       expect(result).toBe('dangerKey');
     });
 
-    test('should return primaryKey when focused true', () => {
+    test('should return primaryKey when focused true and no error', () => {
       // given
       const focused = true;
       const errorState = false;

diff --git a/src/components/TextArea/utils.ts b/src/components/TextArea/utils.ts
@@ -91,5 +91,5 @@ export const getBorderColor = ({
   focused: boolean;
   errorState: boolean;
 }) => {
-  return focused ? 'primaryKey' : errorState ? 'dangerKey' : 'neutralLighter';
+  return errorState ? 'dangerKey' : focused ? 'primaryKey' : 'neutralLighter';
 };