@elementor/editor-variables 0.15.0 → 0.18.0

package/dist/index.js

@@ -39,16 +39,58 @@ var import_editor = require("@elementor/editor");
 
 // src/init-color-variables.ts
 var import_editor_canvas2 = require("@elementor/editor-canvas");
+var import_editor_editing_panel10 = require("@elementor/editor-editing-panel");
+
+// src/controls/color-variable-control.tsx
+var React20 = __toESM(require("react"));
+var import_editor_controls10 = require("@elementor/editor-controls");
+var import_editor_props3 = require("@elementor/editor-props");
+
+// src/components/ui/color-indicator.tsx
+var import_ui = require("@elementor/ui");
+var ColorIndicator = (0, import_ui.styled)(import_ui.UnstableColorIndicator)(({ theme }) => ({
+  borderRadius: `${theme.shape.borderRadius / 2}px`,
+  marginRight: theme.spacing(0.25)
+}));
+
+// src/components/ui/variable/assigned-variable.tsx
+var import_react13 = require("react");
+var React16 = __toESM(require("react"));
 var import_editor_controls8 = require("@elementor/editor-controls");
-var import_editor_editing_panel7 = require("@elementor/editor-editing-panel");
-var import_editor_props4 = require("@elementor/editor-props");
+var import_icons11 = require("@elementor/icons");
+var import_ui18 = require("@elementor/ui");
 
-// src/components/variables-repeater-item-slot.tsx
-var React = __toESM(require("react"));
+// src/components/variable-selection-popover.tsx
+var React14 = __toESM(require("react"));
+var import_react12 = require("react");
+var import_ui16 = require("@elementor/ui");
+
+// src/prop-types/color-variable-prop-type.ts
+var import_editor_props = require("@elementor/editor-props");
+var import_schema = require("@elementor/schema");
+var colorVariablePropTypeUtil = (0, import_editor_props.createPropUtils)("global-color-variable", import_schema.z.string());
+
+// src/prop-types/font-variable-prop-type.ts
+var import_editor_props2 = require("@elementor/editor-props");
+var import_schema2 = require("@elementor/schema");
+var fontVariablePropTypeUtil = (0, import_editor_props2.createPropUtils)("global-font-variable", import_schema2.z.string());
+
+// src/components/color-variable-creation.tsx
+var React3 = __toESM(require("react"));
+var import_react5 = require("react");
+var import_editor_controls = require("@elementor/editor-controls");
+var import_editor_editing_panel = require("@elementor/editor-editing-panel");
+var import_editor_ui = require("@elementor/editor-ui");
+var import_icons = require("@elementor/icons");
+var import_ui4 = require("@elementor/ui");
+var import_i18n5 = require("@wordpress/i18n");
 
 // src/hooks/use-prop-variables.ts
 var import_react = require("react");
 
+// src/service.ts
+var import_i18n = require("@wordpress/i18n");
+
 // src/api.ts
 var import_http_client = require("@elementor/http-client");
 var BASE_PATH = "elementor/v1/variables";
@@ -131,6 +173,12 @@ var Storage = class {
   }
 };
 
+// src/sync/enqueue-font.ts
+var enqueueFont = (fontFamily, context = "preview") => {
+  const extendedWindow = window;
+  return extendedWindow.elementor?.helpers?.enqueueFont?.(fontFamily, context) ?? null;
+};
+
 // src/create-style-variables-repository.ts
 var createStyleVariablesRepository = () => {
   const variables = {};
@@ -147,19 +195,46 @@ var createStyleVariablesRepository = () => {
       subscription({ ...variables });
     }
   };
