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.

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

feat(topbar): add optional application drawer as alternative to application menu #165

Merged
merged 1 commit into from
Jan 31, 2024
Merged
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
58 changes: 58 additions & 0 deletions components/topbar/src/application-drawer.styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import { makeStyles, shorthands, tokens } from "@fluentui/react-components";

export const useApplicationDrawrStyles = makeStyles({
header: {
display: "flex",
flexDirection: "row",
justifyContent: "space-between",
backgroundColor: tokens.colorNeutralBackground5,
color: tokens.colorNeutralForeground3,
...shorthands.padding(tokens.spacingVerticalS, tokens.spacingHorizontalM),
},
headerTitle: {
display: "flex",
flexDirection: "row",
alignItems: "center",
...shorthands.gap(tokens.spacingHorizontalS),
},
iconAndText: {
display: "flex",
flexDirection: "row",
alignItems: "center",
...shorthands.gap(tokens.spacingHorizontalS),
...shorthands.padding(tokens.spacingVerticalXS, tokens.spacingHorizontalM),
},
content: {
display: "flex",
flexDirection: "column",
alignItems: "flex-start",
width: "100%",
...shorthands.gap(tokens.spacingVerticalM),
paddingTop: tokens.spacingVerticalXXXL,
},
contentChildren: {
display: "flex",
flexDirection: "column",
alignItems: "flex-start",
width: "100%",
paddingLeft: "24px",
boxSizing: "border-box",
},
contentButton: {
width: "100%",
justifyContent: "flex-start",
},
selectedContentButton: {
backgroundColor: tokens.colorNeutralBackground2Hover,
},
linkWrapper: {
display: "flex",
justifyContent: "flex-end",
...shorthands.padding(tokens.spacingVerticalS, 0),
},
link: {
display: "flex",
alignItems: "center",
...shorthands.gap(tokens.spacingHorizontalXS),
},
});
261 changes: 261 additions & 0 deletions components/topbar/src/application-drawer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
import { ArrowRightRegular, Dismiss20Regular } from "@fluentui/react-icons";
import React, { Fragment, useState } from "react";

import { ApplicationArea } from "./top-bar.types";
import { useTranslation } from "./translation-context";
import {
Body1Strong,
Button,
Divider,
Drawer,
DrawerBody,
DrawerHeader,
Link,
mergeClasses,
tokens,
} from "@fluentui/react-components";
import { useApplicationDrawrStyles as useApplicationDrawerStyles } from "./application-drawer.styles";
import {
ApplicationAreaFlaworedIcon,
ApplicationAreaIcon,
applicationAreaLabel,
} from "./application-utils";
import {
ApplicationDrawerContent,
ApplicationDrawerProps,
SingleApplicationDrawerContent,
} from "./application-drawer.types";

const IconAndText = ({
icon,
text,
}: {
icon: JSX.Element;
text: string;
}): JSX.Element => {
const styles = useApplicationDrawerStyles();
return (
<div className={styles.iconAndText}>
<div style={{ fontSize: "1.8em" }}>{icon}</div>
<Body1Strong>{text}</Body1Strong>
</div>
);
};

const findCurrent = (
applicationId: string,
content?: ApplicationDrawerContent[]
): SingleApplicationDrawerContent | undefined => {
if (!content) {
return undefined;
}

let currentApplication: SingleApplicationDrawerContent | undefined =
undefined;

content.forEach((c) => {
if (c.id === applicationId) {
currentApplication = c;
}
return c.children?.forEach((child) => {
if (child.id === applicationId) {
currentApplication = child;
}
});
});

return currentApplication;
};

const iconConverter = (
icon: JSX.Element,
isCurrent: boolean,
applicationArea: ApplicationArea
) => {
return isCurrent
? (
<ApplicationAreaFlaworedIcon
applicationArea={applicationArea}
icon={icon}
/>
)
: (
icon
);
};

