Merge pull request #634 from raheeliftikhar5/color-picker-fix

FalkWolsky · web-flow · commit 96da6e40b253 · 2024-01-15T13:32:57.000+01:00
fix for color picker to show selected color
diff --git a/client/packages/lowcoder-design/src/components/colorSelect/index.tsx b/client/packages/lowcoder-design/src/components/colorSelect/index.tsx
@@ -31,7 +31,6 @@ export const ColorSelect = (props: ColorSelectProps) => {
     }, 200),
     [dispatch]
   );
-
   return (
     <Popover
       trigger={trigger}
@@ -170,7 +169,7 @@ const BackDiv = styled.div.attrs<{ $color: string }>((props: { $color: string })
 `;
 // main block
 const ColorBlock = styled.div<{ $color: string }>`
-  background-color: ${(props) => (isValidColor(props.$color) ? props.color : "#FFFFFF")};
+  background-color: ${(props) => (isValidColor(props.$color) ? props.$color : "#FFFFFF")};
   border: 1px solid rgba(0, 0, 0, 0.1);
   border-radius: 4px;
   height: 24px;
diff --git a/client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx b/client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx
@@ -39,7 +39,7 @@ const SelectOptionContains = styled.div`
   align-items: center;
   width: 99%;
 `;
-const SelectOption = styled((props: OptionProps) => <Option {...props} />)`
+const SelectOption = styled(Option)`
   display: flex;
   justify-content: space-between;
 
