Skip to content

fix(collapsibleactionitems): change icon size and add classname/style #500

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.

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

Merged
merged 2 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions src/collapsibleActionItems/__tests__/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('test CollapsibleActionItems', () => {
}}
/>
);
const btns = container.querySelectorAll('.dtc-action-btn-wrapper');
const btns = container.querySelectorAll('.dtc-collapsibleActionItems__btn');
expect(btns).toHaveLength(3);
btns.forEach(testClick);
});
Expand All @@ -53,7 +53,7 @@ describe('test CollapsibleActionItems', () => {
dropdownProps={{ trigger: ['click'] }}
/>
);
const btns = container.querySelectorAll('.dtc-action-btn-wrapper');
const btns = container.querySelectorAll('.dtc-collapsibleActionItems__btn');
const dropdownEl = getByTestId('action-dropdown-link');
expect(btns).toHaveLength(1);
expect(dropdownEl).toBeInTheDocument();
Expand Down
17 changes: 13 additions & 4 deletions src/collapsibleActionItems/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React, { ReactNode } from 'react';
import { EllipsisOutlined } from '@ant-design/icons';
import { Button, ButtonProps, Divider, Dropdown, DropDownProps, Menu } from 'antd';
import classNames from 'classnames';

import './style.scss';

type ActionItem = {
key: React.Key;
name: ReactNode;
disabled?: boolean;
render?: () => ReactNode;
[propName: string]: any;
};

interface ICollapsibleActionItems {
Expand All @@ -18,6 +20,7 @@ interface ICollapsibleActionItems {
collapseIcon?: ReactNode; // 折叠菜单图标
dropdownProps?: Partial<DropDownProps>;
buttonProps?: Partial<ButtonProps>;
style?: React.CSSProperties;
onItemClick?(key: React.Key): void;
}

Expand All @@ -30,6 +33,7 @@ const CollapsibleActionItems: React.FC<ICollapsibleActionItems> = (props) => {
collapseIcon = <EllipsisOutlined />,
dropdownProps,
buttonProps,
style,
onItemClick,
} = props;
const isOverMaxCount = actionItems.length > maxCount;
Expand All @@ -38,7 +42,7 @@ const CollapsibleActionItems: React.FC<ICollapsibleActionItems> = (props) => {
if (!isCollapse)
return (
<span
className="dtc-action-btn-wrapper"
className="dtc-collapsibleActionItems__btn"
key={item.key}
onClick={() => !item.disabled && onItemClick?.(item.key)}
>
Expand Down Expand Up @@ -70,7 +74,7 @@ const CollapsibleActionItems: React.FC<ICollapsibleActionItems> = (props) => {
) : null;

return (
<div className={className}>
<div className={classNames('dtc-collapsibleActionItems', className)} style={style}>
{displayAction.map((actionItem, index) => {
const showDivider = index < actionItems.length - 1;
return (
Expand All @@ -86,7 +90,12 @@ const CollapsibleActionItems: React.FC<ICollapsibleActionItems> = (props) => {
getPopupContainer={(triggerNode) => triggerNode.parentElement ?? document.body}
{...dropdownProps}
>
<a data-testid="action-dropdown-link">{collapseIcon}</a>
<a
data-testid="action-dropdown-link"
className="dtc-collapsibleActionItems__icon"
>
{collapseIcon}
</a>
</Dropdown>
)}
</div>
Expand Down
7 changes: 7 additions & 0 deletions src/collapsibleActionItems/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
$card_prefix: "dtc-collapsibleActionItems";

.#{$card_prefix} {
&__icon {
font-size: 16px;
}
}
Loading