diff --git a/packages/block-editor/src/hooks/gap.js b/packages/block-editor/src/hooks/gap.js index 02f100d2f7b5c..e36f6f0efd0f1 100644 --- a/packages/block-editor/src/hooks/gap.js +++ b/packages/block-editor/src/hooks/gap.js @@ -139,13 +139,22 @@ export function GapEdit( props ) { } }; + const blockGapValue = style?.spacing?.blockGap; + const rowValue = blockGapValue?.row; + const columnValue = blockGapValue?.column; + // Check for blockGap string values, e.g., "blockGap":"169px", on pre-axial blocks. + const isStringValue = typeof blockGapValue === 'string'; + const boxValues = { - top: style?.spacing?.blockGap?.row, - right: style?.spacing?.blockGap?.column, - bottom: style?.spacing?.blockGap?.row, - left: style?.spacing?.blockGap?.column, + top: isStringValue ? blockGapValue : rowValue, + right: isStringValue ? blockGapValue : columnValue, + bottom: isStringValue ? blockGapValue : rowValue, + left: isStringValue ? blockGapValue : columnValue, }; + // The default combined value we'll take from row. + const defaultValue = boxValues.top; + return Platform.select( { web: ( <> @@ -168,7 +177,7 @@ export function GapEdit( props ) { onChange={ onChange } units={ units } // Default to `row` for combined values. - value={ style?.spacing?.blockGap?.row } + value={ defaultValue } /> ) }