Merge pull request #1418 from rocklobster-in/dev/5.9

Dev/5.9

includes/block-editor/block-editor.php

@@ -19,6 +19,7 @@ function wpcf7_init_block_editor_assets() {
 
 	$assets = wp_parse_args( $assets, array(
 		'dependencies' => array(
+			'react',
 			'wp-api-fetch',
 			'wp-block-editor',
 			'wp-blocks',
@@ -45,42 +46,7 @@ function wpcf7_init_block_editor_assets() {
 	register_block_type(
 		wpcf7_plugin_path( 'includes/block-editor' ),
 		array(
-			'editor_script' => 'contact-form-7-block-editor',
+			'editor_script_handles' => 'contact-form-7-block-editor',
 		)
 	);
 }
-
-
-add_action(
-	'enqueue_block_editor_assets',
-	'wpcf7_enqueue_block_editor_assets',
-	10, 0
-);
-
-function wpcf7_enqueue_block_editor_assets() {
-	$contact_forms = array_map(
-		static function ( $contact_form ) {
-			return array(
-				'id' => $contact_form->id(),
-				'hash' => $contact_form->hash(),
-				'slug' => $contact_form->name(),
-				'title' => $contact_form->title(),
-				'locale' => $contact_form->locale(),
-			);
-		},
-		WPCF7_ContactForm::find( array(
-			'posts_per_page' => 20,
-			'orderby' => 'modified',
-			'order' => 'DESC',
-		) )
-	);
-
-	wp_add_inline_script(
-		'contact-form-7-block-editor',
-		sprintf(
-			'window.wpcf7 = {contactForms:%s};',
-			wp_json_encode( $contact_forms )
-		),
-		'before'
-	);
-}

includes/block-editor/src/edit.js

@@ -1,5 +1,5 @@
 import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
+import { useState, useEffect } from '@wordpress/element';
 import { useBlockProps, InspectorControls } from '@wordpress/block-editor';
 
 import {
@@ -31,9 +31,15 @@ export default function ContactFormSelectorEdit( { attributes, setAttributes } )
 	};
 
 	const [ contactForms, setContactForms ] = useState(
-		() => createMap( window.wpcf7.contactForms ?? [] )
+		() => createMap( [] )
 	);
 
+	useEffect( () => {
+		fetchContactForms().then( response => {
+			setContactForms( createMap( response ) );
+		} );
+	}, [] );
+
 	const blockProps = {
 		className: 'components-placeholder',
 		style: {

includes/block-editor/src/index.js

@@ -2,10 +2,6 @@ import { __ } from '@wordpress/i18n';
 import { registerBlockType } from '@wordpress/blocks';
 import { useBlockProps } from '@wordpress/block-editor';
 
-window.wpcf7 = window.wpcf7 ?? {
-	contactForms: [],
-};
-
 import icon from './icon';
 import edit from './edit';
 import transforms from './transforms';