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
feat: Preverve AI menu state, make it initially open (#2495)
Ivan Starkov24a3fb4ea0b9
diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsxindex dc2ae1e602..23bfa43555 100644--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx@@ -48,6 +48,7 @@ import { fetchTranscription } from "./ai-fetch-transcription";import { fetchResult } from "./ai-fetch-result";import { useEffectEvent } from "./hooks/effect-event";import { AiApiException, RateLimitException } from "./api-exceptions";+import { useClientSettings } from "~/builder/shared/client-settings";type PartialButtonProps<T = ComponentPropsWithoutRef<typeof Button>> = {[key in keyof T]?: T[key];@@ -56,7 +57,13 @@ type PartialButtonProps<T = ComponentPropsWithoutRef<typeof Button>> = {export const AiCommandBar = ({ isPreviewMode }: { isPreviewMode: boolean }) => {const [value, setValue] = useState("");const [prompts, setPrompts] = useState<string[]>([]);- const [open, setOpen] = useState(false);+ const [clientSettings, setClientSetting, isClientSettingsLoaded] =+ useClientSettings();+ const open = isClientSettingsLoaded && clientSettings.isAiMenuOpen;+ const setOpen = useEffectEvent((value: boolean) =>+ setClientSetting("isAiMenuOpen", value)+ );+const [isAudioTranscribing, setIsAudioTranscribing] = useState(false);const [isAiRequesting, setIsAiRequesting] = useState(false);const abortController = useRef<AbortController>();diff --git a/apps/builder/app/builder/shared/client-settings/config.ts b/apps/builder/app/builder/shared/client-settings/config.tsdeleted file mode 100644index 53284297e4..0000000000--- a/apps/builder/app/builder/shared/client-settings/config.ts+++ /dev/null@@ -1,4 +0,0 @@-export const navigatorLayout = {- defaultValue: "undocked",- values: ["docked", "undocked"],-} as const;diff --git a/apps/builder/app/builder/shared/client-settings/index.ts b/apps/builder/app/builder/shared/client-settings/index.tsindex de0291ddc0..dcf101b0c6 100644--- a/apps/builder/app/builder/shared/client-settings/index.ts+++ b/apps/builder/app/builder/shared/client-settings/index.ts@@ -1,2 +1 @@export * from "./settings";-export * as config from "./config";diff --git a/apps/builder/app/builder/shared/client-settings/settings.ts b/apps/builder/app/builder/shared/client-settings/settings.tsindex a9479cceb4..800789de1b 100644--- a/apps/builder/app/builder/shared/client-settings/settings.ts+++ b/apps/builder/app/builder/shared/client-settings/settings.ts@@ -2,19 +2,17 @@ import { useEffect, useState } from "react";import { atom } from "nanostores";import { useStore } from "@nanostores/react";import { sentryMessage } from "~/shared/sentry";-import * as config from "./config";-type Name = keyof typeof config;-type Value = (typeof config)[Name]["values"][number];-export type Settings = Record<Name, Value>;+import { z } from "zod";-const defaultSettings = (Object.keys(config) as Array<Name>).reduce(- (acc, settingName) => {- acc[settingName] = config[settingName].defaultValue;- return acc;- },- {} as Settings-);+export const zSettings = z.object({+ navigatorLayout: z.enum(["docked", "undocked"]).default("undocked"),+ isAiMenuOpen: z.boolean().default(true),+});++export type Settings = z.infer<typeof zSettings>;++const defaultSettings = zSettings.parse({});const namespace = "__webstudio_user_settings__";@@ -31,8 +29,7 @@ const read = (): Settings => {}try {- // @todo add zod schema- return JSON.parse(settingsString);+ return zSettings.parse(JSON.parse(settingsString));} catch (error) {if (error instanceof Error) {sentryMessage({@@ -53,24 +50,19 @@ const write = (settings: Settings) => {/*** Get a value from local storage or a default.*/-export const getSetting = (name: Name) => {+export const getSetting = <Name extends keyof Settings>(name: Name) => {const settings = read();- const validValues = config[name].values;const value = settings[name];- const isValidValue = value !== undefined && validValues.includes(value);- if (isValidValue) {- return value;- }- return config[name].defaultValue;+ return value;};-export const setSetting = (name: Name, value: Value) => {+export const setSetting = <Name extends keyof Settings>(+ name: Name,+ value: Settings[Name]+) => {const settings = read();- const validValues = config[name].values;- const isValidValue = validValues.includes(value);- if (isValidValue) {- write({ ...settings, [name]: value });- }++ write({ ...settings, [name]: value });};const settingsContainer = atom<Settings>(defaultSettings);@@ -86,7 +78,10 @@ export const useClientSettings = (): [Settings, typeof setSetting, boolean] => {setIsLoaded(true);}, []);- const setSettingValue = (name: Name, value: Value) => {+ const setSettingValue = <Name extends keyof Settings>(+ name: Name,+ value: Settings[Name]+ ) => {if (settings[name] === value) {return;}