Skip to content

Commit af5d61d

Browse files
authored
feat: Rename "remove" to "detach" in token menu (#4814)
## Description [Discussion](https://discord.com/channels/955905230107738152/1334251272127119430/1335002117961678948) Difference between delete and remove is too subtle. Detach is clearer ## Steps for reproduction 1. click button 2. expect xyz ## Code Review - [ ] hi @kof, I need you to do - conceptual review (architecture, feature-correctness) - detailed review (read every line) - test it on preview ## Before requesting a review - [ ] made a self-review - [ ] added inline comments where things may be not obvious (the "why", not "what") ## Before merging - [ ] tested locally and on preview environment (preview dev login: 0000) - [ ] updated [test cases](https://github.com/webstudio-is/webstudio/blob/main/apps/builder/docs/test-cases.md) document - [ ] added tests - [ ] if any new env variables are added, added them to `.env` file
1 parent 1899e6b commit af5d61d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

apps/builder/app/builder/features/style-panel/style-source-section.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ export const StyleSourcesSection = () => {
422422
setEditingItem(id);
423423
}}
424424
onClearStyles={clearStyles}
425-
onRemoveItem={(id) => {
425+
onDetachItem={(id) => {
426426
removeStyleSourceFromInstance(id);
427427
}}
428428
onDeleteItem={(id) => {

apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const Basic: StoryFn<typeof StyleSourceInput> = () => {
7777
onSelectAutocompleteItem={(item) => {
7878
setValue([...value, item]);
7979
}}
80-
onRemoveItem={(itemId) => {
80+
onDetachItem={(itemId) => {
8181
removeItem(itemId, value, setValue);
8282
}}
8383
onSort={setValue}
@@ -108,7 +108,7 @@ export const WithTruncatedItem: StoryFn<typeof StyleSourceInput> = () => {
108108
onSelectAutocompleteItem={(item) => {
109109
setValue([...value, item]);
110110
}}
111-
onRemoveItem={(itemToRemove) => {
111+
onDetachItem={(itemToRemove) => {
112112
removeItem(itemToRemove, value, setValue);
113113
}}
114114
onSort={setValue}
@@ -148,7 +148,7 @@ export const Complete: StoryFn<typeof StyleSourceInput> = () => {
148148
onSelectAutocompleteItem={(item) => {
149149
setValue([...value, item]);
150150
}}
151-
onRemoveItem={(itemToRemove) => {
151+
onDetachItem={(itemToRemove) => {
152152
removeItem(itemToRemove, value, setValue);
153153
}}
154154
onChangeItem={(changedItem) => {

apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ type StyleSourceInputProps<Item extends IntermediateItem> = {
277277
editingItemId?: Item["id"];
278278
componentStates?: ComponentState[];
279279
onSelectAutocompleteItem?: (item: Item) => void;
280-
onRemoveItem?: (id: Item["id"]) => void;
280+
onDetachItem?: (id: Item["id"]) => void;
281281
onDeleteItem?: (id: Item["id"]) => void;
282282
onClearStyles?: (id: Item["id"]) => void;
283283
onDuplicateItem?: (id: Item["id"]) => void;
@@ -351,7 +351,7 @@ const renderMenuItems = (props: {
351351
onConvertToToken?: (itemId: IntermediateItem["id"]) => void;
352352
onDisable?: (itemId: IntermediateItem["id"]) => void;
353353
onEnable?: (itemId: IntermediateItem["id"]) => void;
354-
onRemove?: (itemId: IntermediateItem["id"]) => void;
354+
onDetach?: (itemId: IntermediateItem["id"]) => void;
355355
onDelete?: (itemId: IntermediateItem["id"]) => void;
356356
onClearStyles?: (itemId: IntermediateItem["id"]) => void;
357357
}) => {
@@ -404,8 +404,8 @@ const renderMenuItems = (props: {
404404
)}
405405
*/}
406406
{props.item.source !== "local" && (
407-
<DropdownMenuItem onSelect={() => props.onRemove?.(props.item.id)}>
408-
Remove
407+
<DropdownMenuItem onSelect={() => props.onDetach?.(props.item.id)}>
408+
Detach
409409
</DropdownMenuItem>
410410
)}
411411
{props.item.source !== "local" && (
@@ -537,7 +537,7 @@ export const StyleSourceInput = (
537537
) {
538538
const item = value[value.length - 2];
539539
if (item) {
540-
props.onRemoveItem?.(item.id);
540+
props.onDetachItem?.(item.id);
541541
}
542542
}
543543
},
@@ -568,7 +568,7 @@ export const StyleSourceInput = (
568568
onEnable: props.onEnableItem,
569569
onDisable: props.onDisableItem,
570570
onEdit: props.onEditItem,
571-
onRemove: props.onRemoveItem,
571+
onDetach: props.onDetachItem,
572572
onDelete: props.onDeleteItem,
573573
onClearStyles: props.onClearStyles,
574574
})

0 commit comments

Comments
 (0)