Skip to content

fix: opt out of ssr full to avoid initial flashing #665

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: opt out of ssr full to avoid initial flashing #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15d60f4
docs: add ssr-off demo
huan-qiu Sep 26, 2023
9143b72
fix: add prop to opt out of ssr full
huan-qiu Sep 26, 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
3 changes: 3 additions & 0 deletions docs/demo/ssr-off.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## ssr off

<code src="../examples/ssr-off.tsx"></code>
71 changes: 71 additions & 0 deletions docs/examples/ssr-off.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import React from 'react';
import '../../assets/index.less';
import Menu, { Divider, Item as MenuItem, SubMenu } from '../../src';

const nestSubMenu = (
<SubMenu
title={<span className="submenu-title-wrapper">offset sub menu 2</span>}
key="4"
popupOffset={[10, 15]}
>
<MenuItem key="4-1">inner inner</MenuItem>
<Divider />
<SubMenu
key="4-2"
title={<span className="submenu-title-wrapper">sub menu 1</span>}
>
<SubMenu
title={<span className="submenu-title-wrapper">sub 4-2-0</span>}
key="4-2-0"
>
<MenuItem key="4-2-0-1">inner inner</MenuItem>
<MenuItem key="4-2-0-2">inner inner2</MenuItem>
</SubMenu>
<MenuItem key="4-2-1">inn</MenuItem>
<SubMenu
title={<span className="submenu-title-wrapper">sub menu 4</span>}
key="4-2-2"
>
<MenuItem key="4-2-2-1">inner inner</MenuItem>
<MenuItem key="4-2-2-2">inner inner2</MenuItem>
</SubMenu>
<SubMenu
title={<span className="submenu-title-wrapper">sub menu 3</span>}
key="4-2-3"
>
<MenuItem key="4-2-3-1">inner inner</MenuItem>
<MenuItem key="4-2-3-2">inner inner2</MenuItem>
</SubMenu>
</SubMenu>
</SubMenu>
);

function handleClick(info) {
console.log(`clicked ${info.key}`);
console.log(info);
}

function Demo() {
return (
<>
<Menu mode="horizontal" onClick={handleClick} ssr="off">
<SubMenu
title={<span className="submenu-title-wrapper">sub menu</span>}
key="1"
>
<MenuItem key="1-1">0-1</MenuItem>
<MenuItem key="1-2">0-2</MenuItem>
</SubMenu>
{nestSubMenu}
<MenuItem key="2">1</MenuItem>
<MenuItem key="3">outer</MenuItem>
<MenuItem key="5" disabled>
disabled
</MenuItem>
<MenuItem key="6">outer3</MenuItem>
</Menu>
</>
);
}

export default Demo;
9 changes: 8 additions & 1 deletion src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ export interface MenuProps
activeKey?: string;
defaultActiveFirst?: boolean;

// SSR control
ssr?: 'full' | 'off';

// Selection
selectable?: boolean;
multiple?: boolean;
Expand Down Expand Up @@ -183,6 +186,9 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
activeKey,
defaultActiveFirst,

// SSR
ssr,

// Selection
selectable = true,
multiple = false,
Expand Down Expand Up @@ -239,6 +245,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
const uuid = useUUID(id);

const isRtl = direction === 'rtl';
const ssrVal = ssr === 'off' ? undefined : 'full';

// ========================= Warn =========================
if (process.env.NODE_ENV !== 'production') {
Expand Down Expand Up @@ -581,7 +588,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
? Overflow.INVALIDATE
: Overflow.RESPONSIVE
}
ssr="full"
ssr={ssrVal}
data-menu-list
onVisibleChange={newLastIndex => {
setLastVisibleIndex(newLastIndex);
Expand Down