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.

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

feat: Breadcrumb support data against #18941

Merged
merged 8 commits into from Sep 23, 2019
Merged

feat: Breadcrumb support data against #18941

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed99c63
add tree-select async demo
Sep 19, 2019
cc77996
merge
Sep 20, 2019
6836871
Merge remote-tracking branch 'upstream/master'
Sep 22, 2019
2c951c2
breadcrumb support data against
Sep 22, 2019
fc68285
lint fix
Sep 22, 2019
c16871a
add ui test
Sep 22, 2019
2e62670
update ui test
Sep 23, 2019
21a6d8f
update ui test
Sep 23, 2019
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
8 changes: 7 additions & 1 deletion components/breadcrumb/Breadcrumb.tsx
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import toArray from 'rc-util/lib/Children/toArray';
import omit from 'omit.js';
import BreadcrumbItem from './BreadcrumbItem';
import BreadcrumbSeparator from './BreadcrumbSeparator';
import Menu from '../menu';
Expand Down Expand Up @@ -144,6 +145,7 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
className,
routes,
children,
...restProps
} = this.props;
const prefixCls = getPrefixCls('breadcrumb', customizePrefixCls);
if (routes && routes.length > 0) {
Expand All @@ -169,7 +171,11 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
});
}
return (
<div className={classNames(className, prefixCls)} style={style}>
<div
className={classNames(className, prefixCls)}
style={style}
{...omit(restProps, ['itemRender', 'params'])}
sosohime marked this conversation as resolved.
Show resolved Hide resolved
>
{crumbs}
</div>
);
Expand Down
10 changes: 10 additions & 0 deletions components/breadcrumb/__tests__/Breadcrumb.test.js
View file
Open in desktop
Expand Up @@ -102,4 +102,14 @@ describe('Breadcrumb', () => {
const wrapper = render(<Breadcrumb routes={routes} />);
expect(wrapper).toMatchSnapshot();
});

it('should support custom attribute', () => {
sosohime marked this conversation as resolved.
Show resolved Hide resolved
const wrapper = render(
<Breadcrumb data-custom="custom">
<Breadcrumb.Item>xxx</Breadcrumb.Item>
<Breadcrumb.Item>yyy</Breadcrumb.Item>
</Breadcrumb>,
);
expect(wrapper).toMatchSnapshot();
});
});
32 changes: 32 additions & 0 deletions components/breadcrumb/__tests__/__snapshots__/Breadcrumb.test.js.snap
View file
Open in desktop
Expand Up @@ -157,3 +157,35 @@ exports[`Breadcrumb should render a menu 1`] = `
</span>
</div>
`;

exports[`Breadcrumb should support custom attribute 1`] = `
<div
class="ant-breadcrumb"
data-custom="custom"
>
<span>
<span
class="ant-breadcrumb-link"
>
xxx
</span>
<span
class="ant-breadcrumb-separator"
>
/
</span>
</span>
<span>
<span
class="ant-breadcrumb-link"
>
yyy
</span>
<span
class="ant-breadcrumb-separator"
>
/
</span>
</span>
</div>
`;
12 changes: 3 additions & 9 deletions components/menu/__tests__/index.test.js
View file
Open in desktop
Expand Up @@ -656,16 +656,10 @@ describe('Menu', () => {
collapsedWidth={0}
openKeys={['3']}
>
<Menu.Item key="1">
Option 1
</Menu.Item>
<Menu.Item key="2">
Option 2
</Menu.Item>
<Menu.Item key="1">Option 1</Menu.Item>
<Menu.Item key="2">Option 2</Menu.Item>
<Menu.SubMenu key="3" title="Option 3">
<Menu.Item key="4">
Option 4
</Menu.Item>
<Menu.Item key="4">Option 4</Menu.Item>
</Menu.SubMenu>
</Menu>,
);
Expand Down