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.

chore: Add portal to the DropdownMenuContent by default (#4828)

Oleg Isonen609fdb47da32
diff --git a/apps/builder/app/builder/features/settings-panel/variables-section.tsx b/apps/builder/app/builder/features/settings-panel/variables-section.tsx
index de64fdb6db..e9b1c8e7f8 100644
--- a/apps/builder/app/builder/features/settings-panel/variables-section.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variables-section.tsx
@@ -9,7 +9,6 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuPortal,
DropdownMenuTrigger,
Flex,
Label,
@@ -257,25 +256,23 @@ const VariablesItem = ({
onClick={() => {}}
/>
</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent
- css={{ width: theme.spacing[28] }}
- onCloseAutoFocus={(event) => event.preventDefault()}
- >
- <DropdownMenuItem onSelect={() => setInspectDialogOpen(true)}>
- Inspect
+ <DropdownMenuContent
+ css={{ width: theme.spacing[28] }}
+ onCloseAutoFocus={(event) => event.preventDefault()}
+ >
+ <DropdownMenuItem onSelect={() => setInspectDialogOpen(true)}>
+ Inspect
+ </DropdownMenuItem>
+ {source === "local" && (
+ <DropdownMenuItem
+ // allow to delete only unused variables
+ disabled={variable.type === "parameter" || usageCount > 0}
+ onSelect={() => deleteVariable(variable.id)}
+ >
+ Delete {usageCount > 0 && `(${usageCount} bindings)`}
</DropdownMenuItem>
- {source === "local" && (
- <DropdownMenuItem
- // allow to delete only unused variables
- disabled={variable.type === "parameter" || usageCount > 0}
- onSelect={() => deleteVariable(variable.id)}
- >
- Delete {usageCount > 0 && `(${usageCount} bindings)`}
- </DropdownMenuItem>
- )}
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ )}
+ </DropdownMenuContent>
</DropdownMenu>
</>
}
diff --git a/apps/builder/app/builder/features/style-panel/controls/menu/menu-control.tsx b/apps/builder/app/builder/features/style-panel/controls/menu/menu-control.tsx
index 6f67d193a3..7fd37fe50b 100644
--- a/apps/builder/app/builder/features/style-panel/controls/menu/menu-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/menu/menu-control.tsx
@@ -6,7 +6,6 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuPortal,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,
DropdownMenuSeparator,
@@ -74,57 +73,55 @@ export const MenuControl = ({
</IconButton>
</DropdownMenuTrigger>
</PropertyValueTooltip>
- <DropdownMenuPortal>
- <DropdownMenuContent sideOffset={4} collisionPadding={16} side="bottom">
- <DropdownMenuRadioGroup
- value={currentValue}
- onValueChange={(value) => setValue({ type: "keyword", value })}
- >
- {items.map(({ name, label, icon: Icon }) => {
- return (
- <DropdownMenuRadioItem
- text="sentence"
- key={name}
- value={name}
- icon={<MenuCheckedIcon />}
- onFocus={() => {
- setValue(
- { type: "keyword", value: name },
- { isEphemeral: true }
- );
- setDescriptionValue(name);
- }}
- onBlur={() => {
- setValue(
- { type: "keyword", value: currentValue },
- { isEphemeral: true }
- );
- setDescriptionValue(undefined);
- }}
- >
- <Flex gap="1">
- <Flex
- css={{
- width: theme.spacing[9],
- height: theme.spacing[9],
- }}
- align="center"
- justify="center"
- >
- <Icon />
- </Flex>
- {label}
+ <DropdownMenuContent sideOffset={4} collisionPadding={16} side="bottom">
+ <DropdownMenuRadioGroup
+ value={currentValue}
+ onValueChange={(value) => setValue({ type: "keyword", value })}
+ >
+ {items.map(({ name, label, icon: Icon }) => {
+ return (
+ <DropdownMenuRadioItem
+ text="sentence"
+ key={name}
+ value={name}
+ icon={<MenuCheckedIcon />}
+ onFocus={() => {
+ setValue(
+ { type: "keyword", value: name },
+ { isEphemeral: true }
+ );
+ setDescriptionValue(name);
+ }}
+ onBlur={() => {
+ setValue(
+ { type: "keyword", value: currentValue },
+ { isEphemeral: true }
+ );
+ setDescriptionValue(undefined);
+ }}
+ >
+ <Flex gap="1">
+ <Flex
+ css={{
+ width: theme.spacing[9],
+ height: theme.spacing[9],
+ }}
+ align="center"
+ justify="center"
+ >
+ <Icon />
</Flex>
- </DropdownMenuRadioItem>
- );
- })}
- </DropdownMenuRadioGroup>
- <DropdownMenuSeparator />
- <DropdownMenuItem hint>
- <Box css={{ width: theme.spacing[25] }}>{description}</Box>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ {label}
+ </Flex>
+ </DropdownMenuRadioItem>
+ );
+ })}
+ </DropdownMenuRadioGroup>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem hint>
+ <Box css={{ width: theme.spacing[25] }}>{description}</Box>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx
index 91cc0c30e7..fcc6ac05f8 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx
@@ -12,7 +12,6 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuPortal,
DropdownMenuTrigger,
Flex,
Grid,
@@ -170,31 +169,29 @@ export const Section = () => {
prefix={<PlusIcon />}
></SectionTitleButton>
</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent
- collisionPadding={16}
- css={{ width: theme.spacing[24] }}
- >
- {transformPanels.map((panel) => (
- <DropdownMenuItem
- disabled={isTransformPanelPropertyUsed({
+ <DropdownMenuContent
+ collisionPadding={16}
+ css={{ width: theme.spacing[24] }}
+ >
+ {transformPanels.map((panel) => (
+ <DropdownMenuItem
+ disabled={isTransformPanelPropertyUsed({
+ panel,
+ styles,
+ })}
+ key={panel}
+ onSelect={() => {
+ addDefaultsForTransormSection({
panel,
styles,
- })}
- key={panel}
- onSelect={() => {
- addDefaultsForTransormSection({
- panel,
- styles,
- });
- setIsOpen(true);
- }}
- >
- {humanizeString(panel)}
- </DropdownMenuItem>
- ))}
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ });
+ setIsOpen(true);
+ }}
+ >
+ {humanizeString(panel)}
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
</DropdownMenu>
</Flex>
}
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
index a3b9374b64..bd5c0aec9f 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
@@ -1,7 +1,6 @@
import {
DropdownMenu,
DropdownMenuContent,
- DropdownMenuPortal,
DropdownMenuTrigger,
Text,
styled,
@@ -97,14 +96,12 @@ const Menu = (props: MenuProps) => {
<ChevronDownIcon style={{ position: "relative" }} />
</MenuTrigger>
</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent
- onCloseAutoFocus={(event) => event.preventDefault()}
- css={{ maxWidth: theme.spacing[24] }}
- >
- {props.children}
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ <DropdownMenuContent
+ onCloseAutoFocus={(event) => event.preventDefault()}
+ css={{ maxWidth: theme.spacing[24] }}
+ >
+ {props.children}
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/apps/builder/app/builder/features/topbar/builder-mode.tsx b/apps/builder/app/builder/features/topbar/builder-mode.tsx
index 2184a5691b..f4fbfb27a2 100644
--- a/apps/builder/app/builder/features/topbar/builder-mode.tsx
+++ b/apps/builder/app/builder/features/topbar/builder-mode.tsx
@@ -20,11 +20,8 @@ import {
ToolbarToggleItem,
Tooltip,
Text,
-} from "@webstudio-is/design-system";
-import {
DropdownMenu,
DropdownMenuContent,
- DropdownMenuPortal,
DropdownMenuTrigger,
} from "@webstudio-is/design-system";
import {
@@ -107,53 +104,51 @@ export const BuilderModeDropDown = () => {
</ToolbarToggleItem>
</DropdownMenuTrigger>
</Tooltip>
- <DropdownMenuPortal>
- <DropdownMenuContent
- sideOffset={4}
- collisionPadding={16}
- side="bottom"
- loop
+ <DropdownMenuContent
+ sideOffset={4}
+ collisionPadding={16}
+ side="bottom"
+ loop
+ >
+ <DropdownMenuRadioGroup
+ value={builderMode}
+ onValueChange={(value) => {
+ if (isBuilderMode(value)) {
+ setBuilderMode(value);
+ }
+ }}
>
- <DropdownMenuRadioGroup
- value={builderMode}
- onValueChange={(value) => {
- if (isBuilderMode(value)) {
- setBuilderMode(value);
- }
- }}
- >
- {Object.entries(menuItems)
- .filter(([_, { enabled }]) => enabled)
- .map(([mode, { icon, title, shortcut }]) => (
- <DropdownMenuRadioItem
- key={mode}
- value={mode}
- onFocus={handleFocus(mode as keyof typeof menuItems)}
- onBlur={handleBlur}
- icon={<MenuCheckedIcon />}
- >
- <Flex css={{ px: theme.spacing[3] }} gap={2}>
- {icon}
- <Box>{title}</Box>
- </Flex>
- <DropdownMenuItemRightSlot>
- <Kbd value={shortcut} />
- </DropdownMenuItemRightSlot>
- &nbsp;
- </DropdownMenuRadioItem>
- ))}
- </DropdownMenuRadioGroup>
- <DropdownMenuSeparator />
+ {Object.entries(menuItems)
+ .filter(([_, { enabled }]) => enabled)
+ .map(([mode, { icon, title, shortcut }]) => (
+ <DropdownMenuRadioItem
+ key={mode}
+ value={mode}
+ onFocus={handleFocus(mode as keyof typeof menuItems)}
+ onBlur={handleBlur}
+ icon={<MenuCheckedIcon />}
+ >
+ <Flex css={{ px: theme.spacing[3] }} gap={2}>
+ {icon}
+ <Box>{title}</Box>
+ </Flex>
+ <DropdownMenuItemRightSlot>
+ <Kbd value={shortcut} />
+ </DropdownMenuItemRightSlot>
+ &nbsp;
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ <DropdownMenuSeparator />
- <div className={menuItemCss({ hint: true })}>
- <Box css={{ width: theme.spacing[25] }}>
- {activeMode
- ? menuItems[activeMode].description
- : "Select Design or Content mode"}
- </Box>
- </div>
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ <div className={menuItemCss({ hint: true })}>
+ <Box css={{ width: theme.spacing[25] }}>
+ {activeMode
+ ? menuItems[activeMode].description
+ : "Select Design or Content mode"}
+ </Box>
+ </div>
+ </DropdownMenuContent>
</DropdownMenu>
</Flex>
);
diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsx
index 9e8791c883..23db037a69 100644
--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx
+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx
@@ -10,7 +10,6 @@ import {
DropdownMenuSubTrigger,
DropdownMenuCheckboxItem,
DropdownMenuSeparator,
- DropdownMenuPortal,
Tooltip,
Kbd,
menuItemCss,
@@ -83,46 +82,41 @@ export const Menu = () => {
return (
<DropdownMenu modal={false}>
<MenuButton />
- <DropdownMenuPortal>
- <DropdownMenuContent
- sideOffset={4}
- collisionPadding={4}
- width="regular"
+ <DropdownMenuContent sideOffset={4} collisionPadding={4} width="regular">
+ <DropdownMenuItem
+ onSelect={() => {
+ window.location.href = dashboardUrl({ origin: window.origin });
+ }}
>
+ Dashboard
+ </DropdownMenuItem>
+ <Tooltip side="right" content={undefined}>
<DropdownMenuItem
onSelect={() => {
- window.location.href = dashboardUrl({ origin: window.origin });
+ $openProjectSettings.set("general");
}}
>
- Dashboard
- </DropdownMenuItem>
- <Tooltip side="right" content={undefined}>
- <DropdownMenuItem
- onSelect={() => {
- $openProjectSettings.set("general");
- }}
- >
- Project Settings
- </DropdownMenuItem>
- </Tooltip>
- <DropdownMenuItem onSelect={() => emitCommand("openBreakpointsMenu")}>
- Breakpoints
- </DropdownMenuItem>
- <ViewMenuItem />
- <DropdownMenuSeparator />
- <DropdownMenuItem onSelect={() => emitCommand("undo")}>
- Undo
- <DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "z"]} />
- </DropdownMenuItemRightSlot>
+ Project Settings
</DropdownMenuItem>
- <DropdownMenuItem onSelect={() => emitCommand("redo")}>
- Redo
- <DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "shift", "z"]} />
- </DropdownMenuItemRightSlot>
- </DropdownMenuItem>
- {/* https://github.com/webstudio-is/webstudio/issues/499
+ </Tooltip>
+ <DropdownMenuItem onSelect={() => emitCommand("openBreakpointsMenu")}>
+ Breakpoints
+ </DropdownMenuItem>
+ <ViewMenuItem />
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onSelect={() => emitCommand("undo")}>
+ Undo
+ <DropdownMenuItemRightSlot>
+ <Kbd value={["cmd", "z"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+ <DropdownMenuItem onSelect={() => emitCommand("redo")}>
+ Redo
+ <DropdownMenuItemRightSlot>
+ <Kbd value={["cmd", "shift", "z"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+ {/* https://github.com/webstudio-is/webstudio/issues/499
<DropdownMenuItem
onSelect={() => {
@@ -142,169 +136,166 @@ export const Menu = () => {
</DropdownMenuItem>
*/}
+ <DropdownMenuItem onSelect={() => emitCommand("deleteInstanceBuilder")}>
+ Delete
+ <DropdownMenuItemRightSlot>
+ <Kbd value={["backspace"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onSelect={() => emitCommand("togglePreviewMode")}>
+ Preview
+ <DropdownMenuItemRightSlot>
+ <Kbd value={["cmd", "shift", "p"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+
+ <Tooltip
+ side="right"
+ sideOffset={10}
+ content={disabledShareTooltipContent}
+ >
<DropdownMenuItem
- onSelect={() => emitCommand("deleteInstanceBuilder")}
+ onSelect={() => {
+ $isShareDialogOpen.set(true);
+ }}
+ disabled={isShareEnabled === false}
>
- Delete
- <DropdownMenuItemRightSlot>
- <Kbd value={["backspace"]} />
- </DropdownMenuItemRightSlot>
+ Share
</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem onSelect={() => emitCommand("togglePreviewMode")}>
- Preview
+ </Tooltip>
+
+ <Tooltip
+ side="right"
+ sideOffset={10}
+ content={disabledPublishTooltipContent}
+ >
+ <DropdownMenuItem
+ onSelect={() => {
+ $publishDialog.set("publish");
+ }}
+ disabled={isPublishEnabled === false}
+ >
+ Publish
<DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "shift", "p"]} />
+ <Kbd value={["shift", "P"]} />
</DropdownMenuItemRightSlot>
</DropdownMenuItem>
+ </Tooltip>
- <Tooltip
- side="right"
- sideOffset={10}
- content={disabledShareTooltipContent}
- >
- <DropdownMenuItem
- onSelect={() => {
- $isShareDialogOpen.set(true);
- }}
- disabled={isShareEnabled === false}
- >
- Share
- </DropdownMenuItem>
- </Tooltip>
-
- <Tooltip
- side="right"
- sideOffset={10}
- content={disabledPublishTooltipContent}
- >
- <DropdownMenuItem
- onSelect={() => {
- $publishDialog.set("publish");
- }}
- disabled={isPublishEnabled === false}
- >
- Publish
- <DropdownMenuItemRightSlot>
- <Kbd value={["shift", "P"]} />
- </DropdownMenuItemRightSlot>
- </DropdownMenuItem>
- </Tooltip>
-
- <Tooltip
- side="right"
- sideOffset={10}
- content={disabledPublishTooltipContent}
- >
- <DropdownMenuItem
- onSelect={() => {
- $publishDialog.set("export");
- }}
- disabled={isPublishEnabled === false}
- >
- Export
- <DropdownMenuItemRightSlot>
- <Kbd value={["shift", "E"]} />
- </DropdownMenuItemRightSlot>
- </DropdownMenuItem>
- </Tooltip>
-
- <Tooltip
- side="right"
- sideOffset={10}
- content={
- authTokenPermission.canClone === false
- ? "Cloning has been disabled by the project owner"
- : undefined
- }
+ <Tooltip
+ side="right"
+ sideOffset={10}
+ content={disabledPublishTooltipContent}
+ >
+ <DropdownMenuItem
+ onSelect={() => {
+ $publishDialog.set("export");
+ }}
+ disabled={isPublishEnabled === false}
>
- <DropdownMenuItem
- onSelect={() => {
- if ($authToken.get() === undefined) {
- $isCloneDialogOpen.set(true);
- return;
- }
- }}
- disabled={authTokenPermission.canClone === false}
- asChild={cloneIsExternal}
- >
- {cloneIsExternal ? (
- <a
- className={menuItemCss()}
- href={cloneProjectUrl({
- origin: window.origin,
- sourceAuthToken: authToken,
- })}
- >
- Clone
- </a>
- ) : (
- "Clone"
- )}
- </DropdownMenuItem>
- </Tooltip>
-
- <DropdownMenuSeparator />
-
- {isDesignMode && (
- <DropdownMenuItem onSelect={() => emitCommand("openCommandPanel")}>
- Search & Commands
- <DropdownMenuItemRightSlot>
- <Kbd value={["cmd", "k"]} />
- </DropdownMenuItemRightSlot>
- </DropdownMenuItem>
- )}
+ Export
+ <DropdownMenuItemRightSlot>
+ <Kbd value={["shift", "E"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+ </Tooltip>
+ <Tooltip
+ side="right"
+ sideOffset={10}
+ content={
+ authTokenPermission.canClone === false
+ ? "Cloning has been disabled by the project owner"
+ : undefined
+ }
+ >
<DropdownMenuItem
onSelect={() => {
- window.open(
- "https://docs.webstudio.is/university/foundations/shortcuts"
- );
+ if ($authToken.get() === undefined) {
+ $isCloneDialogOpen.set(true);
+ return;
+ }
}}
+ disabled={authTokenPermission.canClone === false}
+ asChild={cloneIsExternal}
>
- Keyboard shortcuts
+ {cloneIsExternal ? (
+ <a
+ className={menuItemCss()}
+ href={cloneProjectUrl({
+ origin: window.origin,
+ sourceAuthToken: authToken,
+ })}
+ >
+ Clone
+ </a>
+ ) : (
+ "Clone"
+ )}
</DropdownMenuItem>
+ </Tooltip>
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Help</DropdownMenuSubTrigger>
- <DropdownMenuSubContent width="regular">
- {help.map((item) => (
- <DropdownMenuItem
- key={item.url}
- onSelect={(event) => {
- if ("target" in item && item.target === "embed") {
- event.preventDefault();
- $remoteDialog.set({
- title: item.label,
- url: item.url,
- });
- return;
- }
- window.open(item.url);
- }}
- >
- {item.label}
- </DropdownMenuItem>
- ))}
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ <DropdownMenuSeparator />
- {hasProPlan === false && (
- <>
- <DropdownMenuSeparator />
+ {isDesignMode && (
+ <DropdownMenuItem onSelect={() => emitCommand("openCommandPanel")}>
+ Search & Commands
+ <DropdownMenuItemRightSlot>
+ <Kbd value={["cmd", "k"]} />
+ </DropdownMenuItemRightSlot>
+ </DropdownMenuItem>
+ )}
+
+ <DropdownMenuItem
+ onSelect={() => {
+ window.open(
+ "https://docs.webstudio.is/university/foundations/shortcuts"
+ );
+ }}
+ >
+ Keyboard shortcuts
+ </DropdownMenuItem>
+
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger>Help</DropdownMenuSubTrigger>
+ <DropdownMenuSubContent width="regular">
+ {help.map((item) => (
<DropdownMenuItem
- onSelect={() => {
- window.open("https://webstudio.is/pricing");
+ key={item.url}
+ onSelect={(event) => {
+ if ("target" in item && item.target === "embed") {
+ event.preventDefault();
+ $remoteDialog.set({
+ title: item.label,
+ url: item.url,
+ });
+ return;
+ }
+ window.open(item.url);
}}
- css={{ gap: theme.spacing[3] }}
>
- <UpgradeIcon />
- <div>Upgrade to Pro</div>
+ {item.label}
</DropdownMenuItem>
- </>
- )}
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ ))}
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
+
+ {hasProPlan === false && (
+ <>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onSelect={() => {
+ window.open("https://webstudio.is/pricing");
+ }}
+ css={{ gap: theme.spacing[3] }}
+ >
+ <UpgradeIcon />
+ <div>Upgrade to Pro</div>
+ </DropdownMenuItem>
+ </>
+ )}
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx
index 2138241de5..241c96b400 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx
@@ -15,7 +15,6 @@ import {
Box,
DropdownMenu,
DropdownMenuContent,
- DropdownMenuPortal,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,
DropdownMenuTrigger,
@@ -123,103 +122,100 @@ export const TemplatesMenu = ({
>
<DropdownMenuTrigger asChild>{children}</DropdownMenuTrigger>
</Tooltip>
- <DropdownMenuPortal>
- <DropdownMenuContent
- align="start"
- sideOffset={4}
- collisionPadding={16}
- side="bottom"
- loop
- // @todo remove inert after creation
- {...(inert ? { inert: "" } : {})}
- >
- {templates.length > 0 ? (
- <>
- <DropdownMenuRadioGroup
- value={value !== undefined ? JSON.stringify(value) : value}
- onValueChange={handleValueChangeComplete}
- >
- {menuItems?.map(({ icon, title, id, value }) => (
- <DropdownMenuRadioItem
- onPointerEnter={() => {
- handleValueChange(value);
- }}
- onPointerMove={
- preventFocusOnHover
- ? (e) => {
- e.preventDefault();
- }
- : undefined
- }
- onPointerLeave={
- preventFocusOnHover
- ? (e) => {
- handleValueChange(undefined);
- e.preventDefault();
- }
- : undefined
- }
- onPointerDown={
- preventFocusOnHover
- ? (event) => {
- event.preventDefault();
- }
- : undefined
- }
- key={id}
- value={JSON.stringify(value)}
- {...{ [skipInertHandlersAttribute]: true }}
- >
- <Flex css={{ px: theme.spacing[3] }} gap={2} data-xxx>
- {icon}
- <Box>{title}</Box>
- </Flex>
- </DropdownMenuRadioItem>
- ))}
- </DropdownMenuRadioGroup>
- <DropdownMenuSeparator />
- <div className={menuItemCss({ hint: true })}>
- <Grid css={{ width: theme.spacing[25] }}>
- <Flex
- gap={1}
- css={{ display: hasChildren ? "none" : undefined }}
- >
- <Kbd value={["click"]} />
- <Text>to add before</Text>
- </Flex>
-
- <Flex
- gap={1}
- css={{
- order: modifierKeys.altKey ? 2 : 0,
- display: hasChildren ? undefined : "none",
- }}
- >
- <Kbd value={["click"]} />
- <Text>to add after</Text>
- </Flex>
- <Flex
- gap={1}
- css={{
- order: 1,
- display: hasChildren ? undefined : "none",
- }}
- >
- <Kbd value={["option", "click"]} />{" "}
- <Text>to add before</Text>
+ <DropdownMenuContent
+ align="start"
+ sideOffset={4}
+ collisionPadding={16}
+ side="bottom"
+ loop
+ // @todo remove inert after creation
+ {...(inert ? { inert: "" } : {})}
+ >
+ {templates.length > 0 ? (
+ <>
+ <DropdownMenuRadioGroup
+ value={value !== undefined ? JSON.stringify(value) : value}
+ onValueChange={handleValueChangeComplete}
+ >
+ {menuItems?.map(({ icon, title, id, value }) => (
+ <DropdownMenuRadioItem
+ onPointerEnter={() => {
+ handleValueChange(value);
+ }}
+ onPointerMove={
+ preventFocusOnHover
+ ? (e) => {
+ e.preventDefault();
+ }
+ : undefined
+ }
+ onPointerLeave={
+ preventFocusOnHover
+ ? (e) => {
+ handleValueChange(undefined);
+ e.preventDefault();
+ }
+ : undefined
+ }
+ onPointerDown={
+ preventFocusOnHover
+ ? (event) => {
+ event.preventDefault();
+ }
+ : undefined
+ }
+ key={id}
+ value={JSON.stringify(value)}
+ {...{ [skipInertHandlersAttribute]: true }}
+ >
+ <Flex css={{ px: theme.spacing[3] }} gap={2} data-xxx>
+ {icon}
+ <Box>{title}</Box>
</Flex>
- </Grid>
- </div>
- </>
- ) : (
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ <DropdownMenuSeparator />
<div className={menuItemCss({ hint: true })}>
<Grid css={{ width: theme.spacing[25] }}>
- <Text>No Results</Text>
+ <Flex
+ gap={1}
+ css={{ display: hasChildren ? "none" : undefined }}
+ >
+ <Kbd value={["click"]} />
+ <Text>to add before</Text>
+ </Flex>
+
+ <Flex
+ gap={1}
+ css={{
+ order: modifierKeys.altKey ? 2 : 0,
+ display: hasChildren ? undefined : "none",
+ }}
+ >
+ <Kbd value={["click"]} />
+ <Text>to add after</Text>
+ </Flex>
+ <Flex
+ gap={1}
+ css={{
+ order: 1,
+ display: hasChildren ? undefined : "none",
+ }}
+ >
+ <Kbd value={["option", "click"]} /> <Text>to add before</Text>
+ </Flex>
</Grid>
</div>
- )}
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ </>
+ ) : (
+ <div className={menuItemCss({ hint: true })}>
+ <Grid css={{ width: theme.spacing[25] }}>
+ <Text>No Results</Text>
+ </Grid>
+ </div>
+ )}
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx b/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx
index 4871db251b..e3cbdf75a8 100644
--- a/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx
+++ b/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx
@@ -5,7 +5,6 @@ import {
DropdownMenuContent,
DropdownMenuItem,
Text,
- DropdownMenuPortal,
styled,
Tooltip,
SmallIconButton,
@@ -76,24 +75,22 @@ const ItemMenu = ({
icon={<EllipsesIcon />}
/>
</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent align="start">
- <Tooltip side="bottom" content={tooltipContent}>
- <DropdownMenuItem
- disabled={isDeleteDisabled}
- onClick={(event) => {
- // Prevent setting the current font to the item.
- event.stopPropagation();
- }}
- onSelect={() => {
- onDelete();
- }}
- >
- <Text>Delete font</Text>
- </DropdownMenuItem>
- </Tooltip>
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ <DropdownMenuContent align="start">
+ <Tooltip side="bottom" content={tooltipContent}>
+ <DropdownMenuItem
+ disabled={isDeleteDisabled}
+ onClick={(event) => {
+ // Prevent setting the current font to the item.
+ event.stopPropagation();
+ }}
+ onSelect={() => {
+ onDelete();
+ }}
+ >
+ <Text>Delete font</Text>
+ </DropdownMenuItem>
+ </Tooltip>
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/apps/builder/app/dashboard/profile-menu.tsx b/apps/builder/app/dashboard/profile-menu.tsx
index e9c421f6c7..92445f7443 100644
--- a/apps/builder/app/dashboard/profile-menu.tsx
+++ b/apps/builder/app/dashboard/profile-menu.tsx
@@ -4,7 +4,6 @@ import {
DropdownMenu,
DropdownMenuTrigger,
DropdownMenuContent,
- DropdownMenuPortal,
DropdownMenuItem,
DropdownMenuLabel,
Avatar,
@@ -73,38 +72,36 @@ export const ProfileMenu = ({
}
/>
</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent align="start">
- <DropdownMenuLabel>
- {user.username ?? defaultUserName}
- <Text>{user.email}</Text>
- </DropdownMenuLabel>
- {userPlanFeatures.hasSubscription && (
- <DropdownMenuItem
- onSelect={() => navigate(userPlanSubscriptionPath())}
- >
- Manage Subscription
- </DropdownMenuItem>
- )}
- {userPlanFeatures.hasProPlan === false && (
- <DropdownMenuItem
- onSelect={() => {
- window.open("https://webstudio.is/pricing");
- }}
- css={{
- gap: theme.spacing[3],
- }}
- >
- <UpgradeIcon />
- <div>Upgrade to Pro</div>
- </DropdownMenuItem>
- )}
- <DropdownMenuSeparator />
- <DropdownMenuItem onSelect={() => navigate(logoutPath())}>
- Sign Out
+ <DropdownMenuContent align="start">
+ <DropdownMenuLabel>
+ {user.username ?? defaultUserName}
+ <Text>{user.email}</Text>
+ </DropdownMenuLabel>
+ {userPlanFeatures.hasSubscription && (
+ <DropdownMenuItem
+ onSelect={() => navigate(userPlanSubscriptionPath())}
+ >
+ Manage Subscription
</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ )}
+ {userPlanFeatures.hasProPlan === false && (
+ <DropdownMenuItem
+ onSelect={() => {
+ window.open("https://webstudio.is/pricing");
+ }}
+ css={{
+ gap: theme.spacing[3],
+ }}
+ >
+ <UpgradeIcon />
+ <div>Upgrade to Pro</div>
+ </DropdownMenuItem>
+ )}
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onSelect={() => navigate(logoutPath())}>
+ Sign Out
+ </DropdownMenuItem>
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/apps/builder/app/dashboard/projects/project-card.tsx b/apps/builder/app/dashboard/projects/project-card.tsx
index a50602459e..8318b44840 100644
--- a/apps/builder/app/dashboard/projects/project-card.tsx
+++ b/apps/builder/app/dashboard/projects/project-card.tsx
@@ -3,7 +3,6 @@ import {
DropdownMenu,
DropdownMenuTrigger,
DropdownMenuContent,
- DropdownMenuPortal,
DropdownMenuItem,
IconButton,
css,
@@ -84,14 +83,12 @@ const Menu = ({
<EllipsesIcon width={15} height={15} />
</IconButton>
</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuContent align="end" css={{ width: theme.spacing[24] }}>
- <DropdownMenuItem onSelect={onDuplicate}>Duplicate</DropdownMenuItem>
- <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
- <DropdownMenuItem onSelect={onShare}>Share</DropdownMenuItem>
- <DropdownMenuItem onSelect={onDelete}>Delete</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenuPortal>
+ <DropdownMenuContent align="end" css={{ width: theme.spacing[24] }}>
+ <DropdownMenuItem onSelect={onDuplicate}>Duplicate</DropdownMenuItem>
+ <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
+ <DropdownMenuItem onSelect={onShare}>Share</DropdownMenuItem>
+ <DropdownMenuItem onSelect={onDelete}>Delete</DropdownMenuItem>
+ </DropdownMenuContent>
</DropdownMenu>
);
};
diff --git a/packages/design-system/src/components/dropdown-menu.tsx b/packages/design-system/src/components/dropdown-menu.tsx
index 616b4ab6b2..153b7549b7 100644
--- a/packages/design-system/src/components/dropdown-menu.tsx
+++ b/packages/design-system/src/components/dropdown-menu.tsx
@@ -26,10 +26,20 @@ export const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
export const DropdownMenuSub = DropdownMenuPrimitive.Sub;
-export const DropdownMenuContent = styled(
+const DropdownMenuContentStyled = styled(
DropdownMenuPrimitive.Content,
menuCss
);
+export const DropdownMenuContent = forwardRef<
+ ElementRef<typeof DropdownMenuContentStyled>,
+ ComponentProps<typeof DropdownMenuContentStyled>
+>((props, ref) => {
+ return (
+ <DropdownMenuPrimitive.Portal>
+ <DropdownMenuContentStyled {...props} ref={ref} />
+ </DropdownMenuPrimitive.Portal>
+ );
+});
const SubContentStyled = styled(DropdownMenuPrimitive.SubContent, subMenuCss);
export const DropdownMenuSubContent = forwardRef<
@@ -140,5 +150,3 @@ DropdownMenuCheckboxItem.displayName = "DropdownMenuCheckboxItem";
export const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
export const DropdownMenuGroup = DropdownMenuPrimitive.Group;
-
-export const DropdownMenuPortal = DropdownMenuPrimitive.Portal;