feat(multi-select): add color prop

aiqfome · Feb 27, 2024 · cdc906d · cdc906d
1 parent 72fdfdd
commit cdc906d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/components/MultiSelect/MultiSelect.test.tsx b/src/components/MultiSelect/MultiSelect.test.tsx
@@ -4,8 +4,10 @@ import { fireEvent } from '@testing-library/react'
 import { MultiSelect } from '../MultiSelect'
 import { render } from '../utils/test/render'
 
+const greenColor = '#6EC531'
+
 const items = [
-  { id: 0, name: 'Maringá' },
+  { id: 0, name: 'Maringá', color: greenColor },
   { id: 1, name: 'Guarapuava' },
   { id: 2, name: 'São Paulo' },
   { id: 3, name: 'Curitiba' },
@@ -138,4 +140,13 @@ describe('MultiSelect', () => {
 
     expect(select).toBeDisabled()
   })
+
+  it('should have custom color when have color prop', () => {
+    const { getByTestId } = render(
+      <MultiSelect items={items} value={[items[0]]} />
+    )
+
+    const BadgeItem = getByTestId('select-selected-item')
+    expect(BadgeItem).toHaveStyle({ backgroundColor: greenColor })
+  })
 })
diff --git a/src/components/MultiSelect/MultiSelect.tsx b/src/components/MultiSelect/MultiSelect.tsx
@@ -6,6 +6,7 @@ import { MultiSelectStatic } from './MultiSelectStatic'
 type Item = {
   id: any
   name: string
+  color?: string
 }
 
 export interface Props {

diff --git a/src/components/MultiSelect/MultiSelectFetchable.tsx b/src/components/MultiSelect/MultiSelectFetchable.tsx
@@ -3,6 +3,7 @@ import React, { useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
 import { MdClose } from 'react-icons/md'
 import { useCombobox, useMultipleSelection } from 'downshift'
+import { isEmpty } from 'lodash'
 
 import { Flex } from '../Flex'
 import { Box } from '../Box'
@@ -403,7 +404,7 @@ export const MultiSelectFetchable: React.FC<Props> = ({
           border='1px solid #dedede'
           {...getMenuProps()}
         >
-          {!isDependent && (
+          {!isDependent && !isEmpty(filters) && (
             <>
               <ul>
                 {filters.map((filter, index) => (

diff --git a/src/components/MultiSelect/MultiSelectStatic.tsx b/src/components/MultiSelect/MultiSelectStatic.tsx
@@ -10,11 +10,13 @@ import { Text } from '../Text'
 import { Divider } from '../Divider'
 import { Button } from '../Button'
 import { InputErrorMessage } from '../InputErrorMessage'
+import { isEmpty } from 'lodash'
 
 type Item = {
   id: any
   name: string
   select?: string
+  color?: string
 }
 
 export interface Props {
@@ -349,7 +351,9 @@ export const MultiSelectStatic: React.FC<Props> = ({
                 display='flex'
                 flexDirection='row'
                 alignItems='center'
-                backgroundColor={disabled ? 'darkGrey' : 'primary'}
+                backgroundColor={
+                  disabled ? 'darkGrey' : selectedItem?.color || 'primary'
+                }
                 borderRadius='3px'
                 data-testid='select-selected-item'
               >
@@ -429,7 +433,7 @@ export const MultiSelectStatic: React.FC<Props> = ({
           border='1px solid #dedede'
           {...getMenuProps()}
         >
-          {!isDependent && !disabled && (
+          {!isDependent && !disabled && !isEmpty(filters) && (
             <>
               <ul>
                 {filters.map((filter, index) => (

diff --git a/yarn.lock b/yarn.lock
@@ -11538,7 +11538,7 @@ react-select@^3.2.0:
     react-input-autosize "^3.0.0"
     react-transition-group "^4.3.0"
 
-react-spring@^9.6.1:
+react-spring@9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.6.1.tgz#e715b2fa523c1a3acfdcf1aaa93e081620b8cc8e"
   integrity sha512-BeP80R4SLb1bZHW/Q62nECoScHw/fH+jzGkD7dc892HNGa+lbGIJXURc6U7N8JfZ8peEO46nPxR57aUMuYzquQ==