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.

Add share dialog to dashboard (#916)

Oleg Isonen438697f2cb93
diff --git a/apps/designer/app/dashboard/dashboard.stories.tsx b/apps/designer/app/dashboard/dashboard.stories.tsx
new file mode 100644
index 0000000000..f2d0fb4af0
--- /dev/null
+++ b/apps/designer/app/dashboard/dashboard.stories.tsx
@@ -0,0 +1,46 @@
+import type { ComponentStory } from "@storybook/react";
+import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { Dashboard } from "./dashboard";
+
+export default {
+ title: "Dashboard / Projects",
+ component: Dashboard,
+};
+
+const user = {
+ id: "0",
+ createdAt: new Date().toString(),
+ email: null,
+ image: null,
+ username: "Taylor",
+ teamId: null,
+};
+
+const createRouter = (element: JSX.Element) =>
+ createBrowserRouter([
+ {
+ path: "*",
+ element,
+ loader: () => null,
+ },
+ ]);
+
+export const Empty: ComponentStory<typeof Dashboard> = () => {
+ const router = createRouter(<Dashboard user={user} projects={[]} />);
+ return <RouterProvider router={router} />;
+};
+
+export const WithProjects: ComponentStory<typeof Dashboard> = () => {
+ const projects = [
+ {
+ id: "0",
+ title: "My Project",
+ domain: "domain.com",
+ userId: null,
+ isDeleted: false,
+ isPublished: false,
+ },
+ ];
+ const router = createRouter(<Dashboard user={user} projects={projects} />);
+ return <RouterProvider router={router} />;
+};
diff --git a/apps/designer/app/dashboard/dashboard.tsx b/apps/designer/app/dashboard/dashboard.tsx
index 0c170c81c0..29a0b29d00 100644
--- a/apps/designer/app/dashboard/dashboard.tsx
+++ b/apps/designer/app/dashboard/dashboard.tsx
@@ -1,4 +1,4 @@
-import { Flex, globalCss, theme, Toaster } from "@webstudio-is/design-system";
+import { Flex, globalCss, theme } from "@webstudio-is/design-system";
import type { DashboardProject } from "@webstudio-is/prisma-client";
import { Header } from "./header";
// eslint-disable-next-line import/no-internal-modules
@@ -35,7 +35,6 @@ export const Dashboard = ({ user, projects }: DashboardProps) => {
<Projects projects={projects} />
</Flex>
</main>
- <Toaster />
</>
);
};
diff --git a/apps/designer/app/dashboard/heading.tsx b/apps/designer/app/dashboard/heading.tsx
deleted file mode 100644
index 1b950d3121..0000000000
--- a/apps/designer/app/dashboard/heading.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Box, theme, css } from "@webstudio-is/design-system";
-import { ComponentProps } from "react";
-
-const variantTagMap = {
- large: "h1",
- small: "h2",
- tiny: "h3",
-} as const;
-
-const headingStyle = css({
- fontFamily: theme.fonts.manrope,
- lineHeight: 1,
- margin: 0,
- variants: {
- variant: {
- large: {
- fontSize: 48,
- fontWeight: 700,
- },
- small: {
- fontSize: theme.deprecatedFontSize[5],
- fontWeight: 700,
- },
- tiny: {
- fontSize: theme.deprecatedFontSize[5],
- fontWeight: 400,
- },
- },
- },
-});
-
-type HeadingProps = ComponentProps<typeof Box> & {
- variant: "large" | "small" | "tiny";
-};
-
-// @todo this thing should be gone and we would just use text component or styles from text component
-export const Heading = (props: HeadingProps) => {
- return (
- <Box
- as={variantTagMap[props.variant]}
- className={headingStyle(props)}
- {...props}
- />
- );
-};
diff --git a/apps/designer/app/dashboard/projects/empty-state.tsx b/apps/designer/app/dashboard/projects/empty-state.tsx
index 7ee2fc97ff..437772fe2e 100644
--- a/apps/designer/app/dashboard/projects/empty-state.tsx
+++ b/apps/designer/app/dashboard/projects/empty-state.tsx
@@ -1,6 +1,5 @@
-import { css, Flex, theme } from "@webstudio-is/design-system";
+import { css, Flex, Text, theme } from "@webstudio-is/design-system";
import { type ComponentProps } from "react";
-import { Heading } from "../heading";
const containerStyle = css({
background: "linear-gradient(180deg, #E63CFE 0%, #FFAE3C 100%)",
@@ -15,7 +14,7 @@ const EmptyStateContainer = (props: ComponentProps<typeof Flex>) => (
align="center"
justify="center"
direction="column"
- gap="3"
+ gap="2"
className={containerStyle()}
{...props}
/>
@@ -23,7 +22,9 @@ const EmptyStateContainer = (props: ComponentProps<typeof Flex>) => (
export const EmptyState = () => (
<EmptyStateContainer>
- <Heading variant="large">What will you create?</Heading>
- <Heading variant="tiny">Start your first project today!</Heading>
+ <Text variant="brandLargeTitle" as="h1">
+ What will you create?
+ </Text>
+ <Text variant="brandRegular">Start your first project today!</Text>
</EmptyStateContainer>
);
diff --git a/apps/designer/app/dashboard/projects/project-card.tsx b/apps/designer/app/dashboard/projects/project-card.tsx
index 0a10eed54d..85e7723c56 100644
--- a/apps/designer/app/dashboard/projects/project-card.tsx
+++ b/apps/designer/app/dashboard/projects/project-card.tsx
@@ -6,7 +6,7 @@ import {
IconButton,
css,
Flex,
- DeprecatedText2,
+ Text,
theme,
} from "@webstudio-is/design-system";
import { MenuIcon } from "@webstudio-is/icons";
@@ -14,7 +14,12 @@ import type { DashboardProject } from "@webstudio-is/prisma-client";
import { KeyboardEvent, useEffect, useRef, useState } from "react";
import { designerPath, getPublishedUrl } from "~/shared/router-utils";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
-import { RenameProject, DeleteProject, useDuplicate } from "./project-dialogs";
+import {
+ RenameProjectDialog,
+ DeleteProjectDialog,
+ useDuplicate,
+ ShareProjectDialog,
+} from "./project-dialogs";
import { ThumbnailLink } from "./thumbnail-link";
const containerStyle = css({
@@ -59,12 +64,12 @@ const PublishedLink = ({
}) => {
const { url } = usePublishedLink({ domain });
return (
- <DeprecatedText2
+ <Text
as="a"
href={url?.href}
target="_blank"
truncate
- color="hint"
+ color="subtle"
tabIndex={tabIndex}
css={{
"&:not(:hover)": {
@@ -73,7 +78,7 @@ const PublishedLink = ({
}}
>
{url?.host}
- </DeprecatedText2>
+ </Text>
);
};
@@ -82,11 +87,13 @@ const Menu = ({
onDelete,
onRename,
onDuplicate,
+ onShare,
}: {
tabIndex: number;
onDelete: () => void;
onRename: () => void;
onDuplicate: () => void;
+ onShare: () => void;
}) => {
const [isOpen, setIsOpen] = useState(false);
return (
@@ -105,7 +112,7 @@ const Menu = ({
<DropdownMenuItem onSelect={onDuplicate}>Duplicate</DropdownMenuItem>
<DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
{isFeatureEnabled("share2") && (
- <DropdownMenuItem>Share</DropdownMenuItem>
+ <DropdownMenuItem onSelect={onShare}>Share</DropdownMenuItem>
)}
<DropdownMenuItem onSelect={onDelete}>Delete</DropdownMenuItem>
</DropdownMenuContent>
@@ -166,6 +173,7 @@ export const ProjectCard = ({
}: ProjectCardProps) => {
const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false);
const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
+ const [isShareDialogOpen, setIsShareDialogOpen] = useState(false);
const { thumbnailRef, handleKeyDown } = useProjectCard();
const handleDuplicate = useDuplicate(id);
@@ -191,13 +199,13 @@ export const ProjectCard = ({
className={footerStyle()}
>
<Flex direction="column" justify="around">
- <DeprecatedText2 variant="title" truncate>
+ <Text variant="title" truncate>
{title}
- </DeprecatedText2>
+ </Text>
{isPublished ? (
<PublishedLink domain={domain} tabIndex={-1} />
) : (
- <DeprecatedText2 color="hint">Not Published</DeprecatedText2>
+ <Text color="subtle">Not Published</Text>
)}
</Flex>
<Menu
@@ -208,27 +216,29 @@ export const ProjectCard = ({
onRename={() => {
setIsRenameDialogOpen(true);
}}
+ onShare={() => {
+ setIsShareDialogOpen(true);
+ }}
onDuplicate={handleDuplicate}
/>
</Flex>
</Flex>
- <RenameProject
+ <RenameProjectDialog
isOpen={isRenameDialogOpen}
+ onOpenChange={setIsRenameDialogOpen}
title={title}
projectId={id}
- onComplete={() => {
- setIsRenameDialogOpen(false);
- }}
- onOpenChange={setIsRenameDialogOpen}
/>
- <DeleteProject
+ <DeleteProjectDialog
isOpen={isDeleteDialogOpen}
+ onOpenChange={setIsDeleteDialogOpen}
title={title}
projectId={id}
- onComplete={() => {
- setIsDeleteDialogOpen(false);
- }}
- onOpenChange={setIsDeleteDialogOpen}
+ />
+ <ShareProjectDialog
+ isOpen={isShareDialogOpen}
+ onOpenChange={setIsShareDialogOpen}
+ projectId={id}
/>
</>
);
diff --git a/apps/designer/app/dashboard/projects/project-dialogs.tsx b/apps/designer/app/dashboard/projects/project-dialogs.tsx
index 0c1a49c0a6..733df24004 100644
--- a/apps/designer/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/designer/app/dashboard/projects/project-dialogs.tsx
@@ -4,8 +4,7 @@ import {
Button,
Flex,
Label,
- DeprecatedParagraph,
- DeprecatedText2,
+ Text,
TextField,
theme,
} from "@webstudio-is/design-system";
@@ -21,8 +20,9 @@ import {
DialogDescription,
} from "./dialog";
import { DashboardProject } from "@webstudio-is/prisma-client";
+import { ShareProjectContainer } from "~/shared/share-project";
-const Content = ({
+const DialogContent = ({
onSubmit,
onChange,
placeholder,
@@ -63,7 +63,7 @@ const Content = ({
>
{description && (
<DialogDescription asChild>
- <DeprecatedParagraph>{description}</DeprecatedParagraph>
+ <Text as="p">{description}</Text>
</DialogDescription>
)}
<Label>{label}</Label>
@@ -77,7 +77,7 @@ const Content = ({
}}
/>
<Box css={{ minHeight: theme.spacing["10"] }}>
- {errors && <DeprecatedText2 color="error">{errors}</DeprecatedText2>}
+ {errors && <Text color="destructive">{errors}</Text>}
</Box>
</Flex>
<DialogActions>
@@ -116,7 +116,7 @@ export const CreateProject = () => {
title="New Project"
trigger={<Button prefix={<PlusIcon />}>New Project</Button>}
>
- <Content
+ <DialogContent
onSubmit={handleSubmit}
errors={errors}
placeholder="New Project"
@@ -129,19 +129,19 @@ export const CreateProject = () => {
const useRenameProject = ({
projectId,
- onComplete,
+ onOpenChange,
}: {
projectId: DashboardProject["id"];
- onComplete: () => void;
+ onOpenChange: (isOpen: boolean) => void;
}) => {
const { send, data, state } = trpc.rename.useMutation();
const errors = data && "errors" in data ? data.errors : undefined;
useEffect(() => {
if (errors === undefined && state === "loading") {
- onComplete();
+ onOpenChange(false);
}
- }, [errors, state, onComplete]);
+ }, [errors, state, onOpenChange]);
const handleSubmit = ({ title }: { title: string }) => {
send({ projectId, title });
@@ -154,26 +154,24 @@ const useRenameProject = ({
};
};
-export const RenameProject = ({
+export const RenameProjectDialog = ({
isOpen,
title,
projectId,
- onComplete,
onOpenChange,
}: {
isOpen: boolean;
title: string;
projectId: DashboardProject["id"];
- onComplete: () => void;
onOpenChange: (isOpen: boolean) => void;
}) => {
const { handleSubmit, errors, state } = useRenameProject({
projectId,
- onComplete,
+ onOpenChange,
});
return (
<Dialog title="Rename" isOpen={isOpen} onOpenChange={onOpenChange}>
- <Content
+ <DialogContent
onSubmit={handleSubmit}
errors={errors}
title={title}
@@ -194,11 +192,11 @@ export const RenameProject = ({
const useDeleteProject = ({
projectId,
title,
- onComplete,
+ onOpenChange,
}: {
projectId: DashboardProject["id"];
title: string;
- onComplete: () => void;
+ onOpenChange: (isOpen: false) => void;
}) => {
const { send, data, state } = trpc.delete.useMutation();
const [isMatch, setIsMatch] = useState(false);
@@ -206,9 +204,9 @@ const useDeleteProject = ({
useEffect(() => {
if (errors === undefined && state === "loading") {
- onComplete();
+ onOpenChange(false);
}
- }, [errors, state, onComplete]);
+ }, [errors, state, onOpenChange]);
const handleSubmit = () => {
send({ projectId });
@@ -227,23 +225,21 @@ const useDeleteProject = ({
};
};
-export const DeleteProject = ({
+export const DeleteProjectDialog = ({
isOpen,
title,
projectId,
- onComplete,
onOpenChange,
}: {
isOpen: boolean;
title: string;
projectId: DashboardProject["id"];
- onComplete: () => void;
onOpenChange: (isOpen: boolean) => void;
}) => {
const { handleSubmit, handleChange, errors, isMatch, state } =
useDeleteProject({
projectId,
- onComplete,
+ onOpenChange,
title,
});
return (
@@ -252,16 +248,16 @@ export const DeleteProject = ({
isOpen={isOpen}
onOpenChange={onOpenChange}
>
- <Content
+ <DialogContent
onSubmit={handleSubmit}
onChange={handleChange}
errors={errors}
label={
<>
Confirm by typing{" "}
- <DeprecatedText2 as="span" color="error" variant="label">
+ <Text as="span" color="destructive" variant="labelSentenceCase">
{title}
- </DeprecatedText2>{" "}
+ </Text>{" "}
below
</>
}
@@ -288,3 +284,19 @@ export const useDuplicate = (projectId: DashboardProject["id"]) => {
send({ projectId });
};
};
+
+export const ShareProjectDialog = ({
+ isOpen,
+ onOpenChange,
+ projectId,
+}: {
+ isOpen: boolean;
+ onOpenChange: (isOpen: boolean) => void;
+ projectId: DashboardProject["id"];
+}) => {
+ return (
+ <Dialog title="Share Project" isOpen={isOpen} onOpenChange={onOpenChange}>
+ <ShareProjectContainer projectId={projectId} />
+ </Dialog>
+ );
+};
diff --git a/apps/designer/app/dashboard/projects/projects.tsx b/apps/designer/app/dashboard/projects/projects.tsx
index b7439587e5..b8a7c320e0 100644
--- a/apps/designer/app/dashboard/projects/projects.tsx
+++ b/apps/designer/app/dashboard/projects/projects.tsx
@@ -1,7 +1,6 @@
-import { Flex } from "@webstudio-is/design-system";
+import { Flex, Text } from "@webstudio-is/design-system";
import { EmptyState } from "./empty-state";
import { Panel } from "./panel";
-import { Heading } from "../heading";
import type { DashboardProject } from "@webstudio-is/prisma-client";
import { ProjectCard } from "./project-card";
import { CreateProject } from "./project-dialogs";
@@ -15,7 +14,9 @@ export const Projects = ({ projects }: ProjectsProps) => {
<Panel>
<Flex direction="column" gap="3">
<Flex justify="between">
- <Heading variant="small">Projects</Heading>
+ <Text variant="brandSectionTitle" as="h2">
+ Projects
+ </Text>
<CreateProject />
</Flex>
{projects.length === 0 && <EmptyState />}
diff --git a/apps/designer/app/designer/designer.tsx b/apps/designer/app/designer/designer.tsx
index b5b2df0404..9f9fc32b62 100644
--- a/apps/designer/app/designer/designer.tsx
+++ b/apps/designer/app/designer/designer.tsx
@@ -32,7 +32,7 @@ import { usePublishShortcuts } from "./shared/shortcuts";
import { useDragAndDropState, useIsPreviewMode } from "~/shared/nano-states";
import { useClientSettings } from "./shared/client-settings";
import { Navigator } from "./features/sidebar-left";
-import { designerUrl, getBuildUrl } from "~/shared/router-utils";
+import { getBuildUrl } from "~/shared/router-utils";
import { useCopyPasteInstance } from "~/shared/copy-paste";
import { AssetsProvider, usePublishAssets } from "./shared/assets";
@@ -303,15 +303,6 @@ export const Designer = ({
css={{ gridArea: "header" }}
project={project}
publish={publish}
- designerUrl={({ authToken, mode }) =>
- designerUrl({
- projectId: project.id,
- pageId: page.id,
- origin: window.location.origin,
- authToken,
- mode,
- })
- }
/>
<Main>
<Workspace onTransitionEnd={onTransitionEnd} publish={publish}>
diff --git a/apps/designer/app/designer/features/topbar/share.tsx b/apps/designer/app/designer/features/topbar/share.tsx
index eef15b0c91..62784f7278 100644
--- a/apps/designer/app/designer/features/topbar/share.tsx
+++ b/apps/designer/app/designer/features/topbar/share.tsx
@@ -5,120 +5,19 @@ import {
FloatingPanelPopoverTitle,
FloatingPanelPopoverTrigger,
theme,
- css,
} from "@webstudio-is/design-system";
-import { useProject } from "../../shared/nano-states";
-import {
- ShareProject,
- LinkOptions,
- type ShareProjectProps,
-} from "~/shared/share-project";
-import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
-import type { AuthorizationTokensRouter } from "@webstudio-is/authorization-token";
-import { authorizationTokenPath } from "~/shared/router-utils";
-import { useEffect } from "react";
-import { useDebouncedCallback } from "use-debounce";
-
-const trpc = createTrpcRemixProxy<AuthorizationTokensRouter>(
- authorizationTokenPath
-);
-
-export type ShareButtonProps = {
- designerUrl: ShareProjectProps["designerUrl"];
-};
-
-const useShareProjectContainer = () => {
- const { data: links, load } = trpc.findMany.useQuery();
- const { send: createToken } = trpc.create.useMutation();
- const { send: removeToken } = trpc.remove.useMutation();
- const { send: updateToken } = trpc.update.useMutation();
-
- const [project] = useProject();
- const projectId = project?.id;
-
- useEffect(() => {
- if (projectId === undefined) {
- return;
- }
-
- load({ projectId });
- }, [load, projectId]);
-
- const handleChangeDebounced = useDebouncedCallback((link: LinkOptions) => {
- if (projectId === undefined) {
- return;
- }
- updateToken({
- projectId: projectId,
- token: link.token,
- relation: link.relation,
- name: link.name,
- });
- }, 100);
-
- const handleDelete = (link: LinkOptions) => {
- if (projectId === undefined) {
- return;
- }
-
- removeToken({ projectId: projectId, token: link.token });
- };
-
- const handleCreate = () => {
- if (projectId === undefined) {
- return;
- }
-
- createToken({
- projectId: projectId,
- relation: "viewers",
- name: "Custom link",
- });
- };
-
- return {
- links,
- handleChangeDebounced,
- handleDelete,
- handleCreate,
- };
-};
-
-/**
- * we place the logic inside Popover so that the fetcher does not exist outside of it.
- * Then remix will not call `trpc.findMany.useQuery` if Popover is closed
- */
-const ShareProjectContainer = ({ designerUrl }: ShareButtonProps) => {
- const {
- links,
- // handleChange,
- handleChangeDebounced,
- handleDelete,
- handleCreate,
- } = useShareProjectContainer();
-
- return (
- <ShareProject
- links={links}
- onChange={handleChangeDebounced}
- onDelete={handleDelete}
- onCreate={handleCreate}
- designerUrl={designerUrl}
- />
- );
-};
-
-const classZIndex = css({ zIndex: theme.zIndices[1] });
+import type { Project } from "@webstudio-is/prisma-client";
+import { ShareProjectContainer } from "~/shared/share-project";
-export const ShareButton = ({ designerUrl }: ShareButtonProps) => {
+export const ShareButton = ({ projectId }: { projectId: Project["id"] }) => {
return (
<FloatingPanelPopover modal>
<FloatingPanelPopoverTrigger asChild>
<Button>Share</Button>
</FloatingPanelPopoverTrigger>
- <FloatingPanelPopoverContent className={classZIndex()}>
- <ShareProjectContainer designerUrl={designerUrl} />
+ <FloatingPanelPopoverContent css={{ zIndex: theme.zIndices[1] }}>
+ <ShareProjectContainer projectId={projectId} />
<FloatingPanelPopoverTitle>Share</FloatingPanelPopoverTitle>
</FloatingPanelPopoverContent>
</FloatingPanelPopover>
diff --git a/apps/designer/app/designer/features/topbar/topbar.tsx b/apps/designer/app/designer/features/topbar/topbar.tsx
index 254fb29895..f04f607ba8 100644
--- a/apps/designer/app/designer/features/topbar/topbar.tsx
+++ b/apps/designer/app/designer/features/topbar/topbar.tsx
@@ -1,7 +1,7 @@
import type { Publish } from "~/shared/pubsub";
import { darkTheme, Flex, type CSS } from "@webstudio-is/design-system";
import { PreviewButton } from "./preview";
-import { ShareButton, type ShareButtonProps } from "./share";
+import { ShareButton } from "./share";
import { PublishButton } from "./publish";
import { SyncStatus } from "./sync-status";
import { Menu } from "./menu";
@@ -14,9 +14,9 @@ type TopbarProps = {
css: CSS;
project: Project;
publish: Publish;
- designerUrl: ShareButtonProps["designerUrl"];
};
-export const Topbar = ({ css, project, publish, designerUrl }: TopbarProps) => {
+
+export const Topbar = ({ css, project, publish }: TopbarProps) => {
return (
<Flex
className={darkTheme}
@@ -56,9 +56,7 @@ export const Topbar = ({ css, project, publish, designerUrl }: TopbarProps) => {
>
<SyncStatus />
<PreviewButton />
- {isFeatureEnabled("share2") && (
- <ShareButton designerUrl={designerUrl} />
- )}
+ {isFeatureEnabled("share2") && <ShareButton projectId={project.id} />}
<PublishButton project={project} />
</Flex>
</Flex>
diff --git a/apps/designer/app/shared/share-project/index.ts b/apps/designer/app/shared/share-project/index.ts
index fb032f9ce3..e225d77e1a 100644
--- a/apps/designer/app/shared/share-project/index.ts
+++ b/apps/designer/app/shared/share-project/index.ts
@@ -1,2 +1 @@
-export { ShareProject as ShareProjectDeprecated } from "./share-project";
-export * from "./share-project";
+export { ShareProjectContainer } from "./share-project-container";
diff --git a/apps/designer/app/shared/share-project/share-project-container.tsx b/apps/designer/app/shared/share-project/share-project-container.tsx
new file mode 100644
index 0000000000..3ac484d4a2
--- /dev/null
+++ b/apps/designer/app/shared/share-project/share-project-container.tsx
@@ -0,0 +1,95 @@
+import { ShareProject, LinkOptions } from "./share-project";
+import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
+import type { AuthorizationTokensRouter } from "@webstudio-is/authorization-token";
+import { authorizationTokenPath, designerUrl } from "~/shared/router-utils";
+import { useEffect } from "react";
+import { useDebouncedCallback } from "use-debounce";
+import { Project } from "@webstudio-is/prisma-client";
+
+const trpc = createTrpcRemixProxy<AuthorizationTokensRouter>(
+ authorizationTokenPath
+);
+
+const useShareProjectContainer = (projectId: Project["id"]) => {
+ const { data: links, load } = trpc.findMany.useQuery();
+ const { send: createToken } = trpc.create.useMutation();
+ const { send: removeToken } = trpc.remove.useMutation();
+ const { send: updateToken } = trpc.update.useMutation();
+
+ useEffect(() => {
+ if (projectId === undefined) {
+ return;
+ }
+
+ load({ projectId });
+ }, [load, projectId]);
+
+ const handleChangeDebounced = useDebouncedCallback((link: LinkOptions) => {
+ if (projectId === undefined) {
+ return;
+ }
+ updateToken({
+ projectId: projectId,
+ token: link.token,
+ relation: link.relation,
+ name: link.name,
+ });
+ }, 100);
+
+ const handleDelete = (link: LinkOptions) => {
+ if (projectId === undefined) {
+ return;
+ }
+
+ removeToken({ projectId: projectId, token: link.token });
+ };
+
+ const handleCreate = () => {
+ if (projectId === undefined) {
+ return;
+ }
+
+ createToken({
+ projectId: projectId,
+ relation: "viewers",
+ name: "Custom link",
+ });
+ };
+
+ return {
+ links,
+ handleChangeDebounced,
+ handleDelete,
+ handleCreate,
+ };
+};
+
+type ShareButtonProps = {
+ projectId: Project["id"];
+};
+
+/**
+ * we place the logic inside Popover so that the fetcher does not exist outside of it.
+ * Then remix will not call `trpc.findMany.useQuery` if Popover is closed
+ */
+export const ShareProjectContainer = ({ projectId }: ShareButtonProps) => {
+ const { links, handleChangeDebounced, handleDelete, handleCreate } =
+ useShareProjectContainer(projectId);
+
+ return (
+ <ShareProject
+ links={links}
+ onChange={handleChangeDebounced}
+ onDelete={handleDelete}
+ onCreate={handleCreate}
+ designerUrl={({ authToken, mode }) =>
+ designerUrl({
+ projectId,
+ origin: window.location.origin,
+ authToken,
+ mode,
+ })
+ }
+ />
+ );
+};
diff --git a/apps/designer/app/shared/share-project/share-project.tsx b/apps/designer/app/shared/share-project/share-project.tsx
index 45fd664677..c98b7031ad 100644
--- a/apps/designer/app/shared/share-project/share-project.tsx
+++ b/apps/designer/app/shared/share-project/share-project.tsx
@@ -206,7 +206,7 @@ const SharedLinkItem = ({
);
};
-export type ShareProjectProps = {
+type ShareProjectProps = {
links?: Array<LinkOptions>;
onChange: (link: LinkOptions) => void;
onDelete: (link: LinkOptions) => void;