github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: menu some class not correct

pull/3150/head
tangjinzhou 2020-11-10 00:18:32 +08:00
parent c07d1eab41
commit c523266a99
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/menu/SubMenu.tsx
View File

@ -3,6 +3,7 @@ import { SubMenu as VcSubMenu } from '../vc-menu';
import classNames from '../_util/classNames'; import classNames from '../_util/classNames';
import Omit from 'omit.js'; import Omit from 'omit.js';
import { getSlot } from '../_util/props-util'; import { getSlot } from '../_util/props-util';
import { injectExtraPropsKey } from '../vc-menu/FunctionProvider';
export type MenuTheme = 'light' | 'dark'; export type MenuTheme = 'light' | 'dark';
@ -19,6 +20,7 @@ export default defineComponent({
setup() { setup() {
return { return {
menuPropsContext: inject<MenuContextProps>('menuPropsContext', {}), menuPropsContext: inject<MenuContextProps>('menuPropsContext', {}),
injectExtraProps: inject(injectExtraPropsKey, () => ({})),
}; };
}, },
methods: { methods: {
@ -29,7 +31,7 @@ export default defineComponent({
render() { render() {
const { $slots, $attrs } = this; const { $slots, $attrs } = this;
const { rootPrefixCls, popupClassName } = this.$props; const { rootPrefixCls, popupClassName } = {...this.$props, ...this.injectExtraProps} as any;
const { theme: antdMenuTheme } = this.menuPropsContext; const { theme: antdMenuTheme } = this.menuPropsContext;
const props = { const props = {
...this.$props, ...this.$props,

13
components/vc-menu/SubMenu.jsx
View File

@ -310,9 +310,9 @@ const SubMenu = {
} }
}, },
isChildrenSelected() { isChildrenSelected(children) {
const ret = { find: false }; const ret = { find: false };
loopMenuItemRecursively(getSlot(this), this.$props.selectedKeys, ret); loopMenuItemRecursively(children, this.$props.selectedKeys, ret);
return ret.find; return ret.find;
}, },
// isOpen () { // isOpen () {
@ -412,10 +412,12 @@ const SubMenu = {
render() { render() {
const props = { ...this.$props, ...this.$attrs }; const props = { ...this.$props, ...this.$attrs };
const { onEvents } = splitAttrs(props); const { onEvents } = splitAttrs(props);
const { rootPrefixCls, parentMenu } = this; const { rootPrefixCls } = this;
const isOpen = props.isOpen; const isOpen = props.isOpen;
const prefixCls = this.getPrefixCls(); const prefixCls = this.getPrefixCls();
const isInlineMode = props.mode === 'inline'; const isInlineMode = props.mode === 'inline';
const childrenTemp = filterEmpty(getSlot(this));
const children = this.renderChildren(childrenTemp);
const className = { const className = {
[prefixCls]: true, [prefixCls]: true,
[`${prefixCls}-${props.mode}`]: true, [`${prefixCls}-${props.mode}`]: true,
@ -423,7 +425,7 @@ const SubMenu = {
[this.getOpenClassName()]: isOpen, [this.getOpenClassName()]: isOpen,
[this.getActiveClassName()]: props.active || (isOpen && !isInlineMode), [this.getActiveClassName()]: props.active || (isOpen && !isInlineMode),
[this.getDisabledClassName()]: props.disabled, [this.getDisabledClassName()]: props.disabled,
[this.getSelectedClassName()]: this.isChildrenSelected(), [this.getSelectedClassName()]: this.isChildrenSelected(childrenTemp),
}; };
if (!this.internalMenuId) { if (!this.internalMenuId) {
@ -489,7 +491,6 @@ const SubMenu = {
{icon || <i class={`${prefixCls}-arrow`} />} {icon || <i class={`${prefixCls}-arrow`} />}
</div> </div>
); );
const children = this.renderChildren(filterEmpty(getSlot(this)));
const getPopupContainer = this.parentMenu.isRootMenu const getPopupContainer = this.parentMenu.isRootMenu
? this.parentMenu.getPopupContainer ? this.parentMenu.getPopupContainer
@ -497,7 +498,7 @@ const SubMenu = {
const popupPlacement = popupPlacementMap[props.mode]; const popupPlacement = popupPlacementMap[props.mode];
const popupAlign = props.popupOffset ? { offset: props.popupOffset } : {}; const popupAlign = props.popupOffset ? { offset: props.popupOffset } : {};
let popupClassName = props.mode === 'inline' ? '' : props.popupClassName || ''; let popupClassName = props.mode === 'inline' ? '' : props.popupClassName || '';
popupClassName = `${prefixCls}-popup ${rootPrefixCls}-${parentMenu.theme} ${popupClassName}`; popupClassName = `${prefixCls}-popup ${rootPrefixCls} ${popupClassName}`;
const liProps = { const liProps = {
...omit(onEvents, ['onClick']), ...omit(onEvents, ['onClick']),
...mouseEvents, ...mouseEvents,