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.

Fix popups (#1752)

Bogdan Chadkin3d345da0e7ca
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
index e8442f3414..67967636db 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
@@ -611,10 +611,10 @@ export const CssValueInput = ({
css={{ cursor: "default" }}
/>
</ComboboxAnchor>
- <ComboboxContent align="start" sideOffset={2} collisionPadding={10}>
- <ComboboxListbox {...menuProps}>
- {isOpen &&
- items.map((item, index) => (
+ {isOpen && (
+ <ComboboxContent align="start" sideOffset={2} collisionPadding={10}>
+ <ComboboxListbox {...menuProps}>
+ {items.map((item, index) => (
<ComboboxListboxItem
{...getItemProps({ item, index })}
key={index}
@@ -622,8 +622,9 @@ export const CssValueInput = ({
{itemToString(item)}
</ComboboxListboxItem>
))}
- </ComboboxListbox>
- </ComboboxContent>
+ </ComboboxListbox>
+ </ComboboxContent>
+ )}
</Box>
</Combobox>
);
diff --git a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx
index 6e420ee678..4727c50272 100644
--- a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx
@@ -8,9 +8,7 @@ const iframeStyle = css({
none: {
pointerEvents: "none",
},
- auto: {
- pointerEvents: "auto",
- },
+ auto: {},
},
},
});
diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsx
index 4ff1b80dfe..c395aa9e3b 100644
--- a/packages/design-system/src/components/combobox.tsx
+++ b/packages/design-system/src/components/combobox.tsx
@@ -97,7 +97,9 @@ export const Combobox = Popper;
export const ComboboxContent = forwardRef(
(props: ComponentProps<typeof PopperContent>, ref: Ref<HTMLDivElement>) => (
- <Portal>
+ // @radix-ui/react-popover adds pointer-events: none to body
+ // so need to reset for combobox rendered inside of popover
+ <Portal style={{ pointerEvents: "auto" }}>
<PopperContent ref={ref} {...props} />
</Portal>
)
@@ -292,7 +294,7 @@ export const useCombobox = <Item,>({
const enhancedGetMenuProps = useCallback(
(options?: Parameters<typeof getMenuProps>[0]) => {
return {
- ...getMenuProps(options),
+ ...getMenuProps(options, { suppressRefError: true }),
state: isOpen ? "open" : "closed",
empty: filteredItems.length === 0,
};