Skip to content

chore: Update size of sidebar + remove using sheet #37638

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
jsartisan merged 3 commits into from
Nov 25, 2024
Merged

chore: Update size of sidebar + remove using sheet #37638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
463cf7f
remove usage of sheet
jsartisan Nov 21, 2024
19c34df
update border behaviour
jsartisan Nov 21, 2024
40e6057
update stories
jsartisan Nov 21, 2024
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
20 changes: 1 addition & 19 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as React from "react";
import { type Ref, useRef, useState } from "react";
import { CSSTransition } from "react-transition-group";

import { Sheet } from "../../Sheet";
import styles from "./styles.module.css";
import { useSidebar } from "./use-sidebar";
import type { SidebarProps } from "./types";
Expand All @@ -19,13 +18,12 @@ const _Sidebar = (props: SidebarProps, ref: Ref<HTMLDivElement>) => {
onEntered: onEnteredProp,
onExit: onExitProp,
onExited: onExitedProp,
side = "start",
title,
variant = "sidebar",
...rest
} = props;
const [isAnimating, setIsAnimating] = useState(false);
const { isMobile, setState, state } = useSidebar();
const { side, state } = useSidebar();
const sidebarRef = useRef<HTMLDivElement>();

const onEnter = () => {
Expand Down Expand Up @@ -64,22 +62,6 @@ const _Sidebar = (props: SidebarProps, ref: Ref<HTMLDivElement>) => {
);
}

if (Boolean(isMobile)) {
return (
<Sheet
isOpen={state === "expanded"}
onEnter={onEnter}
onEntered={onEntered}
onExit={onExit}
onExited={onExited}
onOpenChange={(isOpen) => setState(isOpen ? "expanded" : "collapsed")}
position={side}
>
{content}
</Sheet>
);
}

