Merge branch 'dev' into feature/#631-fix-back-page-gesture

Lemoncode · Dec 29, 2024 · a365a76 · a365a76
2 parents 1a15cb4 + 05ee6ad
commit a365a76
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/common/components/mock-components/front-components/listbox/listbox-shape.tsx b/src/common/components/mock-components/front-components/listbox/listbox-shape.tsx
@@ -109,7 +109,7 @@ export const ListBoxShape = forwardRef<any, ListBoxShapeProps>((props, ref) => {
         height={restrictedHeight + 20}
         ref={rectRef}
         cornerRadius={borderRadius}
-        stroke={stroke}
+        stroke={disabled ? DISABLED_COLOR_VALUES.DEFAULT_STROKE_COLOR : stroke}
         strokeWidth={2}
         dash={strokeStyle}
         fill={disabled ? DISABLED_COLOR_VALUES.DEFAULT_BACKGROUND_COLOR : fill}
@@ -136,7 +136,9 @@ export const ListBoxShape = forwardRef<any, ListBoxShapeProps>((props, ref) => {
               height={singleHeaderHeight - 12}
               fontFamily={BASIC_SHAPE.DEFAULT_FONT_FAMILY}
               fontSize={15}
-              fill={textColor}
+              fill={
+                disabled ? DISABLED_COLOR_VALUES.DEFAULT_TEXT_COLOR : textColor
+              }
               wrap="none"
               ellipsis={true}
             />