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.

Sign up for GitHub

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: support for submenu custom styles #645

Merged
merged 8 commits into from
Jul 1, 2023
Merged

feat: support for submenu custom styles #645

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9d14e99
feat: support for submenu custom styles
Jun 3, 2023
7d4aa5f
feat: support for submenu custom styles
Jun 5, 2023
60dacdf
feat: support for submenu custom styles
Jun 5, 2023
147ad54
docs: update docs
Jun 5, 2023
a7d4a96
feat: support custom style
Jun 14, 2023
5741935
docs: update docs
Jun 17, 2023
657bb3a
test: add test case
Jun 18, 2023
6c7c0fd
Merge branch 'master' into feat/support-submenu-style
Jun 18, 2023
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
10 changes: 8 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ ReactDOM.render(
## Compatibility

| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Electron |
| --- | --- | --- | --- | --- |
| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
yoyo837 marked this conversation as resolved.
Show resolved Hide resolved

## API

Expand Down Expand Up @@ -186,6 +186,12 @@ ReactDOM.render(
<th>0.1</th>
<td>delay time to hide popup sub menu. unit: s</td>
</tr>
<tr>
<td>subMenuStyle</td>
<td>Object</td>
yoyo837 marked this conversation as resolved.
Show resolved Hide resolved
<th></th>
<td>the style of sub menu. unit: s</td>
yoyo837 marked this conversation as resolved.
Show resolved Hide resolved
</tr>
<tr>
<td>forceSubMenuRender</td>
<td>Boolean</td>
Expand Down
3 changes: 3 additions & 0 deletions src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export interface MenuProps
// Popup
subMenuOpenDelay?: number;
subMenuCloseDelay?: number;
subMenuStyle?: React.CSSProperties;
forceSubMenuRender?: boolean;
triggerSubMenuAction?: TriggerSubMenuAction;
builtinPlacements?: BuiltinPlacements;
Expand Down Expand Up @@ -175,6 +176,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
// Open
subMenuOpenDelay = 0.1,
subMenuCloseDelay = 0.1,
subMenuStyle,
forceSubMenuRender,
defaultOpenKeys,
openKeys,
Expand Down Expand Up @@ -617,6 +619,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
// Popup
subMenuOpenDelay={subMenuOpenDelay}
subMenuCloseDelay={subMenuCloseDelay}
subMenuStyle={subMenuStyle}
forceSubMenuRender={forceSubMenuRender}
builtinPlacements={builtinPlacements}
triggerSubMenuAction={triggerSubMenuAction}
Expand Down
2 changes: 2 additions & 0 deletions src/SubMenu/PopupTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export default function PopupTrigger({
rtl,
subMenuOpenDelay,
subMenuCloseDelay,
subMenuStyle,
builtinPlacements,
triggerSubMenuAction,
forceSubMenuRender,
Expand Down Expand Up @@ -108,6 +109,7 @@ export default function PopupTrigger({
popupPlacement={popupPlacement}
popupVisible={innerVisible}
popup={popup}
popupStyle={subMenuStyle}
popupAlign={popupOffset && { offset: popupOffset }}
action={disabled ? [] : [triggerSubMenuAction]}
mouseEnterDelay={subMenuOpenDelay}
Expand Down
1 change: 1 addition & 0 deletions src/context/MenuContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export interface MenuContextProps {
// Popup
subMenuOpenDelay: number;
subMenuCloseDelay: number;
subMenuStyle?: React.CSSProperties;
forceSubMenuRender?: boolean;
builtinPlacements?: BuiltinPlacements;
triggerSubMenuAction?: TriggerSubMenuAction;
Expand Down