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
fix: AI Command Bar improvements (#2480)
Ivan Starkov03118d68d63d
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 6ea5a013db..cb1db7b8e7 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -321,8 +321,8 @@ export const Builder = ({}}/></Workspace>- {isFeatureEnabled("ai") && isPreviewMode === false && (- <AiCommandBar />+ {isFeatureEnabled("ai") && (+ <AiCommandBar isPreviewMode={isPreviewMode} />)}</Main><SidePanel gridArea="sidebar" isPreviewMode={isPreviewMode}>diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsxindex 9258f58356..c27d777d25 100644--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx@@ -48,7 +48,7 @@ type PartialButtonProps<T = ComponentPropsWithoutRef<typeof Button>> = {[key in keyof T]?: T[key];};-export const AiCommandBar = () => {+export const AiCommandBar = ({ isPreviewMode }: { isPreviewMode: boolean }) => {const [value, setValue] = useState("");const [prompts, setPrompts] = useState<string[]>([]);const [open, setOpen] = useState(false);@@ -151,6 +151,10 @@ export const AiCommandBar = () => {},});+ if (isPreviewMode) {+ return;+ }+const handleAiRequest = async (prompt: string) => {if (abortController.current) {if (abortController.current.signal.aborted === false) {@@ -175,7 +179,7 @@ export const AiCommandBar = () => {return;}- setPrompts((previousPrompts) => [...previousPrompts, prompt]);+ setPrompts((previousPrompts) => [prompt, ...previousPrompts]);setValue("");} catch (error) {@@ -220,6 +224,9 @@ export const AiCommandBar = () => {};const handleAiButtonClick = () => {+ if (value.trim().length === 0) {+ return;+ }handleAiRequest(value);};@@ -242,10 +249,9 @@ export const AiCommandBar = () => {let recordButtonIcon = <MicIcon />;let recordButtonDisabled = false;- let aiButtonDisabled = value.length === 0;- let aiButtonTooltip: string | undefined = aiButtonDisabled- ? undefined- : "Generate AI results";+ let aiButtonDisabled = false;+ let aiButtonTooltip: string | undefined =+ value.length === 0 ? undefined : "Generate AI results";let aiButtonPending = false;let aiIcon = <AiIcon />;@@ -278,7 +284,6 @@ export const AiCommandBar = () => {textAreaDisabled = true;recordButtonTooltipContent = "Cancel";- recordButtonColor = "neutral";recordButtonProps = {onClick: (event: MouseEvent<HTMLButtonElement>) => {// Cancel AI request@@ -392,7 +397,9 @@ const CommandBarContent = (props: {prompts: string[];onPromptClick: (value: string) => void;}) => {- const shortcutText = "⌘⇧Q";+ // @todo enable when we will have shortcut+ // const shortcutText = "⌘⇧Q";+return (<><CommandBarContentSection>@@ -402,13 +409,13 @@ const CommandBarContent = (props: {color={"subtle"}css={{ visibility: "hidden" }}>- {shortcutText}+ {/* shortcutText */}</Text><Text variant={"labelsSentenceCase"} align={"center"}>Welcome to Webstudio AI alpha!</Text><Text variant={"labelsSentenceCase"} color={"subtle"}>- {shortcutText}+ {/* shortcutText */}</Text></Flex><div />@@ -417,15 +424,45 @@ const CommandBarContent = (props: {<br />For example you can say: ”Make a new contact section”</Text>+{/* @todo: change color on theme when available */}<Text variant={"labelsSentenceCase"} css={{ color: "#828486" }}>- Powered by ChatGPT - By using Webstudio AI, you consent to OpenAI- storing interactions without personal data.+ This is an experimental (alpha) feature so results may vary in+ quality. Consider sharing your feedback to help us improve.+ </Text>+ <Text variant={"labelsSentenceCase"} css={{ color: "#828486" }}>+ By using Webstudio AI, you consent to OpenAI storing interactions+ without personal data.</Text><div />- <Button color="dark" suffix={<ExternalLinkIcon />}>- Learn more- </Button>+ <Grid columns={2} gap={2}>+ <Button+ onClick={(event) => {+ // @todo: Link must be changed+ const url = new URL(+ `https://github.com/webstudio-is/webstudio-community/discussions/new?category=q-a&labels=AI`+ );+ window.open(url.href, "_blank");+ }}+ color="dark"+ suffix={<ExternalLinkIcon />}+ >+ Learn more+ </Button>+ <Button+ onClick={(event) => {+ // @todo: Link must be changed+ const url = new URL(+ `https://github.com/webstudio-is/webstudio-community/discussions/new?category=q-a&labels=AI`+ );+ window.open(url.href, "_blank");+ }}+ color="dark"+ suffix={<ExternalLinkIcon />}+ >+ Share feedback+ </Button>+ </Grid></CommandBarContentSection>{props.prompts.length > 0 && (@@ -439,15 +476,26 @@ const CommandBarContent = (props: {<div />{/* negative then positive margin is used to preserve focus outline on command prompts */}- <ScrollArea css={{ maxHeight: theme.spacing[29], margin: -4 }}>- <Grid gap={2} css={{ margin: 4 }}>+ <ScrollArea+ css={{+ maxHeight: theme.spacing[29],+ margin: -4,+ marginRight: -14,+ }}+ >+ <Grid gap={2} css={{ margin: 4, marginRight: 14 }}>{props.prompts.map((prompt, index) => (- <CommandBarContentPrompt+ <Tooltipkey={index}- onClick={() => props.onPromptClick(prompt)}+ side="top"+ content={"Click to add prompt to input"}>- {prompt}- </CommandBarContentPrompt>+ <CommandBarContentPrompt+ onClick={() => props.onPromptClick(prompt)}+ >+ {prompt}+ </CommandBarContentPrompt>+ </Tooltip>))}</Grid></ScrollArea>diff --git a/packages/design-system/src/components/ai-command-bar/command-bar.tsx b/packages/design-system/src/components/ai-command-bar/command-bar.tsxindex ea383cda96..d3d5265d89 100644--- a/packages/design-system/src/components/ai-command-bar/command-bar.tsx+++ b/packages/design-system/src/components/ai-command-bar/command-bar.tsx@@ -100,15 +100,20 @@ const CommandBarContentPromptText = styled("span", {whiteSpace: "break-spaces",});-export const CommandBarContentPrompt = (props: {- children: ReactNode;- onClick?: () => void;-}) => {+export const CommandBarContentPrompt = forwardRef<+ HTMLButtonElement,+ {+ children: ReactNode;+ onClick?: () => void;+ }+>((props, ref) => {return (- <CommandBarContentPromptStyled color="dark" onClick={props.onClick}>+ <CommandBarContentPromptStyled ref={ref} color="dark" {...props}><CommandBarContentPromptText>{props.children}</CommandBarContentPromptText></CommandBarContentPromptStyled>);-};+});++CommandBarContentPrompt.displayName = "CommandBarContentPrompt";