Add support for skipping serialization of border color

Author: aaronrobertshaw

packages/block-editor/src/hooks/border-color.js

@@ -18,7 +18,7 @@ import {
 	getColorObjectByColorValue,
 } from '../components/colors';
 import useEditorFeature from '../components/use-editor-feature';
-import { hasBorderFeatureSupport } from './border';
+import { hasBorderFeatureSupport, shouldSkipSerialization } from './border';
 import { cleanEmptyObject } from './utils';
 
 const EMPTY_ARRAY = [];
@@ -129,7 +129,10 @@ function addAttributes( settings ) {
  * @return {Object}            Filtered props to apply to save element.
  */
 function addSaveProps( props, blockType, attributes ) {
-	if ( ! hasBorderFeatureSupport( 'color', blockType ) ) {
+	if (
+		! hasBorderFeatureSupport( 'color', blockType ) ||
+		shouldSkipSerialization( blockType )
+	) {
 		return props;
 	}
 
@@ -154,7 +157,10 @@ function addSaveProps( props, blockType, attributes ) {
  * @return {Object}         Filtered block settings.
  */
 function addEditProps( settings ) {
-	if ( ! hasBorderFeatureSupport( 'color', settings ) ) {
+	if (
+		! hasBorderFeatureSupport( 'color', settings ) ||
+		shouldSkipSerialization( settings )
+	) {
 		return settings;
 	}
 

packages/block-editor/src/hooks/border.js

@@ -64,13 +64,25 @@ export function hasBorderSupport( blockName ) {
  *
  * @param {string}        feature   Name of the border feature e.g.`radius`
  * @param {string|Object} blockType Block name or block type object.
- * @return { boolean }              Whether the border feature is supported.
+ * @return {boolean}                Whether the border feature is supported.
  */
 export function hasBorderFeatureSupport( feature, blockType ) {
 	const support = getBlockSupport( blockType, BORDER_SUPPORT_KEY );
 	return !! ( true === support || ( support && support[ feature ] ) );
 }
 
+/**
+ * Check whether serialization of border classes and styles should be skipped.
+ *
+ * @param  {string|Object} blockType Block name or block type object.
+ * @return {boolean}                 Whether serialization of border properties should occur.
+ */
+export function shouldSkipSerialization( blockType ) {
+	const support = getBlockSupport( blockType, BORDER_SUPPORT_KEY );
+
+	return support?.__experimentalSkipSerialization;
+}
+
 /**
  * Determines whether there is any block support for borders e.g. border radius,
  * style, width etc.