Merge branch 'main' into gj-tabs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickhouse/click-ui",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "description": "Official ClickHouse design system react library",
   "type": "module",
   "license": "Apache-2.0",
@@ -46,6 +46,7 @@
     "@radix-ui/react-avatar": "^1.0.3",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-context-menu": "^2.1.4",
+    "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.5",
     "@radix-ui/react-hover-card": "^1.0.6",
     "@radix-ui/react-popover": "^1.0.6",

src/App.tsx

@@ -29,12 +29,14 @@ import {
   WarningAlert,
   CardPrimary,
 } from "@/components";
+import { Dialog } from "@/components/Dialog/Dialog";
 
 const App = () => {
   const [currentTheme, setCurrentTheme] = useState<ThemeName>("dark");
   const [selectedButton, setSelectedButton] = useState(0);
   const [checked, setChecked] = useState(false);
   const [disabled] = useState(false);
+  const [open, setOpen] = useState(true);
 
   return (
     <ClickUIProvider
@@ -267,6 +269,20 @@ const App = () => {
         title="Title"
       />
       <Avatar text="CH" />
+
+      <Button onClick={() => setOpen(true)}>Button</Button>
+      <Dialog
+        open={open}
+        onOpenChange={setOpen}
+      >
+        <Dialog.Content
+          title="Hello"
+          showClose
+          onClose={() => setOpen(false)}
+        >
+          <p>I'm a dialog</p>
+        </Dialog.Content>
+      </Dialog>
     </ClickUIProvider>
   );
 };

src/components/Collapsible/IconWrapper.tsx

@@ -12,6 +12,7 @@ const LabelContainer = styled.span`
   width: stretch;
   flex: 1;
   gap: ${({ theme }) => theme.click.sidebar.navigation.item.default.space.gap};
+  overflow: hidden;
 `;
 
 const EllipsisContainer = styled.span`

src/components/Dialog/Dialog.stories.tsx

@@ -0,0 +1,77 @@
+import { GridCenter } from "../commonElement";
+import { Text } from "../Typography/Text/Text";
+import { Dialog } from "./Dialog";
+import Separator from "../Separator/Separator";
+import { Spacer } from "../Spacer/Spacer";
+import { Button } from "../Button/Button";
+import styled from "styled-components";
+import { Link } from "../Link/Link";
+
+const DialogComponent = ({
+  open,
+  title,
+  modal,
+  showClose,
+  forceMount,
+}: {
+  open?: boolean;
+  title: string;
+  modal: boolean;
+  showClose: boolean;
+  forceMount?: boolean;
+}) => (
+  <GridCenter>
+    <Dialog
+      open={open}
+      modal={modal}
+    >
+      <Dialog.Trigger>
+        <Link>Open dialog</Link>
+      </Dialog.Trigger>
+      <Dialog.Content
+        title={title}
+        showClose={showClose}
+        forceMount={forceMount ? true : undefined}
+      >
+        <Text color="muted">
+          Hello there, I'm a wonderful example of a modal dialog. You can close me by
+          using the button in my top, left corner.
+        </Text>
+        <Spacer />
+        <Separator size="lg" />
+        <ActionArea>
+          <Dialog.Close label="Close" />
+          <Button iconRight="arrow-right">Continue</Button>
+        </ActionArea>
+      </Dialog.Content>
+    </Dialog>
+  </GridCenter>
+);
+
+const ActionArea = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  gap: ${({ theme }) => theme.click.dialog.space.gap};
+`;
+export default {
+  component: DialogComponent,
+  title: "Display/Dialog",
+  tags: ["autodocs", "dialog"],
+  argTypes: {
+    open: {
+      options: [true, false, undefined],
+      control: { type: "radio" },
+    },
+  },
+};
+
+export const Playground = {
+  args: {
+    title: "Example dialog title",
+    showClose: true,
+    open: true,
+    onOpenChange: () => {
+      console.log("ignored");
+    },
+  },
+};

src/components/Dialog/Dialog.test.tsx

@@ -0,0 +1,47 @@
+import { screen } from "@testing-library/react";
+import { DialogProps } from "@radix-ui/react-dialog";
+import { Dialog } from "./Dialog";
+import { fireEvent } from "@testing-library/react";
+import { renderCUI } from "@/utils/test-utils";
+
+describe("Dialog Component", () => {
+  const renderDialog = (props: DialogProps) =>
+    renderCUI(
+      <Dialog {...props}>
+        <Dialog.Trigger>
+          <div>Open Dialog</div>
+        </Dialog.Trigger>
+        <Dialog.Close label="Close" />
+        <Dialog.Content title="Test Dialog">Test Content</Dialog.Content>
+      </Dialog>
+    );
+
+  it("renders the dialog content with title", () => {
+    const { getByText } = renderDialog({});
+    const dialogTrigger = getByText("Open Dialog");
+    expect(dialogTrigger).not.toBeNull();
+    fireEvent.click(dialogTrigger);
+
+    const dialogTitle = screen.getByText("Test Dialog");
+    const dialogContent = screen.getByText("Test Content");
+
+    expect(dialogTitle).toBeTruthy();
+    expect(dialogContent).toBeTruthy();
+  });
+
+  it("closes the dialog when close button is clicked", () => {
+    const { getByText } = renderDialog({});
+    const dialogTrigger = getByText("Open Dialog");
+    expect(dialogTrigger).not.toBeNull();
+    fireEvent.click(dialogTrigger);
+
+    const DialogClose = screen.getByText("Close");
+    fireEvent.click(DialogClose);
+
+    const dialogTitle = screen.queryByText("Test Dialog");
+    const dialogContent = screen.queryByText("Test Content");
+
+    expect(dialogTitle).toBeFalsy();
+    expect(dialogContent).toBeFalsy();
+  });
+});

src/components/Dialog/Dialog.tsx

@@ -0,0 +1,157 @@
+import React, { ReactNode } from "react";
+import * as RadixDialog from "@radix-ui/react-dialog";
+import styled, { keyframes } from "styled-components";
+import { Button, Icon, Spacer, Title } from "@/components";
+import { EmptyButton } from "../commonElement";
+
+export const Dialog = ({ children, ...props }: RadixDialog.DialogProps) => {
+  return <RadixDialog.Root {...props}>{children}</RadixDialog.Root>;
+};
+
+// Dialog Trigger
+const Trigger = styled(RadixDialog.Trigger)`
+  width: fit-content;
+  background: transparent;
+  border: none;
+  cursor: pointer;
+`;
+
+interface DialogTriggerProps extends RadixDialog.DialogTriggerProps {
+  children: React.ReactNode;
+}
+
+const DialogTrigger = ({ children, ...props }: DialogTriggerProps) => {
+  return <Trigger {...props}>{children}</Trigger>;
+};
+
+DialogTrigger.displayName = "DialogTrigger";
+Dialog.Trigger = DialogTrigger;
+
+// Dialog Close
+interface DialogCloseProps extends RadixDialog.DialogCloseProps {
+  label: string;
+}
+
+const DialogClose = ({ label }: DialogCloseProps) => {
+  label = label ?? "Close";
+  return (
+    <RadixDialog.Close asChild>
+      <Button type="secondary">{label}</Button>
+    </RadixDialog.Close>
+  );
+};
+
+DialogClose.displayName = "DialogClose";
+Dialog.Close = DialogClose;
+
+// Dialog Content
+const overlayShow = keyframes({
+  "0%": { opacity: 0 },
+  "100%": { opacity: 1 },
+});
+
+const contentShow = keyframes({
+  "0%": { opacity: 0, transform: "translate(-50%, -48%) scale(.96)" },
+  "100%": { opacity: 1, transform: "translate(-50%, -50%) scale(1)" },
+});
+
+const DialogOverlay = styled(RadixDialog.Overlay)`
+  background-color: ${({ theme }) => theme.click.dialog.color.opaqueBackground.default};
+  position: fixed;
+  inset: 0;
+  animation: ${overlayShow} 150ms cubic-bezier(0.16, 1, 0.3, 1);
+`;
+
+const ContentArea = styled(RadixDialog.Content)`
+  background: ${({ theme }) => theme.click.dialog.color.background.default};
+  border-radius: ${({ theme }) => theme.click.dialog.radii.all};
+  padding: ${({ theme }) => theme.click.dialog.space.y}
+    ${({ theme }) => theme.click.dialog.space.x};
+  box-shadow: ${({ theme }) => theme.click.dialog.shadow.default};
+  border: 1px solid ${({ theme }) => theme.click.global.color.stroke.default};
+  width: 75%;
+  max-width: 670px;
+  position: fixed;
+  top: 25%;
+  margin-top: 20%;
+  left: 50%;
+  max-height: 75%;
+  overflow: auto;
+  transform: translate(-50%, -50%);
+  animation: ${contentShow} 150ms cubic-bezier(0.16, 1, 0.3, 1);
+  outline: none;
+`;
+
+const TitleArea = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  min-height: ${({ theme }) => theme.sizes[9]}; // 32px
+`;
+
+const CrossButton = styled(EmptyButton)`
+  padding: ${({ theme }) => theme.click.button.iconButton.sm.space.y}
+    ${({ theme }) => theme.click.button.iconButton.sm.space.x};
+  background: ${({ theme }) =>
+    theme.click.button.iconButton.color.primary.background.default};
+  border-radius: ${({ theme }) => theme.click.button.iconButton.radii.all};
+
+  &:hover {
+    background: ${({ theme }) =>
+      theme.click.button.iconButton.color.primary.background.hover};
+  }
+`;
+
+const CloseButton = ({ onClose }: { onClose?: () => void }) => (
+  <RadixDialog.Close asChild>
+    <CrossButton onClick={onClose}>
+      <Icon
+        name="cross"
+        size="lg"
+      />
+    </CrossButton>
+  </RadixDialog.Close>
+);
+
+interface DialogContentProps extends RadixDialog.DialogContentProps {
+  title: string;
+  showClose?: boolean;
+  forceMount?: true;
+  container?: HTMLElement | null;
+  children: ReactNode;
+  onClose?: () => void;
+}
+
+const DialogContent = ({
+  title,
+  children,
+  showClose,
+  onClose,
+  forceMount,
+  container,
+}: DialogContentProps) => {
+  return (
+    <RadixDialog.Portal
+      forceMount={forceMount}
+      container={container}
+    >
+      <DialogOverlay />
+      <ContentArea>
+        <TitleArea>
+          <Title
+            size="xl"
+            type="h2"
+          >
+            {title}
+          </Title>
+          {showClose && <CloseButton onClose={onClose} />}
+        </TitleArea>
+        <Spacer />
+        {children}
+      </ContentArea>
+    </RadixDialog.Portal>
+  );
+};
+
+DialogContent.displayName = "DialogContent";
+Dialog.Content = DialogContent;