Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Allow horizontal scrolling in navigator (#2149)

Oleg Isonen81cf3d3fd08a
diff --git a/packages/design-system/src/components/scroll-area.stories.tsx b/packages/design-system/src/components/scroll-area.stories.tsx
new file mode 100644
index 0000000000..43d4e189de
--- /dev/null
+++ b/packages/design-system/src/components/scroll-area.stories.tsx
@@ -0,0 +1,42 @@
+import { StorySection } from "./storybook";
+import { ScrollArea } from "./scroll-area";
+import { theme } from "..";
+
+export default {
+ title: "Library/Scroll Area",
+};
+
+export const Story = () => {
+ const content = (
+ <div style={{ height: 1000, width: 1000 }}>
+ {Array.from(new Array(100))
+ .map(() => {
+ return "a".repeat(300);
+ })
+ .join("\n")}
+ </div>
+ );
+ const css = {
+ height: 100,
+ width: 100,
+ background: theme.colors.backgroundPanel,
+ };
+ return (
+ <>
+ <StorySection title="Vertical">
+ <ScrollArea css={css}>{content}</ScrollArea>
+ </StorySection>
+ <StorySection title="Horizontal">
+ <ScrollArea css={css} direction="horizontal">
+ {content}
+ </ScrollArea>
+ </StorySection>
+ <StorySection title="Both">
+ <ScrollArea css={css} direction="both">
+ {content}
+ </ScrollArea>
+ </StorySection>
+ </>
+ );
+};
+Story.storyName = "Scroll Area";
diff --git a/packages/design-system/src/components/scroll-area.tsx b/packages/design-system/src/components/scroll-area.tsx
index 021e212c52..39784acc3d 100644
--- a/packages/design-system/src/components/scroll-area.tsx
+++ b/packages/design-system/src/components/scroll-area.tsx
@@ -51,36 +51,40 @@ const viewPortStyle = css({
borderRadius: "inherit",
variants: {
- verticalOnly: {
+ direction: {
// https://github.com/radix-ui/primitives/issues/926#issuecomment-1015279283
- true: { "& > div[style]": { display: "block !important" } },
+ vertical: { "& > div[style]": { display: "block !important" } },
+ horizontal: {},
+ both: {},
},
},
});
-type ScrollAreaProps = { css?: CSS; verticalOnly?: boolean } & Pick<
- ComponentProps<"div">,
- "onScroll" | "children"
->;
+type ScrollAreaProps = {
+ css?: CSS;
+ direction?: "vertical" | "horizontal" | "both";
+} & Pick<ComponentProps<"div">, "onScroll" | "children">;
export const ScrollArea = forwardRef(
(
- { children, css, onScroll, verticalOnly = true }: ScrollAreaProps,
+ { children, css, onScroll, direction = "vertical" }: ScrollAreaProps,
ref: Ref<HTMLDivElement>
) => {
return (
<ScrollAreaRoot scrollHideDelay={0} css={css}>
<Viewport
ref={ref}
- className={viewPortStyle({ verticalOnly })}
+ className={viewPortStyle({ direction })}
onScroll={onScroll}
>
{children}
</Viewport>
- <ScrollAreaScrollbar orientation="vertical">
- <ScrollAreaThumb />
- </ScrollAreaScrollbar>
- {verticalOnly === false && (
+ {(direction === "vertical" || direction === "both") && (
+ <ScrollAreaScrollbar orientation="vertical">
+ <ScrollAreaThumb />
+ </ScrollAreaScrollbar>
+ )}
+ {(direction === "horizontal" || direction === "both") && (
<ScrollAreaScrollbar orientation="horizontal">
<ScrollAreaThumb />
</ScrollAreaScrollbar>
diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsx
index ec65ec9da8..117800f145 100644
--- a/packages/design-system/src/components/tree/tree.tsx
+++ b/packages/design-system/src/components/tree/tree.tsx
@@ -266,10 +266,11 @@ export const Tree = <Data extends { id: string }>({
return (
<ScrollArea
+ // TODO allow resizing of the panel instead.
+ direction="both"
css={{
width: "100%",
- overflowY: "auto",
- overflowX: "hidden",
+ overflow: "hidden",
flexBasis: 0,
flexGrow: 1,
}}