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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Topbar layout and buttons redesign (#943)
Oleg Isonen06a7c81d131e
diff --git a/.lostpixel/baseline/library-button--button.png b/.lostpixel/baseline/library-button--button.pngindex 14946528b0..e6ad6007e6 100644Binary files a/.lostpixel/baseline/library-button--button.png and b/.lostpixel/baseline/library-button--button.png differdiff --git a/.lostpixel/baseline/library-toolbar-toggle--toolbar-toggle.png b/.lostpixel/baseline/library-toolbar-toggle--toolbar-toggle.pngnew file mode 100644index 0000000000..33596a9b4bBinary files /dev/null and b/.lostpixel/baseline/library-toolbar-toggle--toolbar-toggle.png differdiff --git a/apps/designer/app/designer/designer.tsx b/apps/designer/app/designer/designer.tsxindex e887e7111b..2df29d6d94 100644--- a/apps/designer/app/designer/designer.tsx+++ b/apps/designer/app/designer/designer.tsx@@ -201,6 +201,7 @@ const ChromeWrapper = ({ children, isPreviewMode }: ChromeWrapperProps) => {<Gridcss={{height: "100vh",+ minWidth: 530, // Enough space to show left sidebars before it becomes broken or unusableoverflow: "hidden",display: "grid",gridTemplateRows: "auto 1fr auto",@@ -306,9 +307,10 @@ export const Designer = ({<AssetsProvider><ChromeWrapper isPreviewMode={isPreviewMode}><Topbar- css={{ gridArea: "header" }}+ gridArea="header"project={project}publish={publish}+ page={page}/><Main><Workspace onTransitionEnd={onTransitionEnd} publish={publish}>diff --git a/apps/designer/app/designer/features/breakpoints/trigger-button.tsx b/apps/designer/app/designer/features/breakpoints/trigger-button.tsxindex 40269b97b0..4a67e6634f 100644--- a/apps/designer/app/designer/features/breakpoints/trigger-button.tsx+++ b/apps/designer/app/designer/features/breakpoints/trigger-button.tsx@@ -1,38 +1,16 @@import { forwardRef, type ComponentProps, type ElementRef } from "react";-import { type Breakpoint } from "@webstudio-is/css-data";import {useCanvasWidth,useZoom,useSelectedBreakpoint,} from "~/designer/shared/nano-states";import { willRender } from "~/designer/shared/breakpoints";-import { DeprecatedButton, DeprecatedText2 } from "@webstudio-is/design-system";-import {- DesktopIcon,- LaptopIcon,- MobileIcon,- TabletIcon,-} from "@webstudio-is/icons";-import { theme } from "@webstudio-is/design-system";--type TriggerButtonProps = ComponentProps<typeof DeprecatedButton>;+import { Button, Text } from "@webstudio-is/design-system";-const renderIcon = (breakpoint: Breakpoint, variant: "contrast" | "hint") => {- const color = variant === "contrast" ? "white" : "hint";- if (breakpoint.minWidth >= 1280) {- return <DesktopIcon color={color} />;- }- if (breakpoint.minWidth >= 1024) {- return <LaptopIcon color={color} />;- }- if (breakpoint.minWidth >= 768) {- return <TabletIcon color={color} />;- }- return <MobileIcon color={color} />;-};+type TriggerButtonProps = ComponentProps<typeof Button>;export const TriggerButton = forwardRef<- ElementRef<typeof DeprecatedButton>,+ ElementRef<typeof Button>,TriggerButtonProps>((props, ref) => {const [zoom] = useZoom();@@ -41,21 +19,14 @@ export const TriggerButton = forwardRef<if (breakpoint === undefined) {return null;}- const variant = willRender(breakpoint, canvasWidth) ? "contrast" : "hint";+ const variant = willRender(breakpoint, canvasWidth) ? "contrast" : "subtle";return (- <DeprecatedButton- {...props}- ref={ref}- css={{ gap: theme.spacing[3] }}- ghost- aria-label="Show breakpoints"- >- {renderIcon(breakpoint, variant)}- <DeprecatedText2 color={variant}>+ <Button {...props} ref={ref} color="dark" aria-label="Show breakpoints">+ <Text color={variant}>{`${breakpoint.label} ${canvasWidth}px / ${zoom}%`}- </DeprecatedText2>- </DeprecatedButton>+ </Text>+ </Button>);});diff --git a/apps/designer/app/designer/features/topbar/menu/menu-button.tsx b/apps/designer/app/designer/features/topbar/menu/menu-button.tsxnew file mode 100644index 0000000000..5c7c2be2ad--- /dev/null+++ b/apps/designer/app/designer/features/topbar/menu/menu-button.tsx@@ -0,0 +1,63 @@+import {+ css,+ DropdownMenuTrigger,+ rawTheme,+ theme,+ ToolbarToggle,+} from "@webstudio-is/design-system";+import { HamburgerMenuIcon, WebstudioIcon } from "@webstudio-is/icons";++const innerContainerStyle = css({+ width: "100%",+ height: "100%",+ color: theme.colors.foregroundContrastMain,+ transformStyle: "preserve-3d",+ transition: "transform 200ms",+});++const faceStyle = css({+ background: theme.colors.backgroundTopbar,+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ position: "absolute",+ width: "100%",+ height: "100%",+ "&:hover": {+ background: theme.colors.backgroundButtonHover,+ },+});++const size = rawTheme.spacing[10];++export const MenuButton = ({ isOpen }: { isOpen: boolean }) => {+ return (+ <DropdownMenuTrigger asChild>+ <ToolbarToggle aria-label="Menu Button" css={{ position: "relative" }}>+ <span+ className={innerContainerStyle()}+ style={{+ transform: isOpen+ ? `translateZ(-${size}) rotateY(-90deg)`+ : `translateZ(-${size}) rotateY(0deg)`,+ }}+ >+ <span+ className={faceStyle()}+ style={{ transform: `rotateY(0deg) translateZ(${size})` }}+ >+ <WebstudioIcon width="22" height="22" />+ </span>+ <span+ className={faceStyle()}+ style={{+ transform: `rotateY(90deg) translateZ(${size})`,+ }}+ >+ <HamburgerMenuIcon />+ </span>+ </span>+ </ToolbarToggle>+ </DropdownMenuTrigger>+ );+};diff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/designer/app/designer/features/topbar/menu/menu.tsxindex 24cd805a78..b79095c8cf 100644--- a/apps/designer/app/designer/features/topbar/menu/menu.tsx+++ b/apps/designer/app/designer/features/topbar/menu/menu.tsx@@ -7,15 +7,11 @@ import {DropdownMenuItemRightSlot,DropdownMenuSub,DropdownMenuSubContent,- DropdownMenuTrigger,DropdownMenuSubTrigger,DropdownMenuCheckboxItem,DropdownMenuSeparator,DropdownMenuPortal,- DeprecatedIconButton,- Box,} from "@webstudio-is/design-system";-import { HamburgerMenuIcon } from "@webstudio-is/icons";import { type Publish } from "~/shared/pubsub";import { ShortcutHint } from "./shortcut-hint";import {@@ -31,6 +27,8 @@ import { useClientSettings } from "~/designer/shared/client-settings";import { dashboardPath } from "~/shared/router-utils";import { theme } from "@webstudio-is/design-system";import { useIsPreviewMode } from "~/shared/nano-states";+import { useState } from "react";+import { MenuButton } from "./menu-button";const ThemeMenuItem = () => {if (isFeatureEnabled("dark") === false) {@@ -98,28 +96,11 @@ export const Menu = ({ publish }: MenuProps) => {const [, setIsShareOpen] = useIsShareDialogOpen();const [, setIsPublishOpen] = useIsPublishDialogOpen();const [isPreviewMode, setIsPreviewMode] = useIsPreviewMode();+ const [isMenuOpen, setIsMenuOpen] = useState(false);return (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Box- css={{- width: theme.spacing[17],- height: "100%",- borderRadius: "0",- outline: "none",- // @todo: would set directly on the element- "& > button": {- width: "inherit",- height: "inherit",- },- }}- >- <DeprecatedIconButton aria-label="Menu Button">- <HamburgerMenuIcon />- </DeprecatedIconButton>- </Box>- </DropdownMenuTrigger>+ <DropdownMenu open={isMenuOpen} onOpenChange={setIsMenuOpen}>+ <MenuButton isOpen={isMenuOpen} /><DropdownMenuPortal><DropdownMenuContentcss={{ zIndex: theme.zIndices[1] }}diff --git a/apps/designer/app/designer/features/topbar/preview.tsx b/apps/designer/app/designer/features/topbar/preview.tsxindex ee883d75da..2b5c62d367 100644--- a/apps/designer/app/designer/features/topbar/preview.tsx+++ b/apps/designer/app/designer/features/topbar/preview.tsx@@ -1,5 +1,5 @@-import { EyeOpenIcon } from "@webstudio-is/icons";-import { Toggle } from "@webstudio-is/design-system";+import { PlayIcon } from "@webstudio-is/icons";+import { ToolbarToggle, theme } from "@webstudio-is/design-system";import { useIsPreviewMode } from "~/shared/nano-states";declare module "~/shared/pubsub" {@@ -12,12 +12,16 @@ export const PreviewButton = () => {const [isPreviewMode, setIsPreviewMode] = useIsPreviewMode();return (- <Toggle- onPressedChange={setIsPreviewMode}- pressed={isPreviewMode}+ <ToolbarTogglearia-label="Toggle Preview"+ css={{+ color: isPreviewMode+ ? theme.colors.foregroundSuccess+ : theme.colors.foregroundContrastMain,+ }}+ onClick={() => setIsPreviewMode(isPreviewMode === false)}>- <EyeOpenIcon />- </Toggle>+ <PlayIcon />+ </ToolbarToggle>);};diff --git a/apps/designer/app/designer/features/topbar/publish.tsx b/apps/designer/app/designer/features/topbar/publish.tsxindex 95d1079971..e3efe39d41 100644--- a/apps/designer/app/designer/features/topbar/publish.tsx+++ b/apps/designer/app/designer/features/topbar/publish.tsx@@ -1,10 +1,9 @@import { useEffect, useState } from "react";import { useFetcher } from "@remix-run/react";-import { ExternalLinkIcon, RocketIcon } from "@webstudio-is/icons";+import { ExternalLinkIcon } from "@webstudio-is/icons";import {DeprecatedText2,Button,- DeprecatedButton,Flex,DeprecatedLabel,Link,@@ -84,13 +83,7 @@ export const PublishButton = ({ project }: PublishButtonProps) => {return (<DeprecatedPopover open={isOpen} onOpenChange={setIsOpen}><DeprecatedPopoverTrigger asChild aria-label="Publish">- <DeprecatedButton- ghost- css={{ display: "flex", gap: theme.spacing[3] }}- >- <RocketIcon />- <DeprecatedText2>Publish</DeprecatedText2>- </DeprecatedButton>+ <Button color="positive">Publish</Button></DeprecatedPopoverTrigger><DeprecatedPopoverPortal><Content project={project} />diff --git a/apps/designer/app/designer/features/topbar/topbar.tsx b/apps/designer/app/designer/features/topbar/topbar.tsxindex f04f607ba8..402bf6dacb 100644--- a/apps/designer/app/designer/features/topbar/topbar.tsx+++ b/apps/designer/app/designer/features/topbar/topbar.tsx@@ -1,58 +1,57 @@import type { Publish } from "~/shared/pubsub";-import { darkTheme, Flex, type CSS } from "@webstudio-is/design-system";+import { css, Flex, Text } from "@webstudio-is/design-system";import { PreviewButton } from "./preview";import { ShareButton } from "./share";import { PublishButton } from "./publish";import { SyncStatus } from "./sync-status";import { Menu } from "./menu";import { Breakpoints } from "../breakpoints";-import type { Project } from "@webstudio-is/project";+import type { Page, Project } from "@webstudio-is/project";import { theme } from "@webstudio-is/design-system";import { isFeatureEnabled } from "@webstudio-is/feature-flags";+const topbarContainerStyle = css({+ background: theme.colors.backgroundTopbar,+ height: theme.spacing[15],+ boxShadow: `inset 0 -1px 0 0 ${theme.colors.panelOutline}`,+ paddingRight: theme.spacing[9],+});+type TopbarProps = {- css: CSS;+ gridArea: string;project: Project;+ page: Page;publish: Publish;};-export const Topbar = ({ css, project, publish }: TopbarProps) => {+export const Topbar = ({ gridArea, project, page, publish }: TopbarProps) => {return (<Flex- className={darkTheme}+ className={topbarContainerStyle({ css: { gridArea } })}as="header"align="center"- justify="between"- css={{- bc: theme.colors.loContrast,- height: theme.spacing[17],- "[data-theme=dark] &": {- boxShadow: `inset 0 -1px 0 0 ${theme.colors.panelOutline}`,- },- // @todo: uhh, setting this on any focused child element? lets see what's the use case and why its necessary to override vs. not having it in the first place- "& :focus": {- boxShadow: "none",- },- "& > *": {- height: "100%",- },- "& button": {- borderRadius: "0",- },- ...css,- }}>- <Menu publish={publish} />- <Breakpoints />+ <Flex grow={false} shrink={false}>+ <Menu publish={publish} />+ </Flex>+ <Flex css={{ width: theme.spacing[30] }}>+ <Text+ variant="labelTitleCase"+ color="contrast"+ css={{ maxWidth: theme.spacing[20] }}+ truncate+ >+ {page.title}+ </Text>+ </Flex>+ <Flex grow align="center" justify="center">+ <Breakpoints />+ </Flex><Flexalign="center"- css={{- "& > *": {- height: "inherit",- width: "auto",- padding: `0 ${theme.spacing[5]}`,- },- }}+ justify="end"+ gap="2"+ css={{ width: theme.spacing[30] }}><SyncStatus /><PreviewButton />diff --git a/packages/design-system/src/components/button.stories.tsx b/packages/design-system/src/components/button.stories.tsxindex cc4cf4a9cf..646b2dab78 100644--- a/packages/design-system/src/components/button.stories.tsx+++ b/packages/design-system/src/components/button.stories.tsx@@ -20,6 +20,7 @@ const colors: ReadonlyArray<ComponentProps<typeof ButtonComponent>["color"]> = ["destructive","positive","ghost",+ "dark",];const states: ReadonlyArray<ComponentProps<typeof ButtonComponent>["state"]> = [diff --git a/packages/design-system/src/components/button.tsx b/packages/design-system/src/components/button.tsxindex 197325a2f7..af4fff985b 100644--- a/packages/design-system/src/components/button.tsx+++ b/packages/design-system/src/components/button.tsx@@ -18,6 +18,7 @@ const colors = ["positive","neutral","ghost",+ "dark",] as const;type ButtonColor = typeof colors[number];@@ -30,6 +31,7 @@ const backgrounds: Record<ButtonColor, string> = {destructive: theme.colors.backgroundDestructiveMain,positive: theme.colors.backgroundSuccessMain,ghost: theme.colors.backgroundHover,+ dark: theme.colors.backgroundTopbar,};const foregrounds: Record<ButtonColor, string> = {@@ -38,6 +40,7 @@ const foregrounds: Record<ButtonColor, string> = {positive: theme.colors.foregroundContrastMain,neutral: theme.colors.foregroundMain,ghost: theme.colors.foregroundMain,+ dark: theme.colors.foregroundContrastMain,};// CSS supports multiple gradients as backgrounds but not multiple colors@@ -97,6 +100,7 @@ const StyledButton = styled("button", {positive: perColorStyle("positive"),neutral: perColorStyle("neutral"),ghost: perColorStyle("ghost"),+ dark: perColorStyle("dark"),},},diff --git a/packages/design-system/src/components/toolbar-toggle.stories.tsx b/packages/design-system/src/components/toolbar-toggle.stories.tsxnew file mode 100644index 0000000000..d00afd9005--- /dev/null+++ b/packages/design-system/src/components/toolbar-toggle.stories.tsx@@ -0,0 +1,32 @@+import { PlayIcon } from "@webstudio-is/icons";+import { theme } from "../stitches.config";+import { Flex } from "./flex";+import { ToolbarToggle } from "./toolbar-toggle";++export default {+ title: "Library/Toolbar Toggle",+};++const ToolbarToggleStory = () => {+ return (+ <Flex+ gap="2"+ css={{+ background: theme.colors.backgroundTopbar,+ color: theme.colors.foregroundContrastMain,+ }}+ >+ <ToolbarToggle>+ <PlayIcon />+ </ToolbarToggle>+ <ToolbarToggle pressed>+ <PlayIcon />+ </ToolbarToggle>+ <ToolbarToggle focused>+ <PlayIcon />+ </ToolbarToggle>+ </Flex>+ );+};++export { ToolbarToggleStory as ToolbarToggle };diff --git a/packages/design-system/src/components/toolbar-toggle.tsx b/packages/design-system/src/components/toolbar-toggle.tsxnew file mode 100644index 0000000000..04df4f140a--- /dev/null+++ b/packages/design-system/src/components/toolbar-toggle.tsx@@ -0,0 +1,52 @@+/**+ * Implementation of the "Toolbar Toggle" component from:+ * https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=1512%3A7422&t=BOWCrlme5NepfLUm-4+ */+import { styled, theme } from "../stitches.config";+import * as Toggle from "@radix-ui/react-toggle";++// It is inside the button, so we need it as a separate element.+const focusRing = {+ "&::after": {+ content: '""',+ position: "absolute",+ width: theme.spacing[12],+ height: theme.spacing[12],+ outlineWidth: 2,+ outlineStyle: "solid",+ outlineColor: theme.colors.borderFocus,+ borderRadius: theme.borderRadius[3],+ },+};++export const ToolbarToggle = styled(Toggle.Root, {+ // reset styles+ boxSizing: "border-box",+ padding: 0,+ appearance: "none",+ border: "none",+ outline: "none",+ // center icon+ display: "flex",+ justifyContent: "center",+ alignItems: "center",+ // prevent shrinking inside flex box+ flexShrink: 0,+ // set size and shape+ width: theme.spacing["15"],+ height: theme.spacing["15"],++ color: "inherit",+ background: "transparent",++ "&:focus-visible": focusRing,+ "&:hover, &[data-state='on']": {+ background: theme.colors.backgroundButtonHover,+ },+ variants: {+ // Just for story+ focused: {+ true: focusRing,+ },+ },+});diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex 20bdfadd51..3aeaf8a609 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -16,6 +16,7 @@ export * from "./components/dialog";export * from "./components/floating-panel-popover";export { MenuItemButton } from "./components/menu";export * from "./components/switch";+export * from "./components/toolbar-toggle";// Not aligneddiff --git a/packages/icons/icons/play.svg b/packages/icons/icons/play.svgnew file mode 100644index 0000000000..250c16f628--- /dev/null+++ b/packages/icons/icons/play.svg@@ -0,0 +1,4 @@+<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">+ <path d="M4.76624 5.7651C4.76624 5.03991 4.76624 4.67731 4.94406 4.47743C5.09897 4.3033 5.33575 4.19555 5.59206 4.18254C5.88628 4.1676 6.24109 4.36873 6.95069 4.771L16.1851 10.0058C16.7714 10.3382 17.0646 10.5044 17.1668 10.7139C17.2561 10.897 17.2561 11.1029 17.1668 11.286C17.0646 11.4955 16.7714 11.6617 16.1851 11.994L6.95069 17.2289C6.24108 17.6312 5.88628 17.8323 5.59206 17.8174C5.33575 17.8043 5.09897 17.6966 4.94406 17.5225C4.76624 17.3226 4.76624 16.96 4.76624 16.2348V5.7651Z"/>+</svg>+\ No newline at end of filediff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex d4c9932442..0005547a63 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -12,6 +12,7 @@ export * from "./eyecon-closed";export * from "./eyecon-open";export * from "./info";export * from "./linked";+export * from "./play";export * from "./scroll";export * from "./subscript";export * from "./superscript";diff --git a/packages/icons/src/__generated__/play.tsx b/packages/icons/src/__generated__/play.tsxnew file mode 100644index 0000000000..16d4179a81--- /dev/null+++ b/packages/icons/src/__generated__/play.tsx@@ -0,0 +1,15 @@+// Generated from icons/play.svg++import { forwardRef } from "react";+import { IconProps } from "../types";++// prettier-ignore+export const PlayIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" fill={color} {...props} ref={forwardedRef}><path d="M4.766 5.765c0-.725 0-1.088.178-1.288a.93.93 0 0 1 .648-.294c.294-.015.65.186 1.359.588l9.234 5.235c.586.332.88.498.982.708.09.183.09.389 0 .572-.102.21-.396.376-.982.708l-9.234 5.235c-.71.402-1.065.603-1.359.588a.93.93 0 0 1-.648-.294c-.178-.2-.178-.563-.178-1.288V5.765Z" /></svg>+ );+ }+);++PlayIcon.displayName = "PlayIcon";diff --git a/packages/icons/src/index.ts b/packages/icons/src/index.tsindex 8accff8bbf..9e1a67b062 100644--- a/packages/icons/src/index.ts+++ b/packages/icons/src/index.ts@@ -8,7 +8,6 @@ export * from "./redo";export * from "./google";export * from "./github";export * from "./devices";-export * from "./tablet";export * from "./body";export * from "./types";export * from "./align-content-center";diff --git a/packages/icons/src/legacy.ts b/packages/icons/src/legacy.tsindex 0877602ee2..af9aebf9a9 100644--- a/packages/icons/src/legacy.ts+++ b/packages/icons/src/legacy.ts@@ -3,9 +3,6 @@ export {FontBoldIcon,FontItalicIcon,Link2Icon,- MobileIcon,- LaptopIcon,- DesktopIcon,PlusIcon,HamburgerMenuIcon,DotsHorizontalIcon,@@ -13,7 +10,6 @@ export {RocketIcon,ExternalLinkIcon,Share1Icon,- EyeOpenIcon,ExclamationTriangleIcon,DotFilledIcon,TriangleRightIcon,diff --git a/packages/icons/src/tablet.tsx b/packages/icons/src/tablet.tsxdeleted file mode 100644index d05796b548..0000000000--- a/packages/icons/src/tablet.tsx+++ /dev/null@@ -1,25 +0,0 @@-import * as React from "react";-import { IconProps } from "./types";--export const TabletIcon = React.forwardRef<SVGSVGElement, IconProps>(- ({ color = "currentColor", ...props }, forwardedRef) => {- return (- <svg- width="15"- height="15"- viewBox="0 0 24 24"- fill="none"- xmlns="http://www.w3.org/2000/svg"- {...props}- ref={forwardedRef}- >- <path- fill={color}- d="M20 0H6C4.34 0 4 0.84 4 2.5V20.5C4 22.16 5.34 23.5 7 23.5H19C20.66 23.5 22 22.16 22 20.5V2.5C22 0.84 21.66 0 20 0ZM15 22.5H13H11V22H13H15V22.5ZM21 21H13H5V10.5V1H13H21V21Z"- />- </svg>- );- }-);--TabletIcon.displayName = "TabletIcon";