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
Animate menu button on hover (#967)
Oleg Isonen266d62c33939
diff --git a/apps/designer/app/designer/features/topbar/menu/menu-button.tsx b/apps/designer/app/designer/features/topbar/menu/menu-button.tsxindex 0cb3344872..53386057d2 100644--- a/apps/designer/app/designer/features/topbar/menu/menu-button.tsx+++ b/apps/designer/app/designer/features/topbar/menu/menu-button.tsx@@ -1,62 +1,65 @@+import { cssVars } from "@webstudio-is/css-vars";import {css,DropdownMenuTrigger,rawTheme,- theme,toggleItemStyle,} from "@webstudio-is/design-system";import { HamburgerMenuIcon, WebstudioIcon } from "@webstudio-is/icons";+const size = rawTheme.spacing[9];++const containerTransformVar = cssVars.define("container-transform");++const triggerStyle = css({+ position: "relative",+ [containerTransformVar]: `translateZ(-${size}) rotateY(0deg)`,+ "&[data-state=open], &:hover": {+ [containerTransformVar]: `translateZ(-${size}) rotateY(-90deg)`,+ },+});+const innerContainerStyle = css({width: "100%",height: "100%",- color: theme.colors.foregroundContrastMain,transformStyle: "preserve-3d",transition: "transform 200ms",+ transform: cssVars.use(containerTransformVar),});const faceStyle = css({- background: theme.colors.backgroundTopbar,display: "flex",alignItems: "center",justifyContent: "center",position: "absolute",width: "100%",height: "100%",- "&:hover": {- background: theme.colors.backgroundButtonHover,+ variants: {+ front: {+ true: {+ transform: `rotateY(0deg) translateZ(${size})`,+ },+ },+ back: {+ true: {+ transform: `rotateY(90deg) translateZ(${size})`,+ },+ },},});-const size = rawTheme.spacing[9];--export const MenuButton = ({ isOpen }: { isOpen: boolean }) => {+export const MenuButton = () => {return (<DropdownMenuTrigger- className={toggleItemStyle({ css: { position: "relative" } })}+ className={toggleItemStyle({ className: triggerStyle() })}aria-label="Menu Button">- <span- className={innerContainerStyle()}- style={{- transform: isOpen- ? `translateZ(-${size}) rotateY(-90deg)`- : `translateZ(-${size}) rotateY(0deg)`,- }}- >- <span- className={faceStyle()}- style={{ transform: `rotateY(0deg) translateZ(${size})` }}- >+ <span className={innerContainerStyle()}>+ <span className={faceStyle({ front: true })}><WebstudioIcon width="22" height="22" /></span>- <span- className={faceStyle()}- style={{- transform: `rotateY(90deg) translateZ(${size})`,- }}- >- <HamburgerMenuIcon />+ <span className={faceStyle({ back: true })}>+ <HamburgerMenuIcon size={22} /></span></span></DropdownMenuTrigger>diff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/designer/app/designer/features/topbar/menu/menu.tsxindex 4b6b6ec290..337e927bff 100644--- a/apps/designer/app/designer/features/topbar/menu/menu.tsx+++ b/apps/designer/app/designer/features/topbar/menu/menu.tsx@@ -1,4 +1,3 @@-import { useState } from "react";import { useNavigate } from "@remix-run/react";import { isFeatureEnabled } from "@webstudio-is/feature-flags";import {@@ -102,7 +101,6 @@ export const Menu = ({ publish }: MenuProps) => {const [, setIsShareOpen] = useIsShareDialogOpen();const [, setIsPublishOpen] = useIsPublishDialogOpen();const [isPreviewMode, setIsPreviewMode] = useIsPreviewMode();- const [isMenuOpen, setIsMenuOpen] = useState(false);const [authPermit] = useAuthPermit();const isPublishDisabled = authPermit !== "own";@@ -117,8 +115,8 @@ export const Menu = ({ publish }: MenuProps) => {: undefined;return (- <DropdownMenu open={isMenuOpen} onOpenChange={setIsMenuOpen}>- <MenuButton isOpen={isMenuOpen} />+ <DropdownMenu>+ <MenuButton /><DropdownMenuPortal><DropdownMenuContentcss={{ zIndex: theme.zIndices[1] }}diff --git a/packages/design-system/src/components/toolbar.tsx b/packages/design-system/src/components/toolbar.tsxindex c0635c954e..ff3855d272 100644--- a/packages/design-system/src/components/toolbar.tsx+++ b/packages/design-system/src/components/toolbar.tsx@@ -54,7 +54,7 @@ export const toggleItemStyle = css({background: "transparent","&:focus-visible": toolbarItemFocusRing,- "&:hover, &[data-state='on']": {+ "&:hover, &[data-state='on'], &[data-state='open']": {background: theme.colors.backgroundButtonHover,},variants: {diff --git a/packages/icons/icons/hamburger-menu.svg b/packages/icons/icons/hamburger-menu.svgnew file mode 100644index 0000000000..c846b38f99--- /dev/null+++ b/packages/icons/icons/hamburger-menu.svg@@ -0,0 +1,4 @@+<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">+ <path fill-rule="evenodd" clip-rule="evenodd" d="M2 5.99805C2 5.58383 2.33579 5.24805 2.75 5.24805H19.25C19.6642 5.24805 20 5.58383 20 5.99805C20 6.41226 19.6642 6.74805 19.25 6.74805H2.75C2.33579 6.74805 2 6.41226 2 5.99805ZM2 11.498C2 11.0838 2.33579 10.748 2.75 10.748H19.25C19.6642 10.748 20 11.0838 20 11.498C20 11.9123 19.6642 12.248 19.25 12.248H2.75C2.33579 12.248 2 11.9123 2 11.498ZM2 16.998C2 16.5838 2.33579 16.248 2.75 16.248H19.25C19.6642 16.248 20 16.5838 20 16.998C20 17.4123 19.6642 17.748 19.25 17.748H2.75C2.33579 17.748 2 17.4123 2 16.998Z"/>+</svg>+\ No newline at end of filediff --git a/packages/icons/src/__generated__/hamburger-menu.tsx b/packages/icons/src/__generated__/hamburger-menu.tsxnew file mode 100644index 0000000000..45151400b2--- /dev/null+++ b/packages/icons/src/__generated__/hamburger-menu.tsx@@ -0,0 +1,15 @@+// Generated from icons/hamburger-menu.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const HamburgerMenuIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M2 5.998a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Zm0 5.5a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Zm0 5.5a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Z" clipRule="evenodd" /></svg>+ );+ }+);++HamburgerMenuIcon.displayName = "HamburgerMenuIcon";diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex 132abec02a..f6c30feaf2 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -10,6 +10,7 @@ export * from "./chevron-filled-up";export * from "./dot";export * from "./eyecon-closed";export * from "./eyecon-open";+export * from "./hamburger-menu";export * from "./info";export * from "./linked";export * from "./offline";diff --git a/packages/icons/src/legacy.ts b/packages/icons/src/legacy.tsindex af9aebf9a9..4d26c5b201 100644--- a/packages/icons/src/legacy.ts+++ b/packages/icons/src/legacy.ts@@ -4,7 +4,6 @@ export {FontItalicIcon,Link2Icon,PlusIcon,- HamburgerMenuIcon,DotsHorizontalIcon,CheckIcon,RocketIcon,