Merge branch 'fix/onsplit' into develop

washingtonstateuniversity · Jul 17, 2024 · f4b44c9 · f4b44c9
2 parents 5e6d91a + 8814cef
commit f4b44c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/blocks/button/block.json b/src/blocks/button/block.json
@@ -1,5 +1,6 @@
 {
-	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
 	"name": "hrswp/button",
 	"title": "Button",
 	"category": "design",
@@ -55,14 +56,23 @@
 	},
 	"supports": {
 		"anchor": true,
+		"splitting": true,
 		"align": true,
 		"alignWide": false,
-		"color": false,
-		"typography": false,
+		"color": {
+			"gradients": false,
+			"background": false,
+			"text": false
+		},
+		"typography": {
+			"fontSize": false,
+			"lineHeight": false,
+			"textAlign": false
+		},
 		"reusable": false,
-		"spacing": false,
+		"spacing": {},
 		"__experimentalBorder": false,
-		"__experimentalSelector": ".wp-block-button__link"
+		"__experimentalSelector": ".wp-block-button .wp-block-button__link"
 	},
 	"styles": [
 		{ "name": "fill", "label": "Fill", "isDefault": true },

diff --git a/src/blocks/button/edit.js b/src/blocks/button/edit.js
@@ -27,7 +27,6 @@ import {
 	__experimentalLinkControl as LinkControl,
 } from '@wordpress/block-editor';
 import { displayShortcut, isKeyboardEvent } from '@wordpress/keycodes';
-import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -183,12 +182,6 @@ function ButtonEdit( props ) {
 						...colorProps.style,
 						...spacingProps.style,
 					} }
-					onSplit={ ( value ) =>
-						createBlock( 'hrswp/button', {
-							...attributes,
-							text: value,
-						} )
-					}
 					onReplace={ onReplace }
 					onMerge={ mergeBlocks }
 					identifier="text"