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
Token deletion confirmation (#1695)
Oleg Isonen4c49ea5f163e
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 b610fae925..c5498351e7 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@@ -6,9 +6,20 @@ import store from "immerhin";import {type Instance,type StyleSource,+ type StyleSourceToken,type StyleSourceSelections,getStyleDeclKey,} from "@webstudio-is/project-build";+import {+ Flex,+ Dialog,+ DialogContent,+ DialogTitle,+ DialogClose,+ Button,+ Text,+ theme,+} from "@webstudio-is/design-system";import { type ItemSource, StyleSourceInput } from "./style-source";import {availableStyleSourcesStore,@@ -341,53 +352,118 @@ export const StyleSourcesSection = () => {undefined | StyleSource["id"]>(undefined);+ const [tokenToDelete, setTokenToDelete] = useState<StyleSourceToken>();+return (- <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,- });+ <>+ <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) => {+ const token = availableStyleSources.find(+ (source) => source.id === id+ );+ if (token?.type === "token") {+ setTokenToDelete(token);+ }+ }}+ 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);+ }}+ />+ {tokenToDelete && (+ <DeleteConfirmationDialog+ onClose={() => {+ setTokenToDelete(undefined);+ }}+ onConfirm={() => {+ deleteStyleSource(tokenToDelete.id);+ }}+ token={tokenToDelete.name}+ />+ )}+ </>+ );+};++type DeleteConfirmationDialogProps = {+ onClose: () => void;+ onConfirm: () => void;+ token: string;+};++const DeleteConfirmationDialog = ({+ onClose,+ onConfirm,+ token,+}: DeleteConfirmationDialogProps) => {+ return (+ <Dialog+ open+ onOpenChange={(isOpen) => {+ if (isOpen === false) {+ onClose();}}}- onChangeItem={(item) => {- renameStyleSource(item.id, item.label);- }}- />+ >+ <DialogContent>+ <Flex gap="3" direction="column" css={{ padding: theme.spacing[9] }}>+ <Text>{`Delete "${token}" token from the project including all of its styles?`}</Text>+ <Flex direction="rowReverse" gap="2">+ <DialogClose asChild>+ <Button+ color="destructive"+ onClick={() => {+ onConfirm();+ }}+ >+ Delete+ </Button>+ </DialogClose>+ <DialogClose asChild>+ <Button color="ghost">Cancel</Button>+ </DialogClose>+ </Flex>+ </Flex>+ <DialogTitle>Delete confirmation</DialogTitle>+ </DialogContent>+ </Dialog>);};diff --git a/packages/project-build/src/schema/style-sources.ts b/packages/project-build/src/schema/style-sources.tsindex cfd7537051..83624fc02b 100644--- a/packages/project-build/src/schema/style-sources.ts+++ b/packages/project-build/src/schema/style-sources.ts@@ -8,6 +8,8 @@ const StyleSourceToken = z.object({name: z.string(),});+export type StyleSourceToken = z.infer<typeof StyleSourceToken>;+const StyleSourceLocal = z.object({type: z.literal("local"),id: StyleSourceId,