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.

Share UI improvements (#1029)

Oleg Isonenf71cc3facb98
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 07a0790abb..2725f688ae 100644
--- a/apps/builder/app/shared/share-project/share-project-container.tsx
+++ b/apps/builder/app/shared/share-project/share-project-container.tsx
@@ -2,7 +2,7 @@ import { ShareProject, LinkOptions } from "./share-project";
import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
import type { AuthorizationTokensRouter } from "@webstudio-is/authorization-token";
import { authorizationTokenPath, builderUrl } from "~/shared/router-utils";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
import { useDebouncedCallback } from "use-debounce";
import type { Project } from "@webstudio-is/prisma-client";
@@ -11,11 +11,11 @@ const trpc = createTrpcRemixProxy<AuthorizationTokensRouter>(
);
const useShareProjectContainer = (projectId: Project["id"]) => {
- const { data: links, load } = trpc.findMany.useQuery();
+ 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 [links, setLinks] = useState(data ?? []);
useEffect(() => {
if (projectId === undefined) {
return;
@@ -24,16 +24,29 @@ const useShareProjectContainer = (projectId: Project["id"]) => {
load({ projectId });
}, [load, projectId]);
+ useEffect(() => {
+ setLinks(data ?? []);
+ }, [data, setLinks]);
+
const handleChangeDebounced = useDebouncedCallback((link: LinkOptions) => {
if (projectId === undefined) {
return;
}
- updateToken({
+ const updatedLink = {
projectId: projectId,
token: link.token,
relation: link.relation,
name: link.name,
+ };
+ const updatedLinks = links.map((currentLink) => {
+ if (currentLink.token === updatedLink.token) {
+ return { ...currentLink, ...updatedLink };
+ }
+ return currentLink;
});
+ // Optimistically set the links, otherwise checkbox will not move until we fetch an updated list.
+ setLinks(updatedLinks);
+ updateToken(updatedLink);
}, 100);
const handleDelete = (link: LinkOptions) => {
@@ -83,7 +96,7 @@ export const ShareProjectContainer = ({ projectId }: ShareButtonProps) => {
onDelete={handleDelete}
onCreate={handleCreate}
builderUrl={({ authToken, mode }) =>
- builderUrl({
+ builderUrl({
projectId,
origin: window.location.origin,
authToken,
diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsx
index 4694175228..256fad26bc 100644
--- a/apps/builder/app/shared/share-project/share-project.tsx
+++ b/apps/builder/app/shared/share-project/share-project.tsx
@@ -4,9 +4,9 @@ import {
css,
Flex,
Label,
- DeprecatedPopover,
- DeprecatedPopoverContent,
- DeprecatedPopoverTrigger,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
rawTheme,
Separator,
Switch,
@@ -69,6 +69,7 @@ const Menu = ({
onChangeName,
onDelete,
}: MenuProps) => {
+ const [isOpen, setIsOpen] = useState(false);
const handleCheckedChange = (relation: Relation) => (checked: boolean) => {
if (checked) {
onChangePermission(relation);
@@ -76,15 +77,15 @@ const Menu = ({
};
return (
- <DeprecatedPopover>
- <DeprecatedPopoverTrigger asChild>
+ <Popover open={isOpen} onOpenChange={setIsOpen}>
+ <PopoverTrigger asChild>
<Button
prefix={<MenuIcon />}
color="ghost"
aria-label="Menu Button for options"
></Button>
- </DeprecatedPopoverTrigger>
- <DeprecatedPopoverContent>
+ </PopoverTrigger>
+ <PopoverContent css={{ zIndex: theme.zIndices[1] }}>
<Item>
<Label>Name</Label>
<TextField
@@ -93,6 +94,11 @@ const Menu = ({
onChange={(event) => {
onChangeName(event.target.value);
}}
+ onKeyDown={(event) => {
+ if (event.key === "Enter") {
+ setIsOpen(false);
+ }
+ }}
/>
</Item>
<Separator />
@@ -133,8 +139,8 @@ const Menu = ({
Delete Link
</Button>
</Item>
- </DeprecatedPopoverContent>
- </DeprecatedPopover>
+ </PopoverContent>
+ </Popover>
);
};
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index f661818c5d..d40b99fed9 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -14,6 +14,7 @@ export * from "./components/dropdown-menu";
export * from "./components/icon-button"; // mostly aligned, but needs a demo and to use tokens
export * from "./components/dialog";
export * from "./components/floating-panel-popover";
+export * from "./components/popover";
export { MenuItemButton } from "./components/menu";
export * from "./components/switch";
export * from "./components/toolbar";