@wordpress/block-library 6.0.12 → 6.0.17-next.33ec3857e2.0

package/src/embed/test/index.native.js

@@ -37,6 +37,16 @@ jest.mock( 'react-native-modal', () => {
 	const mockComponent = require( 'react-native/jest/mockComponent' );
 	return mockComponent( 'react-native-modal' );
 } );
+
+// Mock debounce to prevent potentially belated state updates.
+jest.mock( 'lodash', () => ( {
+	...jest.requireActual( 'lodash' ),
+	debounce: ( fn ) => {
+		fn.cancel = jest.fn();
+		return fn;
+	},
+} ) );
+
 const MODAL_DISMISS_EVENT = Platform.OS === 'ios' ? 'onDismiss' : 'onModalHide';
 
 // oEmbed response mocks
@@ -175,10 +185,10 @@ beforeAll( () => {
 } );
 
 beforeEach( () => {
-	// Invalidate embed preview resolutions
-	dispatch( coreStore ).invalidateResolutionForStoreSelector(
-		'getEmbedPreview'
-	);
+	// Invalidate all resolutions of core-data to prevent
+	// caching embed preview and theme supports requests.
+	dispatch( coreStore ).invalidateResolutionForStore();
+
 	// Mock embed responses
 	mockEmbedResponses( [
 		RICH_TEXT_EMBED_SUCCESS_RESPONSE,
@@ -236,7 +246,6 @@ describe( 'Embed block', () => {
 			const expectedURL = 'https://twitter.com/notnownikki';
 
 			const {
-				getByA11yLabel,
 				getByPlaceholderText,
 				getByTestId,
 			} = await insertEmbedBlock();
@@ -254,12 +263,15 @@ describe( 'Embed block', () => {
 			fireEvent( embedEditURLModal, 'backdropPress' );
 			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
 
-			// Wait for block settings button to be present
-			const settingsButton = await waitFor( () =>
-				getByA11yLabel( 'Open Settings' )
+			const blockSettingsModal = await waitFor( () =>
+				getByTestId( 'block-settings-modal' )
 			);
+			// Get Twitter link field
+			const twitterLinkField = within(
+				blockSettingsModal
+			).getByA11yLabel( `Twitter link, ${ expectedURL }` );
 
-			expect( settingsButton ).toBeDefined();
+			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
 
@@ -269,30 +281,31 @@ describe( 'Embed block', () => {
 			// Mock clipboard
 			Clipboard.getString.mockResolvedValue( clipboardURL );
 
-			const {
-				getByA11yLabel,
-				getByTestId,
-				getByText,
-			} = await insertEmbedBlock();
+			const { getByTestId, getByText } = await insertEmbedBlock();
 
 			// Wait for edit URL modal to be visible
 			const embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
 			await waitFor( () => embedEditURLModal.props.isVisible );
 
-			// Get embed link
-			const embedLink = await waitFor( () => getByText( clipboardURL ) );
+			// Get embed link with auto-pasted URL
+			const autopastedLinkField = await waitFor( () =>
+				getByText( clipboardURL )
+			);
 
 			// Dismiss the edit URL modal
 			fireEvent( embedEditURLModal, 'backdropPress' );
 			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
 
-			// Wait for block settings button to be present
-			const settingsButton = await waitFor( () =>
-				getByA11yLabel( 'Open Settings' )
+			const blockSettingsModal = await waitFor( () =>
+				getByTestId( 'block-settings-modal' )
 			);
+			// Get Twitter link field
+			const twitterLinkField = within(
+				blockSettingsModal
+			).getByA11yLabel( `Twitter link, ${ clipboardURL }` );
 
-			expect( embedLink ).toBeDefined();
-			expect( settingsButton ).toBeDefined();
+			expect( autopastedLinkField ).toBeDefined();
+			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
 
 			Clipboard.getString.mockReset();
@@ -323,7 +336,6 @@ describe( 'Embed block', () => {
 			const expectedURL = 'https://twitter.com/notnownikki';
 
 			const {
-				getByA11yLabel,
 				getByPlaceholderText,
 				getByTestId,
 				getByText,
@@ -345,12 +357,15 @@ describe( 'Embed block', () => {
 			fireEvent( embedEditURLModal, 'backdropPress' );
 			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
 
-			// Wait for block settings button to be present
-			const settingsButton = await waitFor( () =>
-				getByA11yLabel( 'Open Settings' )
+			const blockSettingsModal = await waitFor( () =>
+				getByTestId( 'block-settings-modal' )
 			);
+			// Get Twitter link field
+			const twitterLinkField = within(
+				blockSettingsModal
+			).getByA11yLabel( `Twitter link, ${ expectedURL }` );
 
-			expect( settingsButton ).toBeDefined();
+			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
 
@@ -360,11 +375,9 @@ describe( 'Embed block', () => {
 			// Mock clipboard
 			Clipboard.getString.mockResolvedValue( clipboardURL );
 
-			const {
-				getByA11yLabel,
-				getByTestId,
-				getByText,
-			} = await initializeWithEmbedBlock( EMPTY_EMBED_HTML );
+			const { getByTestId, getByText } = await initializeWithEmbedBlock(
+				EMPTY_EMBED_HTML
+			);
 
 			// Edit URL
 			fireEvent.press( getByText( 'ADD LINK' ) );
@@ -380,13 +393,16 @@ describe( 'Embed block', () => {
 			fireEvent( embedEditURLModal, 'backdropPress' );
 			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
 
-			// Wait for block settings button to be present
-			const settingsButton = await waitFor( () =>
-				getByA11yLabel( 'Open Settings' )
+			const blockSettingsModal = await waitFor( () =>
+				getByTestId( 'block-settings-modal' )
 			);
+			// Get Twitter link field
+			const twitterLinkField = within(
+				blockSettingsModal
+			).getByA11yLabel( `Twitter link, ${ clipboardURL }` );
 
 			expect( embedLink ).toBeDefined();
-			expect( settingsButton ).toBeDefined();
+			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
 
 			Clipboard.getString.mockReset();
@@ -400,18 +416,18 @@ describe( 'Embed block', () => {
 				getByTestId,
 			} = await initializeWithEmbedBlock( RICH_TEXT_EMBED_HTML );
 
-			// Edit URL
+			// Open Block Settings
 			fireEvent.press(
-				await waitFor( () => getByA11yLabel( 'Edit URL' ) )
+				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
 			);
 
-			// Wait for edit URL modal to be visible
-			const embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
-			await waitFor( () => embedEditURLModal.props.isVisible );
+			// Wait for Block Settings to be visible
+			const blockSettingsModal = getByTestId( 'block-settings-modal' );
+			await waitFor( () => blockSettingsModal.props.isVisible );
 
-			// Dismiss the edit URL modal
-			fireEvent( embedEditURLModal, 'backdropPress' );
-			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
+			// Dismiss the Block Settings modal
+			fireEvent( blockSettingsModal, 'backdropPress' );
+			fireEvent( blockSettingsModal, MODAL_DISMISS_EVENT );
 
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
@@ -426,18 +442,20 @@ describe( 'Embed block', () => {
 				getByTestId,
 			} = await initializeWithEmbedBlock( RICH_TEXT_EMBED_HTML );
 
-			// Edit URL
+			// Open Block Settings
 			fireEvent.press(
-				await waitFor( () => getByA11yLabel( 'Edit URL' ) )
+				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
 			);
 
-			// Wait for edit URL modal to be visible
-			const embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
-			await waitFor( () => embedEditURLModal.props.isVisible );
+			// Wait for Block Settings to be visible
+			const blockSettingsModal = getByTestId( 'block-settings-modal' );
+			await waitFor( () => blockSettingsModal.props.isVisible );
 
 			// Start editing link
 			fireEvent.press(
-				getByA11yLabel( `Twitter link, ${ initialURL }` )
+				within( blockSettingsModal ).getByA11yLabel(
+					`Twitter link, ${ initialURL }`
+				)
 			);
 
 			// Replace URL
@@ -445,13 +463,15 @@ describe( 'Embed block', () => {
 			fireEvent( linkTextInput, 'focus' );
 			fireEvent.changeText( linkTextInput, expectedURL );
 
-			// Dismiss the edit URL modal
-			fireEvent( embedEditURLModal, 'backdropPress' );
-			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
+			// Dismiss the Block Settings modal
+			fireEvent( blockSettingsModal, 'backdropPress' );
+			fireEvent( blockSettingsModal, MODAL_DISMISS_EVENT );
 
 			// Get YouTube link field
 			const youtubeLinkField = await waitFor( () =>
-				getByA11yLabel( `YouTube link, ${ expectedURL }` )
+				within( blockSettingsModal ).getByA11yLabel(
+					`YouTube link, ${ expectedURL }`
+				)
 			);
 
 			expect( youtubeLinkField ).toBeDefined();
@@ -469,18 +489,20 @@ describe( 'Embed block', () => {
 				getByText,
 			} = await initializeWithEmbedBlock( RICH_TEXT_EMBED_HTML );
 
-			// Edit URL
+			// Open Block Settings
 			fireEvent.press(
-				await waitFor( () => getByA11yLabel( 'Edit URL' ) )
+				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
 			);
 
-			// Wait for edit URL modal to be visible
-			const embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
-			await waitFor( () => embedEditURLModal.props.isVisible );
+			// Wait for Block Settings to be visible
+			const blockSettingsModal = getByTestId( 'block-settings-modal' );
+			await waitFor( () => blockSettingsModal.props.isVisible );
 
 			// Start editing link
 			fireEvent.press(
-				getByA11yLabel( `Twitter link, ${ previousURL }` )
+				within( blockSettingsModal ).getByA11yLabel(
+					`Twitter link, ${ previousURL }`
+				)
 			);
 
 			// Replace URL
@@ -488,9 +510,9 @@ describe( 'Embed block', () => {
 			fireEvent( linkTextInput, 'focus' );
 			fireEvent.changeText( linkTextInput, invalidURL );
 
-			// Dismiss the edit URL modal
-			fireEvent( embedEditURLModal, 'backdropPress' );
-			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
+			// Dismiss the Block Settings modal
+			fireEvent( blockSettingsModal, 'backdropPress' );
+			fireEvent( blockSettingsModal, MODAL_DISMISS_EVENT );
 
 			const errorNotice = await waitFor( () =>
 				getByText( 'Invalid URL. Please enter a valid URL.' )
@@ -500,6 +522,49 @@ describe( 'Embed block', () => {
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
 
+		it( 'sets empty state when setting an empty URL', async () => {
+			const previousURL = 'https://twitter.com/notnownikki';
+
+			const {
+				getByA11yLabel,
+				getByDisplayValue,
+				getByTestId,
+				getByPlaceholderText,
+			} = await initializeWithEmbedBlock( RICH_TEXT_EMBED_HTML );
+
+			// Open Block Settings
+			fireEvent.press(
+				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
+			);
+
+			// Get Block Settings modal
+			const blockSettingsModal = getByTestId( 'block-settings-modal' );
+
+			// Start editing link
+			fireEvent.press(
+				within( blockSettingsModal ).getByA11yLabel(
+					`Twitter link, ${ previousURL }`
+				)
+			);
+
+			// Replace URL with empty value
+			const linkTextInput = getByDisplayValue( previousURL );
+			fireEvent( linkTextInput, 'focus' );
+			fireEvent.changeText( linkTextInput, '' );
+
+			// Dismiss the Block Settings modal
+			fireEvent( blockSettingsModal, 'backdropPress' );
+			fireEvent( blockSettingsModal, MODAL_DISMISS_EVENT );
+
+			// Get empty embed link
+			const emptyLinkTextInput = await waitFor( () =>
+				getByPlaceholderText( 'Add link' )
+			);
+
+			expect( emptyLinkTextInput ).toBeDefined();
+			expect( getEditorHtml() ).toMatchSnapshot();
+		} );
+
 		// This test case covers the bug fixed in PR #35460
 		it( 'edits URL after dismissing two times the edit URL bottom sheet with empty value', async () => {
 			const { block, getByTestId, getByText } = await insertEmbedBlock();
@@ -549,7 +614,7 @@ describe( 'Embed block', () => {
 			} = await insertEmbedBlock();
 
 			// Wait for edit URL modal to be visible
-			let embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
+			const embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
 			await waitFor( () => embedEditURLModal.props.isVisible );
 
 			// Set an bad URL
@@ -561,30 +626,36 @@ describe( 'Embed block', () => {
 			fireEvent( embedEditURLModal, 'backdropPress' );
 			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
 
-			// Edit URL
+			// Open Block Settings
 			fireEvent.press(
-				await waitFor( () => getByA11yLabel( 'Edit URL' ) )
+				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
 			);
 
-			// Wait for edit URL modal to be visible
-			embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
-			await waitFor( () => embedEditURLModal.props.isVisible );
+			// Wait for Block Settings to be visible
+			const blockSettingsModal = getByTestId( 'block-settings-modal' );
+			await waitFor( () => blockSettingsModal.props.isVisible );
 
 			// Start editing link
-			fireEvent.press( getByA11yLabel( `Embed link, ${ badURL }` ) );
+			fireEvent.press(
+				within( blockSettingsModal ).getByA11yLabel(
+					`Embed link, ${ badURL }`
+				)
+			);
 
 			// Replace URL
 			linkTextInput = getByDisplayValue( badURL );
 			fireEvent( linkTextInput, 'focus' );
 			fireEvent.changeText( linkTextInput, expectedURL );
 
-			// Dismiss the edit URL modal
-			fireEvent( embedEditURLModal, 'backdropPress' );
-			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
+			// Dismiss the Block Settings modal
+			fireEvent( blockSettingsModal, 'backdropPress' );
+			fireEvent( blockSettingsModal, MODAL_DISMISS_EVENT );
 
 			// Get Twitter link field
 			const twitterLinkField = await waitFor( () =>
-				getByA11yLabel( `Twitter link, ${ expectedURL }` )
+				within( blockSettingsModal ).getByA11yLabel(
+					`Twitter link, ${ expectedURL }`
+				)
 			);
 
 			expect( twitterLinkField ).toBeDefined();
@@ -623,6 +694,8 @@ describe( 'Embed block', () => {
 
 	describe( 'retry', () => {
 		it( 'retries loading the preview if initial request failed', async () => {
+			const expectedURL = 'https://twitter.com/notnownikki';
+
 			// Return bad response for the first request to oembed endpoint
 			// and success response for the rest of requests.
 			let isFirstEmbedRequest = true;
@@ -640,23 +713,26 @@ describe( 'Embed block', () => {
 				return Promise.resolve( response );
 			} );
 
-			const {
-				getByA11yLabel,
-				getByText,
-			} = await initializeWithEmbedBlock( RICH_TEXT_EMBED_HTML );
+			const { getByTestId, getByText } = await initializeWithEmbedBlock(
+				RICH_TEXT_EMBED_HTML
+			);
 
 			// Retry request
 			fireEvent.press( getByText( 'More options' ) );
 			fireEvent.press( getByText( 'Retry' ) );
 
-			// Wait for edit URL button to be present
-			const editURLButton = await waitFor( () =>
-				getByA11yLabel( 'Edit URL' )
+			const blockSettingsModal = await waitFor( () =>
+				getByTestId( 'block-settings-modal' )
 			);
+			// Get Twitter link field
+			const twitterLinkField = within(
+				blockSettingsModal
+			).getByA11yLabel( `Twitter link, ${ expectedURL }` );
 
-			expect( editURLButton ).toBeDefined();
+			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
+
 		it( 'converts to link if preview request failed', async () => {
 			// Return bad response for requests to oembed endpoint.
 			fetchRequest.mockImplementation( ( { path } ) => {
@@ -683,6 +759,61 @@ describe( 'Embed block', () => {
 			expect( paragraphBlock ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
+
+		it( 'allows editing link if request failed', async () => {
+			const failURL = 'https://wordpress.org/news/2021/07/tatum/';
+			const successURL = 'https://twitter.com/notnownikki';
+
+			// Return bad response for WordPress URL and success for Twitter URL.
+			fetchRequest.mockImplementation( ( { path } ) => {
+				const matchesPath = ( url ) =>
+					path ===
+					`/oembed/1.0/proxy?url=${ encodeURIComponent( url ) }`;
+
+				let response = {};
+				if ( matchesPath( failURL ) ) {
+					response = MOCK_BAD_WORDPRESS_RESPONSE;
+				} else if ( matchesPath( successURL ) ) {
+					response = RICH_TEXT_EMBED_SUCCESS_RESPONSE;
+				}
+
+				return Promise.resolve( response );
+			} );
+
+			const {
+				getByA11yLabel,
+				getByText,
+				getByTestId,
+				getByDisplayValue,
+			} = await initializeWithEmbedBlock( WP_EMBED_HTML );
+
+			fireEvent.press( getByText( 'More options' ) );
+			fireEvent.press( getByText( 'Edit link' ) );
+
+			// Start editing link
+			fireEvent.press( getByA11yLabel( `WordPress link, ${ failURL }` ) );
+
+			// Set an URL
+			const linkTextInput = getByDisplayValue( failURL );
+			fireEvent( linkTextInput, 'focus' );
+			fireEvent.changeText( linkTextInput, successURL );
+
+			// Dismiss the edit URL modal
+			const embedEditURLModal = getByTestId( 'embed-edit-url-modal' );
+			fireEvent( embedEditURLModal, 'backdropPress' );
+			fireEvent( embedEditURLModal, MODAL_DISMISS_EVENT );
+
+			const blockSettingsModal = await waitFor( () =>
+				getByTestId( 'block-settings-modal' )
+			);
+			// Get Twitter link field
+			const twitterLinkField = within(
+				blockSettingsModal
+			).getByA11yLabel( `Twitter link, ${ successURL }` );
+
+			expect( twitterLinkField ).toBeDefined();
+			expect( getEditorHtml() ).toMatchSnapshot();
+		} );
 	} );
 
 	describe( 'preview coming soon', () => {
@@ -960,10 +1091,12 @@ describe( 'Embed block', () => {
 				getByText,
 			} = await initializeWithEmbedBlock( RICH_TEXT_EMBED_HTML );
 
+			// Open Block Settings
 			fireEvent.press(
 				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
 			);
 
+			// Untoggle resize for smaller devices
 			fireEvent.press(
 				await waitFor( () => getByText( /Resize for smaller devices/ ) )
 			);
@@ -971,21 +1104,28 @@ describe( 'Embed block', () => {
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
 
-		it( 'does not show settings button if responsive is not supported', async () => {
-			const { getByA11yLabel } = await initializeWithEmbedBlock(
-				WP_EMBED_HTML
+		it( 'does not show media settings panel if responsive is not supported', async () => {
+			const {
+				getByA11yLabel,
+				getByText,
+			} = await initializeWithEmbedBlock( WP_EMBED_HTML );
+
+			// Open Block Settings
+			fireEvent.press(
+				await waitFor( () => getByA11yLabel( 'Open Settings' ) )
 			);
 
-			let settingsButton;
+			// Wait for media settings panel
+			let mediaSettingsPanel;
 			try {
-				settingsButton = await waitFor( () =>
-					getByA11yLabel( 'Open Settings' )
+				mediaSettingsPanel = await waitFor( () =>
+					getByText( 'Media settings' )
 				);
 			} catch ( e ) {
 				// NOOP
 			}
 
-			expect( settingsButton ).not.toBeDefined();
+			expect( mediaSettingsPanel ).not.toBeDefined();
 		} );
 	} );
 } );

package/src/file/block.json

@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/file",
 	"title": "File",

package/src/freeform/block.json

@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/freeform",
 	"title": "Classic",

package/src/gallery/block.json

@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/gallery",
 	"title": "Gallery",

package/src/gallery/edit.js

@@ -123,6 +123,16 @@ function GalleryEdit( props ) {
 		[ clientId ]
 	);
 
+	const wasBlockJustInserted = useSelect(
+		( select ) => {
+			return select( blockEditorStore ).wasBlockJustInserted(
+				clientId,
+				'inserter_menu'
+			);
+		},
+		[ clientId ]
+	);
+
 	const images = useMemo(
 		() =>
 			innerBlockImages?.map( ( block ) => ( {
@@ -435,6 +445,9 @@ function GalleryEdit( props ) {
 			value={ hasImageIds ? images : {} }
 			onError={ onUploadError }
 			notices={ hasImages ? undefined : noticeUI }
+			autoOpenMediaUpload={
+				! hasImages && isSelected && wasBlockJustInserted
+			}
 		/>
 	);
 

package/src/gallery/editor.scss

@@ -45,20 +45,6 @@ figure.wp-block-gallery {
 	}
 	.block-editor-media-placeholder {
 		margin: 0;
-
-		&::before {
-			box-shadow: 0 0 0 $border-width $white inset, 0 0 0 3px var(--wp-admin-theme-color) inset;
-			content: "";
-			// Shown in Windows 10 high contrast mode.
-			outline: 2px solid transparent;
-			position: absolute;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
-			z-index: 1;
-			pointer-events: none;
-		}
 		.components-placeholder__label {
 			display: flex;
 		}

package/src/gallery/index.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Server-side rendering of the `core/image` block.
+ * Server-side rendering of the `core/gallery` block.
  *
  * @package WordPress
  */
@@ -13,11 +13,10 @@
  * we add a custom `data-id` attribute before rendering the gallery
  * so that the Image Block can pick it up in its render_callback.
  *
- * @param  array $parsed_block A single parsed block object.
- *
- * @return array               The migrated block object.
+ * @param array $parsed_block The block being rendered.
+ * @return array The migrated block object.
  */
-function render_block_core_gallery_data( $parsed_block ) {
+function block_core_gallery_data_id_backcompatibility( $parsed_block ) {
 	if ( 'core/gallery' === $parsed_block['blockName'] ) {
 		foreach ( $parsed_block['innerBlocks'] as $key => $inner_block ) {
 			if ( 'core/image' === $inner_block['blockName'] ) {
@@ -31,14 +30,14 @@ function render_block_core_gallery_data( $parsed_block ) {
 	return $parsed_block;
 }
 
-add_filter( 'render_block_data', 'render_block_core_gallery_data' );
+add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' );
 
 /**
  * Registers the `core/gallery` block on server.
  * This render callback needs to be here
  * so that the gallery styles are loaded in block-based themes.
  */
-function gutenberg_register_block_core_gallery() {
+function register_block_core_gallery() {
 	register_block_type_from_metadata(
 		__DIR__ . '/gallery',
 		array(
@@ -49,4 +48,4 @@ function gutenberg_register_block_core_gallery() {
 	);
 }
 
-add_action( 'init', 'gutenberg_register_block_core_gallery', 20 );
+add_action( 'init', 'register_block_core_gallery', 20 );

package/src/gallery/style.scss

@@ -63,6 +63,10 @@
 			img {
 				display: inline;
 			}
+
+			a {
+				color: inherit;
+			}
 		}
 
 		&.is-style-rounded {