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
Add rename support to style source input (#1039)
Bogdan Chadkina68fbca04756
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 7603728c13..605aaa5d02 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,3 +1,4 @@+import { useState } from "react";import store from "immerhin";import { nanoid } from "nanoid";import { theme, DeprecatedText2 } from "@webstudio-is/design-system";@@ -82,12 +83,12 @@ const addStyleSourceToInstace = (styleSourceId: StyleSource["id"]) => {const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {const selectedInstanceId = selectedInstanceIdStore.get();+ if (selectedInstanceId === undefined) {+ return;+ }store.createTransaction([styleSourceSelectionsStore],(styleSourceSelections) => {- if (selectedInstanceId === undefined) {- return;- }const styleSourceSelection =styleSourceSelections.get(selectedInstanceId);if (styleSourceSelection === undefined) {@@ -119,6 +120,15 @@ const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {);};+const renameStyleSource = (id: StyleSource["id"], label: string) => {+ store.createTransaction([styleSourcesStore], (styleSources) => {+ const styleSource = styleSources.get(id);+ if (styleSource?.type === "token") {+ styleSource.name = label;+ }+ });+};+type StyleSourceInputItem = {id: string;label: string;@@ -164,6 +174,10 @@ export const StyleSourcesSection = () => {convertToInputItem(styleSource, selectedStyleSource?.id));+ const [editingItemId, setEditingItemId] = useState<+ undefined | StyleSource["id"]+ >(undefined);+return (<><DeprecatedText2 css={{ py: theme.spacing[9] }} variant="label">@@ -186,6 +200,15 @@ export const StyleSourcesSection = () => {onSelectItem={(selectedItem) => {selectedStyleSourceIdStore.set(selectedItem?.id);}}+ // style source renaming+ editingItemId={editingItemId}+ onEditItem={(id) => {+ setEditingItemId(id);+ selectedStyleSourceIdStore.set(id);+ }}+ onChangeItem={(item) => {+ renameStyleSource(item.id, item.label);+ }}/></>);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 0939497fd4..a97e7f1c3c 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@@ -148,14 +148,14 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {state: "disabled",},]);- const [editingItem, setEditingItem] = useState<Item>();+ const [editingItemId, setEditingItemId] = useState<undefined | Item["id"]>();return (<StyleSourceInputcss={{ width: 300 }}items={getItems()}value={value}- editingItem={editingItem}+ editingItemId={editingItemId}onSelectItem={(itemToSelect) => {setValue(value.map((item) => {@@ -169,7 +169,7 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {}));}}- onEditItem={setEditingItem}+ onEditItem={setEditingItemId}onCreateItem={(label) => {createItem(label, value, setValue);}}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 406412a2b0..2d2e9dbf6a 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@@ -55,7 +55,10 @@ type IntermediateItem = {isAdded?: boolean;};-type TextFieldBaseWrapperProps<Item> = Omit<ComponentProps<"input">, "value"> &+type TextFieldBaseWrapperProps<Item extends IntermediateItem> = Omit<+ ComponentProps<"input">,+ "value"+> &Pick<ComponentProps<typeof TextFieldContainer>,"variant" | "state" | "css"@@ -71,8 +74,8 @@ type TextFieldBaseWrapperProps<Item> = Omit<ComponentProps<"input">, "value"> &onEnableItem?: (item: Item) => void;onSort?: (items: Array<Item>) => void;onSelectItem?: (item?: Item) => void;- onEditItem?: (item?: Item) => void;- editingItem?: Item;+ onEditItem?: (id?: Item["id"]) => void;+ editingItemId?: Item["id"];};const TextFieldBase: ForwardRefRenderFunction<@@ -100,7 +103,7 @@ const TextFieldBase: ForwardRefRenderFunction<onSort,onSelectItem,onEditItem,- editingItem,+ editingItemId,...textFieldProps} = props;const [internalInputRef, focusProps] = useTextFieldFocus({@@ -130,12 +133,12 @@ const TextFieldBase: ForwardRefRenderFunction<<StyleSourceid={item.id}isDragging={item.id === dragItemId}- isEditing={item.id === editingItem?.id}+ isEditing={item.id === editingItemId}state={item.state}source={item.source}isEditable={item.isEditable}onChangeEditing={(isEditing) => {- onEditItem?.(isEditing ? item : undefined);+ onEditItem?.(isEditing ? item.id : undefined);}}onChangeState={(state) => {if (state === "disabled") {@@ -161,7 +164,7 @@ const TextFieldBase: ForwardRefRenderFunction<))}{placementIndicator}{/* We want input to be the first element in DOM so it receives the focus first */}- {editingItem?.id === undefined && (+ {editingItemId === undefined && (<TextFieldInput{...textFieldProps}value={label}@@ -180,16 +183,16 @@ const TextFieldBase: ForwardRefRenderFunction<const TextField = forwardRef(TextFieldBase);TextField.displayName = "TextField";-type StyleSourceInputProps<Item> = {+type StyleSourceInputProps<Item extends IntermediateItem> = {items?: Array<Item>;value?: Array<Item>;- editingItem?: Item;+ editingItemId?: Item["id"];onSelectAutocompleteItem?: (item: Item) => void;onRemoveItem?: (item: Item) => void;onCreateItem?: (label: string) => void;onChangeItem?: (item: Item) => void;onSelectItem?: (item?: Item) => void;- onEditItem?: (item?: Item) => void;+ onEditItem?: (id?: Item["id"]) => void;onDisableItem?: (item: Item) => void;onEnableItem?: (item: Item) => void;onSort?: (items: Array<Item>) => void;@@ -276,7 +279,11 @@ export const StyleSourceInput = <Item extends IntermediateItem>(const inputProps = getInputProps({onKeyDown(event) {- if (event.key === "Backspace" && label === "") {+ if (+ event.key === "Backspace" &&+ label === "" &&+ props.editingItemId === undefined+ ) {props.onRemoveItem?.(value[value.length - 1]);}},@@ -300,7 +307,7 @@ export const StyleSourceInput = <Item extends IntermediateItem>(label={label}value={value}css={props.css}- editingItem={props.editingItem}+ editingItemId={props.editingItemId}/></ComboboxPopperAnchor><ComboboxPopperContent align="start" sideOffset={5}>diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source.tsxindex 83b95c6ffa..dabdac3e51 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx@@ -290,6 +290,8 @@ const EditableText = ({css={{outline: "none",textOverflow: isEditing ? "clip" : "ellipsis",+ userSelect: isEditing ? "auto" : "none",+ cursor: isEditing ? "auto" : "default",}}{...handlers}>@@ -327,6 +329,7 @@ const StyledSourceButton = styled(Box, {display: "inline-flex",borderRadius: theme.borderRadius[3],padding: theme.spacing[4],+ minWidth: theme.spacing[13],maxWidth: "100%",position: "relative",color: theme.colors.foregroundContrastMain,