Pass block context differently

packages/block-library/src/audio/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { autoplay, caption, loop, preload, src } = attributes;
 
 	return (

packages/block-library/src/button/save.js

@@ -7,13 +7,14 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import getColorAndStyleProps from './color-props';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { borderRadius, linkTarget, rel, text, title, url } = attributes;
 	const colorProps = getColorAndStyleProps( attributes );
 	const buttonClasses = classnames(

packages/block-library/src/buttons/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { getBlockProps } ) {
+export default function save() {
 	return (
 		<div { ...getBlockProps() }>
 			<InnerBlocks.Content />

packages/block-library/src/code/save.js

@@ -2,13 +2,14 @@
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import { escape } from './utils';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	return (
 		<pre { ...getBlockProps() }>
 			<RichText.Content

packages/block-library/src/column/save.js

@@ -7,8 +7,9 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { verticalAlignment, width } = attributes;
 
 	const wrapperClasses = classnames( {

packages/block-library/src/columns/save.js

@@ -7,8 +7,9 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { verticalAlignment } = attributes;
 
 	const className = classnames( {

packages/block-library/src/cover/save.js

@@ -11,6 +11,7 @@ import {
 	getColorClassName,
 	__experimentalGetGradientClass,
 } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -24,7 +25,7 @@ import {
 	getPositionClassName,
 } from './shared';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const {
 		backgroundType,
 		gradient,

packages/block-library/src/group/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { tagName: Tag } = attributes;
 
 	return (

packages/block-library/src/heading/save.js

@@ -7,8 +7,9 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { align, content, level } = attributes;
 	const TagName = 'h' + level;
 

packages/block-library/src/image/save.js

@@ -8,8 +8,9 @@ import { isEmpty } from 'lodash';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const {
 		url,
 		alt,

packages/block-library/src/list/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { ordered, values, type, reversed, start } = attributes;
 	const TagName = ordered ? 'ol' : 'ul';
 

packages/block-library/src/media-text/save.js

@@ -8,6 +8,7 @@ import { noop, isEmpty } from 'lodash';
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -17,7 +18,7 @@ import { DEFAULT_MEDIA_SIZE_SLUG } from './constants';
 
 const DEFAULT_MEDIA_WIDTH = 50;
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const {
 		isStackedOnMobile,
 		mediaAlt,

packages/block-library/src/paragraph/save.js

@@ -7,8 +7,9 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { align, content, dropCap, direction } = attributes;
 	const className = classnames( {
 		'has-drop-cap': dropCap,

packages/block-library/src/preformatted/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { content } = attributes;
 
 	return (

packages/block-library/src/quote/save.js

@@ -7,8 +7,9 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { align, value, citation } = attributes;
 
 	const className = classnames( {

packages/block-library/src/social-links/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { getBlockProps } ) {
+export default function save() {
 	return (
 		<ul { ...getBlockProps() }>
 			<InnerBlocks.Content />

packages/block-library/src/verse/save.js

@@ -7,8 +7,9 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const { textAlign, content } = attributes;
 
 	const className = classnames( {

packages/block-library/src/video/save.js

@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { getBlockProps } from '@wordpress/blocks';
 
-export default function save( { attributes, getBlockProps } ) {
+export default function save( { attributes } ) {
 	const {
 		autoplay,
 		caption,

packages/blocks/README.md

@@ -298,6 +298,10 @@ _Returns_
 
 -   `string`: The block's default menu item class.
 
+<a name="getBlockProps" href="#getBlockProps">#</a> **getBlockProps**
+
+Undocumented declaration.
+
 <a name="getBlockSupport" href="#getBlockSupport">#</a> **getBlockSupport**
 
 Returns the block support value for a feature, if defined.

packages/blocks/src/api/index.js

@@ -24,6 +24,7 @@ export {
 	getBlockMenuDefaultClassName,
 	getSaveElement,
 	getSaveContent,
+	getBlockProps,
 } from './serializer';
 export { isValidBlockContent } from './validation';
 export { getCategories, setCategories, updateCategory } from './categories';

packages/blocks/src/api/serializer.js

@@ -69,6 +69,18 @@ export function getBlockMenuDefaultClassName( blockName ) {
 	);
 }
 
+const blockPropsProvider = {};
+
+export function getBlockProps( props ) {
+	const { blockType, attributes } = blockPropsProvider;
+	return applyFilters(
+		'blocks.getSaveContent.extraProps',
+		{ ...props },
+		blockType,
+		attributes
+	);
+}
+
 /**
  * Given a block type containing a save render implementation and attributes, returns the
  * enhanced element to be saved or string when raw HTML expected.
@@ -95,16 +107,10 @@ export function getSaveElement(
 		save = instance.render.bind( instance );
 	}
 
-	function getBlockProps( props ) {
-		return applyFilters(
-			'blocks.getSaveContent.extraProps',
-			{ ...props },
-			blockType,
-			attributes
-		);
-	}
+	blockPropsProvider.blockType = blockType;
+	blockPropsProvider.attributes = attributes;
 
-	let element = save( { attributes, innerBlocks, getBlockProps } );
+	let element = save( { attributes, innerBlocks } );
 
 	if (
 		isObject( element ) &&