@elementor/editor-variables 3.33.0-98 → 3.34.2

package/src/components/variables-selection.tsx

@@ -1,22 +1,24 @@
 import * as React from 'react';
 import { useState } from 'react';
-import { useBoundProp } from '@elementor/editor-controls';
 import { PopoverBody } from '@elementor/editor-editing-panel';
-import { PopoverHeader, PopoverMenuList, PopoverSearch, type VirtualizedItem } from '@elementor/editor-ui';
+import { PopoverHeader, PopoverMenuList, SearchField, type VirtualizedItem } from '@elementor/editor-ui';
 import { ColorFilterIcon, PlusIcon, SettingsIcon } from '@elementor/icons';
-import { Divider, IconButton } from '@elementor/ui';
+import { Divider, IconButton, Tooltip } from '@elementor/ui';
 import { __, sprintf } from '@wordpress/i18n';
 
 import { useVariableType } from '../context/variable-type-context';
 import { useFilteredVariables } from '../hooks/use-prop-variables';
+import { useVariableBoundProp } from '../hooks/use-variable-bound-prop';
 import { type ExtendedVirtualizedItem } from '../types';
-import { trackVariableEvent } from '../utils/tracking';
+import { trackVariableEvent, trackVariablesManagerEvent } from '../utils/tracking';
+import { EmptyState } from './ui/empty-state';
 import { MenuItemContent } from './ui/menu-item-content';
 import { NoSearchResults } from './ui/no-search-results';
-import { NoVariables } from './ui/no-variables';
 import { VariablesStyledMenuList } from './ui/styled-menu-list';
 
 const SIZE = 'tiny';
