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.

refactor: decouple features from sidebar (#4304)

Bogdan Chadkin7c23583b7550
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx b/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx
index 2c8e13bc5c..d264633ce3 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/assets/assets.tsx
@@ -1,20 +1,31 @@
-import { ImageIcon } from "@webstudio-is/icons";
+import {
+ Button,
+ PanelTitle,
+ Separator,
+ Tooltip,
+} from "@webstudio-is/design-system";
+import { CrossIcon } from "@webstudio-is/icons";
import { ImageManager } from "~/builder/shared/image-manager";
-import type { TabContentProps } from "../../types";
-import { Header, CloseButton, Root } from "../../shared/panel";
-export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
+export const AssetsPanel = ({ onClose }: { onClose: () => void }) => {
return (
- <Root>
- <Header
- title="Assets"
- suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}
- />
+ <>
+ <PanelTitle
+ suffix={
+ <Tooltip content="Close panel" side="bottom">
+ <Button
+ color="ghost"
+ prefix={<CrossIcon />}
+ aria-label="Close panel"
+ onClick={onClose}
+ />
+ </Tooltip>
+ }
+ >
+ Assets
+ </PanelTitle>
+ <Separator />
<ImageManager />
- </Root>
+ </>
);
};
-
-export const Icon = ImageIcon;
-
-export const label = "Assets";
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
index 255161704d..641cdaf147 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
@@ -1,5 +1,6 @@
import { useMemo, useState } from "react";
import { useStore } from "@nanostores/react";
+import { CrossIcon } from "@webstudio-is/icons";
import {
type WsComponentMeta,
componentCategories,
@@ -17,13 +18,12 @@ import {
findNextListItemIndex,
Text,
Box,
- Kbd,
Grid,
+ PanelTitle,
+ Tooltip,
+ Button,
} from "@webstudio-is/design-system";
-import { PlusIcon } from "@webstudio-is/icons";
import { CollapsibleSection } from "~/builder/shared/collapsible-section";
-import type { TabContentProps } from "../../types";
-import { Header, CloseButton, Root } from "../../shared/panel";
import { dragItemAttribute, useDraggable } from "./use-draggable";
import { MetaIcon } from "~/builder/shared/meta-icon";
import { $registeredComponentMetas, $selectedPage } from "~/shared/nano-states";
@@ -37,6 +37,7 @@ import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { insert } from "./insert";
import { matchSorter } from "match-sorter";
import { parseComponentName } from "@webstudio-is/sdk";
+import type { Publish } from "~/shared/pubsub";
const matchComponents = (
metas: Array<WsComponentMeta>,
@@ -159,13 +160,19 @@ const findComponentIndex = (
return { index: -1, metas: [] };
};
-export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
+export const ComponentsPanel = ({
+ publish,
+ onClose,
+}: {
+ publish: Publish;
+ onClose: () => void;
+}) => {
const metaByComponentName = useStore($registeredComponentMetas);
const selectedPage = useStore($selectedPage);
const [selectedComponent, setSelectedComponent] = useState<string>();
const handleInsert = (component: string) => {
- onSetActiveTab("none");
+ onClose();
insert(component);
};
@@ -227,11 +234,23 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
});
return (
- <Root ref={draggableContainerRef}>
- <Header
- title="Components"
- suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}
- />
+ <>
+ <PanelTitle
+ suffix={
+ <Tooltip content="Close panel" side="bottom">
+ <Button
+ color="ghost"
+ prefix={<CrossIcon />}
+ aria-label="Close panel"
+ onClick={onClose}
+ />
+ </Tooltip>
+ }
+ >
+ Components
+ </PanelTitle>
+ <Separator />
+
<Box css={{ padding: theme.panel.padding }}>
<SearchField
{...searchFieldProps}
@@ -239,10 +258,9 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
placeholder="Find components"
/>
</Box>
-
<Separator />
- <ScrollArea>
+ <ScrollArea ref={draggableContainerRef}>
{groups.map((group) => (
<CollapsibleSection
label={group.category}
@@ -302,15 +320,6 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
</CollapsibleSection>
))}
</ScrollArea>
- </Root>
+ </>
);
};
-
-export const Icon = PlusIcon;
-
-export const label = (
- <Text>
- Components&nbsp;&nbsp;
- <Kbd value={["A"]} color="moreSubtle" />
- </Text>
-);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/index.ts
deleted file mode 100644
index 75a825772f..0000000000
--- a/apps/builder/app/builder/features/sidebar-left/panels/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { ReactNode } from "react";
-import type { IconComponent } from "@webstudio-is/icons";
-import type { SidebarPanelName } from "~/builder/shared/nano-states";
-import * as components from "./components";
-import * as navigator from "./navigator";
-import * as assets from "./assets";
-import * as pages from "./pages";
-import * as marketplace from "./marketplace";
-import type { TabContentProps } from "../types";
-
-type PanelExports = {
- TabContent: (props: TabContentProps) => ReactNode;
- Icon: IconComponent;
- label: ReactNode;
-};
-
-export const panels = new Map<SidebarPanelName, PanelExports>([
- ["components", components],
- ["pages", pages],
- ["navigator", navigator],
- ["assets", assets],
- ["marketplace", marketplace],
-]);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx
index 5ff8b2b577..ce611664d7 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx
@@ -2,6 +2,7 @@ import {
Button,
Flex,
Link,
+ PanelTitle,
Separator,
Text,
Tooltip,
@@ -10,7 +11,6 @@ import {
truncate,
} from "@webstudio-is/design-system";
import type { MarketplaceOverviewItem } from "~/shared/marketplace/types";
-import { Header } from "../../shared/panel";
import { ChevronDoubleLeftIcon, ExternalLinkIcon } from "@webstudio-is/icons";
import { builderUrl } from "~/shared/router-utils";
@@ -29,8 +29,7 @@ export const About = ({
return (
<>
- <Header
- title={item.name}
+ <PanelTitle
suffix={
<Tooltip content="Close" side="bottom">
<Button
@@ -44,7 +43,11 @@ export const About = ({
/>
</Tooltip>
}
- />
+ >
+ {item.name}
+ </PanelTitle>
+ <Separator />
+
<Flex
direction="column"
css={{ my: theme.spacing[5], mx: theme.spacing[8] }}
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
index 94e288fa3a..58193a4cab 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
@@ -1,7 +1,12 @@
-import { ExtensionIcon, SpinnerIcon } from "@webstudio-is/icons";
-import { Flex, rawTheme } from "@webstudio-is/design-system";
-import type { TabContentProps } from "../../types";
-import { Header, CloseButton, Root } from "../../shared/panel";
+import { CrossIcon, SpinnerIcon } from "@webstudio-is/icons";
+import {
+ Button,
+ Flex,
+ PanelTitle,
+ rawTheme,
+ Separator,
+ Tooltip,
+} from "@webstudio-is/design-system";
import { Overview } from "./overview";
import { Templates } from "./templates";
import { useEffect, useState } from "react";
@@ -12,7 +17,7 @@ import { ExtendedPanel } from "../../shared/extended-panel";
import { About } from "./about";
import { trpcClient } from "~/shared/trpc/trpc-client";
-export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
+export const MarketplacePanel = ({ onClose }: { onClose: () => void }) => {
const [activeOverviewItem, setAciveOverviewItem] =
useState<MarketplaceOverviewItem>();
const [openAbout, setOpenAbout] = useState<Project["id"]>();
@@ -36,43 +41,52 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
return (
<>
- <Root>
- <Header
- title="Marketplace"
- suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}
- />
- <Overview
- items={items}
- activeProjectId={activeOverviewItem?.projectId}
- onSelect={(activeOverviewItem) => {
- setAciveOverviewItem(activeOverviewItem);
- getBuildData({ projectId: activeOverviewItem.projectId });
+ <PanelTitle
+ suffix={
+ <Tooltip content="Close panel" side="bottom">
+ <Button
+ color="ghost"
+ prefix={<CrossIcon />}
+ aria-label="Close panel"
+ onClick={onClose}
+ />
+ </Tooltip>
+ }
+ >
+ Marketplace
+ </PanelTitle>
+ <Separator />
+ <Overview
+ items={items}
+ activeProjectId={activeOverviewItem?.projectId}
+ onSelect={(activeOverviewItem) => {
+ setAciveOverviewItem(activeOverviewItem);
+ getBuildData({ projectId: activeOverviewItem.projectId });
+ }}
+ openAbout={openAbout}
+ onOpenAbout={setOpenAbout}
+ hidden={showTemplates}
+ />
+
+ {showTemplates && (
+ <Templates
+ projectId={activeOverviewItem.projectId}
+ name={activeOverviewItem.name}
+ authorizationToken={activeOverviewItem.authorizationToken}
+ productCategory={activeOverviewItem.category}
+ data={toWebstudioData(buildData)}
+ onOpenChange={(isOpen: boolean) => {
+ if (isOpen === false) {
+ setAciveOverviewItem(undefined);
+ }
}}
- openAbout={openAbout}
- onOpenAbout={setOpenAbout}
- hidden={showTemplates}
/>
-
- {showTemplates && (
- <Templates
- projectId={activeOverviewItem.projectId}
- name={activeOverviewItem.name}
- authorizationToken={activeOverviewItem.authorizationToken}
- productCategory={activeOverviewItem.category}
- data={toWebstudioData(buildData)}
- onOpenChange={(isOpen: boolean) => {
- if (isOpen === false) {
- setAciveOverviewItem(undefined);
- }
- }}
- />
- )}
- {itemsLoadingState !== "idle" && (
- <Flex justify="center" css={{ mt: "20%" }}>
- <SpinnerIcon size={rawTheme.spacing[15]} />
- </Flex>
- )}
- </Root>
+ )}
+ {itemsLoadingState !== "idle" && (
+ <Flex justify="center" css={{ mt: "20%" }}>
+ <SpinnerIcon size={rawTheme.spacing[15]} />
+ </Flex>
+ )}
<ExtendedPanel isOpen={openAboutItem !== undefined}>
<About
item={openAboutItem}
@@ -84,7 +98,3 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
</>
);
};
-
-export const Icon = ExtensionIcon;
-
-export const label = "Marketplace";
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx
index c419ac523e..9b29a00399 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx
@@ -1,31 +1,37 @@
-import { NavigatorIcon } from "@webstudio-is/icons";
-import { Kbd, Text, Flex, Separator } from "@webstudio-is/design-system";
-import type { TabContentProps } from "../../types";
-import { Header, CloseButton, Root } from "../../shared/panel";
+import {
+ Button,
+ Flex,
+ PanelTitle,
+ Separator,
+ Tooltip,
+} from "@webstudio-is/design-system";
+import { CrossIcon } from "@webstudio-is/icons";
import { CssPreview } from "./css-preview";
import { NavigatorTree } from "./navigator-tree";
-export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
+export const NavigatorPanel = ({ onClose }: { onClose: () => void }) => {
return (
- <Root>
- <Header
- title="Navigator"
- suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}
- />
+ <>
+ <PanelTitle
+ suffix={
+ <Tooltip content="Close panel" side="bottom">
+ <Button
+ onClick={onClose}
+ color="ghost"
+ prefix={<CrossIcon />}
+ aria-label="Close panel"
+ />
+ </Tooltip>
+ }
+ >
+ Navigator
+ </PanelTitle>
+ <Separator />
<Flex grow direction="column" justify="end">
<NavigatorTree />
<Separator />
<CssPreview />
</Flex>
- </Root>
+ </>
);
};
-
-export const Icon = NavigatorIcon;
-
-export const label = (
- <Text>
- Navigator&nbsp;&nbsp;
- <Kbd value={["z"]} color="moreSubtle" />
- </Text>
-);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
index 991d31d4ea..e74939bebf 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
@@ -26,6 +26,9 @@ import {
Text,
DialogClose,
DialogTitle,
+ PanelTitle,
+ Separator,
+ TitleSuffixSpacer,
} from "@webstudio-is/design-system";
import {
ChevronDoubleLeftIcon,
@@ -33,7 +36,6 @@ import {
HelpIcon,
} from "@webstudio-is/icons";
import { useIds } from "~/shared/form-utils";
-import { Header, HeaderSuffixSpacer } from "../../shared/panel";
import { $pages } from "~/shared/nano-states";
import { nanoid } from "nanoid";
import { serverSyncStore } from "~/shared/sync";
@@ -295,8 +297,7 @@ const NewFolderSettingsView = ({
}) => {
return (
<>
- <Header
- title="New Folder Settings"
+ <PanelTitle
suffix={
<>
<Tooltip content="Cancel" side="bottom">
@@ -310,7 +311,7 @@ const NewFolderSettingsView = ({
tabIndex={3}
/>
</Tooltip>
- <HeaderSuffixSpacer />
+ <TitleSuffixSpacer />
<Button
state={isSubmitting ? "pending" : "auto"}
onClick={onSubmit}
@@ -320,7 +321,10 @@ const NewFolderSettingsView = ({
</Button>
</>
}
- />
+ >
+ New Folder Settings
+ </PanelTitle>
+ <Separator />
<Form onSubmit={onSubmit}>{children}</Form>
</>
);
@@ -482,8 +486,7 @@ const FolderSettingsView = ({
return (
<>
- <Header
- title="Folder Settings"
+ <PanelTitle
suffix={
<>
<Tooltip content="Delete folder" side="bottom">
@@ -515,7 +518,10 @@ const FolderSettingsView = ({
)}
</>
}
- />
+ >
+ Folder Settings
+ </PanelTitle>
+ <Separator />
<Form onSubmit={onClose}>{children}</Form>
</>
);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
index 81016cbd21..6ea80400e1 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
@@ -53,6 +53,8 @@ import {
PanelBanner,
css,
Switch,
+ PanelTitle,
+ TitleSuffixSpacer,
} from "@webstudio-is/design-system";
import {
ChevronDoubleLeftIcon,
@@ -63,7 +65,6 @@ import {
UploadIcon,
} from "@webstudio-is/icons";
import { useIds } from "~/shared/form-utils";
-import { Header, HeaderSuffixSpacer } from "../../shared/panel";
import { updateWebstudioData } from "~/shared/instance-utils";
import {
$assets,
@@ -1343,8 +1344,7 @@ const NewPageSettingsView = ({
}) => {
return (
<>
- <Header
- title="New Page Settings"
+ <PanelTitle
suffix={
<>
<Tooltip content="Cancel" side="bottom">
@@ -1358,7 +1358,7 @@ const NewPageSettingsView = ({
tabIndex={3}
/>
</Tooltip>
- <HeaderSuffixSpacer />
+ <TitleSuffixSpacer />
<Button
state={isSubmitting ? "pending" : "auto"}
onClick={onSubmit}
@@ -1368,7 +1368,10 @@ const NewPageSettingsView = ({
</Button>
</>
}
- />
+ >
+ New Page Settings
+ </PanelTitle>
+ <Separator />
<Form onSubmit={onSubmit}>{children}</Form>
</>
);
@@ -1680,8 +1683,7 @@ const PageSettingsView = ({
}) => {
return (
<>
- <Header
- title="Page Settings"
+ <PanelTitle
suffix={
<>
{onDelete && (
@@ -1715,7 +1717,10 @@ const PageSettingsView = ({
</Tooltip>
</>
}
- />
+ >
+ Page Settings
+ </PanelTitle>
+ <Separator />
<Form onSubmit={onClose}>{children}</Form>
</>
);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index 17cdff85e3..15c4254529 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -8,6 +8,8 @@ import {
TreeNode,
TreeRoot,
TreeNodeLabel,
+ PanelTitle,
+ Separator,
} from "@webstudio-is/design-system";
import {
ChevronRightIcon,
@@ -18,9 +20,8 @@ import {
NewPageIcon,
PageIcon,
DynamicPageIcon,
+ CrossIcon,
} from "@webstudio-is/icons";
-import type { TabContentProps } from "../../types";
-import { CloseButton, Header, Root } from "../../shared/panel";
import { ExtendedPanel } from "../../shared/extended-panel";
import { NewPageSettings, PageSettings } from "./page-settings";
import { $editingPageId, $pages, $selectedPageId } from "~/shared/nano-states";
@@ -176,7 +177,7 @@ const $flatPagesTree = computed(
}
);
-const PagesPanel = ({
+const PagesTree = ({
onClose,
onCreateNewFolder,
onCreateNewPage,
@@ -202,9 +203,8 @@ const PagesPanel = ({
}
return (
- <Root>
- <Header
- title="Pages"
+ <>
+ <PanelTitle
suffix={
<>
<Tooltip content="New folder" side="bottom">
@@ -223,10 +223,21 @@ const PagesPanel = ({
color="ghost"
/>
</Tooltip>
- <CloseButton onClick={onClose} />
+ <Tooltip content="Close panel" side="bottom">
+ <Button
+ color="ghost"
+ prefix={<CrossIcon />}
+ aria-label="Close panel"
+ onClick={onClose}
+ />
+ </Tooltip>
</>
}
- />
+ >
+ Pages
+ </PanelTitle>
+ <Separator />
+
<Box css={{ overflowY: "auto", flexBasis: 0, flexGrow: 1 }}>
<TreeRoot>
{flatPagesTree.map((item, index) => {
@@ -298,7 +309,7 @@ const PagesPanel = ({
})}
</TreeRoot>
</Box>
- </Root>
+ </>
);
};
@@ -379,7 +390,7 @@ const FolderEditor = ({
);
};
-export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
+export const PagesPanel = ({ onClose }: { onClose: () => void }) => {
const currentPageId = useStore($selectedPageId);
const editingItemId = useStore($editingPageId);
const pages = useStore($pages);
@@ -390,8 +401,8 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
return (
<>
- <PagesPanel
- onClose={() => onSetActiveTab("none")}
+ <PagesTree
+ onClose={onClose}
onCreateNewFolder={() => {
$editingPageId.set(
editingItemId === newFolderId ? undefined : newFolderId
@@ -407,7 +418,7 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
return;
}
switchPage(itemId);
- onSetActiveTab("none");
+ onClose();
}}
selectedPageId={currentPageId}
onEdit={$editingPageId.set}
@@ -434,7 +445,3 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
</>
);
};
-
-export const Icon = PageIcon;
-
-export const label = "Pages";
diff --git a/apps/builder/app/builder/features/sidebar-left/shared/panel.tsx b/apps/builder/app/builder/features/sidebar-left/shared/panel.tsx
deleted file mode 100644
index 668067b25f..0000000000
--- a/apps/builder/app/builder/features/sidebar-left/shared/panel.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
- Button,
- Tooltip,
- Separator,
- PanelTitle,
- TitleSuffixSpacer,
- Flex,
- theme,
-} from "@webstudio-is/design-system";
-import { CrossIcon } from "@webstudio-is/icons";
-import { forwardRef, type ComponentProps } from "react";
-
-type HeaderProps = {
- title: string;
- suffix: React.ReactNode;
-};
-
-export const Header = ({ title, suffix }: HeaderProps) => {
- return (
- <>
- <PanelTitle suffix={suffix}>{title}</PanelTitle>
- <Separator />
- </>
- );
-};
-
-export { TitleSuffixSpacer as HeaderSuffixSpacer };
-
-export const CloseButton = ({
- onClick,
- label = "Close panel",
-}: {
- onClick: () => void;
- label?: string;
-}) => (
- <Tooltip content={label} side="bottom">
- <Button
- onClick={onClick}
- color="ghost"
- prefix={<CrossIcon />}
- aria-label={label}
- />
- </Tooltip>
-);
-
-export const Root = forwardRef<HTMLDivElement, ComponentProps<typeof Flex>>(
- (props, ref) => {
- return (
- <Flex
- css={{
- position: "relative",
- height: "100%",
- flexGrow: 1,
- background: theme.colors.backgroundPanel,
- }}
- direction="column"
- ref={ref}
- {...props}
- />
- );
- }
-);
-
-Root.displayName = "Root";
diff --git a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx
index 456aab9a3b..b307b9e151 100644
--- a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx
@@ -1,11 +1,19 @@
-import { useRef, useState } from "react";
-import { Box, rawTheme } from "@webstudio-is/design-system";
+import { useRef, useState, type ReactNode } from "react";
+import { Box, Kbd, rawTheme, Text } from "@webstudio-is/design-system";
import { useSubscribe, type Publish } from "~/shared/pubsub";
import { $dragAndDropState, $isPreviewMode } from "~/shared/nano-states";
-import { panels } from "./panels";
import { Flex } from "@webstudio-is/design-system";
import { theme } from "@webstudio-is/design-system";
-import { AiIcon, HelpIcon } from "@webstudio-is/icons";
+import {
+ AiIcon,
+ ExtensionIcon,
+ HelpIcon,
+ ImageIcon,
+ NavigatorIcon,
+ PageIcon,
+ PlusIcon,
+ type IconComponent,
+} from "@webstudio-is/icons";
import { HelpPopover } from "./help-popover";
import { useStore } from "@nanostores/react";
import {
@@ -29,8 +37,13 @@ import {
useExternalDragStateEffect,
} from "~/builder/shared/assets/drag-monitor";
import { getSetting, setSetting } from "~/builder/shared/client-settings";
+import { ComponentsPanel } from "./panels/components";
+import { PagesPanel } from "./panels/pages";
+import { NavigatorPanel } from "./panels/navigator";
+import { AssetsPanel } from "./panels/assets";
+import { MarketplacePanel } from "./panels/marketplace";
-const none = { TabContent: () => null };
+const none = { Panel: () => null };
const AiTabTrigger = () => {
return (
@@ -65,6 +78,56 @@ const HelpTabTrigger = () => {
);
};
+type PanelConfig = {
+ name: SidebarPanelName;
+ label: ReactNode;
+ Icon: IconComponent;
+ Panel: (props: { publish: Publish; onClose: () => void }) => ReactNode;
+};
+
+const panels: PanelConfig[] = [
+ {
+ name: "components",
+ label: (
+ <Text>
+ Components&nbsp;&nbsp;
+ <Kbd value={["A"]} color="moreSubtle" />
+ </Text>
+ ),
+ Icon: PlusIcon,
+ Panel: ComponentsPanel,
+ },
+ {
+ name: "pages",
+ label: "Pages",
+ Icon: PageIcon,
+ Panel: PagesPanel,
+ },
+ {
+ name: "navigator",
+ label: (
+ <Text>
+ Navigator&nbsp;&nbsp;
+ <Kbd value={["z"]} color="moreSubtle" />
+ </Text>
+ ),
+ Icon: NavigatorIcon,
+ Panel: NavigatorPanel,
+ },
+ {
+ name: "assets",
+ label: "Assets",
+ Icon: ImageIcon,
+ Panel: AssetsPanel,
+ },
+ {
+ name: "marketplace",
+ label: "Marketplace",
+ Icon: ExtensionIcon,
+ Panel: MarketplacePanel,
+ },
+];
+
type SidebarLeftProps = {
publish: Publish;
};
@@ -72,7 +135,7 @@ type SidebarLeftProps = {
export const SidebarLeft = ({ publish }: SidebarLeftProps) => {
const activePanel = useStore($activeSidebarPanel);
const dragAndDropState = useStore($dragAndDropState);
- const { TabContent } = panels.get(activePanel) ?? none;
+ const { Panel } = panels.find((item) => item.name === activePanel) ?? none;
const isPreviewMode = useStore($isPreviewMode);
const tabsWrapperRef = useRef<HTMLDivElement>(null);
const returnTabRef = useRef<SidebarPanelName | undefined>(undefined);
@@ -135,22 +198,20 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {
<ExternalDragDropMonitor />
<div ref={tabsWrapperRef} style={{ display: "contents" }}>
<SidebarTabsList>
- {Array.from(panels.entries()).map(
- ([panel, { Icon, label }]) => {
- return (
- <SidebarTabsTrigger
- key={panel}
- label={label}
- value={panel}
- onClick={() => {
- toggleActiveSidebarPanel(panel);
- }}
- >
- <Icon size={rawTheme.spacing[10]} />
- </SidebarTabsTrigger>
- );
- }
- )}
+ {panels.map(({ name, Icon, label }) => {
+ return (
+ <SidebarTabsTrigger
+ key={name}
+ label={label}
+ value={name}
+ onClick={() => {
+ toggleActiveSidebarPanel(name);
+ }}
+ >
+ <Icon size={rawTheme.spacing[10]} />
+ </SidebarTabsTrigger>
+ );
+ })}
</SidebarTabsList>
</div>
@@ -180,10 +241,20 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {
: "visible",
}}
>
- <TabContent
- publish={publish}
- onSetActiveTab={setActiveSidebarPanel}
- />
+ <Flex
+ css={{
+ position: "relative",
+ height: "100%",
+ flexGrow: 1,
+ background: theme.colors.backgroundPanel,
+ }}
+ direction="column"
+ >
+ <Panel
+ publish={publish}
+ onClose={() => setActiveSidebarPanel("none")}
+ />
+ </Flex>
</SidebarTabsContent>
</SidebarTabs>
</Flex>
diff --git a/apps/builder/app/builder/features/sidebar-left/types.ts b/apps/builder/app/builder/features/sidebar-left/types.ts
deleted file mode 100644
index 1178a0b2fd..0000000000
--- a/apps/builder/app/builder/features/sidebar-left/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { SidebarPanelName } from "~/builder/shared/nano-states";
-import type { Publish } from "~/shared/pubsub";
-
-export type TabContentProps = {
- onSetActiveTab: (tabName: SidebarPanelName) => void;
- publish: Publish;
-};