-  const shouldUpdate = (key, newValue) => {
-    return !(key in variables) || variables[key] !== newValue;
+  const shouldUpdate = (key, maybeUpdated) => {
+    if (!(key in variables)) {
+      return true;
+    }
+    if (variables[key].label !== maybeUpdated.label) {
+      return true;
+    }
+    if (variables[key].value !== maybeUpdated.value) {
+      return true;
+    }
+    if (!variables[key]?.deleted && maybeUpdated?.deleted) {
+      return true;
+    }
+    if (variables[key]?.deleted && !maybeUpdated?.deleted) {
+      return true;
+    }
+    return false;
   };
   const applyUpdates = (updatedVars) => {
     let hasChanges = false;
-    for (const [key, { value }] of Object.entries(updatedVars)) {
-      if (shouldUpdate(key, value)) {
-        variables[key] = value;
+    for (const [key, variable] of Object.entries(updatedVars)) {
+      if (shouldUpdate(key, variable)) {
+        variables[key] = variable;
+        if (variable.type === fontVariablePropTypeUtil.key) {
+          fontEnqueue(variable.value);
+        }
         hasChanges = true;
       }
     }
     return hasChanges;
   };
+  const fontEnqueue = (value) => {
+    if (!value) {
+      return;
+    }
+    try {
+      enqueueFont(value);
+    } catch {
+    }
+  };
   const update = (updatedVars) => {
     if (applyUpdates(updatedVars)) {
       notify();
@@ -201,7 +276,8 @@ var service = {
     return apiClient.create(type, label, value).then((response) => {
       const { success, data: payload } = response.data;
       if (!success) {
-        throw new Error("Unexpected response from server");
+        const errorMessage = payload?.message || (0, import_i18n.__)("Unexpected response from server", "elementor");
+        throw new Error(errorMessage);
       }
       return payload;
     }).then((data) => {
@@ -216,13 +292,17 @@ var service = {
         id: variableId,
         variable: createdVariable
       };
+    }).catch((error) => {
+      const message = getErrorMessage(error.response);
+      throw message ? new Error(message) : error;
     });
   },
   update: (id, { label, value }) => {
     return apiClient.update(id, label, value).then((response) => {
       const { success, data: payload } = response.data;
       if (!success) {
-        throw new Error("Unexpected response from server");
+        const errorMessage = payload?.message || (0, import_i18n.__)("Unexpected response from server", "elementor");
+        throw new Error(errorMessage);
       }
       return payload;
     }).then((data) => {
@@ -237,6 +317,9 @@ var service = {
         id: variableId,
         variable: updatedVariable
       };
+    }).catch((error) => {
+      const message = getErrorMessage(error.response);
+      throw message ? new Error(message) : error;
     });
   },
   delete: (id) => {
@@ -288,6 +371,12 @@ var handleWatermark = (operation, newWatermark) => {
   }
   storage.watermark(newWatermark);
 };
+var getErrorMessage = (response) => {
+  if (response?.data?.code === "duplicated_label") {
+    return (0, import_i18n.__)("This variable name already exists. Please choose a unique name.", "elementor");
+  }
+  return (0, import_i18n.__)("There was a glitch. Try saving your variable again.", "elementor");
+};
 
 // src/hooks/use-prop-variables.ts
 var useVariable = (key) => {
@@ -338,109 +427,133 @@ var deleteVariable = (deleteId) => {
     return id;
   });
 };
+var restoreVariable = (restoreId) => {
+  return service.restore(restoreId).then(({ id }) => {
+    return id;
+  });
+};
 
-// src/components/ui/color-indicator.tsx
-var import_ui = require("@elementor/ui");
-var ColorIndicator = (0, import_ui.styled)(import_ui.UnstableColorIndicator)(({ theme }) => ({
-  borderRadius: `${theme.shape.borderRadius / 2}px`,
-  marginRight: theme.spacing(0.25)
-}));
+// src/components/fields/color-field.tsx
+var React = __toESM(require("react"));
+var import_react3 = require("react");
+var import_ui2 = require("@elementor/ui");
+var import_i18n3 = require("@wordpress/i18n");
 
-// src/components/variables-repeater-item-slot.tsx
-var useColorVariable = (value) => {
-  const variableId = value?.value?.color?.value;
-  return useVariable(variableId || "");
-};
-var BackgroundRepeaterColorIndicator = ({ value }) => {
-  const colorVariable = useColorVariable(value);
-  return /* @__PURE__ */ React.createElement(ColorIndicator, { component: "span", size: "inherit", value: colorVariable?.value });
+// src/utils/validations.ts
+var import_i18n2 = require("@wordpress/i18n");
+var VARIABLE_LABEL_MAX_LENGTH = 50;
+var validateLabel = (name) => {
+  if (!name.trim()) {
+    return (0, import_i18n2.__)("Give your variable a name.", "elementor");
+  }
+  const allowedChars = /^[a-zA-Z0-9_-]+$/;
+  if (!allowedChars.test(name)) {
+    return (0, import_i18n2.__)("Use letters, numbers, dashes (-), or underscores (_) for the name.", "elementor");
+  }
+  const hasAlphanumeric = /[a-zA-Z0-9]/;
+  if (!hasAlphanumeric.test(name)) {
+    return (0, import_i18n2.__)("Names have to include at least one non-special character.", "elementor");
+  }
+  if (VARIABLE_LABEL_MAX_LENGTH < name.length) {
+    return (0, import_i18n2.__)("Keep names up to 50 characters.", "elementor");
+  }
+  return "";
 };
-var BackgroundRepeaterLabel = ({ value }) => {
-  const colorVariable = useColorVariable(value);
-  return /* @__PURE__ */ React.createElement("span", null, colorVariable?.label);
+var labelHint = (name) => {
+  const hintThreshold = VARIABLE_LABEL_MAX_LENGTH * 0.8 - 1;
+  if (hintThreshold < name.length) {
+    return (0, import_i18n2.__)("Keep names up to 50 characters.", "elementor");
+  }
+  return "";
 };
-var BoxShadowRepeaterColorIndicator = ({ value }) => {
-  const colorVariable = useColorVariable(value);
-  return /* @__PURE__ */ React.createElement(ColorIndicator, { component: "span", size: "inherit", value: colorVariable?.value });
+var validateValue = (value) => {
+  if (!value.trim()) {
+    return (0, import_i18n2.__)("Add a value to complete your variable.", "elementor");
+  }
+  return "";
 };
 
-// src/controls/color-variable-control.tsx
-var React13 = __toESM(require("react"));
-var import_react10 = require("react");
-var import_editor_controls7 = require("@elementor/editor-controls");
-var import_editor_props3 = require("@elementor/editor-props");
-var import_icons9 = require("@elementor/icons");
-var import_ui14 = require("@elementor/ui");
+// src/components/variable-selection-popover.context.ts
+var import_react2 = require("react");
+var PopoverContentRefContext = (0, import_react2.createContext)(null);
+var usePopoverContentRef = () => {
+  return (0, import_react2.useContext)(PopoverContentRefContext);
+};
 
-// src/components/ui/variable-tag.tsx
-var React2 = __toESM(require("react"));
-var import_icons = require("@elementor/icons");
-var import_ui2 = require("@elementor/ui");
-var import_i18n = require("@wordpress/i18n");
-var SIZE = "tiny";
-var VariableTag = ({ startIcon, label, onUnlink, ...props }) => {
-  const actions = [];
-  if (onUnlink) {
-    actions.push(
-      /* @__PURE__ */ React2.createElement(import_ui2.IconButton, { key: "unlink", size: SIZE, onClick: onUnlink, "aria-label": (0, import_i18n.__)("Unlink", "elementor") }, /* @__PURE__ */ React2.createElement(import_icons.DetachIcon, { fontSize: SIZE }))
-    );
-  }
-  return /* @__PURE__ */ React2.createElement(
-    import_ui2.UnstableTag,
+// src/components/fields/color-field.tsx
+var ColorField = ({ value, onChange }) => {
+  const [color, setColor] = (0, import_react3.useState)(value);
+  const [errorMessage, setErrorMessage] = (0, import_react3.useState)("");
+  const defaultRef = (0, import_react3.useRef)(null);
+  const anchorRef = usePopoverContentRef() ?? defaultRef;
+  const handleChange = (newValue) => {
+    setColor(newValue);
+    const errorMsg = validateValue(newValue);
+    setErrorMessage(errorMsg);
+    onChange(errorMsg ? "" : newValue);
+  };
+  return /* @__PURE__ */ React.createElement(import_ui2.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React.createElement(import_ui2.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(import_ui2.FormLabel, { size: "tiny" }, (0, import_i18n3.__)("Value", "elementor"))), /* @__PURE__ */ React.createElement(import_ui2.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(
+    import_ui2.UnstableColorField,
     {
+      size: "tiny",
       fullWidth: true,
-      showActionsOnHover: true,
-      startIcon: /* @__PURE__ */ React2.createElement(import_ui2.Stack, { gap: 0.5, direction: "row", alignItems: "center" }, startIcon),
-      label: /* @__PURE__ */ React2.createElement(import_ui2.Box, { sx: { display: "inline-grid", minWidth: 0 } }, /* @__PURE__ */ React2.createElement(import_ui2.Typography, { sx: { lineHeight: 1.34 }, variant: "caption", noWrap: true }, label)),
-      actions,
-      ...props
+      value: color,
+      onChange: handleChange,
+      error: errorMessage ?? void 0,
+      slotProps: {
+        colorPicker: {
+          anchorEl: anchorRef.current,
+          anchorOrigin: { vertical: "top", horizontal: "right" },
+          transformOrigin: { vertical: "top", horizontal: -10 }
+        }
+      }
     }
-  );
+  ), errorMessage && /* @__PURE__ */ React.createElement(import_ui2.FormHelperText, { error: true }, errorMessage)));
 };
 
-// src/components/variable-selection-popover.tsx
-var React12 = __toESM(require("react"));
-var import_react9 = require("react");
-var import_ui13 = require("@elementor/ui");
-
-// src/prop-types/color-variable-prop-type.ts
-var import_editor_props = require("@elementor/editor-props");
-var import_schema = require("@elementor/schema");
-var colorVariablePropTypeUtil = (0, import_editor_props.createPropUtils)("global-color-variable", import_schema.z.string());
-
-// src/prop-types/font-variable-prop-type.ts
-var import_editor_props2 = require("@elementor/editor-props");
-var import_schema2 = require("@elementor/schema");
-var fontVariablePropTypeUtil = (0, import_editor_props2.createPropUtils)("global-font-variable", import_schema2.z.string());
-
-// src/components/color-variable-creation.tsx
-var React3 = __toESM(require("react"));
-var import_react3 = require("react");
-var import_editor_controls = require("@elementor/editor-controls");
-var import_editor_editing_panel = require("@elementor/editor-editing-panel");
-var import_editor_ui = require("@elementor/editor-ui");
-var import_icons2 = require("@elementor/icons");
+// src/components/fields/label-field.tsx
+var React2 = __toESM(require("react"));
+var import_react4 = require("react");
 var import_ui3 = require("@elementor/ui");
-var import_i18n2 = require("@wordpress/i18n");
-
-// src/components/variable-selection-popover.context.ts
-var import_react2 = require("react");
-var PopoverContentRefContext = (0, import_react2.createContext)(null);
-var usePopoverContentRef = () => {
-  return (0, import_react2.useContext)(PopoverContentRefContext);
+var import_i18n4 = require("@wordpress/i18n");
+var LabelField = ({ value, onChange }) => {
+  const [label, setLabel] = (0, import_react4.useState)(value);
+  const [errorMessage, setErrorMessage] = (0, import_react4.useState)("");
+  const [noticeMessage, setNoticeMessage] = (0, import_react4.useState)(() => labelHint(value));
+  const handleChange = (newValue) => {
+    setLabel(newValue);
+    const errorMsg = validateLabel(newValue);
+    const hintMsg = labelHint(newValue);
+    setErrorMessage(errorMsg);
+    setNoticeMessage(errorMsg ? "" : hintMsg);
+    onChange(errorMsg ? "" : newValue);
+  };
+  const id = (0, import_react4.useId)();
+  return /* @__PURE__ */ React2.createElement(import_ui3.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React2.createElement(import_ui3.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React2.createElement(import_ui3.FormLabel, { htmlFor: id, size: "tiny" }, (0, import_i18n4.__)("Name", "elementor"))), /* @__PURE__ */ React2.createElement(import_ui3.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React2.createElement(
+    import_ui3.TextField,
+    {
+      id,
+      size: "tiny",
+      fullWidth: true,
+      value: label,
+      error: !!errorMessage,
+      onChange: (e) => handleChange(e.target.value),
+      inputProps: { maxLength: VARIABLE_LABEL_MAX_LENGTH }
+    }
+  ), errorMessage && /* @__PURE__ */ React2.createElement(import_ui3.FormHelperText, { error: true }, errorMessage), noticeMessage && /* @__PURE__ */ React2.createElement(import_ui3.FormHelperText, null, noticeMessage)));
 };
 
 // src/components/color-variable-creation.tsx
-var SIZE2 = "tiny";
+var SIZE = "tiny";
 var ColorVariableCreation = ({ onGoBack, onClose }) => {
   const { setValue: setVariable } = (0, import_editor_controls.useBoundProp)(colorVariablePropTypeUtil);
-  const [color, setColor] = (0, import_react3.useState)("");
-  const [label, setLabel] = (0, import_react3.useState)("");
-  const defaultRef = (0, import_react3.useRef)(null);
-  const anchorRef = usePopoverContentRef() ?? defaultRef;
+  const [color, setColor] = (0, import_react5.useState)("");
+  const [label, setLabel] = (0, import_react5.useState)("");
+  const [errorMessage, setErrorMessage] = (0, import_react5.useState)("");
   const resetFields = () => {
     setColor("");
     setLabel("");
+    setErrorMessage("");
   };
   const closePopover = () => {
     resetFields();
@@ -454,139 +567,193 @@ var ColorVariableCreation = ({ onGoBack, onClose }) => {
     }).then((key) => {
       setVariable(key);
       closePopover();
+    }).catch((error) => {
+      setErrorMessage(error.message);
     });
   };
-  const isFormInvalid = () => {
-    return !color?.trim() || !label?.trim();
+  const hasEmptyValue = () => {
+    return "" === color.trim() || "" === label.trim();
   };
-  return /* @__PURE__ */ React3.createElement(import_editor_editing_panel.PopoverScrollableContent, { height: "auto" }, /* @__PURE__ */ React3.createElement(
+  const isSubmitDisabled = hasEmptyValue();
+  return /* @__PURE__ */ React3.createElement(import_editor_editing_panel.PopoverBody, { height: "auto" }, /* @__PURE__ */ React3.createElement(
     import_editor_ui.PopoverHeader,
     {
-      icon: /* @__PURE__ */ React3.createElement(React3.Fragment, null, onGoBack && /* @__PURE__ */ React3.createElement(import_ui3.IconButton, { size: SIZE2, "aria-label": (0, import_i18n2.__)("Go Back", "elementor"), onClick: onGoBack }, /* @__PURE__ */ React3.createElement(import_icons2.ArrowLeftIcon, { fontSize: SIZE2 })), /* @__PURE__ */ React3.createElement(import_icons2.BrushIcon, { fontSize: SIZE2 })),
-      title: (0, import_i18n2.__)("Create variable", "elementor"),
+      icon: /* @__PURE__ */ React3.createElement(React3.Fragment, null, onGoBack && /* @__PURE__ */ React3.createElement(import_ui4.IconButton, { size: SIZE, "aria-label": (0, import_i18n5.__)("Go Back", "elementor"), onClick: onGoBack }, /* @__PURE__ */ React3.createElement(import_icons.ArrowLeftIcon, { fontSize: SIZE })), /* @__PURE__ */ React3.createElement(import_icons.BrushIcon, { fontSize: SIZE })),
+      title: (0, import_i18n5.__)("Create variable", "elementor"),
       onClose: closePopover
     }
-  ), /* @__PURE__ */ React3.createElement(import_ui3.Divider, null), /* @__PURE__ */ React3.createElement(import_editor_controls.PopoverContent, { p: 2 }, /* @__PURE__ */ React3.createElement(import_ui3.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React3.createElement(import_ui3.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React3.createElement(import_ui3.FormLabel, { size: "tiny" }, (0, import_i18n2.__)("Name", "elementor"))), /* @__PURE__ */ React3.createElement(import_ui3.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React3.createElement(
-    import_ui3.TextField,
+  ), /* @__PURE__ */ React3.createElement(import_ui4.Divider, null), /* @__PURE__ */ React3.createElement(import_editor_controls.PopoverContent, { p: 2 }, /* @__PURE__ */ React3.createElement(
+    LabelField,
     {
-      size: "tiny",
-      fullWidth: true,
       value: label,
-      onChange: (e) => setLabel(e.target.value)
+      onChange: (value) => {
+        setLabel(value);
+        setErrorMessage("");
+      }
     }
-  ))), /* @__PURE__ */ React3.createElement(import_ui3.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React3.createElement(import_ui3.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React3.createElement(import_ui3.FormLabel, { size: "tiny" }, (0, import_i18n2.__)("Value", "elementor"))), /* @__PURE__ */ React3.createElement(import_ui3.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React3.createElement(
-    import_ui3.UnstableColorField,
+  ), /* @__PURE__ */ React3.createElement(
+    ColorField,
     {
-      size: "tiny",
-      fullWidth: true,
       value: color,
-      onChange: setColor,
-      slotProps: {
-        colorPicker: {
-          anchorEl: anchorRef.current,
-          anchorOrigin: { vertical: "top", horizontal: "right" },
-          transformOrigin: { vertical: "top", horizontal: -10 }
-        }
+      onChange: (value) => {
+        setColor(value);
+        setErrorMessage("");
       }
     }
-  )))), /* @__PURE__ */ React3.createElement(import_ui3.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React3.createElement(import_ui3.Button, { size: "small", variant: "contained", disabled: isFormInvalid(), onClick: handleCreate }, (0, import_i18n2.__)("Create", "elementor"))));
+  ), errorMessage && /* @__PURE__ */ React3.createElement(import_ui4.FormHelperText, { error: true }, errorMessage)), /* @__PURE__ */ React3.createElement(import_ui4.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React3.createElement(import_ui4.Button, { size: "small", variant: "contained", disabled: isSubmitDisabled, onClick: handleCreate }, (0, import_i18n5.__)("Create", "elementor"))));
 };
 
 // src/components/color-variable-edit.tsx
-var React4 = __toESM(require("react"));
-var import_react4 = require("react");
+var React5 = __toESM(require("react"));
+var import_react6 = require("react");
 var import_editor_controls2 = require("@elementor/editor-controls");
+var import_editor_editing_panel2 = require("@elementor/editor-editing-panel");
 var import_editor_ui2 = require("@elementor/editor-ui");
 var import_icons3 = require("@elementor/icons");
-var import_ui4 = require("@elementor/ui");
-var import_i18n3 = require("@wordpress/i18n");
-var SIZE3 = "tiny";
+var import_ui6 = require("@elementor/ui");
+var import_i18n7 = require("@wordpress/i18n");
+
+// src/components/ui/delete-confirmation-dialog.tsx
+var React4 = __toESM(require("react"));
+var import_icons2 = require("@elementor/icons");
+var import_ui5 = require("@elementor/ui");
+var import_i18n6 = require("@wordpress/i18n");
+var TITLE_ID = "delete-variable-dialog";
+var DeleteConfirmationDialog = ({
+  open,
+  label,
+  closeDialog,
+  onConfirm
+}) => {
+  return /* @__PURE__ */ React4.createElement(import_ui5.Dialog, { open, onClose: closeDialog, "aria-labelledby": TITLE_ID, maxWidth: "xs" }, /* @__PURE__ */ React4.createElement(import_ui5.DialogTitle, { id: TITLE_ID, display: "flex", alignItems: "center", gap: 1, sx: { lineHeight: 1 } }, /* @__PURE__ */ React4.createElement(import_icons2.AlertOctagonFilledIcon, { color: "error" }), (0, import_i18n6.__)("Delete this variable?", "elementor")), /* @__PURE__ */ React4.createElement(import_ui5.DialogContent, null, /* @__PURE__ */ React4.createElement(import_ui5.DialogContentText, { variant: "body2", color: "textPrimary" }, (0, import_i18n6.__)("All elements using", "elementor"), /* @__PURE__ */ React4.createElement(import_ui5.Typography, { variant: "subtitle2", component: "span" }, "\xA0", label, "\xA0"), (0, import_i18n6.__)("will keep their current values, but the variable itself will be removed.", "elementor"))), /* @__PURE__ */ React4.createElement(import_ui5.DialogActions, null, /* @__PURE__ */ React4.createElement(import_ui5.Button, { color: "secondary", onClick: closeDialog }, (0, import_i18n6.__)("Not now", "elementor")), /* @__PURE__ */ React4.createElement(import_ui5.Button, { variant: "contained", color: "error", onClick: onConfirm }, (0, import_i18n6.__)("Delete", "elementor"))));
+};
+
+// src/components/color-variable-edit.tsx
+var SIZE2 = "tiny";
 var ColorVariableEdit = ({ onClose, onGoBack, onSubmit, editId }) => {
+  const { setValue: notifyBoundPropChange, value: assignedValue } = (0, import_editor_controls2.useBoundProp)(colorVariablePropTypeUtil);
+  const [deleteConfirmation, setDeleteConfirmation] = (0, import_react6.useState)(false);
+  const [errorMessage, setErrorMessage] = (0, import_react6.useState)("");
   const variable = useVariable(editId);
   if (!variable) {
     throw new Error(`Global color variable not found`);
   }
-  const defaultRef = (0, import_react4.useRef)(null);
-  const anchorRef = usePopoverContentRef() ?? defaultRef;
-  const [color, setColor] = (0, import_react4.useState)(variable.value);
-  const [label, setLabel] = (0, import_react4.useState)(variable.label);
+  const [color, setColor] = (0, import_react6.useState)(variable.value);
+  const [label, setLabel] = (0, import_react6.useState)(variable.label);
   const handleUpdate = () => {
     updateVariable(editId, {
       value: color,
       label
     }).then(() => {
+      maybeTriggerBoundPropChange();
       onSubmit?.();
+    }).catch((error) => {
+      setErrorMessage(error.message);
     });
   };
   const handleDelete = () => {
     deleteVariable(editId).then(() => {
+      maybeTriggerBoundPropChange();
       onSubmit?.();
     });
   };
-  const noValueChanged = () => color === variable.value && label === variable.label;
-  const hasEmptyValue = () => "" === color.trim() || "" === label.trim();
-  const isSaveDisabled = () => noValueChanged() || hasEmptyValue();
+  const maybeTriggerBoundPropChange = () => {
+    if (editId === assignedValue) {
+      notifyBoundPropChange(editId);
+    }
+  };
+  const handleDeleteConfirmation = () => {
+    setDeleteConfirmation(true);
+  };
+  const closeDeleteDialog = () => () => {
+    setDeleteConfirmation(false);
+  };
   const actions = [];
   actions.push(
-    /* @__PURE__ */ React4.createElement(import_ui4.IconButton, { key: "delete", size: SIZE3, "aria-label": (0, import_i18n3.__)("Delete", "elementor"), onClick: handleDelete }, /* @__PURE__ */ React4.createElement(import_icons3.TrashIcon, { fontSize: SIZE3 }))
+    /* @__PURE__ */ React5.createElement(
+      import_ui6.IconButton,
+      {
+        key: "delete",
+        size: SIZE2,
+        "aria-label": (0, import_i18n7.__)("Delete", "elementor"),
+        onClick: handleDeleteConfirmation
+      },
+      /* @__PURE__ */ React5.createElement(import_icons3.TrashIcon, { fontSize: SIZE2 })
+    )
   );
-  return /* @__PURE__ */ React4.createElement(import_editor_ui2.PopoverScrollableContent, { height: "auto" }, /* @__PURE__ */ React4.createElement(
+  const hasEmptyValues = () => {
+    return !color.trim() || !label.trim();
+  };
+  const noValueChanged = () => {
+    return color === variable.value && label === variable.label;
+  };
+  const isSubmitDisabled = noValueChanged() || hasEmptyValues();
+  return /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(import_editor_editing_panel2.PopoverBody, { height: "auto" }, /* @__PURE__ */ React5.createElement(
     import_editor_ui2.PopoverHeader,
     {
-      title: (0, import_i18n3.__)("Edit variable", "elementor"),
+      title: (0, import_i18n7.__)("Edit variable", "elementor"),
       onClose,
-      icon: /* @__PURE__ */ React4.createElement(React4.Fragment, null, onGoBack && /* @__PURE__ */ React4.createElement(import_ui4.IconButton, { size: SIZE3, "aria-label": (0, import_i18n3.__)("Go Back", "elementor"), onClick: onGoBack }, /* @__PURE__ */ React4.createElement(import_icons3.ArrowLeftIcon, { fontSize: SIZE3 })), /* @__PURE__ */ React4.createElement(import_icons3.BrushIcon, { fontSize: SIZE3 })),
+      icon: /* @__PURE__ */ React5.createElement(React5.Fragment, null, onGoBack && /* @__PURE__ */ React5.createElement(
+        import_ui6.IconButton,
+        {
+          size: SIZE2,
+          "aria-label": (0, import_i18n7.__)("Go Back", "elementor"),
+          onClick: onGoBack
+        },
+        /* @__PURE__ */ React5.createElement(import_icons3.ArrowLeftIcon, { fontSize: SIZE2 })
+      ), /* @__PURE__ */ React5.createElement(import_icons3.BrushIcon, { fontSize: SIZE2 })),
       actions
     }
-  ), /* @__PURE__ */ React4.createElement(import_ui4.Divider, null), /* @__PURE__ */ React4.createElement(import_editor_controls2.PopoverContent, { p: 2 }, /* @__PURE__ */ React4.createElement(import_ui4.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React4.createElement(import_ui4.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React4.createElement(import_ui4.FormLabel, { size: "tiny" }, (0, import_i18n3.__)("Name", "elementor"))), /* @__PURE__ */ React4.createElement(import_ui4.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React4.createElement(
-    import_ui4.TextField,
+  ), /* @__PURE__ */ React5.createElement(import_ui6.Divider, null), /* @__PURE__ */ React5.createElement(import_editor_controls2.PopoverContent, { p: 2 }, /* @__PURE__ */ React5.createElement(
+    LabelField,
     {
-      size: "tiny",
-      fullWidth: true,
       value: label,
-      onChange: (e) => setLabel(e.target.value)
+      onChange: (value) => {
+        setLabel(value);
+        setErrorMessage("");
+      }
     }
-  ))), /* @__PURE__ */ React4.createElement(import_ui4.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React4.createElement(import_ui4.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React4.createElement(import_ui4.FormLabel, { size: "tiny" }, (0, import_i18n3.__)("Value", "elementor"))), /* @__PURE__ */ React4.createElement(import_ui4.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React4.createElement(
-    import_ui4.UnstableColorField,
+  ), /* @__PURE__ */ React5.createElement(
+    ColorField,
     {
-      size: "tiny",
-      fullWidth: true,
       value: color,
-      onChange: setColor,
-      slotProps: {
-        colorPicker: {
-          anchorEl: anchorRef.current,
-          anchorOrigin: { vertical: "top", horizontal: "right" },
-          transformOrigin: { vertical: "top", horizontal: -10 }
-        }
+      onChange: (value) => {
+        setColor(value);
+        setErrorMessage("");
       }
     }
-  )))), /* @__PURE__ */ React4.createElement(import_ui4.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React4.createElement(import_ui4.Button, { size: "small", variant: "contained", disabled: isSaveDisabled(), onClick: handleUpdate }, (0, import_i18n3.__)("Save", "elementor"))));
+  ), errorMessage && /* @__PURE__ */ React5.createElement(import_ui6.FormHelperText, { error: true }, errorMessage)), /* @__PURE__ */ React5.createElement(import_ui6.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React5.createElement(import_ui6.Button, { size: "small", variant: "contained", disabled: isSubmitDisabled, onClick: handleUpdate }, (0, import_i18n7.__)("Save", "elementor")))), deleteConfirmation && /* @__PURE__ */ React5.createElement(
+    DeleteConfirmationDialog,
+    {
+      open: true,
+      label,
+      onConfirm: handleDelete,
+      closeDialog: closeDeleteDialog()
+    }
+  ));
 };
 
 // src/components/color-variables-selection.tsx
-var React8 = __toESM(require("react"));
-var import_react5 = require("react");
+var React9 = __toESM(require("react"));
+var import_react7 = require("react");
 var import_editor_controls3 = require("@elementor/editor-controls");
-var import_editor_editing_panel2 = require("@elementor/editor-editing-panel");
+var import_editor_editing_panel3 = require("@elementor/editor-editing-panel");
 var import_editor_ui4 = require("@elementor/editor-ui");
 var import_icons5 = require("@elementor/icons");
-var import_ui9 = require("@elementor/ui");
-var import_i18n7 = require("@wordpress/i18n");
+var import_ui11 = require("@elementor/ui");
+var import_i18n11 = require("@wordpress/i18n");
 
 // src/components/ui/menu-item-content.tsx
-var React5 = __toESM(require("react"));
+var React6 = __toESM(require("react"));
 var import_editor_ui3 = require("@elementor/editor-ui");
-var import_editor_v1_adapters = require("@elementor/editor-v1-adapters");
 var import_icons4 = require("@elementor/icons");
-var import_ui5 = require("@elementor/ui");
-var import_i18n4 = require("@wordpress/i18n");
-var SIZE4 = "tiny";
-var isVersion330Active = (0, import_editor_v1_adapters.isExperimentActive)("e_v_3_30");
+var import_ui7 = require("@elementor/ui");
+var import_i18n8 = require("@wordpress/i18n");
+var SIZE3 = "tiny";
 var MenuItemContent = ({ item }) => {
   const onEdit = item.onEdit;
-  return /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(import_ui5.ListItemIcon, null, item.icon), /* @__PURE__ */ React5.createElement(
-    import_ui5.Box,
+  return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(import_ui7.ListItemIcon, null, item.icon), /* @__PURE__ */ React6.createElement(
+    import_ui7.Box,
     {
       sx: {
         flex: 1,
@@ -596,49 +763,49 @@ var MenuItemContent = ({ item }) => {
         gap: 1
       }
     },
-    /* @__PURE__ */ React5.createElement(
+    /* @__PURE__ */ React6.createElement(
       import_editor_ui3.EllipsisWithTooltip,
       {
         title: item.label || item.value,
-        as: import_ui5.Typography,
-        variant: isVersion330Active ? "caption" : "body2",
-        color: isVersion330Active ? "text.primary" : "text.secondary",
+        as: import_ui7.Typography,
+        variant: "caption",
+        color: "text.primary",
         sx: { marginTop: "1px", lineHeight: "2" },
         maxWidth: "50%"
       }
     ),
-    item.secondaryText && /* @__PURE__ */ React5.createElement(
+    item.secondaryText && /* @__PURE__ */ React6.createElement(
       import_editor_ui3.EllipsisWithTooltip,
       {
         title: item.secondaryText,
-        as: import_ui5.Typography,
+        as: import_ui7.Typography,
         variant: "caption",
         color: "text.tertiary",
         sx: { marginTop: "1px", lineHeight: "1" },
         maxWidth: "50%"
       }
     )
-  ), !!onEdit && /* @__PURE__ */ React5.createElement(
-    import_ui5.IconButton,
+  ), !!onEdit && /* @__PURE__ */ React6.createElement(
+    import_ui7.IconButton,
     {
       sx: { mx: 1, opacity: "0" },
       onClick: (e) => {
         e.stopPropagation();
         onEdit(item.value);
       },
-      "aria-label": (0, import_i18n4.__)("Edit", "elementor")
+      "aria-label": (0, import_i18n8.__)("Edit", "elementor")
     },
-    /* @__PURE__ */ React5.createElement(import_icons4.EditIcon, { color: "action", fontSize: SIZE4 })
+    /* @__PURE__ */ React6.createElement(import_icons4.EditIcon, { color: "action", fontSize: SIZE3 })
   ));
 };
 
 // src/components/ui/no-search-results.tsx
-var React6 = __toESM(require("react"));
-var import_ui6 = require("@elementor/ui");
-var import_i18n5 = require("@wordpress/i18n");
+var React7 = __toESM(require("react"));
+var import_ui8 = require("@elementor/ui");
+var import_i18n9 = require("@wordpress/i18n");
 var NoSearchResults = ({ searchValue, onClear, icon }) => {
-  return /* @__PURE__ */ React6.createElement(
-    import_ui6.Stack,
+  return /* @__PURE__ */ React7.createElement(
+    import_ui8.Stack,
     {
       gap: 1,
       alignItems: "center",
@@ -649,17 +816,17 @@ var NoSearchResults = ({ searchValue, onClear, icon }) => {
       sx: { pb: 3.5 }
     },
     icon,
-    /* @__PURE__ */ React6.createElement(import_ui6.Typography, { align: "center", variant: "subtitle2" }, (0, import_i18n5.__)("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React6.createElement("br", null), "\u201C", searchValue, "\u201D."),
-    /* @__PURE__ */ React6.createElement(import_ui6.Typography, { align: "center", variant: "caption", sx: { display: "flex", flexDirection: "column" } }, (0, import_i18n5.__)("Try something else.", "elementor"), /* @__PURE__ */ React6.createElement(import_ui6.Link, { color: "text.secondary", variant: "caption", component: "button", onClick: onClear }, (0, import_i18n5.__)("Clear & try again", "elementor")))
+    /* @__PURE__ */ React7.createElement(import_ui8.Typography, { align: "center", variant: "subtitle2" }, (0, import_i18n9.__)("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React7.createElement("br", null), "\u201C", searchValue, "\u201D."),
+    /* @__PURE__ */ React7.createElement(import_ui8.Typography, { align: "center", variant: "caption", sx: { display: "flex", flexDirection: "column" } }, (0, import_i18n9.__)("Try something else.", "elementor"), /* @__PURE__ */ React7.createElement(import_ui8.Link, { color: "text.secondary", variant: "caption", component: "button", onClick: onClear }, (0, import_i18n9.__)("Clear & try again", "elementor")))
   );
 };
 
 // src/components/ui/no-variables.tsx
-var React7 = __toESM(require("react"));
-var import_ui7 = require("@elementor/ui");
-var import_i18n6 = require("@wordpress/i18n");
-var NoVariables = ({ icon, title, onAdd }) => /* @__PURE__ */ React7.createElement(
-  import_ui7.Stack,
+var React8 = __toESM(require("react"));
+var import_ui9 = require("@elementor/ui");
+var import_i18n10 = require("@wordpress/i18n");
+var NoVariables = ({ icon, title, onAdd }) => /* @__PURE__ */ React8.createElement(
+  import_ui9.Stack,
   {
     gap: 1,
     alignItems: "center",
@@ -669,14 +836,14 @@ var NoVariables = ({ icon, title, onAdd }) => /* @__PURE__ */ React7.createEleme
     sx: { p: 2.5, pb: 5.5 }
   },
   icon,
-  /* @__PURE__ */ React7.createElement(import_ui7.Typography, { align: "center", variant: "subtitle2" }, title),
-  /* @__PURE__ */ React7.createElement(import_ui7.Typography, { align: "center", variant: "caption", maxWidth: "180px" }, (0, import_i18n6.__)("Variables are saved attributes that you can apply anywhere on your site.", "elementor")),
-  onAdd && /* @__PURE__ */ React7.createElement(import_ui7.Button, { variant: "outlined", color: "secondary", size: "small", onClick: onAdd }, (0, import_i18n6.__)("Create a variable", "elementor"))
+  /* @__PURE__ */ React8.createElement(import_ui9.Typography, { align: "center", variant: "subtitle2" }, title),
+  /* @__PURE__ */ React8.createElement(import_ui9.Typography, { align: "center", variant: "caption", maxWidth: "180px" }, (0, import_i18n10.__)("Variables are saved attributes that you can apply anywhere on your site.", "elementor")),
+  onAdd && /* @__PURE__ */ React8.createElement(import_ui9.Button, { variant: "outlined", color: "secondary", size: "small", onClick: onAdd }, (0, import_i18n10.__)("Create a variable", "elementor"))
 );
 
 // src/components/ui/styled-menu-list.tsx
-var import_ui8 = require("@elementor/ui");
-var VariablesStyledMenuList = (0, import_ui8.styled)(import_ui8.MenuList)(({ theme }) => ({
+var import_ui10 = require("@elementor/ui");
+var VariablesStyledMenuList = (0, import_ui10.styled)(import_ui10.MenuList)(({ theme }) => ({
   "& > li": {
     height: 32,
     width: "100%",
@@ -707,10 +874,10 @@ var VariablesStyledMenuList = (0, import_ui8.styled)(import_ui8.MenuList)(({ the
 }));
 
 // src/components/color-variables-selection.tsx
-var SIZE5 = "tiny";
+var SIZE4 = "tiny";
 var ColorVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
   const { value: variable, setValue: setVariable } = (0, import_editor_controls3.useBoundProp)(colorVariablePropTypeUtil);
-  const [searchValue, setSearchValue] = (0, import_react5.useState)("");
+  const [searchValue, setSearchValue] = (0, import_react7.useState)("");
   const {
     list: variables,
     hasMatches: hasSearchResults,
@@ -723,19 +890,19 @@ var ColorVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
   const actions = [];
   if (onAdd) {
     actions.push(
-      /* @__PURE__ */ React8.createElement(import_ui9.IconButton, { key: "add", size: SIZE5, onClick: onAdd }, /* @__PURE__ */ React8.createElement(import_icons5.PlusIcon, { fontSize: SIZE5 }))
+      /* @__PURE__ */ React9.createElement(import_ui11.IconButton, { key: "add", size: SIZE4, onClick: onAdd }, /* @__PURE__ */ React9.createElement(import_icons5.PlusIcon, { fontSize: SIZE4 }))
     );
   }
   if (onSettings) {
     actions.push(
-      /* @__PURE__ */ React8.createElement(import_ui9.IconButton, { key: "settings", size: SIZE5, onClick: onSettings }, /* @__PURE__ */ React8.createElement(import_icons5.SettingsIcon, { fontSize: SIZE5 }))
+      /* @__PURE__ */ React9.createElement(import_ui11.IconButton, { key: "settings", size: SIZE4, onClick: onSettings }, /* @__PURE__ */ React9.createElement(import_icons5.SettingsIcon, { fontSize: SIZE4 }))
     );
   }
   const items = variables.map(({ value, label, key }) => ({
     type: "item",
     value: key,
     label,
-    icon: /* @__PURE__ */ React8.createElement(ColorIndicator, { size: "inherit", component: "span", value }),
+    icon: /* @__PURE__ */ React9.createElement(ColorIndicator, { size: "inherit", component: "span", value }),
     secondaryText: value,
     onEdit: () => onEdit?.(key)
   }));
@@ -745,22 +912,22 @@ var ColorVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
   const handleClearSearch = () => {
     setSearchValue("");
   };
-  return /* @__PURE__ */ React8.createElement(React8.Fragment, null, /* @__PURE__ */ React8.createElement(
+  return /* @__PURE__ */ React9.createElement(import_editor_editing_panel3.PopoverBody, null, /* @__PURE__ */ React9.createElement(
     import_editor_ui4.PopoverHeader,
     {
-      title: (0, import_i18n7.__)("Variables", "elementor"),
-      icon: /* @__PURE__ */ React8.createElement(import_icons5.ColorFilterIcon, { fontSize: SIZE5 }),
+      title: (0, import_i18n11.__)("Variables", "elementor"),
+      icon: /* @__PURE__ */ React9.createElement(import_icons5.ColorFilterIcon, { fontSize: SIZE4 }),
       onClose: closePopover,
       actions
     }
-  ), hasVariables && /* @__PURE__ */ React8.createElement(
+  ), hasVariables && /* @__PURE__ */ React9.createElement(
     import_editor_ui4.PopoverSearch,
     {
       value: searchValue,
       onSearch: handleSearch,
-      placeholder: (0, import_i18n7.__)("Search", "elementor")
+      placeholder: (0, import_i18n11.__)("Search", "elementor")
     }
-  ), /* @__PURE__ */ React8.createElement(import_ui9.Divider, null), /* @__PURE__ */ React8.createElement(import_editor_editing_panel2.PopoverScrollableContent, null, hasVariables && hasSearchResults && /* @__PURE__ */ React8.createElement(
+  ), /* @__PURE__ */ React9.createElement(import_ui11.Divider, null), hasVariables && hasSearchResults && /* @__PURE__ */ React9.createElement(
     import_editor_ui4.PopoverMenuList,
     {
       items,
@@ -770,45 +937,104 @@ var ColorVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
       selectedValue: variable,
       "data-testid": "color-variables-list",
       menuListTemplate: VariablesStyledMenuList,
-      menuItemContentTemplate: (item) => /* @__PURE__ */ React8.createElement(MenuItemContent, { item })
+      menuItemContentTemplate: (item) => /* @__PURE__ */ React9.createElement(MenuItemContent, { item })
     }
-  ), !hasSearchResults && hasVariables && /* @__PURE__ */ React8.createElement(
+  ), !hasSearchResults && hasVariables && /* @__PURE__ */ React9.createElement(
     NoSearchResults,
     {
       searchValue,
       onClear: handleClearSearch,
-      icon: /* @__PURE__ */ React8.createElement(import_icons5.BrushIcon, { fontSize: "large" })
+      icon: /* @__PURE__ */ React9.createElement(import_icons5.BrushIcon, { fontSize: "large" })
     }
-  ), !hasVariables && /* @__PURE__ */ React8.createElement(
+  ), !hasVariables && /* @__PURE__ */ React9.createElement(
     NoVariables,
     {
-      title: (0, import_i18n7.__)("Create your first color variable", "elementor"),
-      icon: /* @__PURE__ */ React8.createElement(import_icons5.BrushIcon, { fontSize: "large" }),
+      title: (0, import_i18n11.__)("Create your first color variable", "elementor"),
+      icon: /* @__PURE__ */ React9.createElement(import_icons5.BrushIcon, { fontSize: "large" }),
       onAdd
     }
-  )));
+  ));
 };
 
 // src/components/font-variable-creation.tsx
-var React9 = __toESM(require("react"));
-var import_react6 = require("react");
-var import_editor_controls4 = require("@elementor/editor-controls");
-var import_editor_editing_panel3 = require("@elementor/editor-editing-panel");
+var React11 = __toESM(require("react"));
+var import_react9 = require("react");
+var import_editor_controls5 = require("@elementor/editor-controls");
+var import_editor_editing_panel5 = require("@elementor/editor-editing-panel");
 var import_editor_ui5 = require("@elementor/editor-ui");
+var import_icons7 = require("@elementor/icons");
+var import_ui13 = require("@elementor/ui");
+var import_i18n13 = require("@wordpress/i18n");
+
+// src/components/fields/font-field.tsx
+var React10 = __toESM(require("react"));
+var import_react8 = require("react");
+var import_editor_controls4 = require("@elementor/editor-controls");
+var import_editor_editing_panel4 = require("@elementor/editor-editing-panel");
 var import_icons6 = require("@elementor/icons");
-var import_ui10 = require("@elementor/ui");
-var import_i18n8 = require("@wordpress/i18n");
-var SIZE6 = "tiny";
+var import_ui12 = require("@elementor/ui");
+var import_i18n12 = require("@wordpress/i18n");
+var FontField = ({ value, onChange }) => {
+  const [fontFamily, setFontFamily] = (0, import_react8.useState)(value);
+  const [errorMessage, setErrorMessage] = (0, import_react8.useState)("");
+  const defaultRef = (0, import_react8.useRef)(null);
+  const anchorRef = usePopoverContentRef() ?? defaultRef;
+  const fontPopoverState = (0, import_ui12.usePopupState)({ variant: "popover" });
+  const fontFamilies = (0, import_editor_editing_panel4.useFontFamilies)();
+  const sectionWidth = (0, import_editor_editing_panel4.useSectionWidth)();
+  const handleChange = (newValue) => {
+    setFontFamily(newValue);
+    const errorMsg = validateValue(newValue);
+    setErrorMessage(errorMsg);
+    onChange(errorMsg ? "" : newValue);
+  };
+  const handleFontFamilyChange = (newFontFamily) => {
+    handleChange(newFontFamily);
+    fontPopoverState.close();
+  };
+  return /* @__PURE__ */ React10.createElement(import_ui12.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React10.createElement(import_ui12.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React10.createElement(import_ui12.FormLabel, { size: "tiny" }, (0, import_i18n12.__)("Value", "elementor"))), /* @__PURE__ */ React10.createElement(import_ui12.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React10.createElement(
+    import_ui12.UnstableTag,
+    {
+      variant: "outlined",
+      label: fontFamily,
+      endIcon: /* @__PURE__ */ React10.createElement(import_icons6.ChevronDownIcon, { fontSize: "tiny" }),
+      ...(0, import_ui12.bindTrigger)(fontPopoverState),
+      fullWidth: true
+    }
+  ), /* @__PURE__ */ React10.createElement(
+    import_ui12.Popover,
+    {
+      disablePortal: true,
+      disableScrollLock: true,
+      anchorEl: anchorRef.current,
+      anchorOrigin: { vertical: "top", horizontal: "right" },
+      transformOrigin: { vertical: "top", horizontal: -20 },
+      ...(0, import_ui12.bindPopover)(fontPopoverState)
+    },
+    /* @__PURE__ */ React10.createElement(
+      import_editor_controls4.FontFamilySelector,
+      {
+        fontFamilies,
+        fontFamily,
+        onFontFamilyChange: handleFontFamilyChange,
+        onClose: fontPopoverState.close,
+        sectionWidth
+      }
+    )
+  ), errorMessage && /* @__PURE__ */ React10.createElement(import_ui12.FormHelperText, { error: true }, errorMessage)));
+};
+
+// src/components/font-variable-creation.tsx
+var SIZE5 = "tiny";
 var FontVariableCreation = ({ onClose, onGoBack }) => {
-  const fontFamilies = (0, import_editor_editing_panel3.useFontFamilies)();
-  const { setValue: setVariable } = (0, import_editor_controls4.useBoundProp)(fontVariablePropTypeUtil);
-  const [fontFamily, setFontFamily] = (0, import_react6.useState)("");
-  const [label, setLabel] = (0, import_react6.useState)("");
-  const anchorRef = (0, import_react6.useRef)(null);
-  const fontPopoverState = (0, import_ui10.usePopupState)({ variant: "popover" });
+  const { setValue: setVariable } = (0, import_editor_controls5.useBoundProp)(fontVariablePropTypeUtil);
+  const [fontFamily, setFontFamily] = (0, import_react9.useState)("");
+  const [label, setLabel] = (0, import_react9.useState)("");
+  const [errorMessage, setErrorMessage] = (0, import_react9.useState)("");
   const resetFields = () => {
     setFontFamily("");
     setLabel("");
+    setErrorMessage("");
   };
   const closePopover = () => {
     resetFields();
@@ -822,165 +1048,168 @@ var FontVariableCreation = ({ onClose, onGoBack }) => {
     }).then((key) => {
       setVariable(key);
       closePopover();
+    }).catch((error) => {
+      setErrorMessage(error.message);
     });
   };
-  const isFormInvalid = () => {
-    return !fontFamily?.trim() || !label?.trim();
+  const hasEmptyValue = () => {
+    return "" === fontFamily.trim() || "" === label.trim();
   };
-  const sectionWidth = (0, import_editor_editing_panel3.useSectionWidth)();
-  return /* @__PURE__ */ React9.createElement(import_editor_editing_panel3.PopoverScrollableContent, { height: "auto" }, /* @__PURE__ */ React9.createElement(
+  const isSubmitDisabled = hasEmptyValue();
+  return /* @__PURE__ */ React11.createElement(import_editor_editing_panel5.PopoverBody, { height: "auto" }, /* @__PURE__ */ React11.createElement(
     import_editor_ui5.PopoverHeader,
     {
-      icon: /* @__PURE__ */ React9.createElement(React9.Fragment, null, onGoBack && /* @__PURE__ */ React9.createElement(import_ui10.IconButton, { size: SIZE6, "aria-label": (0, import_i18n8.__)("Go Back", "elementor"), onClick: onGoBack }, /* @__PURE__ */ React9.createElement(import_icons6.ArrowLeftIcon, { fontSize: SIZE6 })), /* @__PURE__ */ React9.createElement(import_icons6.TextIcon, { fontSize: SIZE6 })),
-      title: (0, import_i18n8.__)("Create variable", "elementor"),
+      icon: /* @__PURE__ */ React11.createElement(React11.Fragment, null, onGoBack && /* @__PURE__ */ React11.createElement(import_ui13.IconButton, { size: SIZE5, "aria-label": (0, import_i18n13.__)("Go Back", "elementor"), onClick: onGoBack }, /* @__PURE__ */ React11.createElement(import_icons7.ArrowLeftIcon, { fontSize: SIZE5 })), /* @__PURE__ */ React11.createElement(import_icons7.TextIcon, { fontSize: SIZE5 })),
+      title: (0, import_i18n13.__)("Create variable", "elementor"),
       onClose: closePopover
     }
-  ), /* @__PURE__ */ React9.createElement(import_ui10.Divider, null), /* @__PURE__ */ React9.createElement(import_editor_controls4.PopoverContent, { p: 2 }, /* @__PURE__ */ React9.createElement(import_ui10.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React9.createElement(import_ui10.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React9.createElement(import_ui10.FormLabel, { size: "tiny" }, (0, import_i18n8.__)("Name", "elementor"))), /* @__PURE__ */ React9.createElement(import_ui10.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React9.createElement(
-    import_ui10.TextField,
+  ), /* @__PURE__ */ React11.createElement(import_ui13.Divider, null), /* @__PURE__ */ React11.createElement(import_editor_controls5.PopoverContent, { p: 2 }, /* @__PURE__ */ React11.createElement(
+    LabelField,
     {
-      size: "tiny",
-      fullWidth: true,
       value: label,
-      onChange: (e) => setLabel(e.target.value)
-    }
-  ))), /* @__PURE__ */ React9.createElement(import_ui10.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React9.createElement(import_ui10.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React9.createElement(import_ui10.FormLabel, { size: "tiny" }, (0, import_i18n8.__)("Value", "elementor"))), /* @__PURE__ */ React9.createElement(import_ui10.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React9.createElement(React9.Fragment, null, /* @__PURE__ */ React9.createElement(
-    import_ui10.UnstableTag,
-    {
-      variant: "outlined",
-      label: fontFamily,
-      endIcon: /* @__PURE__ */ React9.createElement(import_icons6.ChevronDownIcon, { fontSize: "tiny" }),
-      ...(0, import_ui10.bindTrigger)(fontPopoverState),
-      fullWidth: true
+      onChange: (value) => {
+        setLabel(value);
+        setErrorMessage("");
+      }
     }
-  ), /* @__PURE__ */ React9.createElement(
-    import_ui10.Popover,
+  ), /* @__PURE__ */ React11.createElement(
+    FontField,
     {
-      disablePortal: true,
-      disableScrollLock: true,
-      anchorEl: anchorRef.current,
-      anchorOrigin: { vertical: "top", horizontal: "right" },
-      transformOrigin: { vertical: "top", horizontal: -20 },
-      ...(0, import_ui10.bindPopover)(fontPopoverState)
-    },
-    /* @__PURE__ */ React9.createElement(
-      import_editor_controls4.FontFamilySelector,
-      {
-        fontFamilies,
-        fontFamily,
-        onFontFamilyChange: setFontFamily,
-        onClose: fontPopoverState.close,
-        sectionWidth
+      value: fontFamily,
+      onChange: (value) => {
+        setFontFamily(value);
+        setErrorMessage("");
       }
-    )
-  ))))), /* @__PURE__ */ React9.createElement(import_ui10.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React9.createElement(import_ui10.Button, { size: "small", variant: "contained", disabled: isFormInvalid(), onClick: handleCreate }, (0, import_i18n8.__)("Create", "elementor"))));
+    }
+  ), errorMessage && /* @__PURE__ */ React11.createElement(import_ui13.FormHelperText, { error: true }, errorMessage)), /* @__PURE__ */ React11.createElement(import_ui13.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React11.createElement(import_ui13.Button, { size: "small", variant: "contained", disabled: isSubmitDisabled, onClick: handleCreate }, (0, import_i18n13.__)("Create", "elementor"))));
 };
 
 // src/components/font-variable-edit.tsx
-var React10 = __toESM(require("react"));
-var import_react7 = require("react");
-var import_editor_controls5 = require("@elementor/editor-controls");
-var import_editor_editing_panel4 = require("@elementor/editor-editing-panel");
+var React12 = __toESM(require("react"));
+var import_react10 = require("react");
+var import_editor_controls6 = require("@elementor/editor-controls");
+var import_editor_editing_panel6 = require("@elementor/editor-editing-panel");
 var import_editor_ui6 = require("@elementor/editor-ui");
-var import_icons7 = require("@elementor/icons");
-var import_ui11 = require("@elementor/ui");
-var import_i18n9 = require("@wordpress/i18n");
-var SIZE7 = "tiny";
+var import_icons8 = require("@elementor/icons");
+var import_ui14 = require("@elementor/ui");
+var import_i18n14 = require("@wordpress/i18n");
+var SIZE6 = "tiny";
 var FontVariableEdit = ({ onClose, onGoBack, onSubmit, editId }) => {
+  const { setValue: notifyBoundPropChange, value: assignedValue } = (0, import_editor_controls6.useBoundProp)(fontVariablePropTypeUtil);
+  const [deleteConfirmation, setDeleteConfirmation] = (0, import_react10.useState)(false);
+  const [errorMessage, setErrorMessage] = (0, import_react10.useState)("");
   const variable = useVariable(editId);
   if (!variable) {
     throw new Error(`Global font variable "${editId}" not found`);
   }
-  const [fontFamily, setFontFamily] = (0, import_react7.useState)(variable.value);
-  const [label, setLabel] = (0, import_react7.useState)(variable.label);
-  const variableNameId = (0, import_react7.useId)();
-  const variableValueId = (0, import_react7.useId)();
-  const anchorRef = (0, import_react7.useRef)(null);
-  const fontPopoverState = (0, import_ui11.usePopupState)({ variant: "popover" });
-  const fontFamilies = (0, import_editor_editing_panel4.useFontFamilies)();
+  const [fontFamily, setFontFamily] = (0, import_react10.useState)(variable.value);
+  const [label, setLabel] = (0, import_react10.useState)(variable.label);
   const handleUpdate = () => {
     updateVariable(editId, {
       value: fontFamily,
       label
     }).then(() => {
+      maybeTriggerBoundPropChange();
       onSubmit?.();
+    }).catch((error) => {
+      setErrorMessage(error.message);
     });
   };
   const handleDelete = () => {
     deleteVariable(editId).then(() => {
+      maybeTriggerBoundPropChange();
       onSubmit?.();
     });
   };
-  const noValueChanged = () => fontFamily === variable.value && label === variable.label;
-  const hasEmptyValue = () => "" === fontFamily.trim() || "" === label.trim();
-  const isSaveDisabled = () => noValueChanged() || hasEmptyValue();
-  const sectionWidth = (0, import_editor_editing_panel4.useSectionWidth)();
+  const maybeTriggerBoundPropChange = () => {
+    if (editId === assignedValue) {
+      notifyBoundPropChange(editId);
+    }
+  };
+  const handleDeleteConfirmation = () => {
+    setDeleteConfirmation(true);
+  };
+  const closeDeleteDialog = () => () => {
+    setDeleteConfirmation(false);
+  };
+  const hasEmptyValue = () => {
+    return !fontFamily.trim() || !label.trim();
+  };
+  const noValueChanged = () => {
+    return fontFamily === variable.value && label === variable.label;
+  };
+  const isSubmitDisabled = noValueChanged() || hasEmptyValue();
   const actions = [];
   actions.push(
-    /* @__PURE__ */ React10.createElement(import_ui11.IconButton, { key: "delete", size: SIZE7, "aria-label": (0, import_i18n9.__)("Delete", "elementor"), onClick: handleDelete }, /* @__PURE__ */ React10.createElement(import_icons7.TrashIcon, { fontSize: SIZE7 }))
+    /* @__PURE__ */ React12.createElement(
+      import_ui14.IconButton,
+      {
+        key: "delete",
+        size: SIZE6,
+        "aria-label": (0, import_i18n14.__)("Delete", "elementor"),
+        onClick: handleDeleteConfirmation
+      },
+      /* @__PURE__ */ React12.createElement(import_icons8.TrashIcon, { fontSize: SIZE6 })
+    )
   );
-  return /* @__PURE__ */ React10.createElement(import_editor_ui6.PopoverScrollableContent, { height: "auto" }, /* @__PURE__ */ React10.createElement(
+  return /* @__PURE__ */ React12.createElement(React12.Fragment, null, /* @__PURE__ */ React12.createElement(import_editor_editing_panel6.PopoverBody, { height: "auto" }, /* @__PURE__ */ React12.createElement(
     import_editor_ui6.PopoverHeader,
     {
-      icon: /* @__PURE__ */ React10.createElement(React10.Fragment, null, onGoBack && /* @__PURE__ */ React10.createElement(import_ui11.IconButton, { size: SIZE7, "aria-label": (0, import_i18n9.__)("Go Back", "elementor"), onClick: onGoBack }, /* @__PURE__ */ React10.createElement(import_icons7.ArrowLeftIcon, { fontSize: SIZE7 })), /* @__PURE__ */ React10.createElement(import_icons7.TextIcon, { fontSize: SIZE7 })),
-      title: (0, import_i18n9.__)("Edit variable", "elementor"),
+      icon: /* @__PURE__ */ React12.createElement(React12.Fragment, null, onGoBack && /* @__PURE__ */ React12.createElement(
+        import_ui14.IconButton,
+        {
+          size: SIZE6,
+          "aria-label": (0, import_i18n14.__)("Go Back", "elementor"),
+          onClick: onGoBack
+        },
+        /* @__PURE__ */ React12.createElement(import_icons8.ArrowLeftIcon, { fontSize: SIZE6 })
+      ), /* @__PURE__ */ React12.createElement(import_icons8.TextIcon, { fontSize: SIZE6 })),
+      title: (0, import_i18n14.__)("Edit variable", "elementor"),
       onClose,
       actions
     }
-  ), /* @__PURE__ */ React10.createElement(import_ui11.Divider, null), /* @__PURE__ */ React10.createElement(import_editor_controls5.PopoverContent, { p: 2 }, /* @__PURE__ */ React10.createElement(import_ui11.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React10.createElement(import_ui11.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React10.createElement(import_ui11.FormLabel, { htmlFor: variableNameId, size: "tiny" }, (0, import_i18n9.__)("Name", "elementor"))), /* @__PURE__ */ React10.createElement(import_ui11.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React10.createElement(
-    import_ui11.TextField,
+  ), /* @__PURE__ */ React12.createElement(import_ui14.Divider, null), /* @__PURE__ */ React12.createElement(import_editor_controls6.PopoverContent, { p: 2 }, /* @__PURE__ */ React12.createElement(
+    LabelField,
     {
-      id: variableNameId,
-      size: "tiny",
-      fullWidth: true,
       value: label,
-      onChange: (e) => setLabel(e.target.value)
+      onChange: (value) => {
+        setLabel(value);
+        setErrorMessage("");
+      }
     }
-  ))), /* @__PURE__ */ React10.createElement(import_ui11.Grid, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React10.createElement(import_ui11.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React10.createElement(import_ui11.FormLabel, { htmlFor: variableValueId, size: "tiny" }, (0, import_i18n9.__)("Value", "elementor"))), /* @__PURE__ */ React10.createElement(import_ui11.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(
-    import_ui11.UnstableTag,
+  ), /* @__PURE__ */ React12.createElement(
+    FontField,
     {
-      id: variableValueId,
-      variant: "outlined",
-      label: fontFamily,
-      endIcon: /* @__PURE__ */ React10.createElement(import_icons7.ChevronDownIcon, { fontSize: "tiny" }),
-      ...(0, import_ui11.bindTrigger)(fontPopoverState),
-      fullWidth: true
+      value: fontFamily,
+      onChange: (value) => {
+        setFontFamily(value);
+        setErrorMessage("");
+      }
     }
-  ), /* @__PURE__ */ React10.createElement(
-    import_ui11.Popover,
+  ), errorMessage && /* @__PURE__ */ React12.createElement(import_ui14.FormHelperText, { error: true }, errorMessage)), /* @__PURE__ */ React12.createElement(import_ui14.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React12.createElement(import_ui14.Button, { size: "small", variant: "contained", disabled: isSubmitDisabled, onClick: handleUpdate }, (0, import_i18n14.__)("Save", "elementor")))), deleteConfirmation && /* @__PURE__ */ React12.createElement(
+    DeleteConfirmationDialog,
     {
-      disablePortal: true,
-      disableScrollLock: true,
-      anchorEl: anchorRef.current,
-      anchorOrigin: { vertical: "top", horizontal: "right" },
-      transformOrigin: { vertical: "top", horizontal: -20 },
-      ...(0, import_ui11.bindPopover)(fontPopoverState)
-    },
-    /* @__PURE__ */ React10.createElement(
-      import_editor_controls5.FontFamilySelector,
-      {
-        fontFamilies,
-        fontFamily,
-        onFontFamilyChange: setFontFamily,
-        onClose: fontPopoverState.close,
-        sectionWidth
-      }
-    )
-  ))))), /* @__PURE__ */ React10.createElement(import_ui11.CardActions, { sx: { pt: 0.5, pb: 1 } }, /* @__PURE__ */ React10.createElement(import_ui11.Button, { size: "small", variant: "contained", disabled: isSaveDisabled(), onClick: handleUpdate }, (0, import_i18n9.__)("Save", "elementor"))));
+      open: true,
+      label,
+      onConfirm: handleDelete,
+      closeDialog: closeDeleteDialog()
+    }
+  ));
 };
 
 // src/components/font-variables-selection.tsx
-var React11 = __toESM(require("react"));
-var import_react8 = require("react");
-var import_editor_controls6 = require("@elementor/editor-controls");
-var import_editor_editing_panel5 = require("@elementor/editor-editing-panel");
+var React13 = __toESM(require("react"));
+var import_react11 = require("react");
+var import_editor_controls7 = require("@elementor/editor-controls");
+var import_editor_editing_panel7 = require("@elementor/editor-editing-panel");
 var import_editor_ui7 = require("@elementor/editor-ui");
-var import_icons8 = require("@elementor/icons");
-var import_ui12 = require("@elementor/ui");
-var import_i18n10 = require("@wordpress/i18n");
-var SIZE8 = "tiny";
+var import_icons9 = require("@elementor/icons");
+var import_ui15 = require("@elementor/ui");
+var import_i18n15 = require("@wordpress/i18n");
+var SIZE7 = "tiny";
 var FontVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
-  const { value: variable, setValue: setVariable } = (0, import_editor_controls6.useBoundProp)(fontVariablePropTypeUtil);
-  const [searchValue, setSearchValue] = (0, import_react8.useState)("");
+  const { value: variable, setValue: setVariable } = (0, import_editor_controls7.useBoundProp)(fontVariablePropTypeUtil);
+  const [searchValue, setSearchValue] = (0, import_react11.useState)("");
   const {
     list: variables,
     hasMatches: hasSearchResults,
@@ -993,19 +1222,19 @@ var FontVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
   const actions = [];
   if (onAdd) {
     actions.push(
-      /* @__PURE__ */ React11.createElement(import_ui12.IconButton, { key: "add", size: SIZE8, onClick: onAdd }, /* @__PURE__ */ React11.createElement(import_icons8.PlusIcon, { fontSize: SIZE8 }))
+      /* @__PURE__ */ React13.createElement(import_ui15.IconButton, { key: "add", size: SIZE7, onClick: onAdd }, /* @__PURE__ */ React13.createElement(import_icons9.PlusIcon, { fontSize: SIZE7 }))
     );
   }
   if (onSettings) {
     actions.push(
-      /* @__PURE__ */ React11.createElement(import_ui12.IconButton, { key: "settings", size: SIZE8, onClick: onSettings }, /* @__PURE__ */ React11.createElement(import_icons8.SettingsIcon, { fontSize: SIZE8 }))
+      /* @__PURE__ */ React13.createElement(import_ui15.IconButton, { key: "settings", size: SIZE7, onClick: onSettings }, /* @__PURE__ */ React13.createElement(import_icons9.SettingsIcon, { fontSize: SIZE7 }))
     );
   }
   const items = variables.map(({ value, label, key }) => ({
     type: "item",
     value: key,
     label,
-    icon: /* @__PURE__ */ React11.createElement(import_icons8.TextIcon, { fontSize: SIZE8 }),
+    icon: /* @__PURE__ */ React13.createElement(import_icons9.TextIcon, { fontSize: SIZE7 }),
     secondaryText: value,
     onEdit: () => onEdit?.(key)
   }));
@@ -1015,22 +1244,22 @@ var FontVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
   const handleClearSearch = () => {
     setSearchValue("");
   };
-  return /* @__PURE__ */ React11.createElement(React11.Fragment, null, /* @__PURE__ */ React11.createElement(
+  return /* @__PURE__ */ React13.createElement(import_editor_editing_panel7.PopoverBody, null, /* @__PURE__ */ React13.createElement(
     import_editor_ui7.PopoverHeader,
     {
-      title: (0, import_i18n10.__)("Variables", "elementor"),
+      title: (0, import_i18n15.__)("Variables", "elementor"),
       onClose: closePopover,
-      icon: /* @__PURE__ */ React11.createElement(import_icons8.ColorFilterIcon, { fontSize: SIZE8 }),
+      icon: /* @__PURE__ */ React13.createElement(import_icons9.ColorFilterIcon, { fontSize: SIZE7 }),
       actions
     }
-  ), hasVariables && /* @__PURE__ */ React11.createElement(
+  ), hasVariables && /* @__PURE__ */ React13.createElement(
     import_editor_ui7.PopoverSearch,
     {
       value: searchValue,
       onSearch: handleSearch,
-      placeholder: (0, import_i18n10.__)("Search", "elementor")
+      placeholder: (0, import_i18n15.__)("Search", "elementor")
     }
-  ), /* @__PURE__ */ React11.createElement(import_ui12.Divider, null), /* @__PURE__ */ React11.createElement(import_editor_editing_panel5.PopoverScrollableContent, null, hasVariables && hasSearchResults && /* @__PURE__ */ React11.createElement(
+  ), /* @__PURE__ */ React13.createElement(import_ui15.Divider, null), hasVariables && hasSearchResults && /* @__PURE__ */ React13.createElement(
     import_editor_ui7.PopoverMenuList,
     {
       items,
@@ -1040,23 +1269,23 @@ var FontVariablesSelection = ({ closePopover, onAdd, onEdit, onSettings }) => {
       selectedValue: variable,
       "data-testid": "font-variables-list",
       menuListTemplate: VariablesStyledMenuList,
-      menuItemContentTemplate: (item) => /* @__PURE__ */ React11.createElement(MenuItemContent, { item })
+      menuItemContentTemplate: (item) => /* @__PURE__ */ React13.createElement(MenuItemContent, { item })
     }
-  ), !hasSearchResults && hasVariables && /* @__PURE__ */ React11.createElement(
+  ), !hasSearchResults && hasVariables && /* @__PURE__ */ React13.createElement(
     NoSearchResults,
     {
       searchValue,
       onClear: handleClearSearch,
-      icon: /* @__PURE__ */ React11.createElement(import_icons8.TextIcon, { fontSize: "large" })
+      icon: /* @__PURE__ */ React13.createElement(import_icons9.TextIcon, { fontSize: "large" })
     }
-  ), !hasVariables && /* @__PURE__ */ React11.createElement(
+  ), !hasVariables && /* @__PURE__ */ React13.createElement(
     NoVariables,
     {
-      title: (0, import_i18n10.__)("Create your first font variable", "elementor"),
-      icon: /* @__PURE__ */ React11.createElement(import_icons8.TextIcon, { fontSize: "large" }),
+      title: (0, import_i18n15.__)("Create your first font variable", "elementor"),
+      icon: /* @__PURE__ */ React13.createElement(import_icons9.TextIcon, { fontSize: "large" }),
       onAdd
     }
-  )));
+  ));
 };
 
 // src/components/variable-selection-popover.tsx
@@ -1064,10 +1293,10 @@ var VIEW_LIST = "list";
 var VIEW_ADD = "add";
 var VIEW_EDIT = "edit";
 var VariableSelectionPopover = ({ closePopover, propTypeKey, selectedVariable }) => {
-  const [currentView, setCurrentView] = (0, import_react9.useState)(VIEW_LIST);
-  const editIdRef = (0, import_react9.useRef)("");
-  const anchorRef = (0, import_react9.useRef)(null);
-  return /* @__PURE__ */ React12.createElement(PopoverContentRefContext.Provider, { value: anchorRef }, /* @__PURE__ */ React12.createElement(import_ui13.Box, { ref: anchorRef }, renderStage({
+  const [currentView, setCurrentView] = (0, import_react12.useState)(VIEW_LIST);
+  const editIdRef = (0, import_react12.useRef)("");
+  const anchorRef = (0, import_react12.useRef)(null);
+  return /* @__PURE__ */ React14.createElement(PopoverContentRefContext.Provider, { value: anchorRef }, /* @__PURE__ */ React14.createElement(import_ui16.Box, { ref: anchorRef }, renderStage({
     propTypeKey,
     currentView,
     selectedVariable,
@@ -1086,7 +1315,7 @@ function renderStage(props) {
   };
   if (fontVariablePropTypeUtil.key === props.propTypeKey) {
     if (VIEW_LIST === props.currentView) {
-      return /* @__PURE__ */ React12.createElement(
+      return /* @__PURE__ */ React14.createElement(
         FontVariablesSelection,
         {
           closePopover: props.closePopover,
@@ -1101,7 +1330,7 @@ function renderStage(props) {
       );
     }
     if (VIEW_ADD === props.currentView) {
-      return /* @__PURE__ */ React12.createElement(
+      return /* @__PURE__ */ React14.createElement(
         FontVariableCreation,
         {
           onGoBack: () => props.setCurrentView(VIEW_LIST),
@@ -1110,7 +1339,7 @@ function renderStage(props) {
       );
     }
     if (VIEW_EDIT === props.currentView) {
-      return /* @__PURE__ */ React12.createElement(
+      return /* @__PURE__ */ React14.createElement(
         FontVariableEdit,
         {
           editId: props.editIdRef.current ?? "",
@@ -1123,7 +1352,7 @@ function renderStage(props) {
   }
   if (colorVariablePropTypeUtil.key === props.propTypeKey) {
     if (VIEW_LIST === props.currentView) {
-      return /* @__PURE__ */ React12.createElement(
+      return /* @__PURE__ */ React14.createElement(
         ColorVariablesSelection,
         {
           closePopover: props.closePopover,
@@ -1138,7 +1367,7 @@ function renderStage(props) {
       );
     }
     if (VIEW_ADD === props.currentView) {
-      return /* @__PURE__ */ React12.createElement(
+      return /* @__PURE__ */ React14.createElement(
         ColorVariableCreation,
         {
           onGoBack: () => props.setCurrentView(VIEW_LIST),
@@ -1147,7 +1376,7 @@ function renderStage(props) {
       );
     }
     if (VIEW_EDIT === props.currentView) {
-      return /* @__PURE__ */ React12.createElement(
+      return /* @__PURE__ */ React14.createElement(
         ColorVariableEdit,
         {
           editId: props.editIdRef.current ?? "",
@@ -1161,33 +1390,59 @@ function renderStage(props) {
   return null;
 }
 
-// src/controls/color-variable-control.tsx
-var ColorVariableControl = () => {
-  const { setValue: setColor } = (0, import_editor_controls7.useBoundProp)();
-  const { value: variableValue } = (0, import_editor_controls7.useBoundProp)(colorVariablePropTypeUtil);
-  const anchorRef = (0, import_react10.useRef)(null);
-  const popupId = (0, import_react10.useId)();
-  const popupState = (0, import_ui14.usePopupState)({
+// src/components/ui/tags/assigned-tag.tsx
+var React15 = __toESM(require("react"));
+var import_icons10 = require("@elementor/icons");
+var import_ui17 = require("@elementor/ui");
+var import_i18n16 = require("@wordpress/i18n");
+var SIZE8 = "tiny";
+var AssignedTag = ({ startIcon, label, onUnlink, ...props }) => {
+  const actions = [];
+  if (onUnlink) {
+    actions.push(
+      /* @__PURE__ */ React15.createElement(import_ui17.IconButton, { key: "unlink", size: SIZE8, onClick: onUnlink, "aria-label": (0, import_i18n16.__)("Unlink", "elementor") }, /* @__PURE__ */ React15.createElement(import_icons10.DetachIcon, { fontSize: SIZE8 }))
+    );
+  }
+  return /* @__PURE__ */ React15.createElement(import_ui17.Tooltip, { title: label, placement: "top" }, /* @__PURE__ */ React15.createElement(
+    import_ui17.UnstableTag,
+    {
+      fullWidth: true,
+      showActionsOnHover: true,
+      startIcon: /* @__PURE__ */ React15.createElement(import_ui17.Stack, { gap: 0.5, direction: "row", alignItems: "center" }, startIcon),
+      label: /* @__PURE__ */ React15.createElement(import_ui17.Box, { sx: { display: "inline-grid", minWidth: 0 } }, /* @__PURE__ */ React15.createElement(import_ui17.Typography, { sx: { lineHeight: 1.34 }, variant: "caption", noWrap: true }, label)),
+      actions,
+      ...props
+    }
+  ));
+};
+
+// src/components/ui/variable/assigned-variable.tsx
+var AssignedVariable = ({
+  variable,
+  variablePropTypeUtil,
+  fallbackPropTypeUtil,
+  additionalStartIcon
+}) => {
+  const { setValue } = (0, import_editor_controls8.useBoundProp)();
+  const anchorRef = (0, import_react13.useRef)(null);
+  const popupId = (0, import_react13.useId)();
+  const popupState = (0, import_ui18.usePopupState)({
     variant: "popover",
     popupId: `elementor-variables-list-${popupId}`
   });
-  const selectedVariable = useVariable(variableValue);
-  if (!selectedVariable) {
-    throw new Error(`Global color variable ${variableValue} not found`);
-  }
   const unlinkVariable = () => {
-    setColor(import_editor_props3.colorPropTypeUtil.create(selectedVariable.value));
+    setValue(fallbackPropTypeUtil.create(variable.value));
   };
-  return /* @__PURE__ */ React13.createElement(import_ui14.Box, { ref: anchorRef }, /* @__PURE__ */ React13.createElement(
-    VariableTag,
+  return /* @__PURE__ */ React16.createElement(import_ui18.Box, { ref: anchorRef }, /* @__PURE__ */ React16.createElement(
+    AssignedTag,
     {
-      label: selectedVariable.label,
-      startIcon: /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(import_icons9.ColorFilterIcon, { fontSize: SIZE }), /* @__PURE__ */ React13.createElement(ColorIndicator, { size: "inherit", value: selectedVariable.value, component: "span" })),
+      label: variable.label,
+      startIcon: /* @__PURE__ */ React16.createElement(React16.Fragment, null, /* @__PURE__ */ React16.createElement(import_icons11.ColorFilterIcon, { fontSize: SIZE8 }), additionalStartIcon),
       onUnlink: unlinkVariable,
-      ...(0, import_ui14.bindTrigger)(popupState)
+      ...(0, import_ui18.bindTrigger)(popupState)
     }
-  ), /* @__PURE__ */ React13.createElement(
-    import_ui14.Popover,
+  ), /* @__PURE__ */ React16.createElement(
+    import_ui18.Popover,
     {
       disableScrollLock: true,
       anchorEl: anchorRef.current,
@@ -1196,24 +1451,168 @@ var ColorVariableControl = () => {
       PaperProps: {
         sx: { my: 1 }
       },
-      ...(0, import_ui14.bindPopover)(popupState)
+      ...(0, import_ui18.bindPopover)(popupState)
     },
-    /* @__PURE__ */ React13.createElement(
+    /* @__PURE__ */ React16.createElement(
       VariableSelectionPopover,
       {
-        selectedVariable,
+        selectedVariable: variable,
         closePopover: popupState.close,
-        propTypeKey: colorVariablePropTypeUtil.key
+        propTypeKey: variablePropTypeUtil.key
       }
     )
   ));
 };
 
+// src/components/ui/variable/deleted-variable.tsx
+var React19 = __toESM(require("react"));
+var import_react14 = require("react");
+var import_editor_controls9 = require("@elementor/editor-controls");
+var import_editor_v1_adapters = require("@elementor/editor-v1-adapters");
+var import_ui21 = require("@elementor/ui");
+
+// src/components/ui/deleted-variable-alert.tsx
+var React17 = __toESM(require("react"));
+var import_editor_editing_panel8 = require("@elementor/editor-editing-panel");
+var import_ui19 = require("@elementor/ui");
+var import_i18n17 = require("@wordpress/i18n");
+var DeletedVariableAlert = ({ onClose, onUnlink, onRestore, label }) => {
+  const sectionWidth = (0, import_editor_editing_panel8.useSectionWidth)();
+  return /* @__PURE__ */ React17.createElement(import_ui19.ClickAwayListener, { onClickAway: onClose }, /* @__PURE__ */ React17.createElement(
+    import_ui19.Alert,
+    {
+      variant: "standard",
+      severity: "warning",
+      onClose,
+      action: /* @__PURE__ */ React17.createElement(React17.Fragment, null, onUnlink && /* @__PURE__ */ React17.createElement(import_ui19.AlertAction, { variant: "contained", onClick: onUnlink }, (0, import_i18n17.__)("Unlink", "elementor")), onRestore && /* @__PURE__ */ React17.createElement(import_ui19.AlertAction, { variant: "outlined", onClick: onRestore }, (0, import_i18n17.__)("Restore", "elementor"))),
+      sx: { width: sectionWidth }
+    },
+    /* @__PURE__ */ React17.createElement(import_ui19.AlertTitle, null, (0, import_i18n17.__)("Deleted variable", "elementor")),
+    (0, import_i18n17.__)("The variable", "elementor"),
+    " '",
+    label,
+    "'",
+    " ",
+    (0, import_i18n17.__)(
+      "has been deleted, but it is still referenced in this location. You may restore the variable or unlink it to assign a different value.",
+      "elementor"
+    )
+  ));
+};
+
+// src/components/ui/tags/deleted-tag.tsx
+var React18 = __toESM(require("react"));
+var import_icons12 = require("@elementor/icons");
+var import_ui20 = require("@elementor/ui");
+var import_i18n18 = require("@wordpress/i18n");
+var DeletedTag = React18.forwardRef(({ label, onClick, ...props }, ref) => {
+  return /* @__PURE__ */ React18.createElement(
+    import_ui20.Chip,
+    {
+      ref,
+      size: "tiny",
+      color: "warning",
+      shape: "rounded",
+      variant: "standard",
+      onClick,
+      icon: /* @__PURE__ */ React18.createElement(import_icons12.AlertTriangleFilledIcon, null),
+      label: /* @__PURE__ */ React18.createElement(import_ui20.Tooltip, { title: label, placement: "top" }, /* @__PURE__ */ React18.createElement(import_ui20.Box, { sx: { display: "flex", gap: 0.5, alignItems: "center" } }, /* @__PURE__ */ React18.createElement(import_ui20.Typography, { variant: "caption", noWrap: true }, label), /* @__PURE__ */ React18.createElement(import_ui20.Typography, { variant: "caption", noWrap: true, sx: { textOverflow: "initial", overflow: "visible" } }, "(", (0, import_i18n18.__)("deleted", "elementor"), ")"))),
+      sx: {
+        height: (theme) => theme.spacing(3.5),
+        borderRadius: (theme) => theme.spacing(1),
+        justifyContent: "flex-start",
+        width: "100%"
+      },
+      ...props
+    }
+  );
+});
+
+// src/components/ui/variable/deleted-variable.tsx
+var isV331Active = (0, import_editor_v1_adapters.isExperimentActive)("e_v_3_31");
+var DeletedVariable = ({ variable, variablePropTypeUtil, fallbackPropTypeUtil }) => {
+  const { setValue } = (0, import_editor_controls9.useBoundProp)();
+  const [showInfotip, setShowInfotip] = (0, import_react14.useState)(false);
+  const toggleInfotip = () => setShowInfotip((prev) => !prev);
+  const closeInfotip = () => setShowInfotip(false);
+  const unlinkVariable = () => {
+    setValue(fallbackPropTypeUtil.create(variable.value));
+  };
+  const handleRestore = () => {
+    if (!variable.key) {
+      return;
+    }
+    restoreVariable(variable.key).then((key) => {
+      setValue(variablePropTypeUtil.create(key));
+      closeInfotip();
+    });
+  };
+  return /* @__PURE__ */ React19.createElement(React19.Fragment, null, showInfotip && /* @__PURE__ */ React19.createElement(import_ui21.Backdrop, { open: true, onClick: closeInfotip, invisible: true }), /* @__PURE__ */ React19.createElement(
+    import_ui21.Infotip,
+    {
+      color: "warning",
+      placement: "right-start",
+      open: showInfotip,
+      disableHoverListener: true,
+      onClose: closeInfotip,
+      content: /* @__PURE__ */ React19.createElement(
+        DeletedVariableAlert,
+        {
+          onClose: closeInfotip,
+          onUnlink: unlinkVariable,
+          onRestore: isV331Active ? handleRestore : void 0,
+          label: variable.label
+        }
+      ),
+      slotProps: {
+        popper: {
+          modifiers: [
+            {
+              name: "offset",
+              options: { offset: [0, 24] }
+            }
+          ]
+        }
+      }
+    },
+    /* @__PURE__ */ React19.createElement(DeletedTag, { label: variable.label, onClick: toggleInfotip })
+  ));
+};
+
+// src/controls/color-variable-control.tsx
+var ColorVariableControl = () => {
+  const { value: variableValue } = (0, import_editor_controls10.useBoundProp)(colorVariablePropTypeUtil);
+  const assignedVariable = useVariable(variableValue);
+  if (!assignedVariable) {
+    throw new Error(`Global color variable ${variableValue} not found`);
+  }
+  const isVariableDeleted = assignedVariable?.deleted;
+  if (isVariableDeleted) {
+    return /* @__PURE__ */ React20.createElement(
+      DeletedVariable,
+      {
+        variable: assignedVariable,
+        variablePropTypeUtil: colorVariablePropTypeUtil,
+        fallbackPropTypeUtil: import_editor_props3.colorPropTypeUtil
+      }
+    );
+  }
+  return /* @__PURE__ */ React20.createElement(
+    AssignedVariable,
+    {
+      variable: assignedVariable,
+      variablePropTypeUtil: colorVariablePropTypeUtil,
+      fallbackPropTypeUtil: import_editor_props3.colorPropTypeUtil,
+      additionalStartIcon: /* @__PURE__ */ React20.createElement(ColorIndicator, { size: "inherit", value: assignedVariable.value, component: "span" })
+    }
+  );
+};
+
 // src/hooks/use-prop-color-variable-action.tsx
-var React14 = __toESM(require("react"));
-var import_editor_editing_panel6 = require("@elementor/editor-editing-panel");
-var import_icons10 = require("@elementor/icons");
-var import_i18n11 = require("@wordpress/i18n");
+var React21 = __toESM(require("react"));
+var import_editor_editing_panel9 = require("@elementor/editor-editing-panel");
+var import_icons13 = require("@elementor/icons");
+var import_i18n19 = require("@wordpress/i18n");
 
 // src/utils.ts
 var hasAssignedColorVariable = (propValue) => {
@@ -1231,39 +1630,91 @@ var supportsFontVariables = (propType) => {
 
 // src/hooks/use-prop-color-variable-action.tsx
 var usePropColorVariableAction = () => {
-  const { propType } = (0, import_editor_editing_panel6.useBoundProp)();
+  const { propType } = (0, import_editor_editing_panel9.useBoundProp)();
   const visible = !!propType && supportsColorVariables(propType);
   return {
     visible,
-    icon: import_icons10.ColorFilterIcon,
-    title: (0, import_i18n11.__)("Variables", "elementor"),
+    icon: import_icons13.ColorFilterIcon,
+    title: (0, import_i18n19.__)("Variables", "elementor"),
     content: ({ close: closePopover }) => {
-      return /* @__PURE__ */ React14.createElement(VariableSelectionPopover, { closePopover, propTypeKey: colorVariablePropTypeUtil.key });
+      return /* @__PURE__ */ React21.createElement(VariableSelectionPopover, { closePopover, propTypeKey: colorVariablePropTypeUtil.key });
     }
   };
 };
 
+// src/repeater-injections.ts
+var import_editor_controls11 = require("@elementor/editor-controls");
+var import_editor_props4 = require("@elementor/editor-props");
+
+// src/components/variables-repeater-item-slot.tsx
+var React22 = __toESM(require("react"));
+var useColorVariable = (value) => {
+  const variableId = value?.value?.color?.value;
+  return useVariable(variableId || "");
+};
+var BackgroundRepeaterColorIndicator = ({ value }) => {
+  const colorVariable = useColorVariable(value);
+  return /* @__PURE__ */ React22.createElement(ColorIndicator, { component: "span", size: "inherit", value: colorVariable?.value });
+};
+var BackgroundRepeaterLabel = ({ value }) => {
+  const colorVariable = useColorVariable(value);
+  return /* @__PURE__ */ React22.createElement("span", null, colorVariable?.label);
+};
+var BoxShadowRepeaterColorIndicator = ({ value }) => {
+  const colorVariable = useColorVariable(value);
+  return /* @__PURE__ */ React22.createElement(ColorIndicator, { component: "span", size: "inherit", value: colorVariable?.value });
+};
+
+// src/repeater-injections.ts
+function registerRepeaterInjections() {
+  (0, import_editor_controls11.injectIntoRepeaterItemIcon)({
+    id: "color-variables-background-icon",
+    component: BackgroundRepeaterColorIndicator,
+    condition: ({ value: prop }) => {
+      return hasAssignedColorVariable(import_editor_props4.backgroundColorOverlayPropTypeUtil.extract(prop)?.color);
+    }
+  });
+  (0, import_editor_controls11.injectIntoRepeaterItemIcon)({
+    id: "color-variables-icon",
+    component: BoxShadowRepeaterColorIndicator,
+    condition: ({ value: prop }) => {
+      return hasAssignedColorVariable(import_editor_props4.shadowPropTypeUtil.extract(prop)?.color);
+    }
+  });
+  (0, import_editor_controls11.injectIntoRepeaterItemLabel)({
+    id: "color-variables-label",
+    component: BackgroundRepeaterLabel,
+    condition: ({ value: prop }) => {
+      return hasAssignedColorVariable(import_editor_props4.backgroundColorOverlayPropTypeUtil.extract(prop)?.color);
+    }
+  });
+}
+
 // src/transformers/variable-transformer.ts
 var import_editor_canvas = require("@elementor/editor-canvas");
-var variableTransformer = (0, import_editor_canvas.createTransformer)((value) => {
-  if (!value.trim()) {
+var variableTransformer = (0, import_editor_canvas.createTransformer)((id) => {
+  const variables = service.variables();
+  let name = id;
+  let fallbackValue = "";
+  if (variables[id]) {
+    fallbackValue = variables[id].value;
+    if (!variables[id]?.deleted) {
+      name = variables[id].label;
+    }
+  }
+  if (!name.trim()) {
     return null;
   }
-  return `var(--${value})`;
+  if (!fallbackValue.trim()) {
+    return `var(--${name})`;
+  }
+  return `var(--${name}, ${fallbackValue})`;
 });
 
 // src/init-color-variables.ts
-var { registerPopoverAction } = import_editor_editing_panel7.controlActionsMenu;
-var conditions = {
-  backgroundOverlay: ({ value: prop }) => {
-    return hasAssignedColorVariable(import_editor_props4.backgroundColorOverlayPropTypeUtil.extract(prop)?.color);
-  },
-  boxShadow: ({ value: prop }) => {
-    return hasAssignedColorVariable(import_editor_props4.shadowPropTypeUtil.extract(prop)?.color);
-  }
-};
-function registerControlsAndActions() {
-  (0, import_editor_editing_panel7.registerControlReplacement)({
+var { registerPopoverAction } = import_editor_editing_panel10.controlActionsMenu;
+function initColorVariables() {
+  (0, import_editor_editing_panel10.registerControlReplacement)({
     component: ColorVariableControl,
     condition: ({ value }) => hasAssignedColorVariable(value)
   });
@@ -1271,116 +1722,67 @@ function registerControlsAndActions() {
     id: "color-variables",
     useProps: usePropColorVariableAction
   });
-}
-function registerRepeaterItemIcons() {
-  (0, import_editor_controls8.injectIntoRepeaterItemIcon)({
-    id: "color-variables-background-icon",
-    component: BackgroundRepeaterColorIndicator,
-    condition: conditions.backgroundOverlay
-  });
-  (0, import_editor_controls8.injectIntoRepeaterItemIcon)({
-    id: "color-variables-icon",
-    component: BoxShadowRepeaterColorIndicator,
-    condition: conditions.boxShadow
-  });
-}
-function registerRepeaterItemLabels() {
-  (0, import_editor_controls8.injectIntoRepeaterItemLabel)({
-    id: "color-variables-label",
-    component: BackgroundRepeaterLabel,
-    condition: conditions.backgroundOverlay
-  });
-}
-function registerStyleTransformers() {
   import_editor_canvas2.styleTransformersRegistry.register(colorVariablePropTypeUtil.key, variableTransformer);
-}
-function initColorVariables() {
-  registerControlsAndActions();
-  registerRepeaterItemIcons();
-  registerRepeaterItemLabels();
-  registerStyleTransformers();
+  registerRepeaterInjections();
 }
 
 // src/init-font-variables.ts
 var import_editor_canvas3 = require("@elementor/editor-canvas");
-var import_editor_editing_panel9 = require("@elementor/editor-editing-panel");
+var import_editor_editing_panel12 = require("@elementor/editor-editing-panel");
 
 // src/controls/font-variable-control.tsx
-var React15 = __toESM(require("react"));
-var import_react11 = require("react");
-var import_editor_controls9 = require("@elementor/editor-controls");
+var React23 = __toESM(require("react"));
+var import_editor_controls12 = require("@elementor/editor-controls");
 var import_editor_props5 = require("@elementor/editor-props");
-var import_icons11 = require("@elementor/icons");
-var import_ui15 = require("@elementor/ui");
 var FontVariableControl = () => {
-  const { setValue: setFontFamily } = (0, import_editor_controls9.useBoundProp)();
-  const { value: variableValue } = (0, import_editor_controls9.useBoundProp)(fontVariablePropTypeUtil);
-  const anchorRef = (0, import_react11.useRef)(null);
-  const popupId = (0, import_react11.useId)();
-  const popupState = (0, import_ui15.usePopupState)({
-    variant: "popover",
-    popupId: `elementor-variables-list-${popupId}`
-  });
-  const selectedVariable = useVariable(variableValue);
-  if (!selectedVariable) {
+  const { value: variableValue } = (0, import_editor_controls12.useBoundProp)(fontVariablePropTypeUtil);
+  const assignedVariable = useVariable(variableValue);
+  if (!assignedVariable) {
     throw new Error(`Global font variable ${variableValue} not found`);
   }
-  const unlinkVariable = () => {
-    setFontFamily(import_editor_props5.stringPropTypeUtil.create(selectedVariable.value));
-  };
-  return /* @__PURE__ */ React15.createElement(import_ui15.Box, { ref: anchorRef }, /* @__PURE__ */ React15.createElement(
-    VariableTag,
-    {
-      label: selectedVariable.label,
-      startIcon: /* @__PURE__ */ React15.createElement(import_icons11.ColorFilterIcon, { fontSize: SIZE }),
-      onUnlink: unlinkVariable,
-      ...(0, import_ui15.bindTrigger)(popupState)
-    }
-  ), /* @__PURE__ */ React15.createElement(
-    import_ui15.Popover,
-    {
-      disableScrollLock: true,
-      anchorEl: anchorRef.current,
-      anchorOrigin: { vertical: "bottom", horizontal: "right" },
-      transformOrigin: { vertical: "top", horizontal: "right" },
-      PaperProps: {
-        sx: { my: 1 }
-      },
-      ...(0, import_ui15.bindPopover)(popupState)
-    },
-    /* @__PURE__ */ React15.createElement(
-      VariableSelectionPopover,
+  const isVariableDeleted = assignedVariable?.deleted;
+  if (isVariableDeleted) {
+    return /* @__PURE__ */ React23.createElement(
+      DeletedVariable,
       {
-        selectedVariable,
-        closePopover: popupState.close,
-        propTypeKey: fontVariablePropTypeUtil.key
+        variable: assignedVariable,
+        variablePropTypeUtil: fontVariablePropTypeUtil,
+        fallbackPropTypeUtil: import_editor_props5.stringPropTypeUtil
       }
-    )
-  ));
+    );
+  }
+  return /* @__PURE__ */ React23.createElement(
+    AssignedVariable,
+    {
+      variable: assignedVariable,
+      variablePropTypeUtil: fontVariablePropTypeUtil,
+      fallbackPropTypeUtil: import_editor_props5.stringPropTypeUtil
+    }
+  );
 };
 
 // src/hooks/use-prop-font-variable-action.tsx
-var React16 = __toESM(require("react"));
-var import_editor_editing_panel8 = require("@elementor/editor-editing-panel");
-var import_icons12 = require("@elementor/icons");
-var import_i18n12 = require("@wordpress/i18n");
+var React24 = __toESM(require("react"));
+var import_editor_editing_panel11 = require("@elementor/editor-editing-panel");
+var import_icons14 = require("@elementor/icons");
+var import_i18n20 = require("@wordpress/i18n");
 var usePropFontVariableAction = () => {
-  const { propType } = (0, import_editor_editing_panel8.useBoundProp)();
+  const { propType } = (0, import_editor_editing_panel11.useBoundProp)();
   const visible = !!propType && supportsFontVariables(propType);
   return {
     visible,
-    icon: import_icons12.ColorFilterIcon,
-    title: (0, import_i18n12.__)("Variables", "elementor"),
+    icon: import_icons14.ColorFilterIcon,
+    title: (0, import_i18n20.__)("Variables", "elementor"),
     content: ({ close: closePopover }) => {
-      return /* @__PURE__ */ React16.createElement(VariableSelectionPopover, { closePopover, propTypeKey: fontVariablePropTypeUtil.key });
+      return /* @__PURE__ */ React24.createElement(VariableSelectionPopover, { closePopover, propTypeKey: fontVariablePropTypeUtil.key });
     }
   };
 };
 
 // src/init-font-variables.ts
-var { registerPopoverAction: registerPopoverAction2 } = import_editor_editing_panel9.controlActionsMenu;
+var { registerPopoverAction: registerPopoverAction2 } = import_editor_editing_panel12.controlActionsMenu;
 function initFontVariables() {
-  (0, import_editor_editing_panel9.registerControlReplacement)({
+  (0, import_editor_editing_panel12.registerControlReplacement)({
     component: FontVariableControl,
     condition: ({ value }) => hasAssignedFontVariable(value)
   });
@@ -1392,10 +1794,10 @@ function initFontVariables() {
 }
 
 // src/renderers/style-variables-renderer.tsx
-var React17 = __toESM(require("react"));
-var import_react12 = require("react");
+var React25 = __toESM(require("react"));
+var import_react15 = require("react");
 var import_editor_v1_adapters2 = require("@elementor/editor-v1-adapters");
-var import_ui16 = require("@elementor/ui");
+var import_ui22 = require("@elementor/ui");
 
 // src/sync/get-canvas-iframe-document.ts
 function getCanvasIframeDocument() {
@@ -1414,14 +1816,14 @@ function StyleVariablesRenderer() {
   }
   const cssVariables = convertToCssVariables(styleVariables);
   const wrappedCss = `${VARIABLES_WRAPPER}{${cssVariables}}`;
-  return /* @__PURE__ */ React17.createElement(import_ui16.Portal, { container }, /* @__PURE__ */ React17.createElement("style", { "data-e-style-id": "e-variables", key: wrappedCss }, wrappedCss));
+  return /* @__PURE__ */ React25.createElement(import_ui22.Portal, { container }, /* @__PURE__ */ React25.createElement("style", { "data-e-style-id": "e-variables", key: wrappedCss }, wrappedCss));
 }
 function usePortalContainer() {
   return (0, import_editor_v1_adapters2.__privateUseListenTo)((0, import_editor_v1_adapters2.commandEndEvent)("editor/documents/attach-preview"), () => getCanvasIframeDocument()?.head);
 }
 function useStyleVariables() {
-  const [variables, setVariables] = (0, import_react12.useState)({});
-  (0, import_react12.useEffect)(() => {
+  const [variables, setVariables] = (0, import_react15.useState)({});
+  (0, import_react15.useEffect)(() => {
     const unsubscribe = styleVariablesRepository.subscribe(setVariables);
     return () => {
       unsubscribe();
@@ -1429,8 +1831,14 @@ function useStyleVariables() {
   }, []);
   return variables;
 }
+function cssVariableDeclaration(key, variable) {
+  const variableName = variable?.deleted ? key : variable.label;
+  const value = variable.value;
+  return `--${variableName}:${value};`;
+}
 function convertToCssVariables(variables) {
-  return Object.entries(variables).map(([key, value]) => `--${key}:${value};`).join("");
+  const listOfVariables = Object.entries(variables);
+  return listOfVariables.map(([key, variable]) => cssVariableDeclaration(key, variable)).join("");
 }
 
 // src/init.ts