return (
<CSSTransition
in={state === "full-width"}
Expand Down
12 changes: 10 additions & 2 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,17 @@ const _SidebarContent = (
className={styles.sidebarHeader}
isInner
justifyContent="space-between"
padding="spacing-2"
>
{Boolean(title) && <Text lineClamp={1}>{title}</Text>}
{Boolean(title) && (
<Text
className={styles.sidebarTitle}
fontWeight={500}
lineClamp={1}
textAlign="center"
>
{title}
</Text>
)}
{!isMobile && (
<Button
color="neutral"
Expand Down
22 changes: 0 additions & 22 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarInset.tsx
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const _SidebarProvider = (
className,
defaultState = "expanded",
onStateChange: setStateProp,
side = "end",
state: stateProp,
style,
...rest
Expand Down Expand Up @@ -69,9 +70,10 @@ export const _SidebarProvider = (
state,
setState,
isMobile,
side,
toggleSidebar,
}),
[state, setState, isMobile, toggleSidebar],
[state, setState, isMobile, toggleSidebar, side],
);

return (
Expand All @@ -81,7 +83,6 @@ export const _SidebarProvider = (
ref={ref}
style={
{
"--sidebar-width": SIDEBAR_CONSTANTS.WIDTH.DESKTOP,
"--sidebar-width-icon": SIDEBAR_CONSTANTS.WIDTH.ICON,
Copy link
Collaborator

@KelvinOm KelvinOm Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SIDEBAR_CONSTANTS.WIDTH.DESKTOP — it is no longer used and can be removed from the constants.
SIDEBAR_CONSTANTS.WIDTH.ICON — It seems that this can also be placed in CSS, right?

...style,
} as React.CSSProperties
Expand Down
12 changes: 8 additions & 4 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/SidebarTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ interface SidebarTriggerProps {

export const SidebarTrigger = (props: SidebarTriggerProps) => {
const { onPress } = props;
const { state, toggleSidebar } = useSidebar();
const { side, state, toggleSidebar } = useSidebar();

return (
<Button
color="neutral"
icon={
state === "expanded"
? "layout-sidebar-right-collapse"
: "layout-sidebar-left-collapse"
state === "collapsed"
? side === "start"
? "layout-sidebar-left-expand"
: "layout-sidebar-right-expand"
: side === "start"
? "layout-sidebar-left-collapse"
: "layout-sidebar-right-collapse"
}
onPress={() => {
onPress?.();
Expand Down
1 change: 0 additions & 1 deletion app/client/packages/design-system/widgets/src/components/Sidebar/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export { Sidebar } from "./Sidebar";
export { SidebarProvider } from "./SidebarProvider";
export { SidebarInset } from "./SidebarInset";
export { SidebarTrigger } from "./SidebarTrigger";
export { SidebarContent } from "./SidebarContent";
export { useSidebar } from "./use-sidebar";
Expand Down
125 changes: 31 additions & 94 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,25 @@
*-----------------------------------------------------
*/
.mainSidebar {
display: none;
--sidebar-width: 100cqw;
display: block;
color: var(--color-fg);
}

@container (min-width: 768px) {
.mainSidebar {
display: block;
}
}

.mainSidebar[data-collapsible="icon"] {
overflow: hidden;
}

[data-state="full-width"] .sidebar {
--sidebar-width: 100cqw;
}

@container (width > 550px) {
.mainSidebar {
--sidebar-width: min(50cqw, 1024px);
}
}

/**
*-----------------------------------------------------
* FAKE SIDEBAR
Expand Down Expand Up @@ -57,11 +62,6 @@
width: var(--sidebar-width-icon);
}

.mainSidebar[data-variant="floating"][data-collapsible="icon"] .fakeSidebar,
.mainSidebar[data-variant="inset"][data-collapsible="icon"] .fakeSidebar {
width: calc(var(--sidebar-width-icon) + var(--inner-spacing-2));
}

/**
*-----------------------------------------------------
* SIDEBAR
Expand All @@ -72,7 +72,7 @@
top: 0;
bottom: 0;
z-index: 10;
display: none;
display: flex;
height: 100%;
width: var(--sidebar-width);
transition:
Expand All @@ -82,16 +82,6 @@
background-color: var(--color-bg-elevation-2);
}

[data-state="full-width"] .sidebar {
width: 100%;
}

@container (min-width: 768px) {
.sidebar {
display: flex;
}
}

.mainSidebar[data-side="start"] .sidebar {
left: 0;
}
Expand All @@ -108,45 +98,25 @@
right: calc(var(--sidebar-width) * -1);
}

.mainSidebar[data-variant="floating"] .sidebar,
.mainSidebar[data-variant="inset"] .sidebar {
padding: var(--inner-spacing-2);
}

.mainSidebar[data-collapsible="icon"] .sidebar {
width: calc(var(--sidebar-width-icon));
}

.mainSidebar[data-variant="floating"][data-collapsible="icon"] .sidebar,
.mainSidebar[data-variant="inset"][data-collapsible="icon"] .sidebar {
width: calc(var(--sidebar-width-icon) + var(--inner-spacing-2) + 2px);
}

.mainSidebar[data-side="start"]:not([data-variant="floating"]):not(
[data-variant="inset"]
)
.sidebar {
border-inline-end: var(--border-width-1) solid var(--color-bd-elevation-1);
}
@container (width > 550px) {
.mainSidebar[data-side="start"] .sidebar {
border-inline-end: var(--border-width-1) solid var(--color-bd-elevation-1);
}

.mainSidebar[data-side="end"]:not([data-variant="floating"]):not(
[data-variant="inset"]
)
.sidebar {
border-inline-start: var(--border-width-1) solid var(--color-bd-elevation-1);
.mainSidebar[data-side="end"] .sidebar {
border-inline-start: var(--border-width-1) solid var(--color-bd-elevation-1);
}
}

.mainSidebar[data-state="full-width"][data-side="start"]:is(
[data-variant="sidebar"]
)
.sidebar {
.mainSidebar[data-state="full-width"][data-side="start"] .sidebar {
border-inline-end: none;
}

.mainSidebar[data-state="full-width"][data-side="end"]:is(
[data-variant="sidebar"]
)
.sidebar {
.mainSidebar[data-state="full-width"][data-side="end"] .sidebar {
border-inline-start: none;
}

Expand All @@ -170,12 +140,6 @@
border-inline-end: var(--border-width-1) solid var(--color-bd-subtle);
}

.mainSidebar[data-variant="floating"] .sidebarContainer {
border-radius: var(--border-radius-elevation-3);
border: var(--border-width-1) solid var(--color-bd);
box-shadow: var(--box-shadow-1);
}

/**
*-----------------------------------------------------
* SIDEBAR CONTENT
Expand All @@ -192,47 +156,20 @@
width: 100%;
}

/**
*-----------------------------------------------------
* SIDEBAR INSET
*-----------------------------------------------------
*/
.sidebarInset {
position: relative;
display: flex;
min-height: 100%;
flex: 1;
flex-direction: column;
background-color: var(--background);
}

[data-variant="inset"] ~ .sidebarInset {
min-height: calc(100% - var(--inner-spacing-2) * 2);
}

@container (min-width: 768px) {
[data-variant="inset"] ~ .sidebarInset {
margin: var(--inner-spacing-2);
border-radius: var(--border-radius-elevation-3);
box-shadow: var(--box-shadow-1);
border: var(--border-width-1) solid var(--color-bd);
}

/* Handle margin when sidebar is collapsed */
[data-state="collapsed"][data-variant="inset"] ~ .sidebarInset {
margin-left: var(--inner-spacing-2);
}

[data-variant="inset"] ~ .sidebarInset {
margin-left: 0;
}
}

/**
*-----------------------------------------------------
* SIDEBAR HEADER
*-----------------------------------------------------
*/
.sidebarHeader {
height: var(--sizing-13);
padding: 0 var(--inner-spacing-2);
border-bottom: var(--border-width-1) solid var(--color-bd-elevation-1);
}

.sidebarTitle {
position: absolute;
left: 0;
right: 0;
margin: 0 var(--sizing-14);
}
8 changes: 5 additions & 3 deletions app/client/packages/design-system/widgets/src/components/Sidebar/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import type { ReactNode } from "react";

export type SidebarState = "collapsed" | "expanded" | "full-width";

export type SidebarSide = "start" | "end";
export interface SidebarContextType {
state: SidebarState;
setState: (state: SidebarState) => void;
isMobile: boolean;
toggleSidebar: () => void;
side: SidebarSide;
}

export interface SidebarProviderProps {
Expand All @@ -14,12 +18,10 @@ export interface SidebarProviderProps {
children: ReactNode;
className?: string;
style?: React.CSSProperties;
side?: SidebarSide;
}

export type SidebarState = "collapsed" | "expanded" | "full-width";

export interface SidebarProps {
side?: "start" | "end";
variant?: "sidebar" | "floating" | "inset";
collapsible?: "offcanvas" | "icon" | "none";
onEnter?: () => void;
Expand Down
Loading