From 938720602082dc50a1746bd2e33faa3d3a6096d4 Mon Sep 17 00:00:00 2001 From: Subodh Rajpopat <58080782+subodhr258@users.noreply.github.com> Date: Tue, 10 Dec 2024 23:51:04 +0530 Subject: [PATCH 1/2] CustomSelectControl: Update Value from Fresh State (#67733) * CustomSelectControl: Prioritized props value over store * CustomSelectControl: Refactored Codebase to fix failing testcases * docs: Add changelog entry for CustomSelectControl font size reset fix * CustomSelectControl: Fetch the fresh state on each call instead of stale state * Tweak changelog text --------- Co-authored-by: subodhr258 Co-authored-by: mirka <0mirka00@git.wordpress.org> Co-authored-by: sarthaknagoshe2002 Co-authored-by: Rishit30G Co-authored-by: inc2734 --- packages/components/CHANGELOG.md | 1 + packages/components/src/custom-select-control/index.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 6a7b2545c2e68..2dc35bd54b3ee 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -45,6 +45,7 @@ ### Bug Fixes - `ResizableBox`: Make drag handles focusable ([#67305](https://github.com/WordPress/gutenberg/pull/67305)). +- `CustomSelectControl`: Update correctly when `showSelectedHint` is enabled ([#67733](https://github.com/WordPress/gutenberg/pull/67733)). ## 28.13.0 (2024-11-27) diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx index 74da8a5c74106..339944f419872 100644 --- a/packages/components/src/custom-select-control/index.tsx +++ b/packages/components/src/custom-select-control/index.tsx @@ -154,11 +154,11 @@ function CustomSelectControl< T extends CustomSelectOption >( const renderSelectedValueHint = () => { const selectedOptionHint = options ?.map( applyOptionDeprecations ) - ?.find( ( { name } ) => currentValue === name )?.hint; + ?.find( ( { name } ) => store.getState().value === name )?.hint; return ( - { currentValue } + { store.getState().value } { selectedOptionHint && ( Date: Wed, 11 Dec 2024 00:44:38 +0000 Subject: [PATCH 2/2] Bump plugin version to 19.9.0-rc.1 --- gutenberg.php | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gutenberg.php b/gutenberg.php index bcc941f2cb83f..92f935669fc46 100644 --- a/gutenberg.php +++ b/gutenberg.php @@ -5,7 +5,7 @@ * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality. * Requires at least: 6.6 * Requires PHP: 7.2 - * Version: 19.8.0 + * Version: 19.9.0-rc.1 * Author: Gutenberg Team * Text Domain: gutenberg * diff --git a/package-lock.json b/package-lock.json index 0b0dbbb0905cb..55ddf782bf4fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gutenberg", - "version": "19.8.0", + "version": "19.9.0-rc.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "gutenberg", - "version": "19.8.0", + "version": "19.9.0-rc.1", "hasInstallScript": true, "license": "GPL-2.0-or-later", "workspaces": [ diff --git a/package.json b/package.json index f935ac7250d1c..dbf69043c5829 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gutenberg", - "version": "19.8.0", + "version": "19.9.0-rc.1", "private": true, "description": "A new WordPress editor experience.", "author": "The WordPress Contributors",