changed blocks registration to register_block_type_from_metadata

added support for new Ghost Kit extensions
nk-crew · Nov 25, 2023 · 683e02e · 683e02e
1 parent 66c14f2
commit 683e02e
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 68 deletions.
diff --git a/build/gutenberg/index.asset.php b/build/gutenberg/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'eeb006fa5c19f8e2d012');
+<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '73ed561ca29115334e44');
diff --git a/build/gutenberg/index.js b/build/gutenberg/index.js
diff --git a/build/gutenberg/layouts-editor.asset.php b/build/gutenberg/layouts-editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins'), 'version' => '59d6f76362d56ef3e875');
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins'), 'version' => 'cd65d6b5e7981b2c3805');
diff --git a/build/gutenberg/layouts-editor.js b/build/gutenberg/layouts-editor.js
diff --git a/classes/class-gutenberg-saved.php b/classes/class-gutenberg-saved.php
@@ -25,59 +25,60 @@ class Visual_Portfolio_Gutenberg_Saved_Block {
 	 */
 	public function __construct() {
 		add_action( 'init', array( $this, 'register_block' ), 11 );
+		add_action( 'admin_init', array( $this, 'register_block_layouts_editor' ), 11 );
 	}
 
 	/**
 	 * Register Block.
 	 */
 	public function register_block() {
-		if ( ! function_exists( 'register_block_type' ) ) {
+		if ( ! function_exists( 'register_block_type_from_metadata' ) ) {
 			return;
 		}
 
-		// Default attributes.
-		$attributes = array(
-			'id' => array(
-				'type' => 'string',
-			),
-			'align' => array(
-				'type' => 'string',
-			),
-			'className' => array(
-				'type' => 'string',
-			),
-			'anchor' => array(
-				'type' => 'string',
-			),
-		);
-
-		register_block_type(
+		register_block_type_from_metadata(
 			visual_portfolio()->plugin_path . 'gutenberg/block-saved',
 			array(
 				'render_callback' => array( $this, 'block_render' ),
-				'attributes'      => $attributes,
 			)
 		);
 
-		if ( 'vp_lists' === get_post_type() ) {
-			register_block_type(
-				visual_portfolio()->plugin_path . 'gutenberg/layouts-editor/block',
-				array(
-					'attributes' => $attributes,
-				)
-			);
-		}
-
 		// Fallback.
-		register_block_type(
+		register_block_type_from_metadata(
 			'nk/visual-portfolio',
 			array(
 				'render_callback' => array( $this, 'block_render' ),
-				'attributes'      => $attributes,
+				'attributes'      => array(
+					'id' => array(
+						'type' => 'string',
+					),
+					'align' => array(
+						'type' => 'string',
+					),
+					'className' => array(
+						'type' => 'string',
+					),
+					'anchor' => array(
+						'type' => 'string',
+					),
+				),
 			)
 		);
 	}
 
+	/**
+	 * Register Block for Layouts Editor.
+	 */
+	public function register_block_layouts_editor() {
+		global $pagenow;
+
+		if ( 'post.php' === $pagenow && isset( $_GET['post'] ) && 'vp_lists' === get_post_type( $_GET['post'] ) ) {
+			register_block_type_from_metadata(
+				visual_portfolio()->plugin_path . 'gutenberg/layouts-editor/block'
+			);
+		}
+	}
+
 	/**
 	 * Block output
 	 *

diff --git a/classes/class-gutenberg.php b/classes/class-gutenberg.php
@@ -153,13 +153,13 @@ public function get_block_attributes() {
 	 * Register Block.
 	 */
 	public function register_block() {
-		if ( ! function_exists( 'register_block_type' ) ) {
+		if ( ! function_exists( 'register_block_type_from_metadata' ) ) {
 			return;
 		}
 
 		$attributes = $this->get_block_attributes();
 
-		register_block_type(
+		register_block_type_from_metadata(
 			visual_portfolio()->plugin_path . 'gutenberg/block',
 			array(
 				'render_callback' => array( $this, 'block_render' ),

diff --git a/gutenberg/block-saved/block.json b/gutenberg/block-saved/block.json
@@ -7,7 +7,13 @@
 	"description": "Display saved Visual Portfolio layouts.",
 	"keywords": ["saved", "portfolio", "vpf"],
 	"textdomain": "visual-portfolio",
+	"attributes": {
+		"id": {
+			"type": "string"
+		}
+	},
 	"supports": {
+		"ghostkit": true,
 		"anchor": true,
 		"className": true,
 		"html": false,

diff --git a/gutenberg/block-saved/deprecated.js b/gutenberg/block-saved/deprecated.js
@@ -8,13 +8,6 @@ export default [
 				type: 'string',
 			},
 		},
-		ghostkit: {
-			supports: {
-				spacings: true,
-				display: true,
-				scrollReveal: true,
-			},
-		},
 		supports: {
 			anchor: true,
 			className: true,

diff --git a/gutenberg/block-saved/index.js b/gutenberg/block-saved/index.js
@@ -8,10 +8,9 @@ import edit from './edit';
 import save from './save';
 import transforms from './transforms';
 
-const { name } = metadata;
+const { name, title } = metadata;
 
 const settings = {
-	...metadata,
 	icon: {
 		foreground: '#2540CC',
 		src: (
@@ -71,14 +70,6 @@ const settings = {
 			</svg>
 		),
 	},
-	ghostkit: {
-		supports: {
-			styles: true,
-			spacings: true,
-			display: true,
-			scrollReveal: true,
-		},
-	},
 	edit,
 	save,
 	transforms,
@@ -89,9 +80,10 @@ registerBlockType(name, settings);
 // Fallback.
 registerBlockType('nk/visual-portfolio', {
 	...settings,
+	title,
 	name: 'nk/visual-portfolio',
 	supports: {
-		...settings.supports,
+		...metadata.supports,
 		inserter: false,
 	},
 	deprecated,

diff --git a/gutenberg/block/block.json b/gutenberg/block/block.json
@@ -8,6 +8,7 @@
 	"keywords": ["gallery", "images", "posts", "portfolio", "vpf"],
 	"textdomain": "visual-portfolio",
 	"supports": {
+		"ghostkit": true,
 		"anchor": true,
 		"className": true,
 		"html": false,

diff --git a/gutenberg/block/index.js b/gutenberg/block/index.js
@@ -10,24 +10,13 @@ import save from './save';
 import transforms from './transforms';
 import variations from './variations';
 
-const { attributes } = window.VPGutenbergVariables;
 const { name } = metadata;
 
 const settings = {
-	...metadata,
-	attributes,
 	icon: {
 		foreground: '#2540CC',
 		src: <ElementIcon width="20" height="20" />,
 	},
-	ghostkit: {
-		supports: {
-			styles: true,
-			spacings: true,
-			display: true,
-			scrollReveal: true,
-		},
-	},
 	example: {
 		attributes: {
 			preview_image_example: 'true',

diff --git a/gutenberg/layouts-editor/block/index.js b/gutenberg/layouts-editor/block/index.js
@@ -6,8 +6,6 @@ import { useState } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 import { __ } from '@wordpress/i18n';
 
-import metadata from './block.json';
-
 const { navigator } = window;
 
 let copiedTimeout;
@@ -186,7 +184,6 @@ function LayoutsEditorBlock(props) {
 }
 
 registerBlockType('visual-portfolio/saved-editor', {
-	...metadata,
 	icon: {
 		foreground: '#2540CC',
 		src: (
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'eeb006fa5c19f8e2d012');
		<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '73ed561ca29115334e44');