Skip to content

feat: update breadcrumb #2389

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
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
23 changes: 11 additions & 12 deletions components/breadcrumb/Breadcrumb.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { inject, cloneVNode } from 'vue';
import PropTypes from '../_util/vue-types';
import { cloneElement } from '../_util/vnode';
import { filterEmpty, getComponentFromProp, getSlotOptions } from '../_util/props-util';
import { filterEmpty, getComponent, getSlotOptions, getSlot } from '../_util/props-util';
import warning from '../_util/warning';
import { ConfigConsumerProps } from '../config-provider';
import BreadcrumbItem from './BreadcrumbItem';
Expand Down Expand Up @@ -35,8 +35,10 @@ function getBreadcrumbName(route, params) {
export default {
name: 'ABreadcrumb',
props: BreadcrumbProps,
inject: {
configProvider: { default: () => ConfigConsumerProps },
setup() {
return {
configProvider: inject('configProvider', ConfigConsumerProps),
};
},
methods: {
defaultItemRender({ route, params, routes, paths }) {
Expand Down Expand Up @@ -103,13 +105,13 @@ export default {
},
render() {
let crumbs;
const { prefixCls: customizePrefixCls, routes, params = {}, $slots, $scopedSlots } = this;
const { prefixCls: customizePrefixCls, routes, params = {}, $slots } = this;
const getPrefixCls = this.configProvider.getPrefixCls;
const prefixCls = getPrefixCls('breadcrumb', customizePrefixCls);

const children = filterEmpty($slots.default);
const separator = getComponentFromProp(this, 'separator');
const itemRender = this.itemRender || $scopedSlots.itemRender || this.defaultItemRender;
const children = filterEmpty(getSlot(this));
const separator = getComponent(this, 'separator');
const itemRender = this.itemRender || $slots.itemRender || this.defaultItemRender;
if (routes && routes.length > 0) {
// generated by route
crumbs = this.genForRoutes({
Expand All @@ -126,10 +128,7 @@ export default {
'Breadcrumb',
"Only accepts Breadcrumb.Item and Breadcrumb.Separator as it's children",
);
return cloneElement(element, {
props: { separator },
key: index,
});
return cloneVNode(element, { separator, key: index });
});
}
return <div class={prefixCls}>{crumbs}</div>;
Expand Down
15 changes: 9 additions & 6 deletions components/breadcrumb/BreadcrumbItem.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { inject } from 'vue';
import PropTypes from '../_util/vue-types';
import { hasProp, getComponentFromProp } from '../_util/props-util';
import { hasProp, getComponent } from '../_util/props-util';
import { ConfigConsumerProps } from '../config-provider';
import DropDown from '../dropdown/dropdown';
import DownOutlined from '@ant-design/icons-vue/DownOutlined';
Expand All @@ -13,16 +14,18 @@ export default {
separator: PropTypes.any.def('/'),
overlay: PropTypes.any,
},
inject: {
configProvider: { default: () => ConfigConsumerProps },
setup() {
return {
configProvider: inject('configProvider', ConfigConsumerProps),
};
},
methods: {
/**
* if overlay is have
* Wrap a DropDown
*/
renderBreadcrumbNode(breadcrumbItem, prefixCls) {
const overlay = getComponentFromProp(this, 'overlay');
const overlay = getComponent(this, 'overlay');
if (overlay) {
return (
<DropDown overlay={overlay} placement="bottomCenter">
Expand All @@ -40,8 +43,8 @@ export default {
const { prefixCls: customizePrefixCls, $slots } = this;
const getPrefixCls = this.configProvider.getPrefixCls;
const prefixCls = getPrefixCls('breadcrumb', customizePrefixCls);
const separator = getComponentFromProp(this, 'separator');
const children = $slots.default;
const separator = getComponent(this, 'separator');
const children = $slots.default && $slots.default();
let link;
if (hasProp(this, 'href')) {
link = <a class={`${prefixCls}-link`}>{children}</a>;
Expand Down
9 changes: 6 additions & 3 deletions components/breadcrumb/BreadcrumbSeparator.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { inject } from 'vue';
import { ConfigConsumerProps } from '../config-provider';
import PropTypes from '../_util/vue-types';

Expand All @@ -7,15 +8,17 @@ export default {
props: {
prefixCls: PropTypes.string,
},
inject: {
configProvider: { default: () => ConfigConsumerProps },
setup() {
return {
configProvider: inject('configProvider', ConfigConsumerProps),
};
},
render() {
const { prefixCls: customizePrefixCls, $slots } = this;
const getPrefixCls = this.configProvider.getPrefixCls;
const prefixCls = getPrefixCls('breadcrumb', customizePrefixCls);

const children = $slots.default;
const children = $slots.default && $slots.default();
return <span class={`${prefixCls}-separator`}>{children || '/'}</span>;
},
};
10 changes: 4 additions & 6 deletions components/breadcrumb/index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import Breadcrumb from './Breadcrumb';
import BreadcrumbItem from './BreadcrumbItem';
import BreadcrumbSeparator from './BreadcrumbSeparator';
import Base from '../base';

Breadcrumb.Item = BreadcrumbItem;
Breadcrumb.Separator = BreadcrumbSeparator;

/* istanbul ignore next */
Breadcrumb.install = function(Vue) {
Vue.use(Base);
Vue.component(Breadcrumb.name, Breadcrumb);
Vue.component(BreadcrumbItem.name, BreadcrumbItem);
Vue.component(BreadcrumbSeparator.name, BreadcrumbSeparator);
Breadcrumb.install = function(app) {
app.component(Breadcrumb.name, Breadcrumb);
app.component(BreadcrumbItem.name, BreadcrumbItem);
app.component(BreadcrumbSeparator.name, BreadcrumbSeparator);
};

export default Breadcrumb;
2 changes: 2 additions & 0 deletions examples/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import '@babel/polyfill';
import { createApp } from 'vue';
import App from './App.vue';
import Avatar from 'ant-design-vue/avatar';
import Breadcrumb from 'ant-design-vue/breadcrumb';
import Button from 'ant-design-vue/button';
import Comment from 'ant-design-vue/comment';
import Drawer from 'ant-design-vue/drawer';
Expand All @@ -20,6 +21,7 @@ import 'ant-design-vue/style.js';

createApp(App)
.use(Avatar)
.use(Breadcrumb)
.use(Button)
.use(Comment)
.use(ConfigProvider)
Expand Down