chore: resolve merge conflict

mParticle · Dec 20, 2024 · a7f844e · a7f844e
2 parents 3985d22 + ad063f5
commit a7f844e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/docs/UX Patterns/Table/Table.stories.tsx b/docs/UX Patterns/Table/Table.stories.tsx
@@ -23,8 +23,6 @@ import { tableColumns, tableData, type TableDataType } from './TableStoryUtils'
 import { SelectWithRangePicker } from 'docs/Candidate Components/Directory/Date Range Filter/SelectWithRangePicker'
 import { useState } from 'react'
 import { ColorTextDescription } from 'src/styles/style'
-import MinusSquareOutlined from '@ant-design/icons/MinusSquareOutlined'
-import PlusSquareOutlined from '@ant-design/icons/PlusSquareOutlined'
 
 const meta: Meta<typeof Table> = {
   title: 'UX Patterns/Table/Table',
@@ -110,11 +108,7 @@ const CollapsibleSection = ({ ...item }: ICollapsibleFormSectionProps): React.JS
           },
         },
       }}>
-      <Collapse
-        ghost
-        expandIcon={({ isActive }): React.JSX.Element => (isActive ? <MinusSquareOutlined /> : <PlusSquareOutlined />)}
-        items={[{ ...item, key: 'item' }]}
-      />
+      <Collapse ghost items={[{ ...item, key: 'item' }]} />
     </ConfigProvider>
   )
 }

diff --git a/src/components/data-display/Collapse/Collapse.tsx b/src/components/data-display/Collapse/Collapse.tsx
@@ -1,13 +1,18 @@
 import { Collapse as AntCollapse } from 'antd'
 import type { CollapseProps as AntCollapseProps } from 'antd'
-import { ConfigProvider } from 'src/components'
+import { ConfigProvider, Icon } from 'src/components'
 
 export interface ICollapseProps extends AntCollapseProps {}
 
 export const Collapse = (props: ICollapseProps) => {
   return (
     <ConfigProvider>
-      <AntCollapse {...props} />
+      <AntCollapse
+        expandIcon={({ isActive }): React.JSX.Element =>
+          isActive ? <Icon name="dropdownOpen" size="sm" /> : <Icon name="next" size="sm" />
+        }
+        {...props}
+      />
     </ConfigProvider>
   )
 }