Merge pull request #478 from tomusborne/release/3.2.3

Release: 3.2.3

assets/dist/customizer.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => 'd11e6372862a93a2d27c1488c733d5e4');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '8ea6e41d478be8b7d0dac74069cb0dba');

assets/dist/dashboard.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '0b0b00a375613f57beee85895b88af90');
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '42891bd78f46f557a7fcfe466a6f3080');

functions.php

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

inc/customizer/helpers.php

@@ -352,6 +352,7 @@ function generate_do_control_inline_scripts() {
 		array(
 			'palette' => $colors,
 			'showGoogleFonts' => apply_filters( 'generate_font_manager_show_google_fonts', true ),
+			'colorPickerShouldShift' => function_exists( 'did_filter' ),
 		)
 	);
 

package.json

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

readme.txt

@@ -6,7 +6,7 @@ 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: 5.2
 Tested up to: 6.1
-Stable tag: 3.2.2
+Stable tag: 3.2.3
 
 GeneratePress is a lightweight WordPress theme built with a focus on speed and usability.
 
@@ -99,6 +99,12 @@ MIT License: https://github.com/JedWatson/react-select/blob/master/LICENSE
 
 == Changelog ==
 
+= 3.2.3 =
+
+Release date: November 17, 2022
+
+* Fix: Global color picker positioning
+
 = 3.2.2 =
 
 Release date: November 8, 2022

src/components/color-picker/index.js

@@ -41,6 +41,11 @@ export default function ColorPicker( props ) {
 
 	// This fixes useState getting called twice on close.
 	const debouncedClosePanel = useDebouncedCallback( closePanel, 100 );
+	const popoverProps = {};
+
+	if ( generateCustomizerControls.colorPickerShouldShift ) {
+		popoverProps.shift = true;
+	}
 
 	return (
 		<div className="generate-color-picker-area">
@@ -58,7 +63,7 @@ export default function ColorPicker( props ) {
 				className="generate-component-color-picker"
 				onClose={ debouncedClosePanel }
 				focusOnMount="container"
-				__unstableShift={ true }
+				{ ...popoverProps }
 			>
 				<BaseControl
 					label={ !! label ? label : '' }

src/components/color-picker/style.scss

@@ -98,6 +98,14 @@
 	}
 }
 
+@media screen and (max-width: 1666px) {
+	.generate-component-color-picker {
+		.components-popover__content {
+			width: 265px;
+		}
+	}
+}
+
 .generate-component-color-picker[data-x-axis=left] {
 	.components-popover__content {
 		margin-right: -35px !important;

src/customizer-controls/color-picker/style.scss

@@ -1,4 +1,3 @@
 .generate-component-color-picker {
-	position: fixed !important;
-	margin: 5px;
+	padding: 5px 15px 5px 5px;
 }