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

refactor: menu component token #43576

Merged
merged 9 commits into from
Jul 17, 2023
Merged

refactor: menu component token #43576

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
54d4a7b
docs: update examples link
MadCcc Jul 10, 2023
ea38a8f
refacor: menu component token
MadCcc Jul 15, 2023
0d7dc23
chore: update demo
MadCcc Jul 15, 2023
55a1aea
chore: update test case
MadCcc Jul 15, 2023
b2b0f91
fix: token
MadCcc Jul 15, 2023
cc8c09b
chore: fix
MadCcc Jul 15, 2023
ff0ba24
Apply suggestions from code review
MadCcc Jul 16, 2023
d92d57a
chore: fix lint
MadCcc Jul 16, 2023
9cad921
refactor: more token
MadCcc Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions .dumi/theme/slots/Sidebar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,14 @@ const Sidebar: React.FC = () => {
} = useSiteToken();

const menuChild = (
<ConfigProvider theme={{ components: { Menu: { itemBg: colorBgContainer } } }}>
<ConfigProvider
theme={{ components: { Menu: { itemBg: colorBgContainer, darkItemBg: colorBgContainer } } }}
>
<Menu
items={menuItems}
inlineIndent={30}
css={styles.asideContainer}
mode="inline"
mode='inline'
MadCcc marked this conversation as resolved.
Show resolved Hide resolved
theme={isDark ? 'dark' : 'light'}
selectedKeys={[selectedKey]}
defaultOpenKeys={sidebarData?.map(({ title }) => title).filter((item) => item) as string[]}
Expand All @@ -148,10 +150,10 @@ const Sidebar: React.FC = () => {
);

return isMobile ? (
<MobileMenu key="Mobile-menu">{menuChild}</MobileMenu>
<MobileMenu key='Mobile-menu'>{menuChild}</MobileMenu>
MadCcc marked this conversation as resolved.
Show resolved Hide resolved
) : (
<Col xxl={4} xl={5} lg={6} md={6} sm={24} xs={24} css={styles.mainMenu}>
<section className="main-menu-inner">{menuChild}</section>
<section className='main-menu-inner'>{menuChild}</section>
li-jia-nan marked this conversation as resolved.
Show resolved Hide resolved
MadCcc marked this conversation as resolved.
Show resolved Hide resolved
</Col>
);
};
Expand Down
6 changes: 2 additions & 4 deletions components/layout/__tests__/token.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ describe('Layout.Token', () => {
>
<Header>
<Menu
theme="dark"
mode="horizontal"
mode='horizontal'
MadCcc marked this conversation as resolved.
Show resolved Hide resolved
defaultSelectedKeys={['2']}
items={new Array(15).fill(null).map((_, index) => {
const key = index + 1;
Expand Down Expand Up @@ -62,8 +61,7 @@ describe('Layout.Token', () => {
>
<Header>
<Menu
theme="dark"
mode="horizontal"
mode='horizontal'
MadCcc marked this conversation as resolved.
Show resolved Hide resolved
defaultSelectedKeys={['2']}
items={new Array(15).fill(null).map((_, index) => {
const key = index + 1;
Expand Down