From 21a1ae2f4ff9f00db010e5866a56e75b9074b093 Mon Sep 17 00:00:00 2001
From: Dominika Hustinova <domi.hustinova@gmail.com>
Date: Thu, 12 Sep 2024 10:46:11 +0200
Subject: [PATCH] fix(FormLabel): ensure correct color

Color of label should be different only for inlineLabel
and should not change if value is filled or element is disabled.
---
 .../src/FormLabel/__tests__/index.test.tsx     |  2 +-
 .../orbit-components/src/FormLabel/index.tsx   | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/orbit-components/src/FormLabel/__tests__/index.test.tsx b/packages/orbit-components/src/FormLabel/__tests__/index.test.tsx
index a93454979b..fbd6f7c4ae 100644
--- a/packages/orbit-components/src/FormLabel/__tests__/index.test.tsx
+++ b/packages/orbit-components/src/FormLabel/__tests__/index.test.tsx
@@ -6,7 +6,7 @@ import FormLabel from "..";
 describe("FormLabel", () => {
   it("should have expected DOM output", () => {
     render(
-      <FormLabel filled={false} dataTest="test" required>
+      <FormLabel dataTest="test" required>
         FormLabel
       </FormLabel>,
     );
diff --git a/packages/orbit-components/src/FormLabel/index.tsx b/packages/orbit-components/src/FormLabel/index.tsx
index ade49ca41c..c6c2ee8fbb 100644
--- a/packages/orbit-components/src/FormLabel/index.tsx
+++ b/packages/orbit-components/src/FormLabel/index.tsx
@@ -9,7 +9,6 @@ const FormLabel = ({
   className,
   children,
   required,
-  filled,
   dataTest,
   id,
   error,
@@ -19,16 +18,15 @@ const FormLabel = ({
   iconRef,
   inlineLabel,
   labelRef,
-  disabled,
 }: Props) => (
   <span
     className={cx(
       className,
       "orbit-form-label",
       "font-base text-normal mb-100 ms-100 de:ms-0 inline-flex font-medium leading-normal",
-      !filled || disabled
-        ? "text-form-element-label-foreground"
-        : "text-form-element-label-filled-foreground",
+      inlineLabel
+        ? "text-form-element-label-filled-foreground"
+        : "text-form-element-label-foreground",
     )}
     data-test={dataTest}
     id={id}
@@ -43,14 +41,8 @@ const FormLabel = ({
       </span>
     )}
 
-    {required && !error && (
-      <span
-        className={cx(
-          "text-normal align-top font-bold",
-          filled ? "text-form-element-label-filled-foreground" : "text-critical-foreground",
-        )}
-        aria-hidden="true"
-      >
+    {required && (
+      <span className="text-normal text-critical-foreground align-top font-bold" aria-hidden="true">
         *
       </span>
     )}