+const CREATE_LABEL = __( 'Create variable', 'elementor' );
+const MANAGER_LABEL = __( 'Variables Manager', 'elementor' );
 
 type Props = {
 	closePopover: () => void;
@@ -28,13 +30,14 @@ type Props = {
 export const VariablesSelection = ( { closePopover, onAdd, onEdit, onSettings }: Props ) => {
 	const { icon: VariableIcon, startIcon, variableType, propTypeUtil } = useVariableType();
 
-	const { value: variable, setValue: setVariable, path } = useBoundProp( propTypeUtil );
+	const { value: variable, setValue: setVariable, path } = useVariableBoundProp();
 	const [ searchValue, setSearchValue ] = useState( '' );
 
 	const {
 		list: variables,
 		hasMatches: hasSearchResults,
 		isSourceNotEmpty: hasVariables,
+		hasNoCompatibleVariables,
 	} = useFilteredVariables( searchValue, propTypeUtil.key );
 
 	const handleSetVariable = ( key: string ) => {
@@ -60,17 +63,40 @@ export const VariablesSelection = ( { closePopover, onAdd, onEdit, onSettings }:
 
 	if ( onAdd ) {
 		actions.push(
-			<IconButton key="add" size={ SIZE } onClick={ onAddAndTrack }>
-				<PlusIcon fontSize={ SIZE } />
-			</IconButton>
+			<Tooltip key="add" placement="top" title={ CREATE_LABEL }>
+				<IconButton
+					id="add-variable-button"
+					size={ SIZE }
+					onClick={ onAddAndTrack }
+					aria-label={ CREATE_LABEL }
+				>
+					<PlusIcon fontSize={ SIZE } />
+				</IconButton>
+			</Tooltip>
 		);
 	}
 
 	if ( onSettings ) {
+		const handleOpenManager = () => {
+			onSettings();
+			trackVariablesManagerEvent( {
+				action: 'openManager',
+				varType: variableType,
+				controlPath: path.join( '.' ),
+			} );
+		};
+
 		actions.push(
-			<IconButton key="settings" size={ SIZE } onClick={ onSettings }>
-				<SettingsIcon fontSize={ SIZE } />
-			</IconButton>
+			<Tooltip key="settings" placement="top" title={ MANAGER_LABEL }>
+				<IconButton
+					id="variables-manager-button"
+					size={ SIZE }
+					onClick={ handleOpenManager }
+					aria-label={ MANAGER_LABEL }
+				>
+					<SettingsIcon fontSize={ SIZE } />
+				</IconButton>
+			</Tooltip>
 		);
 	}
 
@@ -109,7 +135,7 @@ export const VariablesSelection = ( { closePopover, onAdd, onEdit, onSettings }:
 			/>
 
 			{ hasVariables && (
-				<PopoverSearch
+				<SearchField
 					value={ searchValue }
 					onSearch={ handleSearch }
 					placeholder={ __( 'Search', 'elementor' ) }
@@ -140,8 +166,28 @@ export const VariablesSelection = ( { closePopover, onAdd, onEdit, onSettings }:
 				/>
 			) }
 
-			{ ! hasVariables && (
-				<NoVariables title={ noVariableTitle } icon={ <VariableIcon fontSize="large" /> } onAdd={ onAdd } />
+			{ ! hasVariables && ! hasNoCompatibleVariables && (
+				<EmptyState
+					title={ noVariableTitle }
+					message={ __(
+						'Variables are saved attributes that you can apply anywhere on your site.',
+						'elementor'
+					) }
+					icon={ <VariableIcon fontSize="large" /> }
+					onAdd={ onAdd }
+				/>
+			) }
+
+			{ hasNoCompatibleVariables && (
+				<EmptyState
+					title={ __( 'No compatible variables', 'elementor' ) }
+					message={ __(
+						'Looks like none of your variables work with this control. Create a new variable to use it here.',
+						'elementor'
+					) }
+					icon={ <VariableIcon fontSize="large" /> }
+					onAdd={ onAdd }
+				/>
 			) }
 		</PopoverBody>
 	);

package/src/controls/variable-control.tsx

@@ -12,7 +12,7 @@ import { getVariableType } from '../variables-registry/variable-type-registry';
 export const VariableControl = () => {
 	const boundProp = useBoundProp();
 
-	const boundPropValue = boundProp.value as TransformablePropValue< string, string >;
+	const boundPropValue = ( boundProp.value ?? boundProp.placeholder ) as TransformablePropValue< string, string >;
 
 	const assignedVariable = useVariable( boundPropValue?.value );
 

package/src/hooks/use-prop-variables.ts

@@ -5,6 +5,7 @@ import { type PropKey } from '@elementor/editor-props';
 import { useVariableType } from '../context/variable-type-context';
 import { service } from '../service';
 import { type NormalizedVariable, type Variable } from '../types';
+import { filterBySearch } from '../utils/filter-by-search';
 
 export const getVariables = ( includeDeleted = true ) => {
 	const variables = service.variables();
@@ -33,12 +34,18 @@ export const useFilteredVariables = ( searchValue: string, propTypeKey: string )
 	const baseVariables = usePropVariables( propTypeKey );
 
 	const typeFilteredVariables = useVariableSelectionFilter( baseVariables );
-	const searchFilteredVariables = filterVariablesBySearchValue( typeFilteredVariables, searchValue );
+	const searchFilteredVariables = filterBySearch( typeFilteredVariables, searchValue );
+	const sortedVariables = searchFilteredVariables.sort( ( a, b ) => {
+		const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
+		const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
+		return orderA - orderB;
+	} );
 
 	return {
-		list: searchFilteredVariables,
+		list: sortedVariables,
 		hasMatches: searchFilteredVariables.length > 0,
 		isSourceNotEmpty: typeFilteredVariables.length > 0,
+		hasNoCompatibleVariables: baseVariables.length > 0 && typeFilteredVariables.length === 0,
 	};
 };
 
@@ -49,11 +56,6 @@ const useVariableSelectionFilter = ( variables: NormalizedVariable[] ): Normaliz
 	return selectionFilter ? selectionFilter( variables, propType ) : variables;
 };
 
-const filterVariablesBySearchValue = ( variables: NormalizedVariable[], searchValue: string ): NormalizedVariable[] => {
-	const lowerSearchValue = searchValue.toLowerCase();
-	return variables.filter( ( { label } ) => label.toLowerCase().includes( lowerSearchValue ) );
-};
-
 const usePropVariables = ( propKey: PropKey ): NormalizedVariable[] => {
 	return useMemo( () => normalizeVariables( propKey ), [ propKey ] );
 };
@@ -63,10 +65,11 @@ const normalizeVariables = ( propKey: string ) => {
 
 	return Object.entries( variables )
 		.filter( ( [ , variable ] ) => variable.type === propKey )
-		.map( ( [ key, { label, value } ] ) => ( {
+		.map( ( [ key, { label, value, order } ] ) => ( {
 			key,
 			label,
 			value,
+			order,
 		} ) );
 };
 

package/src/hooks/use-variable-bound-prop.ts

@@ -0,0 +1,42 @@
+import { useBoundProp } from '@elementor/editor-controls';
+import { isTransformable, type PropValue } from '@elementor/editor-props';
+
+import { useVariableType } from '../context/variable-type-context';
+
+type BoundProp = ReturnType< typeof useBoundProp< PropValue > >;
+
+type VariableBoundProp = ReturnType< typeof useBoundProp< string > > & {
+	setVariableValue: ( value: PropValue ) => void;
+	variableId: string | null;
+};
+
+export const useVariableBoundProp = (): VariableBoundProp => {
+	const { propTypeUtil } = useVariableType();
+	const boundProp = useBoundProp( propTypeUtil );
+
+	return {
+		...boundProp,
+		setVariableValue: ( value: PropValue ) => resolveBoundPropAndSetValue( value, boundProp as BoundProp ),
+		variableId: boundProp.value ?? boundProp.placeholder,
+	};
+};
+
+export const resolveBoundPropAndSetValue = ( value: PropValue, boundProp: BoundProp ) => {
+	const propValue = unwrapValue( boundProp.value );
+	const placeholder = unwrapValue( boundProp.placeholder );
+	const newValue = unwrapValue( value );
+
+	if ( ! propValue && placeholder === newValue ) {
+		return boundProp.setValue( null );
+	}
+
+	return boundProp.setValue( value );
+};
+
+const unwrapValue = ( input: PropValue ): PropValue => {
+	if ( isTransformable( input ) ) {
+		return input.value;
+	}
+
+	return input;
+};

package/src/index.ts

@@ -1,2 +1,3 @@
 export { init } from './init';
 export { registerVariableType } from './variables-registry/variable-type-registry';
+export { registerVariableTypes } from './register-variable-types';

package/src/init.ts

@@ -1,11 +1,12 @@
 import { injectIntoTop } from '@elementor/editor';
 import { controlActionsMenu, registerControlReplacement } from '@elementor/editor-editing-panel';
 import { __registerPanel as registerPanel } from '@elementor/editor-panels';
-import type { PropValue } from '@elementor/editor-props';
+import { isTransformable, type PropValue } from '@elementor/editor-props';
 
 import { panel } from './components/variables-manager/variables-manager-panel';
 import { VariableControl } from './controls/variable-control';
 import { usePropVariableAction } from './hooks/use-prop-variable-action';
+import { initMcp } from './mcp';
 import { registerVariableTypes } from './register-variable-types';
 import { StyleVariablesRenderer } from './renderers/style-variables-renderer';
 import { registerRepeaterInjections } from './repeater-injections';
@@ -20,7 +21,17 @@ export function init() {
 
 	registerControlReplacement( {
 		component: VariableControl,
-		condition: ( { value } ) => hasAssignedVariable( value ),
+		condition: ( { value, placeholder } ) => {
+			if ( hasVariableAssigned( value ) ) {
+				return true;
+			}
+
+			if ( value ) {
+				return false;
+			}
+
+			return hasVariableAssigned( placeholder );
+		},
 	} );
 
 	registerPopoverAction( {
@@ -28,7 +39,9 @@ export function init() {
 		useProps: usePropVariableAction,
 	} );
 
-	variablesService.init();
+	variablesService.init().then( () => {
+		initMcp();
+	} );
 
 	injectIntoTop( {
 		id: 'canvas-style-variables-render',
@@ -38,9 +51,9 @@ export function init() {
 	registerPanel( panel );
 }
 
-function hasAssignedVariable( propValue: PropValue ) {
-	if ( propValue && typeof propValue === 'object' && '$$type' in propValue ) {
-		return hasVariableType( propValue.$$type );
+function hasVariableAssigned( value: PropValue ) {
+	if ( isTransformable( value ) ) {
+		return hasVariableType( value.$$type );
 	}
 
 	return false;

package/src/mcp/create-variable-tool.ts

@@ -0,0 +1,70 @@
+import { getMCPByDomain } from '@elementor/editor-mcp';
+import { z } from '@elementor/schema';
+
+import { service } from '../service';
+
+const InputSchema = {
+	type: z
+		.string()
+		.describe( 'The type of the variable. Example values: "global-color-variable" or "global-font-variable".' ),
+	label: z.string().describe( 'The label of the variable, displayed to the user' ),
+	value: z.string().describe( 'The value of the variable, should correspond to the type' ),
+};
+
+const OutputSchema = {
+	status: z.enum( [ 'ok', 'error' ] ).describe( 'The status of the operation' ),
+	message: z.string().optional().describe( 'Optional message providing additional information about the operation' ),
+};
+
+export const initCreateVariableTool = () => {
+	getMCPByDomain( 'variables' ).addTool( {
+		name: 'create-global-variable',
+		schema: InputSchema,
+		outputSchema: OutputSchema,
+		description: `Create a new global variable
+## When to use this tool:
+- When a user requests to create a new global variable in the Elementor editor.
+- When you need to add a new variable to be used in the editor.
+
+## Prequisites:
+- Ensure you have the most up-to-date list of existing global variables to avoid label duplication. You can use the "list-global-variables" tool to fetch the current variables.
+- Make sure when creating a new variable, the label is unique and not already in use.
+- If the user does not provide a label, ask them to provide one before proceeding.
+- If the user does not provide a type, ask them to provide one before proceeding.
+- If the user does not provide a value, ask them to provide one before proceeding.
+
+## Required parameters:
+- type: The type of the variable. Possible values are 'global-color-variable' or 'global-font-variable'.
+- label: The label of the variable, displayed to the user. Must be unique and not already in use.
+- value: The value of the variable. For color variables, this should be a valid CSS color (e.g., 'rgb(255,0,0)', '#ff0000', 'red'). For font variables, this should be a valid font family (e.g., 'Arial', 'serif').
+
+## Example tool call (JSON format):
+\`\`\`json
+{ "type": "global-color-variable", "label": "My Cool Color", "value": "rgb(1,2,3)" }
+\`\`\`
+
+## Example tool response (JSON format):
+\`\`\`json
+{ "status": "ok" }
+\`\`\`
+
+## Example to a failed tool response, which must be displayed to the end user. If the error message is not plain, attempt to find the most useful part of the message and display it.
+{ "status": "error", "message": "Unsupported type 'global-kuku-variable'" }
+
+In that case, inform the user the type is unsupported and they should try another type, perhaps consult to online documentation.
+`,
+		handler: async ( params ) => {
+			const { type, label, value } = params;
+			try {
+				await service.create( { type, label, value } );
+			} catch ( error ) {
+				const message: string = ( error as Error ).message || 'Unknown server error';
+				return {
+					status: 'error',
+					message: `There was an error creating the variable: ${ message }`,
+				};
+			}
+			return { status: 'ok' };
+		},
+	} );
+};

package/src/mcp/delete-variable-tool.ts

@@ -0,0 +1,50 @@
+import { getMCPByDomain } from '@elementor/editor-mcp';
+import { z } from '@elementor/schema';
+
+import { service } from '../service';
+
+export const initDeleteVariableTool = () => {
+	getMCPByDomain( 'variables' ).addTool( {
+		name: 'delete-global-variable',
+		schema: {
+			id: z.string().describe( 'The unique identifier of the variable to be deleted.' ),
+		},
+		outputSchema: {
+			status: z.enum( [ 'ok', 'error' ] ).describe( 'The status of the operation' ),
+		},
+		description: `Delete an existing global variable
+    
+## When to use this tool:
+- When a user requests to delete an existing global variable in the Elementor editor.
+- When you need to remove a variable that is no longer needed or relevant, with the user's confirmation.
+
+## Prerequisites:
+- Ensure you have the most up-to-date list of existing global variables. You can use the "list-global-variables" tool to fetch the current variables.
+- Reference the variable by the "id" property, given from the "list-global-variables" tool.
+- Make sure you have the unique identifier of the variable to be deleted before using this tool.
+- Confirm with the user that they want to proceed with the deletion, as this action is irreversible.
+
+<notice>
+A use might reference a variable by it's label, but you must always use the unique identifier (id) to delete it.
+If you only have the label, use the "list-global-variables" tool to find the corresponding id.
+</notice>
+
+<important>
+This operation is destructive and cannot be undone. Ensure that the user is fully aware of the consequences before proceeding.
+When a variable is deleted, all references to it in all pages accross the website will lose their effect.
+</important>`,
+		handler: async ( params ) => {
+			const { id } = params;
+			try {
+				await service.delete( id );
+				return { status: 'ok' };
+				// eslint-disable-next-line @typescript-eslint/no-unused-vars
+			} catch ( err: unknown ) {
+				return {
+					status: 'error',
+				};
+			}
+		},
+		isDestrcutive: true,
+	} );
+};

package/src/mcp/index.ts

@@ -0,0 +1,17 @@
+import { getMCPByDomain } from '@elementor/editor-mcp';
+
+import { initCreateVariableTool } from './create-variable-tool';
+import { initDeleteVariableTool } from './delete-variable-tool';
+import { initListVariablesTool } from './list-variables-tool';
+import { initUpdateVariableTool } from './update-variable-tool';
+import { initVariablesResource } from './variables-resource';
+
+export function initMcp() {
+	const { setMCPDescription } = getMCPByDomain( 'variables' );
+	setMCPDescription( `Elementor Editor Variables MCP` );
+	initListVariablesTool();
+	initCreateVariableTool();
+	initUpdateVariableTool();
+	initDeleteVariableTool();
+	initVariablesResource();
+}

package/src/mcp/list-variables-tool.ts

@@ -0,0 +1,58 @@
+import { getMCPByDomain } from '@elementor/editor-mcp';
+import { z } from '@elementor/schema';
+
+import { service } from '../service';
+import { type TVariable } from '../storage';
+
+const VariableSchema = {
+	type: z.string().describe( 'The type of the variable.' ),
+	label: z.string().describe( 'The label of the variable, displayed to the user' ),
+	value: z.string().describe( 'The value of the variable.' ),
+	id: z
+		.string()
+		.describe(
+			'The unique identifier of the variable. Used for internal reference, not to be exposed to end users'
+		),
+};
+const VariableListSchema = {
+	variables: z.array( z.object( VariableSchema ) ).describe( 'List of variables' ),
+};
+
+export const initListVariablesTool = () => {
+	getMCPByDomain( 'variables' ).addTool( {
+		name: 'list-global-variables',
+		description: `List editor global variables
+  
+  ## When to use this tool:
+  - When a user requests to see all available global variables in the Elementor editor.
+  - When you need to be exact on a variable label, to avoid any mistakes.
+  - When you want to see the most up-to-date list of global variables.
+  - Before using any other variables related tools that makes changes, such as deletion, creation, or updates. This ensures you have the latest information and there is no naming collision or mismatching.
+  
+  ## Example tool response (JSON format):
+  \`\`\`json
+  { variables: [
+   { type: 'global-color-variable', label: 'Cool', value: 'rgb(1,2,3)', id: 'some-unique-id' },
+   { type: 'global-font-variable', label: 'Headline', value: 'serif', id: 'some-other-unique-id' },
+  ] }
+  \`\`\`
+  
+  Once you get the response, please display the variables in a user-friendly way, unless explicitly requested otherwise.
+  Unless explicitly requested otherwise, response in HTML Format, prefer to use tables or unordered lists.
+  
+  Note: **The label is most improtant to be seen as-is without any changes.**
+  
+  <important>
+  **Do not omit the label**. This is important for the user to identify the variable.
+  **Do not change the label**, it must be displayed exactly as it is, in it's original characters as received from this tool.
+  </important>
+  `,
+		outputSchema: VariableListSchema,
+		handler: async () => {
+			const variables = service.variables() as Record< string, TVariable >;
+			return {
+				variables: Object.entries( variables ).map( ( [ id, varData ] ) => ( { id, ...varData } ) ),
+			};
+		},
+	} );
+};

package/src/mcp/update-variable-tool.ts

@@ -0,0 +1,81 @@
+import { getMCPByDomain } from '@elementor/editor-mcp';
+import { z } from '@elementor/schema';
+
+import { service } from '../service';
+
+export const initUpdateVariableTool = () => {
+	getMCPByDomain( 'variables' ).addTool( {
+		schema: {
+			id: z.string().describe( 'The unique identifier of the variable to be updated or renamed.' ),
+			label: z
+				.string()
+				.describe(
+					'The label of the variable to be stored after the change. If the user only wishes to update the value, this must be strictly equal to the current label.'
+				),
+			value: z
+				.string()
+				.describe(
+					"The new value for the variable. For color variables, this should be a valid CSS color (e.g., 'rgb(255,0,0)', '#ff0000', 'red'). For font variables, this should be a valid font family (e.g., 'Arial', 'serif'). If the user wishes to rename only, make sure you provide the existing value."
+				),
+		},
+		outputSchema: {
+			status: z.enum( [ 'ok', 'error' ] ).describe( 'The status of the operation' ),
+			message: z
+				.string()
+				.optional()
+				.describe( 'Optional message providing additional information about the operation' ),
+		},
+		name: 'update-global-variable',
+		description: `Update an existing global variable
+
+## When to use this tool:
+- When a user requests to update an existing global variable in the Elementor editor.
+- When you need to modify the value of an existing variable.
+- When you want to rename an existing variable (change its label).
+- When you want to both rename and modify the value of an existing variable.
+
+## Prerequisites:
+- Ensure you have the most up-to-date list of existing global variables to avoid label duplication. You can use the "list-global-variables" tool to fetch the current variables.
+- Make sure when updating a variable, the new label is unique and not already in use by another variable.
+- Make sure you understand whether you are updating a value, renaming, or both.
+- Reference the variable by the "id" property, given from the "list-global-variables" tool.
+- If the user wishes to rename, make sure you have the existing value.
+- If the user wishes to update the value, make sure you have to **correct label**.
+- You must have the unique identifier, the current label, the current value, and the new value or label or both, before using this tool.
+
+## Required parameters:
+- id: The unique identifier of the variable to be updated or renamed.
+- label: The label of the variable to be stored after the change. If the user only wishes to update the value, this must be strictly equal to the current label.
+- value: The new value for the variable. For color variables, this should be a valid CSS color (e.g., 'rgb(255,0,0)', '#ff0000', 'red'). For font variables, this should be a valid font family (e.g., 'Arial', 'serif'). If the user wishes to rename only, make sure you provide the existing value.
+
+## Example tool call (JSON format):
+\`\`\`json
+{ "id": "some-unique-id", "label": "Cool", "value": "rgb(0,140,250)" }
+\`\`\`
+
+## Example responses (JSON format):
+Successful update:
+\`\`\`json
+{ "status": "ok" }
+\`\`\`
+
+Failed update, which must be displayed to the end user. If the error message is not plain, attempt to find the most useful part of the message and display it.
+\`\`\`json
+{ "status": "error", "message": "Label 'Cool' is already in use by another variable." }
+\`\`\`
+`,
+		handler: async ( params ) => {
+			const { id, label, value } = params;
+			try {
+				await service.update( id, { label, value } );
+				return { status: 'ok' };
+			} catch ( error ) {
+				const message: string = ( error as Error ).message || 'Unknown server error';
+				return {
+					status: 'error',
+					message: `There was an error creating the variable: ${ message }`,
+				};
+			}
+		},
+	} );
+};

package/src/mcp/variables-resource.ts

@@ -0,0 +1,28 @@
+import { getMCPByDomain } from '@elementor/editor-mcp';
+
+export const GLOBAL_VARIABLES_URI = 'elementor://variables';
+
+export const initVariablesResource = () => {
+	const { mcpServer } = getMCPByDomain( 'variables' );
+
+	mcpServer.resource(
+		'global-variables',
+		GLOBAL_VARIABLES_URI,
+		{
+			description:
+				'Global variables list. Variables are being used in this way: If it is directly in the schema, you need to put the ID which is the key inside the object.',
+		},
+		async () => {
+			return {
+				contents: [ { uri: GLOBAL_VARIABLES_URI, text: localStorage[ 'elementor-global-variables' ] } ],
+			};
+		}
+	);
+
+	window.addEventListener( 'variables:updated', () => {
+		mcpServer.server.sendResourceUpdated( {
+			uri: GLOBAL_VARIABLES_URI,
+			contents: [ { uri: GLOBAL_VARIABLES_URI, text: localStorage[ 'elementor-global-variables' ] } ],
+		} );
+	} );
+};

package/src/register-variable-types.tsx

@@ -17,6 +17,7 @@ export function registerVariableTypes() {
 		fallbackPropTypeUtil: colorPropTypeUtil,
 		variableType: 'color',
 		startIcon: ( { value } ) => <ColorIndicator size="inherit" component="span" value={ value } />,
+		defaultValue: '#ffffff',
 	} );
 
 	registerVariableType( {
@@ -25,5 +26,6 @@ export function registerVariableTypes() {
 		propTypeUtil: fontVariablePropTypeUtil,
 		fallbackPropTypeUtil: stringPropTypeUtil,
 		variableType: 'font',
+		defaultValue: 'Roboto',
 	} );
 }