Merge branch 'main' into feature/dynamic-color-picker

Author: GeoffDusome

.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require( '@wordpress/prettier-config' );

package.json

@@ -52,7 +52,6 @@
 		"prettier": "npm:wp-prettier@^3.0.3",
 		"webpack-remove-empty-scripts": "^1.0.4"
 	},
-	"prettier": "@wordpress/prettier-config",
 	"scripts": {
 		"dist": "NODE_ENV=production wp-scripts build --webpack-src-dir=$npm_package_config_coreThemeBlocksDir",
 		"build": "wp-scripts build --webpack-src-dir=$npm_package_config_coreThemeBlocksDir",

wp-content/themes/core/blocks/tribe/image-card/edit.js

@@ -23,6 +23,7 @@ import {
 import ServerSideRender from '@wordpress/server-side-render';
 import { withSelect } from '@wordpress/data';
 import { useMemo, useState } from '@wordpress/element';
+import blockSettings from './block.json';
 
 import './editor.pcss';
 
@@ -105,7 +106,7 @@ const Edit = ( { attributes, setAttributes, isSelected, media } ) => {
 	const removeMedia = () => {
 		setAttributes( {
 			mediaId: 0,
-			mediaUrl: '',
+			mediaUrl: blockSettings?.attributes?.mediaUrl?.default || '',
 		} );
 	};
 

wp-content/themes/core/blocks/tribe/image-overlay-card/edit.js

@@ -24,6 +24,7 @@ import ServerSideRender from '@wordpress/server-side-render';
 import { withSelect } from '@wordpress/data';
 import { useMemo, useState } from '@wordpress/element';
 import DynamicColorPicker from 'components/DynamicColorPicker';
+import blockSettings from './block.json';
 
 import './editor.pcss';
 
@@ -108,7 +109,7 @@ const Edit = ( { attributes, setAttributes, isSelected, media } ) => {
 	const removeMedia = () => {
 		setAttributes( {
 			mediaId: 0,
-			mediaUrl: '',
+			mediaUrl: blockSettings?.attributes?.mediaUrl?.default || '',
 		} );
 	};
 

wp-content/themes/core/blocks/tribe/navigation-wrapper/block.json

@@ -9,9 +9,7 @@
 	"description": "A structural block that wraps menu items inside a semantic <nav> tag with no added styles.",
 	"attributes": {
 		"ariaLabel": {
-			"type": "string",
-			"source": "attribute",
-			"attribute": "aria-label"
+			"type": "string"
 		}
 	},
 	"supports": {

wp-content/themes/core/parts/header.html

@@ -1,16 +1,16 @@
-<!-- wp:group {"align":"full","className":"site-header__container alignfull","style":{"spacing":{"blockGap":"var:preset|spacing|10","padding":{"right":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"center"}} -->
+<!-- wp:group {"metadata":{"name":"Header"},"align":"full","className":"site-header__container alignfull","style":{"spacing":{"blockGap":"var:preset|spacing|10","padding":{"right":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"center"}} -->
 <div class="wp-block-group site-header__container alignfull" style="padding-right:0;padding-left:0"><!-- wp:group {"align":"full","className":"alignfull","layout":{"type":"constrained","justifyContent":"right"}} -->
-<div class="wp-block-group alignfull"><!-- wp:tribe/navigation-wrapper {"className":"aligngrid"} -->
-<nav class="wp-block-tribe-navigation-wrapper aligngrid"><!-- wp:template-part {"slug":"utility-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__utility-menu"} /--></nav>
+<div class="wp-block-group alignfull"><!-- wp:tribe/navigation-wrapper {"ariaLabel":"Utility Navigation","className":"aligngrid"} -->
+<nav aria-label="Utility Navigation" class="wp-block-tribe-navigation-wrapper aligngrid"><!-- wp:template-part {"slug":"utility-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__utility-menu"} /--></nav>
 <!-- /wp:tribe/navigation-wrapper --></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"align":"full","className":"site-header__primary-menu alignfull","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group site-header__primary-menu alignfull" style="margin-top:0;margin-bottom:0"><!-- wp:group {"className":"site-header__navigation-wrapper aligngrid","style":{"spacing":{"padding":{"bottom":"0"},"blockGap":"var:preset|spacing|50"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 <div class="wp-block-group site-header__navigation-wrapper aligngrid" style="padding-bottom:0"><!-- wp:site-title {"level":0,"fontSize":"60"} /-->
 
-<!-- wp:tribe/navigation-wrapper -->
-<nav class="wp-block-tribe-navigation-wrapper"><!-- wp:template-part {"slug":"primary-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__navigation"} /--></nav>
+<!-- wp:tribe/navigation-wrapper {"ariaLabel":"Primary Navigation"} -->
+<nav aria-label="Primary Navigation" class="wp-block-tribe-navigation-wrapper"><!-- wp:template-part {"slug":"primary-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__navigation"} /--></nav>
 <!-- /wp:tribe/navigation-wrapper -->
 
 <!-- wp:group {"metadata":{"name":"Masthead Features"},"className":"site-header__features","style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->