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: dissolve features/topbar into standalone features\n\n- Move share, clone, safe-mode, builder-mode, view-mode, sync-status directly under features/\n- Move publish cluster (publish, domains, add-domain, entri, cname) into features/publish/\n- Move menu into features/menu/\n- Move topbar-layout (utility) and topbar (composition) into shared/\n- Remove spinner story (animated SVG causes flaky visual tests)\n- Remove avatar NoImageNoFallback variant (invalid state)\n- Update story titles to reflect new structure

Oleg Isonen2bdd6fd8e1aa
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index a5eddec201..38df0b48ca 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -15,7 +15,7 @@ import { initializeClientSync, getSyncClient } from "~/shared/sync/sync-client";
import { usePreventUnload } from "~/shared/sync/project-queue";
import { usePublish, $publisher } from "~/shared/pubsub";
import { Inspector } from "./inspector";
-import { Topbar } from "./features/topbar";
+import { Topbar } from "./shared/topbar";
import { Footer } from "./features/footer";
import {
CanvasIframe,
diff --git a/apps/builder/app/builder/features/topbar/builder-mode.tsx b/apps/builder/app/builder/features/builder-mode.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/builder-mode.tsx
rename to apps/builder/app/builder/features/builder-mode.tsx
diff --git a/apps/builder/app/builder/features/topbar/clone.tsx b/apps/builder/app/builder/features/clone.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/clone.tsx
rename to apps/builder/app/builder/features/clone.tsx
diff --git a/apps/builder/app/builder/features/topbar/menu/index.ts b/apps/builder/app/builder/features/menu/index.ts
similarity index 100%
rename from apps/builder/app/builder/features/topbar/menu/index.ts
rename to apps/builder/app/builder/features/menu/index.ts
diff --git a/apps/builder/app/builder/features/topbar/menu/menu-button.tsx b/apps/builder/app/builder/features/menu/menu-button.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/menu/menu-button.tsx
rename to apps/builder/app/builder/features/menu/menu-button.tsx
diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/menu/menu.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/menu/menu.tsx
rename to apps/builder/app/builder/features/menu/menu.tsx
diff --git a/apps/builder/app/builder/features/topbar/add-domain.tsx b/apps/builder/app/builder/features/publish/add-domain.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/add-domain.tsx
rename to apps/builder/app/builder/features/publish/add-domain.tsx
diff --git a/apps/builder/app/builder/features/topbar/cname.test.ts b/apps/builder/app/builder/features/publish/cname.test.ts
similarity index 100%
rename from apps/builder/app/builder/features/topbar/cname.test.ts
rename to apps/builder/app/builder/features/publish/cname.test.ts
diff --git a/apps/builder/app/builder/features/topbar/cname.ts b/apps/builder/app/builder/features/publish/cname.ts
similarity index 100%
rename from apps/builder/app/builder/features/topbar/cname.ts
rename to apps/builder/app/builder/features/publish/cname.ts
diff --git a/apps/builder/app/builder/features/topbar/collapsible-domain-section.tsx b/apps/builder/app/builder/features/publish/collapsible-domain-section.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/collapsible-domain-section.tsx
rename to apps/builder/app/builder/features/publish/collapsible-domain-section.tsx
diff --git a/apps/builder/app/builder/features/topbar/domain-checkbox.tsx b/apps/builder/app/builder/features/publish/domain-checkbox.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/domain-checkbox.tsx
rename to apps/builder/app/builder/features/publish/domain-checkbox.tsx
diff --git a/apps/builder/app/builder/features/topbar/domains.tsx b/apps/builder/app/builder/features/publish/domains.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/domains.tsx
rename to apps/builder/app/builder/features/publish/domains.tsx
diff --git a/apps/builder/app/builder/features/topbar/entri.tsx b/apps/builder/app/builder/features/publish/entri.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/entri.tsx
rename to apps/builder/app/builder/features/publish/entri.tsx
diff --git a/apps/builder/app/builder/features/publish/index.ts b/apps/builder/app/builder/features/publish/index.ts
new file mode 100644
index 0000000000..1d9925a003
--- /dev/null
+++ b/apps/builder/app/builder/features/publish/index.ts
@@ -0,0 +1 @@
+export { PublishButton } from "./publish";
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/publish/publish.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/publish.tsx
rename to apps/builder/app/builder/features/publish/publish.tsx
diff --git a/apps/builder/app/builder/features/topbar/safe-mode.tsx b/apps/builder/app/builder/features/safe-mode.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/safe-mode.tsx
rename to apps/builder/app/builder/features/safe-mode.tsx
diff --git a/apps/builder/app/builder/features/topbar/share.tsx b/apps/builder/app/builder/features/share.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/share.tsx
rename to apps/builder/app/builder/features/share.tsx
diff --git a/apps/builder/app/builder/features/sync-status.stories.tsx b/apps/builder/app/builder/features/sync-status.stories.tsx
new file mode 100644
index 0000000000..a57d40a77b
--- /dev/null
+++ b/apps/builder/app/builder/features/sync-status.stories.tsx
@@ -0,0 +1,23 @@
+import { rawTheme, Flex, theme } from "@webstudio-is/design-system";
+import { $queueStatus } from "~/shared/sync/project-queue";
+import { SyncStatus } from "./sync-status";
+
+export default {
+ title: "Builder/Sync Status",
+ component: SyncStatus,
+};
+
+export const Failed = () => {
+ $queueStatus.set({ status: "failed" });
+ return (
+ <Flex
+ css={{
+ height: theme.spacing[15],
+ background: rawTheme.colors.backgroundTopbar,
+ padding: theme.spacing[5],
+ }}
+ >
+ <SyncStatus />
+ </Flex>
+ );
+};
diff --git a/apps/builder/app/builder/features/topbar/sync-status.tsx b/apps/builder/app/builder/features/sync-status.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/sync-status.tsx
rename to apps/builder/app/builder/features/sync-status.tsx
diff --git a/apps/builder/app/builder/features/topbar/index.ts b/apps/builder/app/builder/features/topbar/index.ts
deleted file mode 100644
index 45bbddd3da..0000000000
--- a/apps/builder/app/builder/features/topbar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Topbar } from "./topbar";
diff --git a/apps/builder/app/builder/features/topbar/sync-status.stories.tsx b/apps/builder/app/builder/features/topbar/sync-status.stories.tsx
deleted file mode 100644
index 4517615ba5..0000000000
--- a/apps/builder/app/builder/features/topbar/sync-status.stories.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { rawTheme, Flex, theme } from "@webstudio-is/design-system";
-import { $queueStatus } from "~/shared/sync/project-queue";
-import { SyncStatus } from "./sync-status";
-
-export default {
- title: "Builder/Topbar/Sync Status",
- component: SyncStatus,
-};
-
-export const Idle = () => {
- $queueStatus.set({ status: "idle" });
- return (
- <Flex
- css={{
- height: theme.spacing[15],
- background: rawTheme.colors.backgroundPanel,
- padding: theme.spacing[5],
- }}
- >
- <SyncStatus />
- </Flex>
- );
-};
-
-export const Failed = () => {
- $queueStatus.set({ status: "failed" });
- return (
- <Flex
- css={{
- height: theme.spacing[15],
- background: rawTheme.colors.backgroundPanel,
- padding: theme.spacing[5],
- }}
- >
- <SyncStatus />
- </Flex>
- );
-};
-
-export const Fatal = () => {
- $queueStatus.set({
- status: "fatal",
- error: "Connection lost. Please reload the page.",
- });
- return (
- <Flex
- css={{
- height: theme.spacing[15],
- background: rawTheme.colors.backgroundPanel,
- padding: theme.spacing[5],
- }}
- >
- <SyncStatus />
- </Flex>
- );
-};
diff --git a/apps/builder/app/builder/features/topbar/view-mode.stories.tsx b/apps/builder/app/builder/features/view-mode.stories.tsx
similarity index 53%
rename from apps/builder/app/builder/features/topbar/view-mode.stories.tsx
rename to apps/builder/app/builder/features/view-mode.stories.tsx
index bea54b2e44..e3220bb716 100644
--- a/apps/builder/app/builder/features/topbar/view-mode.stories.tsx
+++ b/apps/builder/app/builder/features/view-mode.stories.tsx
@@ -3,7 +3,7 @@ import { $authPermit } from "~/shared/nano-states";
import { ViewMode } from "./view-mode";
export default {
- title: "Builder/Topbar/View Mode",
+ title: "Builder/View Mode",
component: ViewMode,
};
@@ -13,22 +13,7 @@ export const Active = () => {
<Flex
css={{
height: theme.spacing[15],
- background: rawTheme.colors.backgroundPanel,
- padding: theme.spacing[5],
- }}
- >
- <ViewMode />
- </Flex>
- );
-};
-
-export const Hidden = () => {
- $authPermit.set("edit");
- return (
- <Flex
- css={{
- height: theme.spacing[15],
- background: rawTheme.colors.backgroundPanel,
+ background: rawTheme.colors.backgroundTopbar,
padding: theme.spacing[5],
}}
>
diff --git a/apps/builder/app/builder/features/topbar/view-mode.tsx b/apps/builder/app/builder/features/view-mode.tsx
similarity index 100%
rename from apps/builder/app/builder/features/topbar/view-mode.tsx
rename to apps/builder/app/builder/features/view-mode.tsx
diff --git a/apps/builder/app/builder/shared/topbar-layout.stories.tsx b/apps/builder/app/builder/shared/topbar-layout.stories.tsx
new file mode 100644
index 0000000000..37be65c619
--- /dev/null
+++ b/apps/builder/app/builder/shared/topbar-layout.stories.tsx
@@ -0,0 +1,165 @@
+import {
+ Button,
+ Flex,
+ rawTheme,
+ theme,
+ ToolbarButton,
+ Text,
+ buttonStyle,
+ Link,
+} from "@webstudio-is/design-system";
+import {
+ CloudIcon,
+ OfflineIcon,
+ ShieldIcon,
+ WebstudioIcon,
+} from "@webstudio-is/icons";
+import { TopbarLayout } from "./topbar-layout";
+
+export default {
+ title: "Builder/Topbar Layout",
+ component: TopbarLayout,
+};
+
+const MenuPlaceholder = () => (
+ <ToolbarButton aria-label="Menu">
+ <WebstudioIcon size={22} />
+ </ToolbarButton>
+);
+
+const PagePlaceholder = () => (
+ <ToolbarButton css={{ paddingInline: theme.panel.paddingInline }}>
+ <Text truncate css={{ maxWidth: theme.spacing[24] }}>
+ Home
+ </Text>
+ </ToolbarButton>
+);
+
+const BreakpointsPlaceholder = () => (
+ <Flex align="center" gap="1">
+ <ToolbarButton>Base</ToolbarButton>
+ </Flex>
+);
+
+const SyncErrorIndicator = () => (
+ <Flex
+ align="center"
+ justify="center"
+ css={{ height: theme.spacing["15"] }}
+ shrink={false}
+ >
+ <OfflineIcon color={rawTheme.colors.foregroundDestructive} />
+ </Flex>
+);
+
+const ViewModeIndicator = () => (
+ <Flex
+ align="center"
+ justify="center"
+ css={{ height: theme.spacing["15"] }}
+ shrink={false}
+ >
+ <CloudIcon color={rawTheme.colors.backgroundAlertMain} />
+ </Flex>
+);
+
+const SafeModeIndicator = () => (
+ <ToolbarButton variant="subtle">
+ <ShieldIcon stroke={rawTheme.colors.foregroundDestructive} />
+ </ToolbarButton>
+);
+
+export const Default = () => (
+ <TopbarLayout
+ menu={<MenuPlaceholder />}
+ left={<PagePlaceholder />}
+ center={<BreakpointsPlaceholder />}
+ right={
+ <>
+ <Button color="gradient">Share</Button>
+ <Button color="positive">Publish</Button>
+ </>
+ }
+ />
+);
+
+export const WithSyncError = () => (
+ <TopbarLayout
+ menu={<MenuPlaceholder />}
+ left={<PagePlaceholder />}
+ center={<BreakpointsPlaceholder />}
+ right={
+ <>
+ <SyncErrorIndicator />
+ <Button color="gradient">Share</Button>
+ <Button color="positive">Publish</Button>
+ </>
+ }
+ />
+);
+
+export const WithViewMode = () => (
+ <TopbarLayout
+ menu={<MenuPlaceholder />}
+ left={<PagePlaceholder />}
+ center={<BreakpointsPlaceholder />}
+ right={
+ <>
+ <ViewModeIndicator />
+ <Button color="gradient">Share</Button>
+ <Button color="positive">Publish</Button>
+ </>
+ }
+ />
+);
+
+export const WithClone = () => (
+ <TopbarLayout
+ menu={<MenuPlaceholder />}
+ left={<PagePlaceholder />}
+ center={<BreakpointsPlaceholder />}
+ right={
+ <>
+ <Button color="gradient">Share</Button>
+ <Button color="positive">Publish</Button>
+ <Link
+ data-state="auto"
+ className={buttonStyle({ color: "positive" })}
+ color="contrast"
+ href="#"
+ underline="none"
+ >
+ Clone
+ </Link>
+ </>
+ }
+ />
+);
+
+export const AllIndicators = () => (
+ <TopbarLayout
+ menu={<MenuPlaceholder />}
+ left={<PagePlaceholder />}
+ center={<BreakpointsPlaceholder />}
+ right={
+ <>
+ <SafeModeIndicator />
+ <ViewModeIndicator />
+ <SyncErrorIndicator />
+ <Button color="gradient">Share</Button>
+ <Button color="positive">Publish</Button>
+ <Link
+ data-state="auto"
+ className={buttonStyle({ color: "positive" })}
+ color="contrast"
+ href="#"
+ underline="none"
+ >
+ Clone
+ </Link>
+ </>
+ }
+ />
+);
+
+export const Empty = () => <TopbarLayout menu={<MenuPlaceholder />} />;
diff --git a/apps/builder/app/builder/shared/topbar-layout.tsx b/apps/builder/app/builder/shared/topbar-layout.tsx
new file mode 100644
index 0000000000..bd41c278a0
--- /dev/null
+++ b/apps/builder/app/builder/shared/topbar-layout.tsx
@@ -0,0 +1,61 @@
+import type { ReactNode } from "react";
+import {
+ theme,
+ css,
+ Flex,
+ Toolbar,
+ ToolbarToggleGroup,
+ type CSS,
+} from "@webstudio-is/design-system";
+
+const topbarContainerStyle = css({
+ position: "relative",
+ display: "flex",
+ justifyContent: "space-between",
+ background: theme.colors.backgroundTopbar,
+ height: theme.spacing[15],
+ paddingRight: theme.panel.paddingInline,
+ color: theme.colors.foregroundContrastMain,
+});
+
+type TopbarLayoutProps = {
+ menu: ReactNode;
+ left?: ReactNode;
+ center?: ReactNode;
+ right?: ReactNode;
+ loading?: ReactNode;
+ css?: CSS;
+};
+
+export const TopbarLayout = ({
+ menu,
+ left,
+ center,
+ right,
+ loading,
+ css,
+}: TopbarLayoutProps) => (
+ <nav className={topbarContainerStyle({ css })}>
+ <Flex css={{ flexBasis: "20%" }}>
+ <Flex grow={false} shrink={false}>
+ {menu}
+ </Flex>
+ {left && <Flex align="center">{left}</Flex>}
+ </Flex>
+ <Flex justify="center">{center}</Flex>
+ <Toolbar>
+ <ToolbarToggleGroup
+ type="single"
+ css={{
+ isolation: "isolate",
+ justifyContent: "flex-end",
+ gap: theme.spacing[5],
+ flexShrink: 0,
+ }}
+ >
+ {right}
+ </ToolbarToggleGroup>
+ </Toolbar>
+ {loading}
+ </nav>
+);
diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/shared/topbar.tsx
similarity index 53%
rename from apps/builder/app/builder/features/topbar/topbar.tsx
rename to apps/builder/app/builder/shared/topbar.tsx
index bd1013f555..495de09bea 100644
--- a/apps/builder/app/builder/features/topbar/topbar.tsx
+++ b/apps/builder/app/builder/shared/topbar.tsx
@@ -1,10 +1,6 @@
import { useStore } from "@nanostores/react";
import {
theme,
- css,
- Flex,
- Toolbar,
- ToolbarToggleGroup,
ToolbarButton,
Text,
type CSS,
@@ -15,19 +11,20 @@ import type { Project } from "@webstudio-is/project";
import { $pages } from "~/shared/sync/data-stores";
import { $editingPageId } from "~/shared/nano-states";
-import { ShareButton } from "./share";
-import { PublishButton } from "./publish";
-import { SyncStatus } from "./sync-status";
-import { Menu } from "./menu";
-import { BreakpointsContainer } from "../breakpoints";
-import { ViewMode } from "./view-mode";
-import { AddressBarPopover } from "../address-bar";
+import { ShareButton } from "~/builder/features/share";
+import { PublishButton } from "~/builder/features/publish";
+import { SyncStatus } from "~/builder/features/sync-status";
+import { Menu } from "~/builder/features/menu";
+import { BreakpointsContainer } from "~/builder/features/breakpoints";
+import { ViewMode } from "~/builder/features/view-mode";
+import { AddressBarPopover } from "~/builder/features/address-bar";
import { toggleActiveSidebarPanel } from "~/builder/shared/nano-states";
import type { ReactNode } from "react";
-import { CloneButton } from "./clone";
+import { CloneButton } from "~/builder/features/clone";
import { $selectedPage } from "~/shared/awareness";
-import { BuilderModeDropDown } from "./builder-mode";
-import { SafeModeButton } from "./safe-mode";
+import { BuilderModeDropDown } from "~/builder/features/builder-mode";
+import { SafeModeButton } from "~/builder/features/safe-mode";
+import { TopbarLayout } from "./topbar-layout";
const PagesButton = () => {
const page = useStore($selectedPage);
@@ -61,16 +58,6 @@ const PagesButton = () => {
);
};
-const topbarContainerStyle = css({
- position: "relative",
- display: "flex",
- justifyContent: "space-between",
- background: theme.colors.backgroundTopbar,
- height: theme.spacing[15],
- paddingRight: theme.panel.paddingInline,
- color: theme.colors.foregroundContrastMain,
-});
-
type TopbarProps = {
project: Project;
loading: ReactNode;
@@ -80,44 +67,30 @@ type TopbarProps = {
export const Topbar = ({ project, css, loading }: TopbarProps) => {
const pages = useStore($pages);
return (
- <nav className={topbarContainerStyle({ css })}>
- <Flex css={{ flexBasis: "20%" }}>
- <Flex grow={false} shrink={false}>
- <Menu />
- </Flex>
-
- {/* prevent rendering when data is not loaded */}
- {pages && (
- <Flex align="center">
+ <TopbarLayout
+ css={css}
+ menu={<Menu />}
+ left={
+ pages ? (
+ <>
<PagesButton />
<AddressBarPopover />
- </Flex>
- )}
- </Flex>
- <Flex justify="center">
- <BreakpointsContainer />
- </Flex>
- <Toolbar>
- <ToolbarToggleGroup
- type="single"
- css={{
- isolation: "isolate",
- justifyContent: "flex-end",
- gap: theme.spacing[5],
- flexShrink: 0,
- }}
- >
+ </>
+ ) : undefined
+ }
+ center={<BreakpointsContainer />}
+ right={
+ <>
<SafeModeButton />
<ViewMode />
<SyncStatus />
-
<BuilderModeDropDown />
<ShareButton projectId={project.id} />
<PublishButton projectId={project.id} />
<CloneButton />
- </ToolbarToggleGroup>
- </Toolbar>
- {loading}
- </nav>
+ </>
+ }
+ loading={loading}
+ />
);
};
diff --git a/apps/builder/app/dashboard/shared/spinner.stories.tsx b/apps/builder/app/dashboard/shared/spinner.stories.tsx
deleted file mode 100644
index be7e0d63fe..0000000000
--- a/apps/builder/app/dashboard/shared/spinner.stories.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Spinner } from "./spinner";
-
-export default {
- title: "Builder/Dashboard/Spinner",
- component: Spinner,
-};
-
-export const Basic = () => (
- <div style={{ position: "relative", width: 400, height: 300 }}>
- <Spinner delay={0} />
- </div>
-);
-
-export const SmallSize = () => (
- <div style={{ position: "relative", width: 200, height: 150 }}>
- <Spinner delay={0} size={32} />
- </div>
-);
diff --git a/packages/design-system/src/components/avatar.stories.tsx b/packages/design-system/src/components/avatar.stories.tsx
index fcdd8b3355..8be81b799f 100644
--- a/packages/design-system/src/components/avatar.stories.tsx
+++ b/packages/design-system/src/components/avatar.stories.tsx
@@ -23,5 +23,3 @@ export const WithFallback = () => (
<Avatar fallback="WS" />
</Flex>
);
-
-export const NoImageNoFallback = () => <Avatar />;