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: Implement cmd+enter shortcut to focus style source input (#5045)
Oleg Isonenb68fcf04628e
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 6041f456db..080121adc6 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -13,7 +13,7 @@ import {useSyncServer,} from "./shared/sync/sync-server";import { SidebarLeft } from "./sidebar-left";-import { Inspector } from "./features/inspector";+import { Inspector } from "./inspector";import { Topbar } from "./features/topbar";import { Footer } from "./features/footer";import {diff --git a/apps/builder/app/builder/features/inspector/index.ts b/apps/builder/app/builder/features/inspector/index.tsdeleted file mode 100644index 03389bb90d..0000000000--- a/apps/builder/app/builder/features/inspector/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./inspector";diff --git a/apps/builder/app/builder/features/style-panel/style-panel.tsx b/apps/builder/app/builder/features/style-panel/style-panel.tsxindex 6a7cf91f77..c7b3e5b248 100644--- a/apps/builder/app/builder/features/style-panel/style-panel.tsx+++ b/apps/builder/app/builder/features/style-panel/style-panel.tsx@@ -1,5 +1,5 @@import { useState } from "react";-import { computed } from "nanostores";+import { computed, type WritableAtom } from "nanostores";import { useStore } from "@nanostores/react";import {theme,@@ -115,7 +115,11 @@ export const ModeMenu = () => {);};-export const StylePanel = () => {+export const StylePanel = ({+ $styleSourceInputElement,+}: {+ $styleSourceInputElement: WritableAtom<HTMLInputElement | undefined>;+}) => {const { stylePanelMode } = useStore($settings);const selectedInstanceRenderState = useStore($selectedInstanceRenderState);const tag = useStore($selectedInstanceTag);@@ -164,7 +168,9 @@ export const StylePanel = () => {<Text variant="titles" css={{ paddingBlock: theme.panel.paddingBlock }}>Style Sources</Text>- <StyleSourcesSection />+ <StyleSourcesSection+ $styleSourceInputElement={$styleSourceInputElement}+ /></Box><Separator /><ScrollArea>diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsxindex 96963ae012..28b4ef735a 100644--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx@@ -1,7 +1,7 @@import { useState } from "react";import { useStore } from "@nanostores/react";import { nanoid } from "nanoid";-import { computed } from "nanostores";+import { computed, type WritableAtom } from "nanostores";import {type Instance,type StyleSource,@@ -369,7 +369,11 @@ const $availableStyleSources = computed([$styleSources], (styleSources) => {return availableStylesSources;});-export const StyleSourcesSection = () => {+export const StyleSourcesSection = ({+ $styleSourceInputElement,+}: {+ $styleSourceInputElement: WritableAtom<HTMLInputElement | undefined>;+}) => {const componentStates = useStore($componentStates);const availableStyleSources = useStore($availableStyleSources);const selectedInstanceStyleSources = useStore($selectedInstanceStyleSources);@@ -402,6 +406,7 @@ export const StyleSourcesSection = () => {return (<><StyleSourceInput+ $styleSourceInputElement={$styleSourceInputElement}error={error}items={availableStyleSources}value={value}diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsxindex 816126b15e..1fbd44c6b3 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx@@ -2,6 +2,7 @@ import { nanoid } from "nanoid";import type { StoryFn } from "@storybook/react";import { useState } from "react";import { type ItemSelector, type ItemSource, StyleSourceInput } from ".";+import { atom } from "nanostores";export default {component: StyleSourceInput,@@ -67,6 +68,7 @@ export const Basic: StoryFn<typeof StyleSourceInput> = () => {const [value, setValue] = useState([localItem, ...getItems()]);return (<StyleSourceInput+ $styleSourceInputElement={atom()}css={{ width: 300 }}items={getItems()}value={value}@@ -98,6 +100,7 @@ export const WithTruncatedItem: StoryFn<typeof StyleSourceInput> = () => {]);return (<StyleSourceInput+ $styleSourceInputElement={atom()}css={{ width: 300 }}items={getItems()}value={value}@@ -135,6 +138,7 @@ export const Complete: StoryFn<typeof StyleSourceInput> = () => {return (<StyleSourceInput+ $styleSourceInputElement={atom()}css={{ width: 300 }}items={getItems()}value={value}diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsxindex 5d8b35cacd..20134d9ff2 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx@@ -63,6 +63,7 @@ import { StyleSourceBadge } from "./style-source-badge";import { humanizeString } from "~/shared/string-utils";import { $computedStyleDeclarations } from "../shared/model";import type { ComputedStyleDecl } from "~/shared/style-object-model";+import type { WritableAtom } from "nanostores";type IntermediateItem = {id: StyleSource["id"];@@ -220,8 +221,7 @@ const TextFieldBase: ForwardRefRenderFunction<size="1"value={label}onClick={onClick}- ref={inputRef}- inputRef={internalInputRef}+ inputRef={mergeRefs(internalInputRef, inputRef)}spellCheck={false}aria-label="New Style Source Input"/>@@ -269,6 +269,7 @@ const TextField = forwardRef(TextFieldBase);TextField.displayName = "TextField";type StyleSourceInputProps<Item extends IntermediateItem> = {+ $styleSourceInputElement: WritableAtom<HTMLInputElement | undefined>;error?: StyleSourceError;items?: Array<Item>;value?: Array<Item>;@@ -554,6 +555,9 @@ export const StyleSourceInput = (<TextField// @todo inputProps is any which breaks all types passed to TextField{...inputProps}+ inputRef={(element) =>+ props.$styleSourceInputElement.set(element ?? undefined)+ }error={props.error}renderStyleSourceMenuItems={(item, hasStyles) =>renderMenuItems({diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/inspector.tsxsimilarity index 97%rename from apps/builder/app/builder/features/inspector/inspector.tsxrename to apps/builder/app/builder/inspector.tsxindex 4e60951144..63aa09dc6d 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/inspector.tsx@@ -36,6 +36,7 @@ import {$selectedInstanceKey,$selectedPage,} from "~/shared/awareness";+import { $styleSourceInputElement } from "./shared/commands";const InstanceInfo = ({ instance }: { instance: Instance }) => {const metas = useStore($registeredComponentMetas);@@ -178,7 +179,9 @@ export const Inspector = ({ navigatorLayout }: InspectorProps) => {<InstanceInfo instance={selectedInstance} /><ModeMenu /></Flex>- <StylePanel />+ <StylePanel+ $styleSourceInputElement={$styleSourceInputElement}+ /></PanelTabsContent><PanelTabsContentvalue="settings"diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex b73d46d272..6ce296d3df 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -43,6 +43,9 @@ import {} from "~/shared/matcher";import { getSetting, setSetting } from "./client-settings";import { findAvailableVariables } from "~/shared/data-variables";+import { atom } from "nanostores";++export const $styleSourceInputElement = atom<HTMLInputElement | undefined>();const makeBreakpointCommand = <CommandName extends string>(name: CommandName,@@ -350,6 +353,23 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({},disableOnInputLikeControls: true,},+ {+ name: "focusStyleSources",+ defaultHotkeys: ["meta+enter"],+ handler: () => {+ if ($isDesignMode.get() === false) {+ builderApi.toast.info(+ "Style panel is only available in design mode."+ );+ return;+ }+ $activeInspectorPanel.set("style");+ requestAnimationFrame(() => {+ $styleSourceInputElement.get()?.focus();+ });+ },+ disableOnInputLikeControls: true,+ },{name: "toggleStylePanelFocusMode",defaultHotkeys: ["alt+shift+s"],