Merge branch 'release/1.13.2' of https://github.com/pixelgrade/nova-b…

…locks into release/1.13.2
pixelgrade · Sep 3, 2021 · 37e7121 · 37e7121
2 parents 9206656 + 17f71a2
commit 37e7121
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/packages/block-editor/src/filters/with-color-signal/update-blocks.js b/packages/block-editor/src/filters/with-color-signal/update-blocks.js
@@ -31,11 +31,14 @@ subscribe( () => {
 const updateBlock = ( block ) => {
 
   const supports = getSupports( block.name );
+  const { attributes, clientId } = block;
+  const { colorSignal, palette, paletteVariation, useSourceColorAsReference } = attributes;
 
-  if ( supports?.novaBlocks?.colorSignal ) {
+  if ( supports?.novaBlocks?.colorSignal &&
+       typeof colorSignal !== "undefined" &&
+       typeof palette !== "undefined" &&
+       typeof paletteVariation !== "undefined" ) {
     const { updateBlockAttributes } = dispatch( 'core/block-editor' );
-    const { attributes, clientId } = block;
-    const { colorSignal, paletteVariation, useSourceColorAsReference } = attributes;
     const parentVariation = getParentVariation( clientId );
     const absoluteVariation = getAbsoluteColorVariation( attributes );
     const nextVariation = computeColorSignal( parentVariation, colorSignal, absoluteVariation );

diff --git a/packages/block-editor/src/filters/with-content-position-matrix/index.js b/packages/block-editor/src/filters/with-content-position-matrix/index.js
@@ -100,6 +100,7 @@ const withContentPositionMatrixDeprecated = ( settings ) => {
   return Object.assign( {}, settings, {
     deprecated: [ {
       attributes: {
+        ...settings.attributes,
         horizontalAlignment: {
           type: "string",
           default: "center"
@@ -112,11 +113,11 @@ const withContentPositionMatrixDeprecated = ( settings ) => {
       isEligible( attributes ) {
         return ! isUndefined( attributes.horizontalAlignment ) && ! isUndefined( attributes.verticalAlignment ) && isUndefined( attributes.contentPosition );
       },
-      migrate( oldAttributes ) {
-        const { horizontalAlignment, verticalAlignment, ...attributes } = oldAttributes;
+      migrate( attributes ) {
+        const { horizontalAlignment, verticalAlignment, ...newAttributes } = attributes;
 
         return {
-          ...attributes,
+          ...newAttributes,
           contentPosition: `${ verticalAlignment } ${ horizontalAlignment }`
         };
       },

diff --git a/packages/block-library/src/blocks/media/attributes.json b/packages/block-library/src/blocks/media/attributes.json
@@ -11,14 +11,6 @@
 		"type": "string",
 		"default": "moderate"
 	},
-	"horizontalAlignment": {
-		"type": "string",
-		"default": "center"
-	},
-	"verticalAlignment": {
-		"type": "string",
-		"default": ""
-	},
 	"layoutPreset": {
 		"type": "string",
 		"default": "stable"