Fix context namespacing

WordPress · Jul 22, 2020 · 342c91a · 342c91a
1 parent 16064bd
commit 342c91a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
@@ -31,16 +31,18 @@
 			"type": "string",
 			"default": "large"
 		},
-		"imageSettings": {
-			"type": "object",
-			"default": {
-				"allowResize": false,
-				"allowAlign": false
-			}
+		"allowBlockAlign": {
+			"type": "boolean",
+			"default": false
+		},
+		"allowResize": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"providesContext": {
-		"gallery/imageSettings": "imageSettings"
+		"allowBlockAlign": "allowBlockAlign",
+		"allowResize": "allowResize"
 	},
 	"supports": {
 		"anchor": true,

diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
@@ -1,7 +1,7 @@
 {
 	"name": "core/image",
 	"category": "media",
-	"usesContext": [ "gallery/imageSettings" ],
+	"usesContext": [ "allowBlockAlign", "allowResize" ],
 	"attributes": {
 		"align": {
 			"type": "string"

diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
@@ -96,14 +96,10 @@ export function ImageEdit( {
 	} );
 
 	const allowResize =
-		context[ 'gallery/imageSettings' ]?.allowResize !== undefined
-			? context[ 'gallery/imageSettings' ].allowResize
-			: true;
+		context.allowResize !== undefined ? context.allowResize : true;
 
 	const allowAlign =
-		context[ 'gallery/imageSettings' ]?.allowAlign !== undefined
-			? context[ 'gallery/imageSettings' ].allowAlign
-			: true;
+		context.allowBlockAlign !== undefined ? context.allowBlockAlign : true;
 
 	function onUploadError( message ) {
 		noticeOperations.removeAllNotices();