Release: 3.6.0-alpha.1

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Check changed files
         id: 'js-files'
-        uses: tj-actions/changed-files@v35.4.3
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             src/**/*.js
@@ -68,7 +68,7 @@ jobs:
 
       - name: Check changed files
         id: 'js-files'
-        uses: tj-actions/changed-files@v35.4.3
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             src/**/*.js
@@ -102,7 +102,7 @@ jobs:
 
       - name: Check changed files
         id: 'js-files'
-        uses: tj-actions/changed-files@v35.4.3
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             src/**/*.js
@@ -147,7 +147,7 @@ jobs:
 
       - name: Check changed files
         id: 'php-files'
-        uses: tj-actions/changed-files@v35.4.3
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             **/*.php
@@ -180,7 +180,7 @@ jobs:
 
       - name: Check changed files
         id: 'php-files'
-        uses: tj-actions/changed-files@v35.4.3
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             **/*.php

assets/dist/block-editor.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready', 'wp-element', 'wp-plugins'), 'version' => '53a6a5a937a68e460003');
+<?php return array('dependencies' => array('wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-plugins'), 'version' => '24bb9110ccf231b1e49f');

assets/dist/customizer.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '731b220042b06e3421fb');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '79795830803e662a540e');

assets/dist/modal.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '8b4cabf5d14f1f64f94a');
+<?php return array('dependencies' => array(), 'version' => 'b9041bb3f75d06782df7');

functions.php

@@ -12,7 +12,7 @@
 }
 
 // Set our theme version.
