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
chore: delete deprecated popover (#3867)
Oleg Isonenbf95b0f15fa8
diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsxindex 877b959055..c5e70ad14c 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx@@ -1,11 +1,10 @@import { type ComponentProps, useState } from "react";import {keyframes,- DeprecatedPopover,- DeprecatedPopoverTrigger,- DeprecatedPopoverContent,- DeprecatedPopoverPortal,styled,+ Popover,+ PopoverTrigger,+ PopoverContent,} from "@webstudio-is/design-system";import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";import {@@ -91,7 +90,7 @@ const Input = ({// trigger is used only for positioningconst Trigger = styled("div", { position: "absolute", width: 0, height: 0 });-const PopoverContentStyled = styled(DeprecatedPopoverContent, {+const PopoverContentStyled = styled(PopoverContent, {minWidth: 0,minHeight: 0,width: theme.spacing[20],@@ -121,7 +120,7 @@ export const InputPopover = ({onClose: () => void;}) => {return (- <DeprecatedPopover+ <Popoveropen={isOpen}onOpenChange={(nextOpen) => {if (nextOpen === false) {@@ -129,20 +128,18 @@ export const InputPopover = ({}}}>- <DeprecatedPopoverTrigger asChild>+ <PopoverTrigger asChild><Trigger />- </DeprecatedPopoverTrigger>- <DeprecatedPopoverPortal>- <PopoverContentStyled hideArrow sideOffset={-24}>- <Input- styleSource={styleSource}- value={value}- property={property}- onChange={onChange}- onClosePopover={onClose}- />- </PopoverContentStyled>- </DeprecatedPopoverPortal>- </DeprecatedPopover>+ </PopoverTrigger>+ <PopoverContentStyled hideArrow sideOffset={-24}>+ <Input+ styleSource={styleSource}+ value={value}+ property={property}+ onChange={onChange}+ onClosePopover={onClose}+ />+ </PopoverContentStyled>+ </Popover>);};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 3eb0a12bb8..603b008b1f 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@@ -1,11 +1,10 @@import { useState } from "react";import {- DeprecatedPopover,- DeprecatedPopoverTrigger,- DeprecatedPopoverContent,- DeprecatedPopoverPortal,- DeprecatedPopoverHeader,SmallIconButton,+ FloatingPanelPopover,+ FloatingPanelPopoverTrigger,+ FloatingPanelPopoverContent,+ FloatingPanelPopoverTitle,} from "@webstudio-is/design-system";import { GearIcon, gearIconCssVars } from "@webstudio-is/icons";import type { Asset } from "@webstudio-is/sdk";@@ -27,8 +26,8 @@ export const ImageInfoTrigger = ({}) => {const [isInfoOpen, setInfoOpen] = useState(false);return (- <DeprecatedPopover open={isInfoOpen} onOpenChange={setInfoOpen}>- <DeprecatedPopoverTrigger asChild>+ <FloatingPanelPopover modal open={isInfoOpen} onOpenChange={setInfoOpen}>+ <FloatingPanelPopoverTrigger asChild><SmallIconButtontitle="Options"onClick={() => setInfoOpen(true)}@@ -47,19 +46,17 @@ export const ImageInfoTrigger = ({}}icon={<GearIcon />}/>- </DeprecatedPopoverTrigger>- <DeprecatedPopoverPortal>- <DeprecatedPopoverContent>- <DeprecatedPopoverHeader title="Asset Details" />- <ImageInfo- onDelete={(ids) => {- setInfoOpen(false);- onDelete(ids);- }}- asset={asset}- />- </DeprecatedPopoverContent>- </DeprecatedPopoverPortal>- </DeprecatedPopover>+ </FloatingPanelPopoverTrigger>+ <FloatingPanelPopoverContent>+ <FloatingPanelPopoverTitle>Asset Details</FloatingPanelPopoverTitle>+ <ImageInfo+ onDelete={(ids) => {+ setInfoOpen(false);+ onDelete(ids);+ }}+ asset={asset}+ />+ </FloatingPanelPopoverContent>+ </FloatingPanelPopover>);};diff --git a/packages/design-system/src/components/__DEPRECATED__/popover.tsx b/packages/design-system/src/components/__DEPRECATED__/popover.tsxdeleted file mode 100644index 21efe16bfe..0000000000--- a/packages/design-system/src/components/__DEPRECATED__/popover.tsx+++ /dev/null@@ -1,104 +0,0 @@-import {- type ComponentProps,- type ElementRef,- type ReactNode,- forwardRef,-} from "react";-import { CrossLargeIcon } from "@webstudio-is/icons";-import * as PopoverPrimitive from "@radix-ui/react-popover";-import { Box } from "../box";-import { panelStyle } from "../panel";-import { Flex } from "../flex";-import { DeprecatedIconButton } from "./icon-button";-import { DeprecatedText2 } from "./text2";-import { Separator } from "../separator";-import { styled, type CSS } from "../../stitches.config";-import { theme } from "../../stitches.config";--type PopoverProps = ComponentProps<typeof PopoverPrimitive.Root> & {- children: ReactNode;-};--export const DeprecatedPopover = ({ children, ...props }: PopoverProps) => {- return <PopoverPrimitive.Root {...props}>{children}</PopoverPrimitive.Root>;-};--const StyledContent = styled(PopoverPrimitive.Content, panelStyle, {- backgroundColor: "white",- minWidth: 200,- minHeight: theme.spacing[13],- maxWidth: "max-content",- "&:focus": {- outline: "none",- },- display: "flex",- flexDirection: "column",-});--type PopoverContentPrimitiveProps = ComponentProps<- typeof PopoverPrimitive.Content->;--type PopoverContentProps = PopoverContentPrimitiveProps & {- css?: CSS;- hideArrow?: boolean;-};--export const DeprecatedPopoverContent = forwardRef<- ElementRef<typeof StyledContent>,- PopoverContentProps->(({ children, hideArrow, ...props }, fowardedRef) => (- <StyledContent- sideOffset={4}- collisionPadding={4}- {...props}- ref={fowardedRef}- >- {children}- {!hideArrow && (- <Box css={{ color: theme.colors.panel }}>- <PopoverPrimitive.Arrow- width={11}- height={5}- offset={5}- style={{ fill: "currentColor" }}- />- </Box>- )}- </StyledContent>-));-DeprecatedPopoverContent.displayName = "PopoverContent";--type PopoverHeaderProps = {- title: string;-};--export const DeprecatedPopoverHeader = ({ title }: PopoverHeaderProps) => {- return (- <Box css={{ order: -1 }}>- <Flex- css={{ height: 40, paddingLeft: theme.spacing[9] }}- align="center"- justify="between"- >- <DeprecatedText2 variant="title">{title}</DeprecatedText2>- <DeprecatedPopoverClose asChild>- <DeprecatedIconButton- size="2"- css={{- marginRight: theme.spacing[5],- }}- aria-label="Close"- >- <CrossLargeIcon />- </DeprecatedIconButton>- </DeprecatedPopoverClose>- </Flex>- <Separator />- </Box>- );-};--export const DeprecatedPopoverTrigger = PopoverPrimitive.Trigger;-export const DeprecatedPopoverClose = PopoverPrimitive.Close;-export const DeprecatedPopoverPortal = PopoverPrimitive.Portal;diff --git a/packages/design-system/src/components/floating-panel-popover.tsx b/packages/design-system/src/components/floating-panel-popover.tsxindex c7a0bf2f1b..5cb9121d9b 100644--- a/packages/design-system/src/components/floating-panel-popover.tsx+++ b/packages/design-system/src/components/floating-panel-popover.tsx@@ -8,7 +8,7 @@ import * as Primitive from "@radix-ui/react-popover";import { css, theme, type CSS } from "../stitches.config";import { PanelTitle } from "./panel-title";import { floatingPanelStyle, CloseButton, TitleSlot } from "./floating-panel";-import { Flex } from "..";+import { Flex } from "./flex";export const FloatingPanelPopover = Primitive.Root;diff --git a/packages/design-system/src/components/menu.stories.tsx b/packages/design-system/src/components/menu.stories.tsxindex 5b07ecc63d..7c028c3469 100644--- a/packages/design-system/src/components/menu.stories.tsx+++ b/packages/design-system/src/components/menu.stories.tsx@@ -42,9 +42,9 @@ import {DotIcon,} from "@webstudio-is/icons";import { useState } from "react";-import { DeprecatedIconButton } from "./__DEPRECATED__/icon-button";import { StorySection } from "./storybook";import { InputField } from "./input-field";+import { NestedInputButton } from "./nested-input-button";const DropdownDemo = ({ withIndicator }: { withIndicator: boolean }) => {const [isApple, setIsApple] = useState(true);@@ -184,9 +184,9 @@ const ComboboxDemo = () => {{...getInputProps()}placeholder="Enter: Apple"suffix={- <DeprecatedIconButton {...getToggleButtonProps()}>+ <NestedInputButton {...getToggleButtonProps()}><ChevronDownIcon />- </DeprecatedIconButton>+ </NestedInputButton>}/></ComboboxAnchor>diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex 0df0315418..031181305f 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -87,5 +87,4 @@ export * from "./components/kbd";export * from "./components/__DEPRECATED__/text2";export { DeprecatedIconButton } from "./components/__DEPRECATED__/icon-button";-export * from "./components/__DEPRECATED__/popover";export * from "./components/__DEPRECATED__/list";