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
feat: Allow seeing inspector in parallel with variable editor (#3231)
Oleg Isonen98a6fee5abca
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex c573f8a72a..1be932ea21 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -334,13 +334,13 @@ export const Builder = ({</Workspace><AiCommandBar isPreviewMode={isPreviewMode} /></Main>- <SidePanel gridArea="sidebar">- <SidebarLeft publish={publish} />- </SidePanel><NavigatorPanelisPreviewMode={isPreviewMode}navigatorLayout={navigatorLayout}/>+ <SidePanel gridArea="sidebar">+ <SidebarLeft publish={publish} />+ </SidePanel><SidePanelgridArea="inspector"isPreviewMode={isPreviewMode}diff --git a/apps/builder/app/builder/features/address-bar.tsx b/apps/builder/app/builder/features/address-bar.tsxindex 74aa75a67f..1d1d4d745d 100644--- a/apps/builder/app/builder/features/address-bar.tsx+++ b/apps/builder/app/builder/features/address-bar.tsx@@ -204,7 +204,7 @@ export const AddressBarPopover = () => {</PopoverTrigger><PopoverPortal><PopoverContent- css={{ zIndex: theme.zIndices[1], padding: 0 }}+ css={{ padding: 0 }}sideOffset={0}collisionPadding={4}align="start"diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxindex 0d68f63b71..937936d1a7 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx@@ -118,7 +118,7 @@ const BreakpointEditorItem = ({<Flex gap="2" css={{ width: theme.spacing[26] }}><Selectname="type"- css={{ zIndex: theme.zIndices[1], width: theme.spacing[21] }}+ css={{ width: theme.spacing[21] }}options={["maxWidth", "minWidth"]}getLabel={(option) =>option === "maxWidth" ? "Max Width" : "Min Width"diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxindex a4c5269749..dbb890fb4f 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -96,7 +96,7 @@ export const BreakpointsPopover = () => {</Tooltip><PopoverPortal><PopoverContent- css={{ zIndex: theme.zIndices[1], padding: 0 }}+ css={{ padding: 0 }}sideOffset={0}collisionPadding={4}align="start"diff --git a/apps/builder/app/builder/features/project-settings/image-control.tsx b/apps/builder/app/builder/features/project-settings/image-control.tsxindex 5da33350ef..350f5ee74b 100644--- a/apps/builder/app/builder/features/project-settings/image-control.tsx+++ b/apps/builder/app/builder/features/project-settings/image-control.tsx@@ -10,7 +10,6 @@ export const ImageControl = (props: {return (<FloatingPaneltitle="Images"- zIndex={1}content={<ImageManageronChange={(asset) => {diff --git a/apps/builder/app/builder/features/project-settings/project-settings.tsx b/apps/builder/app/builder/features/project-settings/project-settings.tsxindex 538ff7e680..04f51c1ca5 100644--- a/apps/builder/app/builder/features/project-settings/project-settings.tsx+++ b/apps/builder/app/builder/features/project-settings/project-settings.tsx@@ -39,15 +39,11 @@ export const ProjectSettingsView = ({return (<Dialog open={isOpen} onOpenChange={onOpenChange}><DialogContent- // Left Aside panels (e.g., Pages, Components) use zIndex: theme.zIndices[1].- // For a dialog to appear above these panels, both overlay and content should also have zIndex: theme.zIndices[1].css={{width: `calc(${leftPanelWidth} + ${rightPanelWidth})`,maxWidth: "none",height: theme.spacing[35],- zIndex: theme.zIndices[1],}}- overlayCss={{ zIndex: theme.zIndices[1] }}><Flex grow><List asChild>diff --git a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx b/apps/builder/app/builder/features/project-settings/section-marketplace.tsxindex 94fd6a96db..617c972fa1 100644--- a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx+++ b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx@@ -187,7 +187,6 @@ export const SectionMarketplace = () => {<Grid gap={1} css={sectionSpacing}><Label htmlFor={ids.category}>Category</Label><Select- css={{ zIndex: theme.zIndices[1] }}options={Array.from(marketplaceCategories.keys())}getLabel={(category: MarketplaceProduct["category"]) =>marketplaceCategories.get(category)?.labeldiff --git a/apps/builder/app/builder/features/project-settings/section-redirects.tsx b/apps/builder/app/builder/features/project-settings/section-redirects.tsxindex c94eb805fb..89833e26aa 100644--- a/apps/builder/app/builder/features/project-settings/section-redirects.tsx+++ b/apps/builder/app/builder/features/project-settings/section-redirects.tsx@@ -160,7 +160,6 @@ export const SectionRedirects = () => {<InputErrorsTooltiperrors={oldPathErrors.length > 0 ? oldPathErrors : undefined}side="top"- css={{ zIndex: theme.zIndices["1"] }}><InputFieldref={oldPathRef}@@ -180,7 +179,7 @@ export const SectionRedirects = () => {placeholder="301"options={["301", "302"]}value={httpStatus ?? "301"}- css={{ zIndex: theme.zIndices["1"], width: theme.spacing[18] }}+ css={{ width: theme.spacing[18] }}onChange={(value) => {setHttpStatus(value as PageRedirect["status"]);}}@@ -191,7 +190,6 @@ export const SectionRedirects = () => {<InputErrorsTooltiperrors={newPathErrors.length > 0 ? newPathErrors : undefined}side="top"- css={{ zIndex: theme.zIndices["2"] }}><InputFieldtype="text"diff --git a/apps/builder/app/builder/features/sidebar-left/help-popover.tsx b/apps/builder/app/builder/features/sidebar-left/help-popover.tsxindex 964830f180..6a0b3ad506 100644--- a/apps/builder/app/builder/features/sidebar-left/help-popover.tsx+++ b/apps/builder/app/builder/features/sidebar-left/help-popover.tsx@@ -35,8 +35,6 @@ export const HelpPopover = ({// Height of the footercollisionPadding={{ bottom: Number.parseFloat(rawTheme.spacing[11]) }}side={side}- // Sidebar has z-index 1, so we need to be above that using portal + same zindex- css={{ zIndex: theme.zIndices[1] }}><Flexas="form"diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsxindex 270bee53ff..4ea3d65fd7 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx@@ -168,7 +168,6 @@ const FormFields = ({<Label htmlFor={fieldIds.parentFolderId}>Parent Folder</Label><SelecttabIndex={1}- css={{ zIndex: theme.zIndices[1] }}options={filterSelfAndChildren(folderId, pages.folders)}getValue={(folder) => folder.id}getLabel={(folder) => folder.name}@@ -544,7 +543,7 @@ const DeleteConfirmationDialog = ({}}}>- <DialogContent css={{ zIndex: theme.zIndices[1] }}>+ <DialogContent><Flex gap="3" direction="column" css={{ padding: theme.spacing[9] }}><Text>{`Delete folder "${folder.name}" including all of its pages?`}</Text><Flex direction="rowReverse" gap="2">diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsxindex d32d090c3f..942792aa89 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx@@ -701,7 +701,6 @@ const FormFields = ({<Grid gap={1}><Label htmlFor={fieldIds.parentFolderId}>Parent Folder</Label><Select- css={{ zIndex: theme.zIndices[1] }}options={pages.folders}getValue={(folder) => folder.id}getLabel={(folder) => folder.name}diff --git a/apps/builder/app/builder/features/sidebar-left/shared/extended-panel.tsx b/apps/builder/app/builder/features/sidebar-left/shared/extended-panel.tsxindex 3a29eda70c..6e5f633363 100644--- a/apps/builder/app/builder/features/sidebar-left/shared/extended-panel.tsx+++ b/apps/builder/app/builder/features/sidebar-left/shared/extended-panel.tsx@@ -1,9 +1,4 @@-import {- styled,- keyframes,- Collapsible,- Flex,-} from "@webstudio-is/design-system";+import { styled, Collapsible, Flex } from "@webstudio-is/design-system";import { theme } from "@webstudio-is/design-system";import { useRef } from "react";import { BindingPopoverProvider } from "~/builder/shared/binding-popover";@@ -16,29 +11,6 @@ const CollapsibleRoot = styled(Collapsible.Root, {display: "flex",flexDirection: "column",marginLeft: 1,- zIndex: -1,-});--const openKeyframes = keyframes({- from: {- opacity: 0.5,- transform: `translateX(-${theme.spacing[30]})`,- },- to: {- transform: "translateX(0)",- opacity: 1,- },-});--const closeKeyframes = keyframes({- from: {- transform: "translateX(0)",- opacity: 1,- },- to: {- opacity: 0.2,- transform: `translateX(-${theme.spacing[30]})`,- },});const CollapsibleContent = styled(Collapsible.Content, {@@ -46,12 +18,6 @@ const CollapsibleContent = styled(Collapsible.Content, {flexGrow: "1",display: "flex",flexDirection: "column",- '&[data-state="open"]': {- animation: `${openKeyframes} 200ms ${theme.easing.easeOutQuart}`,- },- '&[data-state="closed"]': {- animation: `${closeKeyframes} 200ms ${theme.easing.easeOutQuart}`,- },});export const ExtendedPanel = ({diff --git a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsxindex 5ffc12950d..cd39f433d0 100644--- a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx@@ -162,7 +162,6 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {<SidebarTabsContentvalue={activeTab === "none" ? "" : activeTab}css={{- zIndex: theme.zIndices[1],width: theme.spacing[30],// We need the node to be rendered but hidden// to keep receiving the drag events.diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsxindex fa58f4ff7f..6446ab9ae1 100644--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx@@ -14,8 +14,6 @@ import {ComboboxListbox,ComboboxListboxItem,ComboboxSeparator,- theme,- css,NestedInputButton,Tooltip,Text,@@ -48,8 +46,6 @@ const filteredPropertiesSet = new Set<AnimatableProperties>(animatableProperties.filter((item) => commonPropertiesSet.has(item) === false));-const comboBoxStyles = css({ zIndex: theme.zIndices[1] });-export const TransitionProperty = ({property,onPropertySelection,@@ -159,11 +155,7 @@ export const TransitionProperty = ({suffix={<NestedInputButton {...getToggleButtonProps()} />}/></ComboboxAnchor>- <ComboboxContent- align="end"- sideOffset={5}- className={comboBoxStyles()}- >+ <ComboboxContent align="end" sideOffset={5}><ComboboxListbox {...getMenuProps()}><ComboboxScrollArea>{isOpen && (diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsxindex e906eeb554..f3393c220c 100644--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx@@ -78,7 +78,6 @@ export const Menu = () => {<MenuButton /><DropdownMenuPortal><DropdownMenuContent- css={{ zIndex: theme.zIndices[1] }}sideOffset={4}collisionPadding={4}width="regular"diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex 653cad9e68..b381412e42 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -629,7 +629,6 @@ const ExportContent = () => {<SelectfullWidth- css={{ zIndex: theme.zIndices[2] }}value={deployTarget}options={Object.keys(deployTargets)}getLabel={(value) => humanizeString(value)}@@ -730,7 +729,6 @@ export const PublishButton = ({ projectId }: PublishProps) => {<FloatingPanelPopoverContentsideOffset={Number.parseFloat(rawTheme.spacing[8])}css={{- zIndex: theme.zIndices[1],width: theme.spacing[33],maxWidth: theme.spacing[33],marginRight: theme.spacing[3],diff --git a/apps/builder/app/builder/shared/code-editor.tsx b/apps/builder/app/builder/shared/code-editor.tsxindex 16a1fa4031..bac182ea22 100644--- a/apps/builder/app/builder/shared/code-editor.tsx+++ b/apps/builder/app/builder/shared/code-editor.tsx@@ -304,17 +304,16 @@ export const EditorDialog = ({const height = isExpanded ? "80vh" : "480px";const padding = rawTheme.spacing[7];return (- <Dialog open={open} onOpenChange={onOpenChange}>+ <Dialog open={open} onOpenChange={onOpenChange} modal={false}><DialogTrigger asChild>{children}</DialogTrigger><DialogContent- // Left Aside panels (e.g., Pages, Components) use zIndex: theme.zIndices[1].- // For a dialog to appear above these panels, both overlay and content should also have zIndex: theme.zIndices[1].css={{maxWidth: "none",maxHeight: "none",- zIndex: theme.zIndices[1],}}- overlayCss={{ zIndex: theme.zIndices[1] }}+ onInteractOutside={(event) => {+ event.preventDefault();+ }}><Gridalign="stretch"diff --git a/apps/builder/app/builder/shared/floating-panel.tsx b/apps/builder/app/builder/shared/floating-panel.tsxindex 510263e1a3..edb557a319 100644--- a/apps/builder/app/builder/shared/floating-panel.tsx+++ b/apps/builder/app/builder/shared/floating-panel.tsx@@ -92,10 +92,6 @@ type FloatingPanelProps = {children: JSX.Element;open?: boolean;onOpenChange?: (isOpen: boolean) => void;- // Left Aside panels (e.g., Pages, Components) use zIndex: theme.zIndices[1].- // For a panel to appear above these panels, both overlay and content should also have zIndex: theme.zIndices[1].- // After layout is fixed, this prop should be removed.- zIndex?: 1;};const contentStyle = css({@@ -108,7 +104,6 @@ export const FloatingPanel = ({children,open,onOpenChange,- zIndex,}: FloatingPanelProps) => {const { isOpen, handleOpenChange, triggerRef, sideOffset } = useLogic(open,@@ -124,11 +119,7 @@ export const FloatingPanel = ({sideOffset={sideOffset}side="left"align="start"- className={contentStyle({- css: {- zIndex: zIndex ? theme.zIndices[zIndex] : undefined,- },- })}+ className={contentStyle()}>{content}<FloatingPanelPopoverTitle>{title}</FloatingPanelPopoverTitle>diff --git a/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsxindex 42ccde698b..c4e6f973a2 100644--- a/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx+++ b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx@@ -51,7 +51,7 @@ export const ImageInfoTrigger = ({</DeprecatedButton></DeprecatedPopoverTrigger><DeprecatedPopoverPortal>- <DeprecatedPopoverContent css={{ zIndex: theme.zIndices[1] }}>+ <DeprecatedPopoverContent><DeprecatedPopoverHeader title="Asset Details" /><ImageInfoonDelete={(ids) => {diff --git a/apps/builder/app/shared/clone-project.tsx b/apps/builder/app/shared/clone-project.tsxindex 8182d3596b..b8ff25c3cf 100644--- a/apps/builder/app/shared/clone-project.tsx+++ b/apps/builder/app/shared/clone-project.tsx@@ -74,7 +74,7 @@ const CloneProjectView = ({}) => {return (<Dialog open={isOpen} onOpenChange={onOpenChange}>- <DialogContent css={{ zIndex: theme.zIndices[1] }}>+ <DialogContent><formonSubmit={(event) => {event.preventDefault();diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsxindex d69ea8de44..593d3c13a4 100644--- a/packages/design-system/src/components/dialog.tsx+++ b/packages/design-system/src/components/dialog.tsx@@ -27,21 +27,15 @@ export const DialogContent = forwardRef(children,className,css,- overlayCss,...props}: ComponentProps<typeof Primitive.Content> & {css?: CSS;- overlayCss?: CSS;},forwardedRef: Ref<HTMLDivElement>) => {return (<Primitive.Portal>- <Primitive.Overlay- className={overlayStyle({- css: { zIndex: css?.zIndex, ...overlayCss },- })}- />+ <Primitive.Overlay className={overlayStyle()} /><Primitive.ContentclassName={contentStyle({ className, css })}{...props}diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsxindex cbd68db9bf..b7727bd012 100644--- a/packages/design-system/src/components/select.tsx+++ b/packages/design-system/src/components/select.tsx@@ -215,10 +215,7 @@ const SelectBase = <Option,>(</SelectButton></Primitive.Trigger><Primitive.Portal>- <SelectContent- position="popper"- css={{ zIndex: props.css?.zIndex ?? 0 }}- >+ <SelectContent position="popper"><SelectScrollUpButton css={{ order: 1 }}><ChevronUpIcon /></SelectScrollUpButton>diff --git a/packages/design-system/src/components/tooltip.tsx b/packages/design-system/src/components/tooltip.tsxindex e52f3e1f0e..8686b89239 100644--- a/packages/design-system/src/components/tooltip.tsx+++ b/packages/design-system/src/components/tooltip.tsx@@ -31,7 +31,6 @@ const Content = styled(TooltipPrimitive.Content, {color: theme.colors.loContrast,borderRadius: theme.borderRadius[7],padding: theme.spacing[5],- zIndex: theme.zIndices[1],position: "relative",variants: {