rename role to __experimentalRole

WordPress · Apr 13, 2021 · edd5588 · edd5588
1 parent 081e257
commit edd5588
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 26 deletions.
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
@@ -69,10 +69,6 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 					? getBlockType( firstBlockName )?.icon
 					: stack;
 			}
-			const _patterns = __experimentalGetPatternTransformItems(
-				blocks,
-				rootClientId
-			);
 			return {
 				possibleBlockTransformations: getBlockTransformItems(
 					blocks,
@@ -81,7 +77,10 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				hasBlockStyles: !! styles?.length,
 				icon: _icon,
 				blockTitle: getBlockType( firstBlockName ).title,
-				patterns: _patterns,
+				patterns: __experimentalGetPatternTransformItems(
+					blocks,
+					rootClientId
+				),
 			};
 		},
 		[ clientIds, blocks, blockInformation?.icon ]

diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
@@ -11,7 +11,7 @@
 			"source": "html",
 			"selector": "h1,h2,h3,h4,h5,h6",
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"level": {
 			"type": "number",

diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
@@ -6,7 +6,7 @@
 		"ordered": {
 			"type": "boolean",
 			"default": false,
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"values": {
 			"type": "string",
@@ -15,7 +15,7 @@
 			"multiline": "li",
 			"__unstableMultilineWrapperTags": [ "ol", "ul" ],
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"type": {
 			"type": "string"

diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
@@ -11,7 +11,7 @@
 			"source": "html",
 			"selector": "p",
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"dropCap": {
 			"type": "boolean",

diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json
@@ -9,7 +9,7 @@
 			"selector": "pre",
 			"default": "",
 			"__unstablePreserveWhiteSpace": true,
-			"role": "content"
+			"__experimentalRole": "content"
 		}
 	},
 	"supports": {

diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json
@@ -8,14 +8,14 @@
 			"source": "html",
 			"selector": "blockquote",
 			"multiline": "p",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"citation": {
 			"type": "string",
 			"source": "html",
 			"selector": "cite",
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"mainColor": {
 			"type": "string"

diff --git a/packages/block-library/src/quote/block.json b/packages/block-library/src/quote/block.json
@@ -9,14 +9,14 @@
 			"selector": "blockquote",
 			"multiline": "p",
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"citation": {
 			"type": "string",
 			"source": "html",
 			"selector": "cite",
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"align": {
 			"type": "string"

diff --git a/packages/block-library/src/search/block.json b/packages/block-library/src/search/block.json
@@ -5,7 +5,7 @@
 	"attributes": {
 		"label": {
 			"type": "string",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"showLabel": {
 			"type": "boolean",
@@ -14,7 +14,7 @@
 		"placeholder": {
 			"type": "string",
 			"default": "",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"width": {
 			"type": "number"
@@ -24,7 +24,7 @@
 		},
 		"buttonText": {
 			"type": "string",
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"buttonPosition": {
 			"type": "string",

diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json
@@ -9,7 +9,7 @@
 			"selector": "pre",
 			"default": "",
 			"__unstablePreserveWhiteSpace": true,
-			"role": "content"
+			"__experimentalRole": "content"
 		},
 		"textAlign": {
 			"type": "string"

diff --git a/packages/blocks/src/api/test/utils.js b/packages/blocks/src/api/test/utils.js
@@ -321,15 +321,15 @@ describe( '__experimentalGetBlockAttributesNamesByRole', () => {
 				},
 				content: {
 					type: 'boolean',
-					role: 'content',
+					__experimentalRole: 'content',
 				},
 				level: {
 					type: 'number',
-					role: 'content',
+					__experimentalRole: 'content',
 				},
 				color: {
 					type: 'string',
-					role: 'other',
+					__experimentalRole: 'other',
 				},
 			},
 			save: noop,
@@ -365,10 +365,9 @@ describe( '__experimentalGetBlockAttributesNamesByRole', () => {
 		).toEqual( [] );
 	} );
 	it( 'should return all attribute names if no role is provided', () => {
-		const res = __experimentalGetBlockAttributesNamesByRole(
-			'core/test-block-1'
-		);
-		expect( res ).toEqual(
+		expect(
+			__experimentalGetBlockAttributesNamesByRole( 'core/test-block-1' )
+		).toEqual(
 			expect.arrayContaining( [ 'align', 'content', 'level', 'color' ] )
 		);
 	} );

diff --git a/packages/blocks/src/api/utils.js b/packages/blocks/src/api/utils.js
@@ -290,6 +290,7 @@ export function __experimentalGetBlockAttributesNamesByRole( name, role ) {
 	const attributesNames = Object.keys( attributes );
 	if ( ! role ) return attributesNames;
 	return attributesNames.filter(
-		( attributeName ) => attributes[ attributeName ]?.role === role
+		( attributeName ) =>
+			attributes[ attributeName ]?.__experimentalRole === role
 	);
 }