Skip to content
Draft
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
48 changes: 26 additions & 22 deletions packages/components/menu/submenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
watch,
Slots,
toRefs,
reactive,
nextTick,
Transition,
toRef,
} from 'vue';
import props from './submenu-props';
import { TdMenuInterface, TdSubMenuInterface, TdMenuItem } from './types';
Expand All @@ -36,7 +36,7 @@ export default defineComponent({
const { theme, activeValues, expandValues, isHead, open } = menu;

const submenu = inject<TdSubMenuInterface>('TdSubmenu', {});
const { setSubPopup, closeParentPopup } = submenu;
const { setSubPopup, closeParentPopup, popupVisible: parentPopupVisible } = submenu;

const mode = computed(() => attrs.expandType || menu.mode.value);

Expand Down Expand Up @@ -100,26 +100,26 @@ export default defineComponent({
},
]);

provide<TdSubMenuInterface>(
'TdSubmenu',
reactive({
value,
addMenuItem: (item: TdMenuItem) => {
menuItems.value.push(item);
if (submenu) {
submenu.addMenuItem(item);
}
},
setSubPopup: (ref: HTMLElement) => {
subPopupRef.value = ref;
},
closeParentPopup: (e: MouseEvent) => {
const related = e.relatedTarget as HTMLElement;
if (loopInPopup(related)) return;
handleMouseLeavePopup(e);
},
}),
);
const submenuInterface = {
value: value.value,
addMenuItem: (item: TdMenuItem) => {
menuItems.value.push(item);
if (submenu) {
submenu.addMenuItem(item);
}
},
setSubPopup: (ref: HTMLElement) => {
subPopupRef.value = ref;
},
closeParentPopup: (e: MouseEvent) => {
const related = e.relatedTarget as HTMLElement;
if (loopInPopup(related)) return;
handleMouseLeavePopup(e);
},
popupVisible: toRef(popupVisible),
};

provide<TdSubMenuInterface>('TdSubmenu', submenuInterface);

const passSubPopupRefToParent = (val: HTMLElement) => {
if (isFunction(setSubPopup)) {
Expand All @@ -131,6 +131,7 @@ export default defineComponent({
const handleMouseEnter = () => {
if (props.disabled) return;
setTimeout(() => {
if (parentPopupVisible?.value === false) return;
if (!popupVisible.value) {
open(props.value);

Expand Down Expand Up @@ -178,6 +179,9 @@ export default defineComponent({
closeParentPopup?.(e);
};
const handleEnterPopup = () => {
// 如果父 popup 存在且不可见,不触发保持可见功能
if (parentPopupVisible?.value === false) return;

isCursorInPopup.value = true;
};

Expand Down
1 change: 1 addition & 0 deletions packages/components/menu/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ export interface TdSubMenuInterface {
addMenuItem?: (item: TdMenuItem) => void;
setSubPopup?: (popupRef: HTMLElement) => void;
closeParentPopup?: (e: MouseEvent) => void;
popupVisible?: Ref<boolean>;
}
Loading