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

Jump to bottom

fix: collapse default position in rtl #23445

Merged
merged 7 commits into from Apr 21, 2020
Merged

fix: collapse default position in rtl #23445

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2aa2939
fix: collapse default position in rtl
xrkffgg Apr 21, 2020
d205651
update snap
xrkffgg Apr 21, 2020
8cbf686
up
xrkffgg Apr 21, 2020
832bdea
fix
xrkffgg Apr 21, 2020
0d90988
fix
xrkffgg Apr 21, 2020
271e995
fix var
xrkffgg Apr 21, 2020
2bf199d
fix
xrkffgg Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions components/collapse/Collapse.tsx
View file
Open in desktop
Expand Up @@ -40,7 +40,6 @@ export default class Collapse extends React.Component<CollapseProps, any> {

static defaultProps = {
bordered: true,
expandIconPosition: 'left' as CollapseProps['expandIconPosition'],
};

renderExpandIcon = (panelProps: PanelProps = {}, prefixCls: string) => {
Expand All @@ -66,10 +65,16 @@ export default class Collapse extends React.Component<CollapseProps, any> {
expandIconPosition,
} = this.props;
const prefixCls = getPrefixCls('collapse', customizePrefixCls);
let iconPosition;
if (expandIconPosition !== undefined) {
iconPosition = expandIconPosition;
} else {
iconPosition = direction === 'rtl' ? 'right' : 'left';
}
Copy link
Member

Choose a reason for hiding this comment

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

提到一个函数里。

const collapseClassName = classNames(
{
[`${prefixCls}-borderless`]: !bordered,
[`${prefixCls}-icon-position-${expandIconPosition}`]: true,
[`${prefixCls}-icon-position-${iconPosition}`]: true,
[`${prefixCls}-rtl`]: direction === 'rtl',
},
className,
Expand Down
2 changes: 1 addition & 1 deletion components/collapse/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ exports[`Collapse could override default openAnimation 1`] = `

exports[`Collapse rtl render component should be rendered correctly in RTL direction 1`] = `
<div
class="ant-collapse ant-collapse-icon-position-left ant-collapse-rtl"
class="ant-collapse ant-collapse-icon-position-right ant-collapse-rtl"
/>
`;

Expand Down