From b65aa79c95d2236402de09de105ae73491218825 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 15 Apr 2026 19:18:28 +0800
Subject: [PATCH 1/2] Block Editor: Settings Sidebar: Support `optgroup` for
 Member Content

---
 ...onvertkit-plugin-sidebar-post-settings.php | 18 +++-
 resources/backend/js/gutenberg.js             | 91 +++++++++++++++++--
 2 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
index c84121cee..e504bad9a 100644
--- a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
@@ -160,9 +160,13 @@ public function get_fields() {
 			'0' => esc_html__( 'Don\'t restrict content to member-only', 'convertkit' ),
 		);
 		if ( $convertkit_forms->exist() ) {
+			$restrict_content['forms'] = array(
+				'label'  => esc_html__( 'Forms', 'convertkit' ),
+				'values' => array(),
+			);
 			foreach ( $convertkit_forms->get() as $form ) {
 				// Legacy forms don't include a `format` key, so define them as inline.
-				$restrict_content[ 'form_' . absint( $form['id'] ) ] = sprintf(
+				$restrict_content['forms']['values'][ 'form_' . absint( $form['id'] ) ] = sprintf(
 					'%s [%s]',
 					sanitize_text_field( $form['name'] ),
 					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
@@ -170,13 +174,21 @@ public function get_fields() {
 			}
 		}
 		if ( $convertkit_tags->exist() ) {
+			$restrict_content['tags'] = array(
+				'label'  => esc_html__( 'Tags', 'convertkit' ),
+				'values' => array(),
+			);
 			foreach ( $convertkit_tags->get() as $tag ) {
-				$restrict_content[ 'tag_' . absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
+				$restrict_content['tags']['values'][ 'tag_' . absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
 			}
 		}
 		if ( $convertkit_products->exist() ) {
+			$restrict_content['products'] = array(
+				'label'  => esc_html__( 'Products', 'convertkit' ),
+				'values' => array(),
+			);
 			foreach ( $convertkit_products->get() as $product ) {
-				$restrict_content[ 'product_' . $product['id'] ] = sanitize_text_field( $product['name'] );
+				$restrict_content['products']['values'][ 'product_' . $product['id'] ] = sanitize_text_field( $product['name'] );
 			}
 		}
 
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index 1e617cbbb..24965b7ad 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -1009,25 +1009,104 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 				// depending on the Field Type (select, textarea, text etc).
 				switch (field.type) {
 					case 'select':
-						// Build options for <select> input.
+						// Check if any values are optgroups.
+						const hasOptgroups = Object.keys(field.values).some(
+							(subKey) =>
+								typeof field.values[subKey] === 'object' &&
+								field.values[subKey].label &&
+								field.values[subKey].values
+						);
+
+						if (hasOptgroups) {
+							const children = [];
+
+							for (const value of Object.keys(field.values)) {
+								if (
+									typeof field.values[value] === 'object' &&
+									field.values[value].label &&
+									field.values[value].values
+								) {
+									// Optgroup.
+									const groupChildren = [];
+									for (const groupValue of Object.keys(
+										field.values[value].values
+									)) {
+										const label =
+											typeof field.values[value].values[
+												groupValue
+											] === 'string'
+												? field.values[value].values[
+														groupValue
+													].replace(
+														/&#0*39;|&#x27;|&apos;/g,
+														"'"
+													)
+												: field.values[value].values[
+														groupValue
+													];
+										groupChildren.push(
+											el(
+												'option',
+												{
+													value: groupValue,
+													key: groupValue,
+												},
+												label
+											)
+										);
+									}
+									children.push(
+										el(
+											'optgroup',
+											{
+												label: field.values[value]
+													.label,
+												key: value,
+											},
+											...groupChildren
+										)
+									);
+								} else {
+									// Flat option.
+									const label = field.values[value].replace(
+										/&#0*39;|&#x27;|&apos;/g,
+										"'"
+									);
+									children.push(
+										el(
+											'option',
+											{ value, key: value },
+											label
+										)
+									);
+								}
+							}
+
+							return el(
+								SelectControl,
+								fieldProperties,
+								...children
+							);
+						}
+
+						// Non-optgroup: existing logic using options prop.
 						for (const value of Object.keys(field.values)) {
 							fieldOptions.push({
-								label: field.values[value],
+								label: field.values[value].replace(
+									/&#0*39;|&#x27;|&apos;/g,
+									"'"
+								),
 								value,
 							});
 						}
 
-						// Sort field's options alphabetically by label.
 						fieldOptions.sort(function (x, y) {
 							const a = x.label.toUpperCase(),
 								b = y.label.toUpperCase();
 							return a.localeCompare(b);
 						});
 
-						// Assign options to field.
 						fieldProperties.options = fieldOptions;
-
-						// Return field element.
 						return el(SelectControl, fieldProperties);
 
 					default:

From 2b6e730653ee1523a9398dfbca1b44742f85957c Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 15 Apr 2026 19:29:51 +0800
Subject: [PATCH 2/2] Fixes

---
 ...onvertkit-plugin-sidebar-post-settings.php |  2 +-
 resources/backend/js/gutenberg.js             | 39 ++++++-------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
index e504bad9a..5f319715b 100644
--- a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
@@ -157,7 +157,7 @@ public function get_fields() {
 
 		// Get Products.
 		$restrict_content = array(
-			'0' => esc_html__( 'Don\'t restrict content to member-only', 'convertkit' ),
+			'0' => esc_html__( 'Do not restrict content to member-only', 'convertkit' ),
 		);
 		if ( $convertkit_forms->exist() ) {
 			$restrict_content['forms'] = array(
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index 24965b7ad..3b1047548 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -1003,8 +1003,6 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 					},
 				};
 
-				const fieldOptions = [];
-
 				// Define additional Field Properties and the Field Element,
 				// depending on the Field Type (select, textarea, text etc).
 				switch (field.type) {
@@ -1031,19 +1029,6 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 									for (const groupValue of Object.keys(
 										field.values[value].values
 									)) {
-										const label =
-											typeof field.values[value].values[
-												groupValue
-											] === 'string'
-												? field.values[value].values[
-														groupValue
-													].replace(
-														/&#0*39;|&#x27;|&apos;/g,
-														"'"
-													)
-												: field.values[value].values[
-														groupValue
-													];
 										groupChildren.push(
 											el(
 												'option',
@@ -1051,7 +1036,9 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 													value: groupValue,
 													key: groupValue,
 												},
-												label
+												field.values[value].values[
+													groupValue
+												]
 											)
 										);
 									}
@@ -1067,16 +1054,12 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 										)
 									);
 								} else {
-									// Flat option.
-									const label = field.values[value].replace(
-										/&#0*39;|&#x27;|&apos;/g,
-										"'"
-									);
+									// Option within optgroup.
 									children.push(
 										el(
 											'option',
 											{ value, key: value },
-											label
+											field.values[value]
 										)
 									);
 								}
@@ -1089,24 +1072,26 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 							);
 						}
 
-						// Non-optgroup: existing logic using options prop.
+						// Options only, no optgroups.
+						const fieldOptions = [];
 						for (const value of Object.keys(field.values)) {
 							fieldOptions.push({
-								label: field.values[value].replace(
-									/&#0*39;|&#x27;|&apos;/g,
-									"'"
-								),
+								label: field.values[value],
 								value,
 							});
 						}
 
+						// Sort options alphabetically by label.
 						fieldOptions.sort(function (x, y) {
 							const a = x.label.toUpperCase(),
 								b = y.label.toUpperCase();
 							return a.localeCompare(b);
 						});
 
+						// Assign options to field properties.
 						fieldProperties.options = fieldOptions;
+
+						// Return field element.
 						return el(SelectControl, fieldProperties);
 
 					default: