Merge pull request #5982 from wordpress-mobile/fix/crash-when-registering-non-core-blocks

fluiddot · web-flow · commit 107358868998 · 2023-07-20T19:57:07.000+02:00
Fix crash when registering non-core blocks
diff --git a/gutenberg b/gutenberg
@@ -1 +1 @@
-Subproject commit 6d22c92b664927d0894cec816adfb07769af8688
+Subproject commit 6b1a2688d8cd906744e09c55f89d28a8eaefdcac
diff --git a/src/block-experiments-setup.js b/src/block-experiments-setup.js
@@ -16,7 +16,7 @@ const blockExperiments = [ 'jetpack/layout-grid' ];
 const setupHooks = () => {
 	// Hook triggered after the editor is rendered
 	addAction(
-		'native.render',
+		'native.post-register-core-blocks',
 		'gutenberg-mobile-block-experiments',
 		( props ) => {
 			const capabilities = props.capabilities ?? {};
diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js
@@ -147,9 +147,13 @@ const setupHooks = () => {
 	} );
 
 	// Hook triggered after the editor is rendered
-	addAction( 'native.render', 'gutenberg-mobile-jetpack', ( props ) => {
-		registerJetpackBlocks( props );
-	} );
+	addAction(
+		'native.post-register-core-blocks',
+		'gutenberg-mobile-jetpack',
+		( props ) => {
+			registerJetpackBlocks( props );
+		}
+	);
 };
 
 const setupStringsOverrides = () => {
