Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: swap default expand icon for collapse component #491

Merged
merged 3 commits into from
Dec 19, 2024
Merged

chore: swap default expand icon for collapse component #491

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
759c77b
chore: swap default expand icon for collapse component
tibuurcio Nov 14, 2024
2af6559
Merge branch 'main' into chore/collapse-default-icon
gabyzif Nov 20, 2024
c6f42ba
Merge branch 'main' into chore/collapse-default-icon
tibuurcio Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions docs/UX Patterns/Table/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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>
)
}
Expand Down
5 changes: 2 additions & 3 deletions src/components/data-display/Collapse/Collapse.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react'
import type { Meta, StoryObj } from '@storybook/react'
import { Collapse } from 'src/components/data-display/Collapse/Collapse'
import { ExampleStory } from 'src/utils/ExampleStory'
import { type ICollapseProps } from 'src/components/data-display/Collapse/Collapse'
import type { ICollapseProps } from 'src/components/data-display/Collapse/Collapse'
import { Divider, Icon, Space } from 'src/components'
import { theme } from 'antd'
import { Select } from 'src/components'
Expand Down Expand Up @@ -42,7 +42,6 @@ const meta: Meta<typeof Collapse> = {
collapsible: undefined,
defaultActiveKey: undefined,
destroyInactivePanel: false,
expandIcon: undefined,
expandIconPosition: undefined,
ghost: false,
size: 'middle',
Expand Down
9 changes: 7 additions & 2 deletions src/components/data-display/Collapse/Collapse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does the native ant icon not work for us?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a different chevron, same as the Select component. Our chevron came from Design and looks better IMO
image
image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does look better indeed

}
{...props}
/>
</ConfigProvider>
)
}
Expand Down
Loading