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
fix: fix page context menu actions (#5799)
Oleg Isonen96433918b758
diff --git a/apps/builder/app/builder/features/pages/page-context-menu.tsx b/apps/builder/app/builder/features/pages/page-context-menu.tsxindex 7b2811ce77..ba7f6a20ae 100644--- a/apps/builder/app/builder/features/pages/page-context-menu.tsx+++ b/apps/builder/app/builder/features/pages/page-context-menu.tsx@@ -1,4 +1,5 @@import { useState, type ReactNode } from "react";+import { flushSync } from "react-dom";import { findParentFolderByChildId } from "@webstudio-is/sdk";import {ContextMenu,@@ -95,13 +96,15 @@ export const PageContextMenu = ({event.target.closest<HTMLElement>("[data-tree-button]");const pageId = button?.getAttribute("data-page-id");const folderId = button?.getAttribute("data-folder-id");- if (pageId) {- setTarget({ type: "page", id: pageId });- } else if (folderId) {- setTarget({ type: "folder", id: folderId });- } else {- setTarget(undefined);- }+ flushSync(() => {+ if (pageId) {+ setTarget({ type: "page", id: pageId });+ } else if (folderId) {+ setTarget({ type: "folder", id: folderId });+ } else {+ setTarget(undefined);+ }+ });}}>{children}@@ -181,11 +184,13 @@ export const TemplateContextMenu = ({const button =event.target.closest<HTMLElement>("[data-tree-button]");const templateId = button?.getAttribute("data-template-id");- if (templateId) {- setTemplateId(templateId);- } else {- setTemplateId(undefined);- }+ flushSync(() => {+ if (templateId) {+ setTemplateId(templateId);+ } else {+ setTemplateId(undefined);+ }+ });}}>{children}diff --git a/apps/builder/app/builder/features/pages/page-item-actions.tsx b/apps/builder/app/builder/features/pages/page-item-actions.tsxindex 6dbf463aef..3a73fea653 100644--- a/apps/builder/app/builder/features/pages/page-item-actions.tsx+++ b/apps/builder/app/builder/features/pages/page-item-actions.tsx@@ -9,6 +9,7 @@ import {DropdownMenuTrigger,Kbd,Tooltip,+ theme,} from "@webstudio-is/design-system";import { EllipsesIcon } from "@webstudio-is/icons";@@ -42,6 +43,8 @@ type ActionItem = (typeof items)[number];const isDestructive = (name: ActionItem["name"]) => name === "delete";+const shortcutSlotStyle = { paddingLeft: theme.spacing[5] };+const ActionContextMenuItem = ({item,actions,@@ -55,7 +58,7 @@ const ActionContextMenuItem = ({>{item.label}{action && (- <ContextMenuItemRightSlot>+ <ContextMenuItemRightSlot css={shortcutSlotStyle}><Kbd value={item.shortcut} /></ContextMenuItemRightSlot>)}@@ -111,7 +114,7 @@ export const PageItemActionsDropdown = ({>{item.label}{action && (- <DropdownMenuItemRightSlot>+ <DropdownMenuItemRightSlot css={shortcutSlotStyle}><Kbd value={item.shortcut} /></DropdownMenuItemRightSlot>)}