const SingleApplication = ({
application,
currentSelectionId,
onChange,
applicationArea,
}: {
application: SingleApplicationDrawerContent;
currentSelectionId: string;
onChange: (id: string) => void;
applicationArea: ApplicationArea;
}): JSX.Element => {
const styles = useApplicationDrawerStyles();

const buttonStyle = mergeClasses(
styles.contentButton,
application.id === currentSelectionId && styles.selectedContentButton
);

return (
<Button
data-testid={`application-drawer-item-${application.id}`}
className={buttonStyle}
size="large"
appearance="subtle"
icon={iconConverter(
application.icon,
application.id === currentSelectionId,
applicationArea
)}
onClick={() => onChange(application.id)}
>
{application.label}
</Button>
);
};

const ApplicationWithChildren = ({
application,
currentSelectionId,
onChange,
applicationArea,
}: {
application: ApplicationDrawerContent;
currentSelectionId: string;
onChange: (id: string) => void;
applicationArea: ApplicationArea;
}): JSX.Element => {
const styles = useApplicationDrawerStyles();

return (
<>
{IconAndText({
icon: application.icon,
text: application.label.toLocaleUpperCase(),
})}
<div className={styles.contentChildren}>
{application.children?.map((child) => {
return (
<SingleApplication
key={child.id}
application={child}
applicationArea={applicationArea}
currentSelectionId={currentSelectionId}
onChange={onChange}
/>
);
})}
</div>
</>
);
};

export const ApplicationDrawer = ({
link,
title,
applicationId,
content,
onChange,
applicationArea,
}: ApplicationDrawerProps & { applicationArea: ApplicationArea }) => {
const { t } = useTranslation();
const [isOpen, setIsOpen] = useState(false);
const styles = useApplicationDrawerStyles();
const currentSelection = findCurrent(applicationId, content);

const onClickItem = (id: string) => {
if (id === currentSelection?.id) {
setIsOpen(false);
} else {
onChange(id);
}
};

return (
<>
<Button
data-testid="application-drawer-trigger"
appearance="subtle"
onClick={() => setIsOpen(true)}
>
{<ApplicationAreaIcon applicationArea={applicationArea} />}
<Divider vertical style={{ padding: "0 0 0 12px" }}></Divider>
{currentSelection
? (
<IconAndText
icon={currentSelection.icon}
text={currentSelection.label}
/>
)
: null}
</Button>
<Drawer open={isOpen} onOpenChange={(_, { open }) => setIsOpen(open)}>
<DrawerHeader className={styles.header}>
<div className={styles.headerTitle}>
<ApplicationAreaIcon applicationArea={applicationArea} />
<Body1Strong>
{applicationAreaLabel(t, applicationArea)}
</Body1Strong>
</div>
<Button
data-testid={"application-drawer-dismiss"}
size="small"
appearance="subtle"
aria-label="Close"
icon={<Dismiss20Regular color={tokens.colorNeutralForeground3} />}
onClick={() => setIsOpen(false)}
/>
</DrawerHeader>

<DrawerBody>
{link && (
<div className={styles.linkWrapper}>
<Link
data-testid={"application-drawer-link"}
className={styles.link}
href={link.url}
>
{link.text}
<ArrowRightRegular />
</Link>
</div>
)}
<div className={styles.content}>
{title}
<Divider></Divider>
{content?.map((c) => {
return (
<Fragment key={c.id}>
{c.children
? (
<ApplicationWithChildren
application={c}
currentSelectionId={currentSelection?.id ?? ""}
onChange={onClickItem}
applicationArea={applicationArea ?? ""}
/>
)
: (
<SingleApplication
application={c}
currentSelectionId={currentSelection?.id ?? ""}
onChange={onClickItem}
applicationArea={applicationArea}
/>
)}
<Divider></Divider>
</Fragment>
);
})}
</div>
</DrawerBody>
</Drawer>
</>
);
};
17 changes: 17 additions & 0 deletions components/topbar/src/application-drawer.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export type ApplicationDrawerContent = SingleApplicationDrawerContent & {
children?: SingleApplicationDrawerContent[];
};

export type SingleApplicationDrawerContent = {
id: string;
icon: JSX.Element;
label: string;
};

export type ApplicationDrawerProps = {
link?: { text: string; url: string };
title: JSX.Element;
content?: ApplicationDrawerContent[];
applicationId: string;
onChange: (id: string) => void;
};
Loading
Loading