Skip to content
Closed
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
11 changes: 10 additions & 1 deletion src/DOMWrap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ interface DOMWrapProps {
visible?: boolean;
tag?: string;
style?: React.CSSProperties;
forwardedRef: React.RefObject<HTMLElement>;
}

interface DOMWrapState {
Expand Down Expand Up @@ -53,10 +54,16 @@ class DOMWrap extends React.Component<DOMWrapProps, DOMWrapState> {

childRef = React.createRef<HTMLElement>();

setRef(e: HTMLElement) {
(this.childRef as any).current = e;
(this.props.forwardedRef as any).current = e;
}

componentDidMount() {
this.setChildrenWidthAndResize();
if (this.props.level === 1 && this.props.mode === 'horizontal') {
const menuUl = this.childRef.current;

if (!menuUl) {
return;
}
Expand Down Expand Up @@ -249,6 +256,7 @@ class DOMWrap extends React.Component<DOMWrapProps, DOMWrapState> {
}

const ul = this.childRef.current;

if (!ul) {
return;
}
Expand Down Expand Up @@ -356,13 +364,14 @@ class DOMWrap extends React.Component<DOMWrapProps, DOMWrapState> {
tag,
children,
theme,
forwardedRef,
...rest
} = this.props;

const Tag = tag as any;

return (
<Tag ref={this.childRef} {...rest}>
<Tag ref={this.setRef.bind(this)} {...rest}>
{this.renderChildren(children)}
</Tag>
);
Expand Down
2 changes: 2 additions & 0 deletions src/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export interface MenuItemProps
inlineIndent?: number;
level?: number;
direction?: 'ltr' | 'rtl';
forwardedRef?: React.RefObject<HTMLElement>;
}

export class MenuItem extends React.Component<MenuItemProps> {
Expand Down Expand Up @@ -235,6 +236,7 @@ export class MenuItem extends React.Component<MenuItemProps> {
'onMouseEnter',
'onMouseLeave',
'onSelect',
'forwardedRef',
])}
{...attrs}
{...mouseEvent}
Expand Down
11 changes: 9 additions & 2 deletions src/SubMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import Trigger from 'rc-trigger';
import raf from 'rc-util/lib/raf';
import KeyCode from 'rc-util/lib/KeyCode';
Expand Down Expand Up @@ -102,6 +101,7 @@ export interface SubMenuProps {

motion?: CSSMotionProps;
direction?: 'ltr' | 'rtl';
forwardedRef?: React.RefObject<HTMLElement>;
}

interface SubMenuState {
Expand Down Expand Up @@ -140,12 +140,16 @@ export class SubMenu extends React.Component<SubMenuProps, SubMenuState> {
mode: props.mode,
isOpen: props.isOpen,
};

this.menuInstanceRef = React.createRef();
}

isRootMenu: boolean;

menuInstance: MenuItem;

menuInstanceRef: React.RefObject<HTMLElement>;

subMenuTitle: HTMLElement;

internalMenuId: string;
Expand Down Expand Up @@ -414,7 +418,7 @@ export class SubMenu extends React.Component<SubMenuProps, SubMenuState> {
if (!this.subMenuTitle || !this.menuInstance) {
return;
}
const popupMenu = ReactDOM.findDOMNode(this.menuInstance) as HTMLElement;
const popupMenu = this.menuInstanceRef.current;
if (popupMenu.offsetWidth >= this.subMenuTitle.offsetWidth) {
return;
}
Expand Down Expand Up @@ -462,6 +466,7 @@ export class SubMenu extends React.Component<SubMenuProps, SubMenuState> {
itemIcon: props.itemIcon,
expandIcon: props.expandIcon,
direction: props.direction,
forwardedRef: this.menuInstanceRef,
};
};

Expand Down Expand Up @@ -664,6 +669,8 @@ export class SubMenu extends React.Component<SubMenuProps, SubMenuState> {
? null
: this.getMotion(baseProps.mode, baseProps.visible);

delete props.forwardedRef;

return (
<li
{...(props as any)}
Expand Down
4 changes: 4 additions & 0 deletions src/SubPopupMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ export interface SubPopupMenuProps {
motion?: CSSMotionProps;

direction?: 'ltr' | 'rtl';

forwardedRef: React.RefObject<HTMLElement>;
}

export class SubPopupMenu extends React.Component<SubPopupMenuProps> {
Expand All @@ -168,6 +170,7 @@ export class SubPopupMenu extends React.Component<SubPopupMenuProps> {
focusable: true,
style: {},
manualRef: noop,
forwardedRef: noop,
};

constructor(props: SubPopupMenuProps) {
Expand Down Expand Up @@ -388,6 +391,7 @@ export class SubPopupMenu extends React.Component<SubPopupMenuProps> {
expandIcon: childProps.expandIcon || this.props.expandIcon,
...extraProps,
direction: props.direction,
forwardedRef: childProps.disabled ? undefined : props.forwardedRef,
};
// ref: https://github.com/ant-design/ant-design/issues/13943
if (props.mode === 'inline' || isMobileDevice()) {
Expand Down