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
Update inspector panels design (#1680)
Bogdan Chadkin5f15ef7e48b1
diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex f00234f414..787efe5429 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -1,7 +1,9 @@import { useRef, useState } from "react";import { useStore } from "@nanostores/react";-import type { Publish } from "~/shared/pubsub";+import type { Instance } from "@webstudio-is/project-build";+import { getComponentMeta } from "@webstudio-is/react-sdk";import {+ theme,PanelTabs,PanelTabsList,PanelTabsTrigger,@@ -11,15 +13,43 @@ import {Box,EnhancedTooltipProvider,Flex,+ ScrollArea,} from "@webstudio-is/design-system";+import type { Publish } from "~/shared/pubsub";import { StylePanel } from "~/builder/features/style-panel";import { PropsPanelContainer } from "~/builder/features/props-panel";import { FloatingPanelProvider } from "~/builder/shared/floating-panel";-import { theme } from "@webstudio-is/design-system";import { selectedInstanceStore, isDraggingStore } from "~/shared/nano-states";import { SettingsPanel } from "../settings-panel";import { NavigatorTree } from "~/builder/shared/navigator-tree";import type { Settings } from "~/builder/shared/client-settings";+import { MetaIcon } from "~/builder/shared/meta-icon";+import { getInstanceLabel } from "~/builder/shared/tree";++const InstanceInfo = ({ instance }: { instance: Instance }) => {+ const componentMeta = getComponentMeta(instance.component);+ if (componentMeta === undefined) {+ return null;+ }+ const label = getInstanceLabel(instance, componentMeta);+ return (+ <Flex+ shrink="false"+ gap="1"+ align="center"+ css={{+ px: theme.spacing[9],+ height: theme.spacing[13],+ color: theme.colors.foregroundSubtle,+ }}+ >+ <MetaIcon icon={componentMeta.icon} />+ <Text truncate variant="labelsSentenceCase">+ {label}+ </Text>+ </Flex>+ );+};type InspectorProps = {publish: Publish;@@ -80,20 +110,29 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {<PanelTabsTrigger value="settings">Settings</PanelTabsTrigger></PanelTabsList><PanelTabsContent value="style" css={contentStyle} tabIndex={-1}>+ <InstanceInfo instance={selectedInstance} /><StylePanelpublish={publish}selectedInstance={selectedInstance}/></PanelTabsContent><PanelTabsContent value="props" css={contentStyle} tabIndex={-1}>- <PropsPanelContainer- publish={publish}- key={selectedInstance.id /* Re-render when instance changes */}- selectedInstance={selectedInstance}- />+ <ScrollArea>+ <InstanceInfo instance={selectedInstance} />+ <PropsPanelContainer+ publish={publish}+ key={+ selectedInstance.id /* Re-render when instance changes */+ }+ selectedInstance={selectedInstance}+ />+ </ScrollArea></PanelTabsContent><PanelTabsContent value="settings" css={contentStyle} tabIndex={-1}>- <SettingsPanel />+ <ScrollArea>+ <InstanceInfo instance={selectedInstance} />+ <SettingsPanel />+ </ScrollArea></PanelTabsContent></Flex></PanelTabs>diff --git a/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx b/apps/builder/app/builder/features/props-panel/props-panel.stories.tsxindex bb5b52a736..f4070733c6 100644--- a/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx+++ b/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx@@ -1,5 +1,4 @@import { useState } from "react";-import { ButtonElementIcon } from "@webstudio-is/icons/svg";import { PropsPanel } from "./props-panel";import { usePropsLogic } from "./use-props-logic";import {@@ -11,10 +10,7 @@ import {} from "~/shared/nano-states";import { setMockEnv } from "~/shared/env";import type { Instance, Prop } from "@webstudio-is/project-build";-import type {- WsComponentMeta,- WsComponentPropsMeta,-} from "@webstudio-is/react-sdk";+import type { WsComponentPropsMeta } from "@webstudio-is/react-sdk";import { textVariants } from "@webstudio-is/design-system";import type { Asset } from "@webstudio-is/asset-uploader";// eslint-disable-next-line import/no-internal-modules@@ -195,13 +191,6 @@ const checkProp = (options = defaultOptions, label?: string): PropMeta => ({label,});-const componentMeta: WsComponentMeta = {- category: "general",- type: "rich-text",- label: "Button",- icon: ButtonElementIcon,-};-const componentPropsMeta: WsComponentPropsMeta = {props: {initialText: textProp(),@@ -396,8 +385,6 @@ export const Story = () => {instanceId={instanceId}propsLogic={logic}component="Button"- instanceLabel="My Button"- componentMeta={componentMeta}setCssProperty={() => () => undefined}/></div>diff --git a/apps/builder/app/builder/features/props-panel/props-panel.tsx b/apps/builder/app/builder/features/props-panel/props-panel.tsxindex 11e5a40f41..d5422518fe 100644--- a/apps/builder/app/builder/features/props-panel/props-panel.tsx+++ b/apps/builder/app/builder/features/props-panel/props-panel.tsx@@ -11,16 +11,10 @@ import {ComboboxListboxItem,Separator,Flex,- Text,type CSS,- ScrollArea,InputField,NestedInputButton,} from "@webstudio-is/design-system";-import {- type WsComponentMeta,- getComponentMeta,-} from "@webstudio-is/react-sdk";import type { Publish } from "~/shared/pubsub";import {propsStore,@@ -40,8 +34,6 @@ import {} from "./use-props-logic";import { getLabel } from "./shared";import { useState, type ReactNode } from "react";-import { getInstanceLabel } from "~/builder/shared/tree";-import { MetaIcon } from "~/builder/shared/meta-icon";const itemToString = (item: NameAndLabel | null) =>item ? getLabel(item, item.name) : "";@@ -52,25 +44,6 @@ const Row = ({ children, css }: { children: ReactNode; css?: CSS }) => (</Flex>);-const InstanceInfo = ({- meta,- label,-}: {- label: string;- meta: WsComponentMeta;-}) => (- <Flex- gap="1"- css={{ height: theme.spacing[13], color: theme.colors.foregroundSubtle }}- align="center"- >- <MetaIcon icon={meta.icon} />- <Text truncate variant="labelsSentenceCase">- {label}- </Text>- </Flex>-);-const PropsCombobox = ({items,onItemSelect,@@ -175,32 +148,21 @@ const AddPropertyForm = ({type PropsPanelProps = {propsLogic: ReturnType<typeof usePropsLogic>;component: Instance["component"];- instanceLabel: string;instanceId: string;- componentMeta: WsComponentMeta;setCssProperty: SetCssProperty;};// A UI componet with minimum logic that can be demoed in Storybook etc.export const PropsPanel = (props: PropsPanelProps) => {- const { propsLogic: logic, instanceLabel, componentMeta } = props;+ const { propsLogic: logic } = props;const [addingProp, setAddingProp] = useState(false);const hasAddedProps = logic.addedProps.length > 0 || addingProp;return (- <ScrollArea css={{ paddingTop: theme.spacing[3] }}>- <Row>- <InstanceInfo meta={componentMeta} label={instanceLabel} />- </Row>-- <Row- css={{- paddingTop: theme.spacing[3],- paddingBottom: theme.spacing[5],- }}- >+ <>+ <Row css={{ py: theme.spacing[5] }}>{logic.systemProps.map((item) => renderProperty(props, item))}</Row>@@ -240,7 +202,7 @@ export const PropsPanel = (props: PropsPanelProps) => {</Flex>)}</CollapsibleSectionWithAddButton>- </ScrollArea>+ </>);};@@ -258,11 +220,6 @@ export const PropsPanelContainer = ({throw new Error(`Could not get meta for compoent "${instance.component}"`);}- const componentMeta = getComponentMeta(instance.component);- if (componentMeta === undefined) {- throw new Error(`Could not get meta for compoent "${instance.component}"`);- }-const { setProperty: setCssProperty } = useStyleData({selectedInstance: instance,publish,@@ -284,15 +241,11 @@ export const PropsPanelContainer = ({},});- const instanceLabel = getInstanceLabel(instance, componentMeta);-return (<PropsPanelpropsLogic={logic}component={instance.component}instanceId={instance.id}- instanceLabel={instanceLabel}- componentMeta={componentMeta}setCssProperty={setCssProperty}/>);diff --git a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx b/apps/builder/app/builder/features/settings-panel/settings-panel.tsxindex e9133bfdb0..a7fe57a712 100644--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx@@ -1,11 +1,5 @@import { useStore } from "@nanostores/react";-import {- Flex,- Label,- theme,- ScrollArea,- InputField,-} from "@webstudio-is/design-system";+import { Flex, Label, theme, InputField } from "@webstudio-is/design-system";import { getComponentMeta } from "@webstudio-is/react-sdk";import { selectedInstanceStore } from "~/shared/nano-states";import { useSettingsLogic } from "./use-settings-logic";@@ -18,26 +12,24 @@ export const SettingsPanel = () => {}const label = getComponentMeta(selectedInstance.component)?.label;return (- <ScrollArea>- <Flex- gap="1"- direction="column"- grow- css={{ px: theme.spacing[9], py: theme.spacing[9] }}- >- <Label>Instance Name</Label>- <InputField- /* Key is required, otherwise when label is undefined, previous value stayed */- key={selectedInstance.id}- onBlur={handleBlur}- onKeyDown={handleKeyDown}- placeholder={label}- defaultValue={selectedInstance.label}- onChange={(event) => {- setLabel(event.target.value.trim());- }}- />- </Flex>- </ScrollArea>+ <Flex+ gap="1"+ direction="column"+ grow+ css={{ px: theme.spacing[9], py: theme.spacing[9] }}+ >+ <Label>Instance Name</Label>+ <InputField+ /* Key is required, otherwise when label is undefined, previous value stayed */+ key={selectedInstance.id}+ onBlur={handleBlur}+ onKeyDown={handleKeyDown}+ placeholder={label}+ defaultValue={selectedInstance.label}+ onChange={(event) => {+ setLabel(event.target.value.trim());+ }}+ />+ </Flex>);};diff --git a/apps/builder/app/builder/features/style-panel/style-panel.tsx b/apps/builder/app/builder/features/style-panel/style-panel.tsxindex 0c08bd3d18..d73ab5c01b 100644--- a/apps/builder/app/builder/features/style-panel/style-panel.tsx+++ b/apps/builder/app/builder/features/style-panel/style-panel.tsx@@ -1,10 +1,10 @@import {theme,Box,- ScrollArea,- Separator,Card,Text,+ Separator,+ ScrollArea,} from "@webstudio-is/design-system";import type { Instance } from "@webstudio-is/project-build";import type { Publish } from "~/shared/pubsub";@@ -51,9 +51,11 @@ export const StylePanel = ({ selectedInstance, publish }: StylePanelProps) => {css={{px: theme.spacing[9],pb: theme.spacing[9],- boxShadow: theme.shadows.panelSectionDropShadow,}}>+ <Text css={{ py: theme.spacing[7] }} variant="titles">+ Style Sources+ </Text><StyleSourcesSection /></Box><Separator />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 506c8a0705..99d165d16f 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@@ -3,7 +3,6 @@ import { useStore } from "@nanostores/react";import { nanoid } from "nanoid";import { computed } from "nanostores";import store from "immerhin";-import { theme, Text } from "@webstudio-is/design-system";import {type Instance,type StyleSource,@@ -343,58 +342,52 @@ export const StyleSourcesSection = () => {>(undefined);return (- <>- <Text css={{ py: theme.spacing[9] }} variant="titles">- Style Sources- </Text>-- <StyleSourceInput- items={items}- value={value}- selectedItemSelector={selectedOrLastStyleSourceSelector}- componentStates={componentStates}- onCreateItem={createStyleSource}- onSelectAutocompleteItem={({ id }) => {- addStyleSourceToInstace(id);- }}- onDuplicateItem={(id) => {- const newId = duplicateStyleSource(id);- if (newId !== undefined) {- setEditingItemId(newId);- }- }}- onConvertToToken={(id) => {- convertLocalStyleSourceToToken(id);- setEditingItemId(id);- }}- onRemoveItem={(id) => {- removeStyleSourceFromInstance(id);- }}- onDeleteItem={(id) => {- deleteStyleSource(id);- }}- onSort={(items) => {- reorderStyleSources(items.map((item) => item.id));- }}- onSelectItem={(styleSourceSelector) => {- createLocalStyleSourceIfNotExists(styleSourceSelector.styleSourceId);- selectedStyleSourceSelectorStore.set(styleSourceSelector);- }}- // style source renaming- editingItemId={editingItemId}- onEditItem={(id) => {- setEditingItemId(id);- // prevent deselect after renaming- if (id !== undefined) {- selectedStyleSourceSelectorStore.set({- styleSourceId: id,- });- }- }}- onChangeItem={(item) => {- renameStyleSource(item.id, item.label);- }}- />- </>+ <StyleSourceInput+ items={items}+ value={value}+ selectedItemSelector={selectedOrLastStyleSourceSelector}+ componentStates={componentStates}+ onCreateItem={createStyleSource}+ onSelectAutocompleteItem={({ id }) => {+ addStyleSourceToInstace(id);+ }}+ onDuplicateItem={(id) => {+ const newId = duplicateStyleSource(id);+ if (newId !== undefined) {+ setEditingItemId(newId);+ }+ }}+ onConvertToToken={(id) => {+ convertLocalStyleSourceToToken(id);+ setEditingItemId(id);+ }}+ onRemoveItem={(id) => {+ removeStyleSourceFromInstance(id);+ }}+ onDeleteItem={(id) => {+ deleteStyleSource(id);+ }}+ onSort={(items) => {+ reorderStyleSources(items.map((item) => item.id));+ }}+ onSelectItem={(styleSourceSelector) => {+ createLocalStyleSourceIfNotExists(styleSourceSelector.styleSourceId);+ selectedStyleSourceSelectorStore.set(styleSourceSelector);+ }}+ // style source renaming+ editingItemId={editingItemId}+ onEditItem={(id) => {+ setEditingItemId(id);+ // prevent deselect after renaming+ if (id !== undefined) {+ selectedStyleSourceSelectorStore.set({+ styleSourceId: id,+ });+ }+ }}+ onChangeItem={(item) => {+ renameStyleSource(item.id, item.label);+ }}+ />);};