Merge pull request #3038 from Autodesk/development

Release: August 29, 2023
Autodesk · Aug 30, 2023 · 5004de7 · 5004de7
2 parents 9ab9c8b + 05e7a13
commit 5004de7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/input/src/presenters/InputHaloPresenter.stylesheet.js b/packages/input/src/presenters/InputHaloPresenter.stylesheet.js
@@ -38,12 +38,12 @@ function borderBottomStyles(
     ...(error
       ? { borderBottomColor: themeData["input.error.borderBottomColor"] }
       : {}),
-    ...(hasFocus
-      ? { borderBottomColor: themeData["input.line.focus.borderBottomColor"] }
-      : {}),
     ...(hasHover
       ? { borderBottomColor: themeData["input.box.hover.borderBottomColor"] }
       : {}),
+    ...(hasFocus
+      ? { borderBottomColor: themeData["input.line.focus.borderBottomColor"] }
+      : {}),
   };
 }
 
@@ -70,8 +70,8 @@ function haloStyles({ isDisabled, hasFocus, hasHover }, themeData) {
 
   return {
     ...defaults,
-    ...(hasFocus ? focusStyles : {}),
     ...(hasHover ? hoverStyles : {}),
+    ...(hasFocus ? focusStyles : {}),
   };
 }