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.

Use pending state on button in Share panel (#2248)

Ivan Starkov905b8287f375
diff --git a/apps/builder/app/shared/share-project/share-project-container.tsx b/apps/builder/app/shared/share-project/share-project-container.tsx
index 7927fcf2e0..1135a4e5e9 100644
--- a/apps/builder/app/shared/share-project/share-project-container.tsx
+++ b/apps/builder/app/shared/share-project/share-project-container.tsx
@@ -11,10 +11,10 @@ const trpc = createTrpcRemixProxy<AuthorizationTokensRouter>(
);
const useShareProjectContainer = (projectId: Project["id"]) => {
- const { data, load } = trpc.findMany.useQuery();
- const { send: createToken } = trpc.create.useMutation();
- const { send: removeToken } = trpc.remove.useMutation();
- const { send: updateToken } = trpc.update.useMutation();
+ const { data, load, state: loadState } = trpc.findMany.useQuery();
+ const { send: createToken, state: createState } = trpc.create.useMutation();
+ const { send: removeToken, state: removeState } = trpc.remove.useMutation();
+ const { send: updateToken, state: updateState } = trpc.update.useMutation();
const [links, setLinks] = useState(data ?? []);
useEffect(() => {
@@ -48,6 +48,11 @@ const useShareProjectContainer = (projectId: Project["id"]) => {
if (projectId === undefined) {
return;
}
+ const updatedLinks = links.filter((currentLink) => {
+ return currentLink.token !== link.token;
+ });
+
+ setLinks(updatedLinks);
removeToken({ projectId: projectId, token: link.token });
};
@@ -64,11 +69,18 @@ const useShareProjectContainer = (projectId: Project["id"]) => {
});
};
+ const isPending =
+ loadState !== "idle" ||
+ createState !== "idle" ||
+ removeState !== "idle" ||
+ updateState !== "idle";
+
return {
links,
handleChangeDebounced,
handleDelete,
handleCreate,
+ isPending,
};
};
@@ -81,8 +93,13 @@ type ShareButtonProps = {
* Then remix will not call `trpc.findMany.useQuery` if Popover is closed
*/
export const ShareProjectContainer = ({ projectId }: ShareButtonProps) => {
- const { links, handleChangeDebounced, handleDelete, handleCreate } =
- useShareProjectContainer(projectId);
+ const {
+ links,
+ handleChangeDebounced,
+ handleDelete,
+ handleCreate,
+ isPending,
+ } = useShareProjectContainer(projectId);
return (
<ShareProject
@@ -90,6 +107,7 @@ export const ShareProjectContainer = ({ projectId }: ShareButtonProps) => {
onChange={handleChangeDebounced}
onDelete={handleDelete}
onCreate={handleCreate}
+ isPending={isPending}
builderUrl={({ authToken, mode }) =>
builderUrl({
projectId,
diff --git a/apps/builder/app/shared/share-project/share-project.stories.tsx b/apps/builder/app/shared/share-project/share-project.stories.tsx
index 1991e5810f..82f30e7126 100644
--- a/apps/builder/app/shared/share-project/share-project.stories.tsx
+++ b/apps/builder/app/shared/share-project/share-project.stories.tsx
@@ -85,6 +85,7 @@ export const Empty: ComponentStory<typeof ShareProject> = () => {
<FloatingPanelPopoverContent>
<ShareProject
{...props}
+ isPending={false}
builderUrl={({ authToken, mode }) =>
`https://blabla.com/${authToken}/${mode}`
}
@@ -105,6 +106,7 @@ export const WithLinks: ComponentStory<typeof ShareProject> = () => {
<FloatingPanelPopoverContent>
<ShareProject
{...props}
+ isPending={false}
builderUrl={({ authToken, mode }) =>
`https://blabla.com/${authToken}/${mode}`
}
@@ -125,6 +127,7 @@ export const WithAsyncLinks: ComponentStory<typeof ShareProject> = () => {
<FloatingPanelPopoverContent>
<ShareProject
{...props}
+ isPending={false}
builderUrl={({ authToken, mode }) =>
`https://blabla.com/${authToken}/${mode}`
}
diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsx
index 6c08f7b5eb..9851e02d20 100644
--- a/apps/builder/app/shared/share-project/share-project.tsx
+++ b/apps/builder/app/shared/share-project/share-project.tsx
@@ -228,6 +228,7 @@ type ShareProjectProps = {
onDelete: (link: LinkOptions) => void;
onCreate: () => void;
builderUrl: SharedLinkItemType["builderUrl"];
+ isPending: boolean;
};
const animateCollapsibleHeight = keyframes({
@@ -253,6 +254,7 @@ export const ShareProject = ({
onDelete,
onCreate,
builderUrl,
+ isPending,
}: ShareProjectProps) => {
const items = links.map((link) => (
<Fragment key={link.token}>
@@ -277,7 +279,10 @@ export const ShareProject = ({
<Box className={itemStyle({ css: { py: theme.spacing["9"] } })}>
<Button
color="neutral"
- prefix={<PlusIcon />}
+ state={isPending ? "pending" : undefined}
+ prefix={
+ isPending ? <Flex css={{ width: theme.spacing[9] }} /> : <PlusIcon />
+ }
onClick={() => {
onCreate();
}}