Skip to content

Nav Layout Fixes/Updates #510

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

Merged
merged 9 commits into from
Nov 20, 2023
Merged

Nav Layout Fixes/Updates #510

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a5831f
Merge pull request #507 from lowcoder-org/dev
FalkWolsky Nov 19, 2023
6e1bc05
fix: handle empty itemKeys for sub-menus
raheeliftikhar5 Nov 14, 2023
48e4c71
feat: allow more than 2 levels nested nav
raheeliftikhar5 Nov 14, 2023
ee148f5
feat: make parent menu items clickable
raheeliftikhar5 Nov 14, 2023
8e39c18
feat: added width and background option for nav bar
raheeliftikhar5 Nov 14, 2023
ce51a67
feat: styling option for nav layout
raheeliftikhar5 Nov 16, 2023
4be209b
feat: background-image for nav layout
raheeliftikhar5 Nov 16, 2023
b06fa7e
feat: allow json data for nav layout
raheeliftikhar5 Nov 20, 2023
a3389a4
Merge branch 'dev' into nav-layout-updates
FalkWolsky Nov 20, 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
Prev Previous commit
Next Next commit
feat: added width and background option for nav bar
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Nov 20, 2023
commit 8e39c185b5a75c8ebfc672eba385b7b49caf4fb9
21 changes: 19 additions & 2 deletions client/packages/lowcoder/src/comps/comps/layout/navLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ import { withDispatchHook } from "comps/generators/withDispatchHook";
import { NameAndExposingInfo } from "comps/utils/exposingTypes";
import { ALL_APPLICATIONS_URL } from "constants/routesURL";
import { TopHeaderHeight } from "constants/style";
import { Section } from "lowcoder-design";
import { Section, sectionNames } from "lowcoder-design";
import { trans } from "i18n";
import { EditorContainer, EmptyContent } from "pages/common/styledComponent";
import { useCallback, useEffect, useMemo, useState } from "react";
import styled from "styled-components";
import { isUserViewMode, useAppPathParam } from "util/hooks";
import { StringControl } from "comps/controls/codeControl";
import { styleControl } from "comps/controls/styleControl";
import { NavLayoutStyle } from "comps/controls/styleControlConstants";

const DEFAULT_WIDTH = 240;

const StyledSide = styled(Layout.Sider)`
max-height: calc(100vh - ${TopHeaderHeight});
Expand Down Expand Up @@ -46,6 +51,8 @@ let NavTmpLayout = (function () {
label: trans("menuItem") + " 1",
},
]),
width: StringControl,
style: styleControl(NavLayoutStyle),
};
return new MultiCompBuilder(childrenMap, (props) => {
return null;
Expand All @@ -54,6 +61,16 @@ let NavTmpLayout = (function () {
return (
<>
<Section name={trans("menu")}>{menuPropertyView(children.items)}</Section>
<Section name={sectionNames.layout}>
{ children.width.propertyView({
label: trans("drawer.width"),
tooltip: trans("drawer.widthTooltip"),
placeholder: DEFAULT_WIDTH + "",
})}
</Section>
<Section name={sectionNames.style}>
{ children.style.getPropertyView() }
</Section>
</>
);
})
Expand Down Expand Up @@ -195,7 +212,7 @@ NavTmpLayout = withViewFn(NavTmpLayout, (comp) => {

let content = (
<Layout>
<StyledSide theme="light" width={240}>
<StyledSide theme="light" width={DEFAULT_WIDTH}>
<AntdMenu
items={menuItems}
mode="inline"
Expand Down
2 changes: 2 additions & 0 deletions client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,8 @@ export const TreeSelectStyle = [...multiSelectCommon, ...ACCENT_VALIDATE] as con

export const DrawerStyle = [getBackground()] as const;

export const NavLayoutStyle = [getBackground()] as const;

export const JsonEditorStyle = [LABEL] as const;

export const CalendarStyle = [
Expand Down