-define( 'GENERATE_VERSION', '3.5.1' );
+define( 'GENERATE_VERSION', '3.6.0-alpha.1' );
 
 if ( ! function_exists( 'generate_setup' ) ) {
 	add_action( 'after_setup_theme', 'generate_setup' );

inc/general.php

@@ -74,31 +74,35 @@ function generate_scripts() {
 
 		if ( generate_has_active_menu() ) {
 			wp_enqueue_script( 'generate-menu', $dir_uri . "/assets/js/menu{$suffix}.js", array(), GENERATE_VERSION, true );
-		}
 
-		wp_localize_script(
-			'generate-menu',
-			'generatepressMenu',
-			apply_filters(
+			$menu_script_args = apply_filters(
 				'generate_localize_js_args',
 				array(
 					'toggleOpenedSubMenus' => true,
-					'openSubMenuLabel' => esc_attr__( 'Open Sub-Menu', 'generatepress' ),
-					'closeSubMenuLabel' => esc_attr__( 'Close Sub-Menu', 'generatepress' ),
+					'openSubMenuLabel'     => esc_attr__( 'Open Sub-Menu', 'generatepress' ),
+					'closeSubMenuLabel'    => esc_attr__( 'Close Sub-Menu', 'generatepress' ),
 				)
-			)
-		);
+			);
+
+			generate_add_inline_script(
+				'generate-menu',
+				$menu_script_args,
+				'generatepressMenu'
+			);
+		}
 
 		if ( 'click' === generate_get_option( 'nav_dropdown_type' ) || 'click-arrow' === generate_get_option( 'nav_dropdown_type' ) ) {
 			wp_enqueue_script( 'generate-dropdown-click', $dir_uri . "/assets/js/dropdown-click{$suffix}.js", array(), GENERATE_VERSION, true );
 
-			wp_localize_script(
+			$dropdown_click_args = array(
+				'openSubMenuLabel'  => esc_attr__( 'Open Sub-Menu', 'generatepress' ),
+				'closeSubMenuLabel' => esc_attr__( 'Close Sub-Menu', 'generatepress' ),
+			);
+
+			generate_add_inline_script(
 				'generate-dropdown-click',
-				'generatepressDropdownClick',
-				array(
-					'openSubMenuLabel' => esc_attr__( 'Open Sub-Menu', 'generatepress' ),
-					'closeSubMenuLabel' => esc_attr__( 'Close Sub-Menu', 'generatepress' ),
-				)
+				$dropdown_click_args,
+				'generatepressDropdownClick'
 			);
 		}
 
@@ -109,29 +113,33 @@ function generate_scripts() {
 		if ( 'enable' === generate_get_option( 'nav_search' ) ) {
 			wp_enqueue_script( 'generate-navigation-search', $dir_uri . "/assets/js/navigation-search{$suffix}.js", array(), GENERATE_VERSION, true );
 
-			wp_localize_script(
+			$nav_search_args = array(
+				'open'  => esc_attr__( 'Open Search Bar', 'generatepress' ),
+				'close' => esc_attr__( 'Close Search Bar', 'generatepress' ),
+			);
+
+			generate_add_inline_script(
 				'generate-navigation-search',
-				'generatepressNavSearch',
-				array(
-					'open' => esc_attr__( 'Open Search Bar', 'generatepress' ),
-					'close' => esc_attr__( 'Close Search Bar', 'generatepress' ),
-				)
+				$nav_search_args,
+				'generatepressNavSearch'
 			);
 		}
 
 		if ( 'enable' === generate_get_option( 'back_to_top' ) ) {
 			wp_enqueue_script( 'generate-back-to-top', $dir_uri . "/assets/js/back-to-top{$suffix}.js", array(), GENERATE_VERSION, true );
 
-			wp_localize_script(
-				'generate-back-to-top',
-				'generatepressBackToTop',
-				apply_filters(
-					'generate_back_to_top_js_args',
-					array(
-						'smooth' => true,
-					)
+			$back_to_top_args = apply_filters(
+				'generate_back_to_top_js_args',
+				array(
+					'smooth' => true,
 				)
 			);
+
+			generate_add_inline_script(
+				'generate-back-to-top',
+				$back_to_top_args,
+				'generatepressBackToTop'
+			);
 		}
 
 		if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
@@ -482,11 +490,12 @@ function generate_set_microdata_markup( $output, $context ) {
  * @since 3.1.0
  */
 function generate_do_a11y_scripts() {
-	if ( apply_filters( 'generate_print_a11y_script', true ) ) {
-		// Add our small a11y script inline.
-		printf(
-			'<script id="generate-a11y">%s</script>',
-			'!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var e=document.body;e.addEventListener("mousedown",function(){e.classList.add("using-mouse")}),e.addEventListener("keydown",function(){e.classList.remove("using-mouse")})}}();'
+	if ( apply_filters( 'generate_print_a11y_script', true ) && function_exists( 'wp_print_inline_script_tag' ) ) {
+		wp_print_inline_script_tag(
+			'!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var e=document.body;e.addEventListener("mousedown",function(){e.classList.add("using-mouse")}),e.addEventListener("keydown",function(){e.classList.remove("using-mouse")})}}();',
+			array(
+				'id' => 'generate-a11y',
+			)
 		);
 	}
 }

inc/theme-functions.php

@@ -826,3 +826,19 @@ function generate_has_active_menu() {
 function generate_is_using_dynamic_typography() {
 	return generate_get_option( 'use_dynamic_typography' );
 }
+
+/**
+ * Add inline script.
+ *
+ * @param string $handle The script handle to attach the inline script to.
+ * @param array  $data   The data to be passed to the script.
+ * @param string $var    The JavaScript variable name to assign the data to.
+ * @param string $position The position to add the inline script.
+ */
+function generate_add_inline_script( $handle, $data, $var, $position = 'before' ) {
+	if ( ! empty( $data ) ) {
+		$json_data = wp_json_encode( $data );
+		$inline_script = "var $var = $json_data;";
+		wp_add_inline_script( $handle, $inline_script, $position );
+	}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generatepress",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.1",
   "description": "A super lightweight WordPress theme.",
   "main": "Gruntfile.js",
   "scripts": {

readme.txt

@@ -4,9 +4,9 @@ Donate link: https://generatepress.com/ongoing-development/
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Tags: two-columns, three-columns, one-column, right-sidebar, left-sidebar, footer-widgets, blog, e-commerce, flexible-header, full-width-template, buddypress, custom-header, custom-background, custom-menu, custom-colors, sticky-post, threaded-comments, translation-ready, rtl-language-support, featured-images, theme-options
-Requires at least: 6.1
+Requires at least: 6.5
 Requires PHP: 7.4
-Tested up to: 6.6
+Tested up to: 6.7
 Stable tag: 3.5.1
 
 GeneratePress is a lightweight WordPress theme built with a focus on speed and usability.
@@ -100,6 +100,9 @@ MIT License: https://github.com/JedWatson/react-select/blob/master/LICENSE
 
 == Changelog ==
 
+= 3.6.0 =
+* Fix: Inability to add more than one font in the Font Manager
+
 = 3.5.1 =
 * Tweak: Revert addition of appearance-tools theme support
 * Fix: Dropdown click conflict with off-canvas panel

src/customizer-controls/font-manager/GeneratePressFontManagerControlForm.js

@@ -333,7 +333,7 @@ const GeneratePressFontManagerControlForm = ( props ) => {
 			<Button
 				isPrimary
 				onClick={ () => {
-					const fontValues = [ ...props.value ];
+					const fontValues = [ ...fonts ];
 
 					fontValues.push( {
 						fontFamily: '',
@@ -345,8 +345,7 @@ const GeneratePressFontManagerControlForm = ( props ) => {
 
 					handleChangeComplete( fontValues );
 
-					const itemCount = wp.customize.control( props.customizerSetting.id ).setting.get().length;
-					setOpen( itemCount );
+					setOpen( fontValues.length );
 				} }
 			>
 				{ __( 'Add Font', 'generatepress' ) }

src/extend/content-width/index.js

@@ -1,6 +1,8 @@
 import { registerPlugin } from '@wordpress/plugins';
 import { useEffect, useState } from '@wordpress/element';
 import domReady from '@wordpress/dom-ready';
+import { store as editorStore } from '@wordpress/editor';
+import { useSelect } from '@wordpress/data';
 
 function getContentWidth( layout, contentContainer = '' ) {
 	let contentWidth = '';
@@ -40,22 +42,59 @@ function getContentWidth( layout, contentContainer = '' ) {
 const ContentWidth = () => {
 	const [ sidebarLayout, setSidebarLayout ] = useState( generatepressBlockEditor.sidebarLayout );
 	const [ fullWidth, setFullWidth ] = useState( generatepressBlockEditor.contentAreaType );
-	const editorWrapperStyles = document.querySelector( '.editor-styles-wrapper' )?.style;
 
-	// We use editorWrapperStyles to update the content width when changing devices or code editor to visual editor.
-	// See https://github.com/tomusborne/generatepress/issues/493.
+	const editorMode = useSelect( ( select ) => (
+		select( editorStore ).getEditorMode()
+	), [] );
+
+	const deviceType = useSelect( ( select ) => {
+		const { getDeviceType } = select( 'core/editor' ) || {};
+
+		if ( 'function' === typeof getDeviceType ) {
+			return getDeviceType();
+		}
+
+		const {
+			__experimentalGetPreviewDeviceType: experimentalGetPreviewDeviceType,
+		} = select( 'core/edit-post' );
+
+		if ( 'function' === typeof experimentalGetPreviewDeviceType ) {
+			return experimentalGetPreviewDeviceType();
+		}
+
+		return 'Desktop';
+	}, [] );
+
 	useEffect( () => {
-		const body = document.querySelector( '.editor-styles-wrapper' );
-		body?.style?.setProperty( '--content-width', getContentWidth( sidebarLayout, fullWidth ) );
-	}, [ sidebarLayout, fullWidth, JSON.stringify( editorWrapperStyles ) ] );
+		const iframe = document.querySelector( 'iframe[name="editor-canvas"]' );
+		const queryDocument = iframe?.contentDocument || document;
+		const body = queryDocument.querySelector( '.editor-styles-wrapper' );
+
+		if ( body ) {
+			const contentWidth = getContentWidth( sidebarLayout, fullWidth );
+			body.style.setProperty( '--content-width', contentWidth );
+		}
+
+		if ( iframe && 'loading' === iframe.contentDocument.readyState ) {
+			const handleLoad = () => {
+				if ( body ) {
+					const contentWidth = getContentWidth( sidebarLayout, fullWidth );
+					body.style.setProperty( '--content-width', contentWidth );
+				}
+			};
+
+			iframe.addEventListener( 'load', handleLoad, { once: true } );
+			return () => iframe.removeEventListener( 'load', handleLoad );
+		}
+	}, [ sidebarLayout, fullWidth, editorMode, deviceType ] );
 
 	domReady( () => {
 		const sidebarSelect = document.getElementById( 'generate-sidebar-layout' );
 		const contentWidthSelect = document.getElementById( '_generate-full-width-content' );
 
 		if ( sidebarSelect ) {
 			sidebarSelect.onchange = ( event ) => {
-				setSidebarLayout( event.target.value || generatepressBlockEditor.globalSidebarLayout );
+				setSidebarLayout( event.target.value || generatepressBlockEditor.sidebarLayout );
 			};
 		}