From fc4b1969a1fb17c6a9dca17fec98b17159c9b5d9 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 24 Feb 2026 11:44:55 +0800
Subject: [PATCH 01/12] Block Editor: Register Post Settings Panel

---
 includes/class-convertkit-gutenberg.php | 185 +++++++++++++++++++++++
 resources/backend/js/gutenberg.js       | 193 +++++++++++++++++++++++-
 2 files changed, 377 insertions(+), 1 deletion(-)

diff --git a/includes/class-convertkit-gutenberg.php b/includes/class-convertkit-gutenberg.php
index e7286322d..bd83add04 100644
--- a/includes/class-convertkit-gutenberg.php
+++ b/includes/class-convertkit-gutenberg.php
@@ -29,6 +29,10 @@ public function __construct() {
 			add_filter( 'block_categories', array( $this, 'add_block_categories' ), 10, 2 );
 		}
 
+		// Register Gutenberg Post Settings.
+		add_action( 'init', array( $this, 'register_post_settings' ) );
+		add_action( 'convertkit_gutenberg_enqueue_scripts', array( $this, 'register_post_settings_fields' ) );
+
 		// Register Gutenberg Blocks.
 		add_action( 'init', array( $this, 'add_blocks' ) );
 
@@ -37,6 +41,187 @@ public function __construct() {
 
 	}
 
+	/**
+	 * Registers the post meta key for storing post settings for the block editor.
+	 *
+	 * @since   3.3.0
+	 */
+	public function register_post_settings() {
+
+		register_post_meta(
+			'',
+			'_wp_convertkit_settings',
+			array(
+				'show_in_rest'      => array(
+					'schema' => array(
+						'type'       => 'object',
+						'properties' => array(
+							'form'             => array(
+								'type'    => 'string',
+								'default' => '-1',
+							),
+							'landing_page'     => array(
+								'type'    => 'string',
+								'default' => '0',
+							),
+							'tag'              => array(
+								'type'    => 'string',
+								'default' => '0',
+							),
+							'restrict_content' => array(
+								'type'    => 'string',
+								'default' => '0',
+							),
+						),
+					),
+				),
+				'single'            => true,
+				'type'              => 'object',
+				'default'           => array(
+					'form'             => '-1',
+					'landing_page'     => '0',
+					'tag'              => '0',
+					'restrict_content' => '0',
+				),
+				'sanitize_callback' => function ( $value ) {
+
+					if ( ! is_array( $value ) ) {
+						return array(
+							'form'             => '-1',
+							'landing_page'     => '0',
+							'tag'              => '0',
+							'restrict_content' => '0',
+						);
+					}
+
+					return array(
+						'form'             => sanitize_text_field( $value['form'] ?? '-1' ),
+						'landing_page'     => sanitize_text_field( $value['landing_page'] ?? '0' ),
+						'tag'              => sanitize_text_field( $value['tag'] ?? '0' ),
+						'restrict_content' => sanitize_text_field( $value['restrict_content'] ?? '0' ),
+					);
+
+				},
+				'auth_callback'     => function () {
+
+					return current_user_can( 'edit_posts' );
+
+				},
+			)
+		);
+
+	}
+
+	/**
+	 * Registers the post settings fields for the block editor.
+	 */
+	public function register_post_settings_fields() {
+
+		// Load resource classes.
+		$convertkit_forms         = new ConvertKit_Resource_Forms( 'post_settings' );
+		$convertkit_landing_pages = new ConvertKit_Resource_Landing_Pages( 'post_settings' );
+		$convertkit_tags          = new ConvertKit_Resource_Tags( 'post_settings' );
+		$convertkit_products      = new ConvertKit_Resource_Products( 'post_settings' );
+
+		// Get Forms.
+		$forms = array(
+			'-1' => esc_html__( 'Default', 'convertkit' ),
+			'0'  => esc_html__( 'None', 'convertkit' ),
+		);
+		if ( $convertkit_forms->exist() ) {
+			foreach ( $convertkit_forms->get() as $form ) {
+				// Legacy forms don't include a `format` key, so define them as inline.
+				$forms[ absint( $form['id'] ) ] = sprintf(
+					'%s [%s]',
+					sanitize_text_field( $form['name'] ),
+					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
+				);
+			}
+		}
+
+		// Get Landing Pages.
+		$landing_pages = array(
+			'0' => esc_html__( 'None', 'convertkit' ),
+		);
+		if ( $convertkit_landing_pages->exist() ) {
+			foreach ( $convertkit_landing_pages->get() as $landing_page ) {
+				$landing_pages[ absint( $landing_page['id'] ) ] = sanitize_text_field( $landing_page['name'] );
+			}
+		}
+
+		// Get Tags.
+		$tags = array(
+			'0' => esc_html__( 'None', 'convertkit' ),
+		);
+		if ( $convertkit_tags->exist() ) {
+			foreach ( $convertkit_tags->get() as $tag ) {
+				$tags[ absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
+			}
+		}
+
+		// Get Products.
+		$restrict_content = array(
+			'0' => esc_html__( 'Don\'t restrict content to member-only', 'convertkit' ),
+		);
+		if ( $convertkit_forms->exist() ) {
+			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(
+					'%s [%s]',
+					sanitize_text_field( $form['name'] ),
+					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
+				);
+			}
+		}
+		if ( $convertkit_tags->exist() ) {
+			foreach ( $convertkit_tags->get() as $tag ) {
+				$restrict_content[ 'tag_' . absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
+			}
+		}
+		if ( $convertkit_products->exist() ) {
+			foreach ( $convertkit_products->get() as $product ) {
+				$restrict_content[ 'product_' . $product['id'] ] = sanitize_text_field( $product['name'] );
+			}
+		}
+
+		// Define post settings fields.
+		wp_localize_script(
+			'convertkit-gutenberg',
+			'convertkit_post_settings',
+			array(
+				'form'             => array(
+					'label'         => __( 'Form', 'convertkit' ),
+					'type'          => 'select',
+					'description'   => __( 'Select a form to display on this post.', 'convertkit' ),
+					'values'        => $forms,
+					'default_value' => '-1',
+				),
+				'landing_page'     => array(
+					'label'         => __( 'Landing Page', 'convertkit' ),
+					'type'          => 'select',
+					'description'   => __( 'Select a landing page to display on this post.', 'convertkit' ),
+					'values'        => $landing_pages,
+					'default_value' => '0',
+				),
+				'tag'              => array(
+					'label'         => __( 'Tag', 'convertkit' ),
+					'type'          => 'select',
+					'description'   => __( 'Select a tag to apply to visitors of this page who are subscribed.', 'convertkit' ),
+					'values'        => $tags,
+					'default_value' => '0',
+				),
+				'restrict_content' => array(
+					'label'         => __( 'Restrict Content', 'convertkit' ),
+					'type'          => 'select',
+					'description'   => __( 'Select a content to restrict to members only.', 'convertkit' ),
+					'values'        => $restrict_content,
+					'default_value' => '0',
+				),
+			)
+		);
+
+	}
+
 	/**
 	 * Register REST API routes.
 	 *
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index 258fe1fff..a3ececc01 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -19,8 +19,15 @@ if (convertKitGutenbergEnabled()) {
 		convertKitGutenbergRegisterBlock(convertkit_blocks[block]);
 	}
 
-	// Register ConvertKit Pre-publish actions in Gutenberg if we're editing a Post.
 	if (convertKitEditingPostInGutenberg()) {
+		// Register Post Meta settings in Gutenberg if we're editing a Post.
+		if (typeof convertkit_post_settings !== 'undefined') {
+			convertKitGutenbergRegisterPostSettingsPanel(
+				convertkit_post_settings
+			);
+		}
+
+		// Register ConvertKit Pre-publish actions in Gutenberg if we're editing a Post.
 		if (typeof convertkit_pre_publish_actions !== 'undefined') {
 			convertKitGutenbergRegisterPrePublishActions(
 				convertkit_pre_publish_actions
@@ -912,6 +919,190 @@ function convertKitGutenbergRegisterBlock(block) {
 	);
 }
 
+/**
+ * Registers post settings in Gutenberg's document sidebar panel.
+ *
+ * @since 3.3.0
+ *
+ * @param {Object} postSettings Post settings configuration.
+ */
+function convertKitGutenbergRegisterPostSettingsPanel(fields) {
+	(function (plugins, editPost, element, components, data) {
+		// Define some constants for the various items we'll use.
+		const el = element.createElement;
+		const { registerPlugin } = plugins;
+		const { PluginDocumentSettingPanel } = editPost;
+		const {
+			Button,
+			Icon,
+			TextControl,
+			SelectControl,
+			ToggleControl,
+			Flex,
+			FlexItem,
+			PanelBody,
+			PanelRow,
+			ProgressBar,
+		} = components;
+		const { useSelect, useDispatch } = data;
+
+		/**
+		 * Returns a PluginDocumentSettingPanel for this plugin, containing
+		 * post-level settings.
+		 *
+		 * @since 3.3.0
+		 */
+		const RenderPanel = function () {
+			const meta = useSelect(function (wpSelect) {
+				return wpSelect('core/editor').getEditedPostAttribute('meta') || {};
+			}, []);
+
+			const { editPost: wpEditPost } = useDispatch('core/editor');
+
+			const settings = meta._wp_convertkit_post_meta || {};
+
+			/**
+			 * Updates a single key within the _wp_convertkit_post_meta object.
+			 *
+			 * @since 3.3.0
+			 *
+			 * @param {string} key   Sub-key within the _wp_convertkit_post_meta object.
+			 * @param {string} value Value to assign to the sub-key.
+			 */
+			const updateSetting = function (key, value) {
+				wpEditPost({
+					meta: {
+						_wp_convertkit_post_meta: Object.assign(
+							{},
+							settings,
+							{ [key]: value }
+						),
+					},
+				});
+			};
+
+			/**
+			 * Return a field element for the settings panel.
+			 *
+			 * @since   3.3.0
+			 *
+			 * @param {Object} props     Block properties.
+			 * @param {Object} field     Field attributes.
+			 * @param {string} attribute Attribute name to store the field's data in.
+			 * @return {Object}            Field element.
+			 */
+			const getField = function (field, key) {
+				
+				// Define some field properties shared across all field types.
+				const fieldProperties = {
+					key: 'convertkit_post_settings_' + key,
+					label: field.label,
+					help: field.description,
+					value: settings[key] || field.default_value || '',
+
+					// Add __next40pxDefaultSize and __nextHasNoMarginBottom properties,
+					// preventing deprecation notices in the block editor and opt in to the new styles
+					// from 7.0.
+					__next40pxDefaultSize: true,
+					__nextHasNoMarginBottom: true,
+
+					onChange(value) {
+						updateSetting(key, value);
+					},
+				};
+
+				const fieldOptions = [];
+
+				// Define additional Field Properties and the Field Element,
+				// depending on the Field Type (select, textarea, text etc).
+				switch (field.type) {
+					case 'select':
+						// Build options for <select> input.
+						for (const value of Object.keys(field.values)) {
+							fieldOptions.push({
+								label: field.values[value],
+								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);
+
+					case 'number':
+						// Define field properties.
+						fieldProperties.type = field.type;
+						fieldProperties.min = field.min;
+						fieldProperties.max = field.max;
+						fieldProperties.step = field.step;
+
+						// Return field element.
+						return el(TextControl, fieldProperties);
+
+					default:
+						// Return field element.
+						return el(TextControl, fieldProperties);
+				}
+			};
+
+			/**
+			 * Return an array of field elements to display in the settings panel.
+			 *
+			 * @since   3.3.0
+			 *
+			 * @return {Array}        Panel rows.
+			 */
+			const getFields = function (fields) {
+				const rows = [];
+
+				for (const key in fields) {
+
+					console.log(key);
+					console.log(fields[key]);
+					rows.push(getField(fields[key], key));
+				}
+
+				console.log(rows);
+
+				return rows;
+			};
+
+			// Return the settings panel with fields.
+			return el(
+				PluginDocumentSettingPanel,
+				{
+					name: 'convertkit-post-settings',
+					title: 'Kit',
+					className: 'convertkit-post-settings',
+				},
+				getFields(fields)
+			);
+		};
+
+		// Register the settings panel.
+		console.log('registering convertkit-post-settings');
+		registerPlugin('convertkit-post-settings', {
+			render: RenderPanel,
+			icon: 'admin-settings',
+		});
+	})(
+		window.wp.plugins,
+		window.wp.editPost,
+		window.wp.element,
+		window.wp.components,
+		window.wp.data
+	);
+}
+
 /**
  * Registers pre-publish actions in Gutenberg's pre-publish checks panel.
  *

From 9658be158f1a764d4f97bee73a6e65b329c311ad Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 24 Feb 2026 11:45:06 +0800
Subject: [PATCH 02/12] =?UTF-8?q?Don=E2=80=99t=20register=20meta=20box=20i?=
 =?UTF-8?q?f=20using=20the=20block=20editor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/class-convertkit-admin-post.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/admin/class-convertkit-admin-post.php b/admin/class-convertkit-admin-post.php
index b36a5cbe9..8b9cee2f7 100644
--- a/admin/class-convertkit-admin-post.php
+++ b/admin/class-convertkit-admin-post.php
@@ -8,8 +8,8 @@
 
 /**
  * Registers a metabox on Posts, Pages and public facing Custom Post Types
- * and saves its settings when the Post is saved in the WordPress Administration
- * interface.
+ * that do not use the block editor, saving settings when the Post is saved
+ * in the WordPress Administration interface.
  *
  * @package ConvertKit
  * @author ConvertKit
@@ -27,7 +27,7 @@ public function __construct() {
 		add_filter( 'views_edit-page', array( $this, 'output_wp_list_table_buttons' ) );
 
 		add_action( 'post_submitbox_misc_actions', array( $this, 'output_pre_publish_actions' ) );
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
+		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 10, 2 );
 		add_action( 'save_post', array( $this, 'save_post_meta' ) );
 
 	}
@@ -181,9 +181,10 @@ public function output_pre_publish_actions( $post ) {
 	 *
 	 * @since   1.9.6
 	 *
-	 * @param   string $post_type  Post Type.
+	 * @param   string  $post_type  Post Type.
+	 * @param   WP_Post $post       Post.
 	 */
-	public function add_meta_boxes( $post_type ) {
+	public function add_meta_boxes( $post_type, $post ) {
 
 		// Don't register the meta box if this Post Type isn't supported.
 		$supported_post_types = convertkit_get_supported_post_types();
@@ -191,6 +192,11 @@ public function add_meta_boxes( $post_type ) {
 			return;
 		}
 
+		// Don't register the meta box if the block editor is being used, as register_post_meta() handles saving post meta.
+		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( $post ) ) {
+			return;
+		}
+
 		// Register Meta Box.
 		add_meta_box( 'wp-convertkit-meta-box', __( 'Kit', 'convertkit' ), array( $this, 'display_meta_box' ), $post_type, 'normal' );
 
@@ -261,6 +267,11 @@ public function save_post_meta( $post_id ) {
 			return;
 		}
 
+		// Bail if the block editor is being used, as register_post_meta() handles saving post meta.
+		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( $post_id ) ) {
+			return;
+		}
+
 		// Bail if no nonce field exists.
 		if ( ! isset( $_POST['wp-convertkit-save-meta-nonce'] ) ) {
 			return;

From ecee309d73e9512e9fcb2a0c044714f812905450 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 24 Feb 2026 13:04:29 +0800
Subject: [PATCH 03/12] Build Plugin Sidebar registration system

Similar to how blocks are registered; this can later be used to register settings as backward compat. meta boxes, replacing the hard coded views and add_meta_box() call.
---
 includes/class-convertkit-gutenberg.php       | 255 +++++-------------
 includes/class-wp-convertkit.php              |   1 +
 includes/functions.php                        |  24 ++
 ...onvertkit-plugin-sidebar-post-settings.php | 221 +++++++++++++++
 .../class-convertkit-plugin-sidebar.php       | 146 ++++++++++
 resources/backend/js/gutenberg.js             |  77 ++++--
 wp-convertkit.php                             |   2 +
 7 files changed, 513 insertions(+), 213 deletions(-)
 create mode 100644 includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
 create mode 100644 includes/plugin-sidebars/class-convertkit-plugin-sidebar.php

diff --git a/includes/class-convertkit-gutenberg.php b/includes/class-convertkit-gutenberg.php
index bd83add04..5662d8702 100644
--- a/includes/class-convertkit-gutenberg.php
+++ b/includes/class-convertkit-gutenberg.php
@@ -29,199 +29,17 @@ public function __construct() {
 			add_filter( 'block_categories', array( $this, 'add_block_categories' ), 10, 2 );
 		}
 
-		// Register Gutenberg Post Settings.
-		add_action( 'init', array( $this, 'register_post_settings' ) );
-		add_action( 'convertkit_gutenberg_enqueue_scripts', array( $this, 'register_post_settings_fields' ) );
-
 		// Register Gutenberg Blocks.
 		add_action( 'init', array( $this, 'add_blocks' ) );
 
+		// Register Gutenberg Plugin Sidebars.
+		add_action( 'init', array( $this, 'add_plugin_sidebars' ) );
+
 		// Register REST API routes.
 		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
 
 	}
 
-	/**
-	 * Registers the post meta key for storing post settings for the block editor.
-	 *
-	 * @since   3.3.0
-	 */
-	public function register_post_settings() {
-
-		register_post_meta(
-			'',
-			'_wp_convertkit_settings',
-			array(
-				'show_in_rest'      => array(
-					'schema' => array(
-						'type'       => 'object',
-						'properties' => array(
-							'form'             => array(
-								'type'    => 'string',
-								'default' => '-1',
-							),
-							'landing_page'     => array(
-								'type'    => 'string',
-								'default' => '0',
-							),
-							'tag'              => array(
-								'type'    => 'string',
-								'default' => '0',
-							),
-							'restrict_content' => array(
-								'type'    => 'string',
-								'default' => '0',
-							),
-						),
-					),
-				),
-				'single'            => true,
-				'type'              => 'object',
-				'default'           => array(
-					'form'             => '-1',
-					'landing_page'     => '0',
-					'tag'              => '0',
-					'restrict_content' => '0',
-				),
-				'sanitize_callback' => function ( $value ) {
-
-					if ( ! is_array( $value ) ) {
-						return array(
-							'form'             => '-1',
-							'landing_page'     => '0',
-							'tag'              => '0',
-							'restrict_content' => '0',
-						);
-					}
-
-					return array(
-						'form'             => sanitize_text_field( $value['form'] ?? '-1' ),
-						'landing_page'     => sanitize_text_field( $value['landing_page'] ?? '0' ),
-						'tag'              => sanitize_text_field( $value['tag'] ?? '0' ),
-						'restrict_content' => sanitize_text_field( $value['restrict_content'] ?? '0' ),
-					);
-
-				},
-				'auth_callback'     => function () {
-
-					return current_user_can( 'edit_posts' );
-
-				},
-			)
-		);
-
-	}
-
-	/**
-	 * Registers the post settings fields for the block editor.
-	 */
-	public function register_post_settings_fields() {
-
-		// Load resource classes.
-		$convertkit_forms         = new ConvertKit_Resource_Forms( 'post_settings' );
-		$convertkit_landing_pages = new ConvertKit_Resource_Landing_Pages( 'post_settings' );
-		$convertkit_tags          = new ConvertKit_Resource_Tags( 'post_settings' );
-		$convertkit_products      = new ConvertKit_Resource_Products( 'post_settings' );
-
-		// Get Forms.
-		$forms = array(
-			'-1' => esc_html__( 'Default', 'convertkit' ),
-			'0'  => esc_html__( 'None', 'convertkit' ),
-		);
-		if ( $convertkit_forms->exist() ) {
-			foreach ( $convertkit_forms->get() as $form ) {
-				// Legacy forms don't include a `format` key, so define them as inline.
-				$forms[ absint( $form['id'] ) ] = sprintf(
-					'%s [%s]',
-					sanitize_text_field( $form['name'] ),
-					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
-				);
-			}
-		}
-
-		// Get Landing Pages.
-		$landing_pages = array(
-			'0' => esc_html__( 'None', 'convertkit' ),
-		);
-		if ( $convertkit_landing_pages->exist() ) {
-			foreach ( $convertkit_landing_pages->get() as $landing_page ) {
-				$landing_pages[ absint( $landing_page['id'] ) ] = sanitize_text_field( $landing_page['name'] );
-			}
-		}
-
-		// Get Tags.
-		$tags = array(
-			'0' => esc_html__( 'None', 'convertkit' ),
-		);
-		if ( $convertkit_tags->exist() ) {
-			foreach ( $convertkit_tags->get() as $tag ) {
-				$tags[ absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
-			}
-		}
-
-		// Get Products.
-		$restrict_content = array(
-			'0' => esc_html__( 'Don\'t restrict content to member-only', 'convertkit' ),
-		);
-		if ( $convertkit_forms->exist() ) {
-			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(
-					'%s [%s]',
-					sanitize_text_field( $form['name'] ),
-					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
-				);
-			}
-		}
-		if ( $convertkit_tags->exist() ) {
-			foreach ( $convertkit_tags->get() as $tag ) {
-				$restrict_content[ 'tag_' . absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
-			}
-		}
-		if ( $convertkit_products->exist() ) {
-			foreach ( $convertkit_products->get() as $product ) {
-				$restrict_content[ 'product_' . $product['id'] ] = sanitize_text_field( $product['name'] );
-			}
-		}
-
-		// Define post settings fields.
-		wp_localize_script(
-			'convertkit-gutenberg',
-			'convertkit_post_settings',
-			array(
-				'form'             => array(
-					'label'         => __( 'Form', 'convertkit' ),
-					'type'          => 'select',
-					'description'   => __( 'Select a form to display on this post.', 'convertkit' ),
-					'values'        => $forms,
-					'default_value' => '-1',
-				),
-				'landing_page'     => array(
-					'label'         => __( 'Landing Page', 'convertkit' ),
-					'type'          => 'select',
-					'description'   => __( 'Select a landing page to display on this post.', 'convertkit' ),
-					'values'        => $landing_pages,
-					'default_value' => '0',
-				),
-				'tag'              => array(
-					'label'         => __( 'Tag', 'convertkit' ),
-					'type'          => 'select',
-					'description'   => __( 'Select a tag to apply to visitors of this page who are subscribed.', 'convertkit' ),
-					'values'        => $tags,
-					'default_value' => '0',
-				),
-				'restrict_content' => array(
-					'label'         => __( 'Restrict Content', 'convertkit' ),
-					'type'          => 'select',
-					'description'   => __( 'Select a content to restrict to members only.', 'convertkit' ),
-					'values'        => $restrict_content,
-					'default_value' => '0',
-				),
-			)
-		);
-
-	}
-
 	/**
 	 * Register REST API routes.
 	 *
@@ -384,6 +202,63 @@ public function add_blocks() {
 
 	}
 
+	/**
+	 * Registers post meta for any registered plugin sidebars using register_post_meta(),
+	 * so data is saved when using the Gutenberg editor.
+	 *
+	 * @since   3.3.0
+	 */
+	public function add_plugin_sidebars() {
+
+		// Get plugin sidebars.
+		$plugin_sidebars = convertkit_get_plugin_sidebars();
+
+		// Bail if no plugin sidebars are available.
+		if ( ! count( $plugin_sidebars ) ) {
+			return;
+		}
+
+		foreach ( $plugin_sidebars as $plugin_sidebar ) {
+			register_post_meta(
+				'',
+				$plugin_sidebar['name'],
+				array(
+					'show_in_rest'      => array(
+						'schema' => array(
+							'type'       => 'object',
+							'properties' => $plugin_sidebar['attributes'],
+						),
+					),
+					'single'            => true,
+					'type'              => 'object',
+					'default'           => $plugin_sidebar['default_values'],
+					'sanitize_callback' => function ( $value ) {
+
+						// If the value is not an array, return the default values.
+						if ( ! is_array( $value ) ) {
+							return $plugin_sidebar['default_values'];
+						}
+
+						// Iterate through the attributes and sanitize the value.
+						foreach ( $plugin_sidebar['attributes'] as $attribute => $value ) {
+							$value[ $attribute ] = sanitize_text_field( $value[ $attribute ] ?? $value['default'] );
+						}
+
+						// Return the sanitized value.
+						return $value;
+
+					},
+					'auth_callback'     => function () {
+
+						return current_user_can( $plugin_sidebar['minimum_capability'] );
+
+					},
+				)
+			);
+		}
+
+	}
+
 	/**
 	 * Enqueues scripts for Gutenberg blocks in the editor view.
 	 *
@@ -403,13 +278,23 @@ public function enqueue_scripts() {
 		$blocks              = convertkit_get_blocks();
 		$block_formatters    = convertkit_get_block_formatters();
 		$pre_publish_actions = convertkit_get_pre_publish_actions();
+		$plugin_sidebars     = convertkit_get_plugin_sidebars();
 
 		// Enqueue Gutenberg Javascript, and set the blocks data.
 		wp_enqueue_script( 'convertkit-gutenberg', CONVERTKIT_PLUGIN_URL . 'resources/backend/js/gutenberg.js', array( 'jquery' ), CONVERTKIT_PLUGIN_VERSION, true );
 		wp_localize_script( 'convertkit-gutenberg', 'convertkit_blocks', $blocks );
+
+		// If pre-publish actions are available, set the data.
 		if ( count( $pre_publish_actions ) ) {
 			wp_localize_script( 'convertkit-gutenberg', 'convertkit_pre_publish_actions', $pre_publish_actions );
 		}
+
+		// If plugin sidebars are available, set the data.
+		if ( count( $plugin_sidebars ) ) {
+			wp_localize_script( 'convertkit-gutenberg', 'convertkit_plugin_sidebars', $plugin_sidebars );
+		}
+
+		// Set the Gutenberg data.
 		wp_localize_script(
 			'convertkit-gutenberg',
 			'convertkit_gutenberg',
diff --git a/includes/class-wp-convertkit.php b/includes/class-wp-convertkit.php
index 3dbb8f8b6..9e49cc858 100644
--- a/includes/class-wp-convertkit.php
+++ b/includes/class-wp-convertkit.php
@@ -196,6 +196,7 @@ private function initialize_global() {
 		$this->classes['block_formatter_form_link']                   = new ConvertKit_Block_Formatter_Form_Link();
 		$this->classes['block_formatter_product_link']                = new ConvertKit_Block_Formatter_Product_Link();
 		$this->classes['pre_publish_action_broadcast_export']         = new ConvertKit_Pre_Publish_Action_Broadcast_Export();
+		$this->classes['plugin_sidebar_post_settings']                = new ConvertKit_Plugin_Sidebar_Post_Settings();
 		$this->classes['broadcasts_exporter']                         = new ConvertKit_Broadcasts_Exporter();
 		$this->classes['broadcasts_importer']                         = new ConvertKit_Broadcasts_Importer();
 		$this->classes['elementor']                                   = new ConvertKit_Elementor();
diff --git a/includes/functions.php b/includes/functions.php
index f4f214ec1..8550c73d5 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -234,6 +234,30 @@ function convertkit_get_block_formatters() {
 
 }
 
+/**
+ * Helper method to get registered plugin sidebars.
+ *
+ * @since   3.3.0
+ *
+ * @return  array   Plugin sidebars
+ */
+function convertkit_get_plugin_sidebars() {
+
+	$plugin_sidebars = array();
+
+	/**
+	 * Registers plugin sidebars for the WordPress block editor.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   array   $plugin_sidebars     Plugin sidebars.
+	 */
+	$plugin_sidebars = apply_filters( 'convertkit_plugin_sidebars', $plugin_sidebars );
+
+	return $plugin_sidebars;
+
+}
+
 /**
  * Helper method to get registered pre-publish actions.
  *
diff --git a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
new file mode 100644
index 000000000..b294231e5
--- /dev/null
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * ConvertKit Plugin Sidebar Post Settings class.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+
+/**
+ * ConvertKit Plugin Sidebar Post Settings definition for Gutenberg.
+ *
+ * @package ConvertKit
+ * @author  ConvertKit
+ */
+class ConvertKit_Plugin_Sidebar_Post_Settings extends ConvertKit_Plugin_Sidebar {
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.3.0
+	 */
+	public function __construct() {
+
+		// Register this as a plugin sidebar in the ConvertKit Plugin.
+		add_filter( 'convertkit_plugin_sidebars', array( $this, 'register' ) );
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's programmatic name, excluding the convertkit- prefix.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  string
+	 */
+	public function get_name() {
+
+		return '_wp_convertkit_settings';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's title.
+	 *
+	 * @since   3.3.0
+	 */
+	public function get_title() {
+
+		return __( 'Kit', 'convertkit' );
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's icon.
+	 *
+	 * @since   3.3.0
+	 */
+	public function get_icon() {
+
+		return 'resources/backend/images/block-icon-form.svg';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's attributes
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  array
+	 */
+	public function get_attributes() {
+
+		return array(
+			'form'             => array(
+				'type'    => 'string',
+				'default' => $this->get_default_value( 'form' ),
+			),
+			'landing_page'     => array(
+				'type'    => 'string',
+				'default' => $this->get_default_value( 'landing_page' ),
+			),
+			'tag'              => array(
+				'type'    => 'string',
+				'default' => $this->get_default_value( 'tag' ),
+			),
+			'restrict_content' => array(
+				'type'    => 'string',
+				'default' => $this->get_default_value( 'restrict_content' ),
+			),
+		);
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's Fields
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  bool|array
+	 */
+	public function get_fields() {
+
+		// Load resource classes.
+		$convertkit_forms         = new ConvertKit_Resource_Forms( 'post_settings' );
+		$convertkit_landing_pages = new ConvertKit_Resource_Landing_Pages( 'post_settings' );
+		$convertkit_tags          = new ConvertKit_Resource_Tags( 'post_settings' );
+		$convertkit_products      = new ConvertKit_Resource_Products( 'post_settings' );
+
+		// Get Forms.
+		$forms = array(
+			'-1' => esc_html__( 'Default', 'convertkit' ),
+			'0'  => esc_html__( 'None', 'convertkit' ),
+		);
+		if ( $convertkit_forms->exist() ) {
+			foreach ( $convertkit_forms->get() as $form ) {
+				// Legacy forms don't include a `format` key, so define them as inline.
+				$forms[ absint( $form['id'] ) ] = sprintf(
+					'%s [%s]',
+					sanitize_text_field( $form['name'] ),
+					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
+				);
+			}
+		}
+
+		// Get Landing Pages.
+		$landing_pages = array(
+			'0' => esc_html__( 'None', 'convertkit' ),
+		);
+		if ( $convertkit_landing_pages->exist() ) {
+			foreach ( $convertkit_landing_pages->get() as $landing_page ) {
+				$landing_pages[ absint( $landing_page['id'] ) ] = sanitize_text_field( $landing_page['name'] );
+			}
+		}
+
+		// Get Tags.
+		$tags = array(
+			'0' => esc_html__( 'None', 'convertkit' ),
+		);
+		if ( $convertkit_tags->exist() ) {
+			foreach ( $convertkit_tags->get() as $tag ) {
+				$tags[ absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
+			}
+		}
+
+		// Get Products.
+		$restrict_content = array(
+			'0' => esc_html__( 'Don\'t restrict content to member-only', 'convertkit' ),
+		);
+		if ( $convertkit_forms->exist() ) {
+			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(
+					'%s [%s]',
+					sanitize_text_field( $form['name'] ),
+					( ! empty( $form['format'] ) ? sanitize_text_field( $form['format'] ) : 'inline' )
+				);
+			}
+		}
+		if ( $convertkit_tags->exist() ) {
+			foreach ( $convertkit_tags->get() as $tag ) {
+				$restrict_content[ 'tag_' . absint( $tag['id'] ) ] = sanitize_text_field( $tag['name'] );
+			}
+		}
+		if ( $convertkit_products->exist() ) {
+			foreach ( $convertkit_products->get() as $product ) {
+				$restrict_content[ 'product_' . $product['id'] ] = sanitize_text_field( $product['name'] );
+			}
+		}
+
+		return array(
+			'form'             => array(
+				'label'       => __( 'Form', 'convertkit' ),
+				'type'        => 'select',
+				'description' => array(
+					__( 'Default', 'convertkit' ) . ': ' . __( 'Uses the form specified on the settings page.', 'convertkit' ),
+					__( 'None', 'convertkit' ) . ': ' . __( 'do not display a form.', 'convertkit' ),
+					__( 'Any other option will display that form after the main content.', 'convertkit' ),
+				),
+				'values'      => $forms,
+			),
+			'landing_page'     => array(
+				'label'       => __( 'Landing Page', 'convertkit' ),
+				'type'        => 'select',
+				'description' => __( 'Select a landing page to make it appear in place of this page.', 'convertkit' ),
+				'values'      => $landing_pages,
+			),
+			'tag'              => array(
+				'label'       => __( 'Tag', 'convertkit' ),
+				'type'        => 'select',
+				'description' => __( 'Select a tag to apply to visitors of this page who are subscribed. A visitor is deemed to be subscribed if they have clicked a link in an email to this site which includes their subscriber ID, or have entered their email address in a Kit Form on this site.', 'convertkit' ),
+				'values'      => $tags,
+			),
+			'restrict_content' => array(
+				'label'       => __( 'Restrict Content', 'convertkit' ),
+				'type'        => 'select',
+				'description' => __( 'Select the Kit form, tag or product that the visitor must be subscribed to, permitting them access to view this member-only content.', 'convertkit' ),
+				'values'      => $restrict_content,
+			),
+		);
+
+	}
+
+	/**
+	 * Returns this block's Default Values
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  array
+	 */
+	public function get_default_values() {
+
+		return array(
+			'form'             => '-1',
+			'landing_page'     => '0',
+			'tag'              => '0',
+			'restrict_content' => '0',
+		);
+
+	}
+
+}
diff --git a/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php b/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
new file mode 100644
index 000000000..afdb390f6
--- /dev/null
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * ConvertKit Plugin Sidebar class.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+
+/**
+ * ConvertKit Plugin Sidebar definition for Gutenberg.
+ *
+ * @package ConvertKit
+ * @author  ConvertKit
+ */
+class ConvertKit_Plugin_Sidebar {
+
+	/**
+	 * Registers this plugin sidebar with the ConvertKit Plugin.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   array $plugin_sidebars     Plugin Sidebars to Register.
+	 * @return  array               Plugin Sidebars to Register
+	 */
+	public function register( $plugin_sidebars ) {
+
+		$plugin_sidebars[ $this->get_name() ] = array(
+			'name'               => $this->get_name(),
+			'minimum_capability' => $this->get_minimum_capability(),
+			'title'              => $this->get_title(),
+			'icon'               => $this->get_icon(),
+			'fields'             => $this->get_fields(),
+			'attributes'         => $this->get_attributes(),
+			'default_values'     => $this->get_default_values(),
+		);
+
+		return $plugin_sidebars;
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's meta key.
+	 *
+	 * @since   3.3.0
+	 */
+	public function get_name() {
+
+		return '';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's minimum capability required
+	 * for displaying and permitting edits to the settings.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  string
+	 */
+	public function get_minimum_capability() {
+
+		return 'edit_posts';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's title.
+	 *
+	 * @since   3.3.0
+	 */
+	public function get_title() {
+
+		return '';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's icon.
+	 *
+	 * @since   3.3.0
+	 */
+	public function get_icon() {
+
+		return '';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's attributes.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  array
+	 */
+	public function get_attributes() {
+
+		return array();
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's Fields
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  array
+	 */
+	public function get_fields() {
+
+		return array();
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's Default Values
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  array
+	 */
+	public function get_default_values() {
+
+		return array();
+
+	}
+
+	/**
+	 * Returns the given plugin sidebar's field's Default Value
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   string $field Field Name.
+	 * @return  string
+	 */
+	public function get_default_value( $field ) {
+
+		$defaults = $this->get_default_values();
+		if ( isset( $defaults[ $field ] ) ) {
+			return $defaults[ $field ];
+		}
+
+		return '';
+
+	}
+
+}
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index a3ececc01..b9a50fabf 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -926,23 +926,17 @@ function convertKitGutenbergRegisterBlock(block) {
  *
  * @param {Object} postSettings Post settings configuration.
  */
-function convertKitGutenbergRegisterPostSettingsPanel(fields) {
-	(function (plugins, editPost, element, components, data) {
+function convertKitGutenbergRegisterPostSettingsPanel(postSettings) {
+	(function (plugins, editor, element, components, data) {
 		// Define some constants for the various items we'll use.
 		const el = element.createElement;
 		const { registerPlugin } = plugins;
-		const { PluginDocumentSettingPanel } = editPost;
+		const { PluginSidebar } = editor;
 		const {
-			Button,
-			Icon,
 			TextControl,
 			SelectControl,
-			ToggleControl,
-			Flex,
-			FlexItem,
 			PanelBody,
 			PanelRow,
-			ProgressBar,
 		} = components;
 		const { useSelect, useDispatch } = data;
 
@@ -959,7 +953,23 @@ function convertKitGutenbergRegisterPostSettingsPanel(fields) {
 
 			const { editPost: wpEditPost } = useDispatch('core/editor');
 
-			const settings = meta._wp_convertkit_post_meta || {};
+			const settings = meta._wp_convertkit_post_meta || postSettings.default_values;
+
+			console.log('meta', meta);
+			console.log('settings', settings);
+
+			/**
+			 * Returns the icon to display in the header for this plugin sidebar.
+			 *
+			 * @since   3.3.0
+			 *
+			 * @return  {WPElement} WordPress element (RawHTML)
+			 */
+			const getIcon = function () {
+
+				return ;
+
+			};
 
 			/**
 			 * Updates a single key within the _wp_convertkit_post_meta object.
@@ -970,6 +980,8 @@ function convertKitGutenbergRegisterPostSettingsPanel(fields) {
 			 * @param {string} value Value to assign to the sub-key.
 			 */
 			const updateSetting = function (key, value) {
+				console.log('updateSetting', key, value);
+
 				wpEditPost({
 					meta: {
 						_wp_convertkit_post_meta: Object.assign(
@@ -997,7 +1009,7 @@ function convertKitGutenbergRegisterPostSettingsPanel(fields) {
 				const fieldProperties = {
 					key: 'convertkit_post_settings_' + key,
 					label: field.label,
-					help: field.description,
+					help: Array.isArray(field.description) ? field.description.join('\n\n') : field.description,
 					value: settings[key] || field.default_value || '',
 
 					// Add __next40pxDefaultSize and __nextHasNoMarginBottom properties,
@@ -1007,6 +1019,7 @@ function convertKitGutenbergRegisterPostSettingsPanel(fields) {
 					__nextHasNoMarginBottom: true,
 
 					onChange(value) {
+						console.log('onChange', key, value);
 						updateSetting(key, value);
 					},
 				};
@@ -1065,38 +1078,46 @@ function convertKitGutenbergRegisterPostSettingsPanel(fields) {
 				const rows = [];
 
 				for (const key in fields) {
-
-					console.log(key);
-					console.log(fields[key]);
-					rows.push(getField(fields[key], key));
+					rows.push(
+						el(
+							PanelRow,
+							{
+								key: key,
+							},
+							getField(fields[key], key)
+						)
+					);
 				}
 
-				console.log(rows);
-
-				return rows;
+				return el(
+					PanelBody,
+					{},
+					rows
+				);
 			};
 
-			// Return the settings panel with fields.
+			// Return the settings sidebar panel with fields.
 			return el(
-				PluginDocumentSettingPanel,
+				PluginSidebar,
 				{
-					name: 'convertkit-post-settings',
-					title: 'Kit',
-					className: 'convertkit-post-settings',
+					name: postSettings.name,
+					title: postSettings.title,
+					className: postSettings.name,
+					icon: element.RawHTML({
+						children: postSettings.icon,
+					})
 				},
-				getFields(fields)
+				getFields(postSettings.fields)
 			);
 		};
 
 		// Register the settings panel.
-		console.log('registering convertkit-post-settings');
 		registerPlugin('convertkit-post-settings', {
 			render: RenderPanel,
-			icon: 'admin-settings',
 		});
 	})(
 		window.wp.plugins,
-		window.wp.editPost,
+		window.wp.editor,
 		window.wp.element,
 		window.wp.components,
 		window.wp.data
@@ -1175,7 +1196,7 @@ function convertKitGutenbergRegisterPrePublishActions(actions) {
 		});
 	})(
 		window.wp.plugins,
-		window.wp.editPost,
+		window.wp.editor,
 		window.wp.element,
 		window.wp.components,
 		window.wp.data
diff --git a/wp-convertkit.php b/wp-convertkit.php
index 3f52f4c49..e3fdbfc6a 100644
--- a/wp-convertkit.php
+++ b/wp-convertkit.php
@@ -98,6 +98,8 @@
 require_once CONVERTKIT_PLUGIN_PATH . '/includes/block-formatters/class-convertkit-block-formatter.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/includes/block-formatters/class-convertkit-block-formatter-form-link.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/includes/block-formatters/class-convertkit-block-formatter-product-link.php';
+require_once CONVERTKIT_PLUGIN_PATH . '/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php';
+require_once CONVERTKIT_PLUGIN_PATH . '/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/includes/pre-publish-actions/class-convertkit-pre-publish-action.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/includes/pre-publish-actions/class-convertkit-pre-publish-action-broadcast-export.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/includes/widgets/class-ck-widget-form.php';

From c88f04764ea872867368ea1d6cb47e6ed405d588 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 24 Feb 2026 13:16:23 +0800
Subject: [PATCH 04/12] Separate out meta_key property

---
 includes/class-convertkit-gutenberg.php       |  2 +-
 ...onvertkit-plugin-sidebar-post-settings.php | 15 +++++-
 .../class-convertkit-plugin-sidebar.php       | 14 +++++
 resources/backend/js/gutenberg.js             | 54 ++++++++-----------
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/includes/class-convertkit-gutenberg.php b/includes/class-convertkit-gutenberg.php
index 5662d8702..735330f73 100644
--- a/includes/class-convertkit-gutenberg.php
+++ b/includes/class-convertkit-gutenberg.php
@@ -221,7 +221,7 @@ public function add_plugin_sidebars() {
 		foreach ( $plugin_sidebars as $plugin_sidebar ) {
 			register_post_meta(
 				'',
-				$plugin_sidebar['name'],
+				$plugin_sidebar['meta_key'],
 				array(
 					'show_in_rest'      => array(
 						'schema' => array(
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 b294231e5..6a359ac55 100644
--- a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
@@ -35,7 +35,20 @@ public function __construct() {
 	 */
 	public function get_name() {
 
-		return '_wp_convertkit_settings';
+		return 'post-settings';
+
+	}
+
+	/**
+	 * Returns this plugin sidebar's meta key.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  string
+	 */
+	public function get_meta_key() {
+
+		return '_wp_convertkit_post_meta';
 
 	}
 
diff --git a/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php b/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
index afdb390f6..50742bc68 100644
--- a/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
@@ -27,6 +27,7 @@ public function register( $plugin_sidebars ) {
 		$plugin_sidebars[ $this->get_name() ] = array(
 			'name'               => $this->get_name(),
 			'minimum_capability' => $this->get_minimum_capability(),
+			'meta_key'           => $this->get_meta_key(), // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key
 			'title'              => $this->get_title(),
 			'icon'               => $this->get_icon(),
 			'fields'             => $this->get_fields(),
@@ -63,6 +64,19 @@ public function get_minimum_capability() {
 
 	}
 
+	/**
+	 * Returns this plugin sidebar's meta key.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @return  string
+	 */
+	public function get_meta_key() {
+
+		return '';
+
+	}
+
 	/**
 	 * Returns this plugin sidebar's title.
 	 *
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index b9a50fabf..09e7198fa 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -20,11 +20,13 @@ if (convertKitGutenbergEnabled()) {
 	}
 
 	if (convertKitEditingPostInGutenberg()) {
-		// Register Post Meta settings in Gutenberg if we're editing a Post.
-		if (typeof convertkit_post_settings !== 'undefined') {
-			convertKitGutenbergRegisterPostSettingsPanel(
-				convertkit_post_settings
-			);
+		// Register Plugin Sidebars in Gutenberg if we're editing a Post.
+		if (typeof convertkit_plugin_sidebars !== 'undefined') {
+			for (const pluginSidebar in convertkit_plugin_sidebars) {
+				convertKitGutenbergRegisterPluginSidebar(
+					convertkit_plugin_sidebars[pluginSidebar]
+				);
+			}
 		}
 
 		// Register ConvertKit Pre-publish actions in Gutenberg if we're editing a Post.
@@ -920,13 +922,13 @@ function convertKitGutenbergRegisterBlock(block) {
 }
 
 /**
- * Registers post settings in Gutenberg's document sidebar panel.
+ * Registers a Plugin Sidebar in Gutenberg.
  *
  * @since 3.3.0
  *
- * @param {Object} postSettings Post settings configuration.
+ * @param {Object} sidebar Plugin Sidebars
  */
-function convertKitGutenbergRegisterPostSettingsPanel(postSettings) {
+function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 	(function (plugins, editor, element, components, data) {
 		// Define some constants for the various items we'll use.
 		const el = element.createElement;
@@ -950,26 +952,12 @@ function convertKitGutenbergRegisterPostSettingsPanel(postSettings) {
 			const meta = useSelect(function (wpSelect) {
 				return wpSelect('core/editor').getEditedPostAttribute('meta') || {};
 			}, []);
-
 			const { editPost: wpEditPost } = useDispatch('core/editor');
+			const settings = meta[sidebar.meta_key] || sidebar.default_values;
 
-			const settings = meta._wp_convertkit_post_meta || postSettings.default_values;
-
-			console.log('meta', meta);
-			console.log('settings', settings);
-
-			/**
-			 * Returns the icon to display in the header for this plugin sidebar.
-			 *
-			 * @since   3.3.0
-			 *
-			 * @return  {WPElement} WordPress element (RawHTML)
-			 */
-			const getIcon = function () {
-
-				return ;
-
-			};
+			console.log( 'settings', settings );
+			console.log( 'meta', meta );
+			console.log( 'sidebar.meta_key', sidebar.meta_key );
 
 			/**
 			 * Updates a single key within the _wp_convertkit_post_meta object.
@@ -1100,19 +1088,19 @@ function convertKitGutenbergRegisterPostSettingsPanel(postSettings) {
 			return el(
 				PluginSidebar,
 				{
-					name: postSettings.name,
-					title: postSettings.title,
-					className: postSettings.name,
+					name: sidebar.name,
+					title: sidebar.title,
+					className: sidebar.name,
 					icon: element.RawHTML({
-						children: postSettings.icon,
+						children: sidebar.icon,
 					})
 				},
-				getFields(postSettings.fields)
+				getFields(sidebar.fields)
 			);
 		};
 
-		// Register the settings panel.
-		registerPlugin('convertkit-post-settings', {
+		// Register the plugin sidebar.
+		registerPlugin('convertkit-' + sidebar.name.replace(/_/g, '-'), {
 			render: RenderPanel,
 		});
 	})(

From 551dfbae464365b3b55b994f9e1e065f4534a28b Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 24 Feb 2026 13:34:35 +0800
Subject: [PATCH 05/12] Coding Standards

---
 includes/class-convertkit-gutenberg.php |  8 +--
 resources/backend/js/gutenberg.js       | 70 ++++++++-----------------
 2 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/includes/class-convertkit-gutenberg.php b/includes/class-convertkit-gutenberg.php
index 735330f73..3849f087d 100644
--- a/includes/class-convertkit-gutenberg.php
+++ b/includes/class-convertkit-gutenberg.php
@@ -232,7 +232,7 @@ public function add_plugin_sidebars() {
 					'single'            => true,
 					'type'              => 'object',
 					'default'           => $plugin_sidebar['default_values'],
-					'sanitize_callback' => function ( $value ) {
+					'sanitize_callback' => function ( $value ) use ( $plugin_sidebar ) {
 
 						// If the value is not an array, return the default values.
 						if ( ! is_array( $value ) ) {
@@ -240,15 +240,15 @@ public function add_plugin_sidebars() {
 						}
 
 						// Iterate through the attributes and sanitize the value.
-						foreach ( $plugin_sidebar['attributes'] as $attribute => $value ) {
-							$value[ $attribute ] = sanitize_text_field( $value[ $attribute ] ?? $value['default'] );
+						foreach ( $plugin_sidebar['attributes'] as $key => $attribute ) {
+							$value[ $key ] = sanitize_text_field( $value[ $key ] ?? $value['default'] );
 						}
 
 						// Return the sanitized value.
 						return $value;
 
 					},
-					'auth_callback'     => function () {
+					'auth_callback'     => function () use ( $plugin_sidebar ) {
 
 						return current_user_can( $plugin_sidebar['minimum_capability'] );
 
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index 09e7198fa..6f590a3fa 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -934,12 +934,7 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 		const el = element.createElement;
 		const { registerPlugin } = plugins;
 		const { PluginSidebar } = editor;
-		const {
-			TextControl,
-			SelectControl,
-			PanelBody,
-			PanelRow,
-		} = components;
+		const { TextControl, SelectControl, PanelBody, PanelRow } = components;
 		const { useSelect, useDispatch } = data;
 
 		/**
@@ -950,33 +945,27 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 		 */
 		const RenderPanel = function () {
 			const meta = useSelect(function (wpSelect) {
-				return wpSelect('core/editor').getEditedPostAttribute('meta') || {};
+				return (
+					wpSelect('core/editor').getEditedPostAttribute('meta') || {}
+				);
 			}, []);
 			const { editPost: wpEditPost } = useDispatch('core/editor');
 			const settings = meta[sidebar.meta_key] || sidebar.default_values;
 
-			console.log( 'settings', settings );
-			console.log( 'meta', meta );
-			console.log( 'sidebar.meta_key', sidebar.meta_key );
-
 			/**
-			 * Updates a single key within the _wp_convertkit_post_meta object.
+			 * Updates the Post meta meta_key object.
 			 *
 			 * @since 3.3.0
 			 *
-			 * @param {string} key   Sub-key within the _wp_convertkit_post_meta object.
-			 * @param {string} value Value to assign to the sub-key.
+			 * @param {string} key   Sub key within the meta_key object.
+			 * @param {string} value Value to assign to the sub key.
 			 */
 			const updateSetting = function (key, value) {
-				console.log('updateSetting', key, value);
-
 				wpEditPost({
 					meta: {
-						_wp_convertkit_post_meta: Object.assign(
-							{},
-							settings,
-							{ [key]: value }
-						),
+						[sidebar.meta_key]: Object.assign({}, settings, {
+							[key]: value,
+						}),
 					},
 				});
 			};
@@ -986,18 +975,18 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 			 *
 			 * @since   3.3.0
 			 *
-			 * @param {Object} props     Block properties.
-			 * @param {Object} field     Field attributes.
-			 * @param {string} attribute Attribute name to store the field's data in.
-			 * @return {Object}            Field element.
+			 * @param {Object} field Field properties.
+			 * @param {string} key   Field name.
+			 * @return {Object}        Field element.
 			 */
 			const getField = function (field, key) {
-				
 				// Define some field properties shared across all field types.
 				const fieldProperties = {
-					key: 'convertkit_post_settings_' + key,
+					key: 'convertkit_plugin_sidebar_' + key,
 					label: field.label,
-					help: Array.isArray(field.description) ? field.description.join('\n\n') : field.description,
+					help: Array.isArray(field.description)
+						? field.description.join('\n\n')
+						: field.description,
 					value: settings[key] || field.default_value || '',
 
 					// Add __next40pxDefaultSize and __nextHasNoMarginBottom properties,
@@ -1006,8 +995,8 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 					__next40pxDefaultSize: true,
 					__nextHasNoMarginBottom: true,
 
+					// Save Post Meta on value change.
 					onChange(value) {
-						console.log('onChange', key, value);
 						updateSetting(key, value);
 					},
 				};
@@ -1039,16 +1028,6 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 						// Return field element.
 						return el(SelectControl, fieldProperties);
 
-					case 'number':
-						// Define field properties.
-						fieldProperties.type = field.type;
-						fieldProperties.min = field.min;
-						fieldProperties.max = field.max;
-						fieldProperties.step = field.step;
-
-						// Return field element.
-						return el(TextControl, fieldProperties);
-
 					default:
 						// Return field element.
 						return el(TextControl, fieldProperties);
@@ -1060,7 +1039,8 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 			 *
 			 * @since   3.3.0
 			 *
-			 * @return {Array}        Panel rows.
+			 * @param {Object} fields Fields to display.
+			 * @return {Array}         Panel rows.
 			 */
 			const getFields = function (fields) {
 				const rows = [];
@@ -1070,18 +1050,14 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 						el(
 							PanelRow,
 							{
-								key: key,
+								key,
 							},
 							getField(fields[key], key)
 						)
 					);
 				}
 
-				return el(
-					PanelBody,
-					{},
-					rows
-				);
+				return el(PanelBody, {}, rows);
 			};
 
 			// Return the settings sidebar panel with fields.
@@ -1093,7 +1069,7 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 					className: sidebar.name,
 					icon: element.RawHTML({
 						children: sidebar.icon,
-					})
+					}),
 				},
 				getFields(sidebar.fields)
 			);

From 73ea33f6fea79c5828a30b3c8f704c7b953e6434 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 26 Feb 2026 13:12:26 +0800
Subject: [PATCH 06/12] Tests: Pre-publish actions: Support 7.0 ID selectors

---
 .../broadcasts/import-export/BroadcastsExportPostCest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php b/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php
index a276f5f2e..14d83937b 100644
--- a/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php
+++ b/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php
@@ -168,7 +168,7 @@ public function testCreateBroadcastWhenEnabledInPost(EndToEndTester $I)
 		$I->waitForElementVisible('.editor-post-publish-panel__header-publish-button');
 
 		// Enable the Create Broadcast option.
-		$I->click('.convertkit-pre-publish-actions #inspector-toggle-control-0');
+		$I->click('.convertkit-pre-publish-actions input#convertkit_action_broadcast_export');
 
 		// Publish the Post.
 		$I->clickPublishOnPrePublishChecksForGutenbergPage($I);

From 3016bab8e96b254153fad11410e3d448f5f414c1 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 26 Feb 2026 13:12:32 +0800
Subject: [PATCH 07/12] Tests: Update db_version

---
 tests/Support/Data/dump.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Support/Data/dump.sql b/tests/Support/Data/dump.sql
index ba1ffe735..713e442b6 100644
--- a/tests/Support/Data/dump.sql
+++ b/tests/Support/Data/dump.sql
@@ -168,7 +168,7 @@ INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`
 (43,  'html_type',  'text/html',  'on'),
 (44,  'use_trackback',  '0',  'on'),
 (45,  'default_role', 'subscriber', 'on'),
-(46,  'db_version', '60717',  'on'),
+(46,  'db_version', '61696',  'on'),
 (47,  'uploads_use_yearmonth_folders',  '1',  'on'),
 (48,  'upload_path',  '', 'on'),
 (49,  'blog_public',  '1',  'on'),
@@ -221,7 +221,7 @@ INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`
 (96,  'auto_update_core_minor', 'enabled',  'on'),
 (97,  'auto_update_core_major', 'enabled',  'on'),
 (98,  'wp_force_deactivated_plugins', 'a:0:{}', 'on'),
-(99,  'initial_db_version', '60717',  'on'),
+(99,  'initial_db_version', '61696',  'on'),
 (100, 'wp_user_roles',  'a:5:{s:13:\"administrator\";a:2:{s:4:\"name\";s:13:\"Administrator\";s:12:\"capabilities\";a:61:{s:13:\"switch_themes\";b:1;s:11:\"edit_themes\";b:1;s:16:\"activate_plugins\";b:1;s:12:\"edit_plugins\";b:1;s:10:\"edit_users\";b:1;s:10:\"edit_files\";b:1;s:14:\"manage_options\";b:1;s:17:\"moderate_comments\";b:1;s:17:\"manage_categories\";b:1;s:12:\"manage_links\";b:1;s:12:\"upload_files\";b:1;s:6:\"import\";b:1;s:15:\"unfiltered_html\";b:1;s:10:\"edit_posts\";b:1;s:17:\"edit_others_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:10:\"edit_pages\";b:1;s:4:\"read\";b:1;s:8:\"level_10\";b:1;s:7:\"level_9\";b:1;s:7:\"level_8\";b:1;s:7:\"level_7\";b:1;s:7:\"level_6\";b:1;s:7:\"level_5\";b:1;s:7:\"level_4\";b:1;s:7:\"level_3\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:17:\"edit_others_pages\";b:1;s:20:\"edit_published_pages\";b:1;s:13:\"publish_pages\";b:1;s:12:\"delete_pages\";b:1;s:19:\"delete_others_pages\";b:1;s:22:\"delete_published_pages\";b:1;s:12:\"delete_posts\";b:1;s:19:\"delete_others_posts\";b:1;s:22:\"delete_published_posts\";b:1;s:20:\"delete_private_posts\";b:1;s:18:\"edit_private_posts\";b:1;s:18:\"read_private_posts\";b:1;s:20:\"delete_private_pages\";b:1;s:18:\"edit_private_pages\";b:1;s:18:\"read_private_pages\";b:1;s:12:\"delete_users\";b:1;s:12:\"create_users\";b:1;s:17:\"unfiltered_upload\";b:1;s:14:\"edit_dashboard\";b:1;s:14:\"update_plugins\";b:1;s:14:\"delete_plugins\";b:1;s:15:\"install_plugins\";b:1;s:13:\"update_themes\";b:1;s:14:\"install_themes\";b:1;s:11:\"update_core\";b:1;s:10:\"list_users\";b:1;s:12:\"remove_users\";b:1;s:13:\"promote_users\";b:1;s:18:\"edit_theme_options\";b:1;s:13:\"delete_themes\";b:1;s:6:\"export\";b:1;}}s:6:\"editor\";a:2:{s:4:\"name\";s:6:\"Editor\";s:12:\"capabilities\";a:34:{s:17:\"moderate_comments\";b:1;s:17:\"manage_categories\";b:1;s:12:\"manage_links\";b:1;s:12:\"upload_files\";b:1;s:15:\"unfiltered_html\";b:1;s:10:\"edit_posts\";b:1;s:17:\"edit_others_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:10:\"edit_pages\";b:1;s:4:\"read\";b:1;s:7:\"level_7\";b:1;s:7:\"level_6\";b:1;s:7:\"level_5\";b:1;s:7:\"level_4\";b:1;s:7:\"level_3\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:17:\"edit_others_pages\";b:1;s:20:\"edit_published_pages\";b:1;s:13:\"publish_pages\";b:1;s:12:\"delete_pages\";b:1;s:19:\"delete_others_pages\";b:1;s:22:\"delete_published_pages\";b:1;s:12:\"delete_posts\";b:1;s:19:\"delete_others_posts\";b:1;s:22:\"delete_published_posts\";b:1;s:20:\"delete_private_posts\";b:1;s:18:\"edit_private_posts\";b:1;s:18:\"read_private_posts\";b:1;s:20:\"delete_private_pages\";b:1;s:18:\"edit_private_pages\";b:1;s:18:\"read_private_pages\";b:1;}}s:6:\"author\";a:2:{s:4:\"name\";s:6:\"Author\";s:12:\"capabilities\";a:10:{s:12:\"upload_files\";b:1;s:10:\"edit_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:4:\"read\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:12:\"delete_posts\";b:1;s:22:\"delete_published_posts\";b:1;}}s:11:\"contributor\";a:2:{s:4:\"name\";s:11:\"Contributor\";s:12:\"capabilities\";a:5:{s:10:\"edit_posts\";b:1;s:4:\"read\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:12:\"delete_posts\";b:1;}}s:10:\"subscriber\";a:2:{s:4:\"name\";s:10:\"Subscriber\";s:12:\"capabilities\";a:2:{s:4:\"read\";b:1;s:7:\"level_0\";b:1;}}}',  'on'),
 (101, 'fresh_site', '1',  'on'),
 (102, 'user_count', '1',  'off'),

From 89cfc47a006e6d6e4e5a13be09b1c4fbe0221355 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 5 Mar 2026 10:59:24 +0800
Subject: [PATCH 08/12] Revert DB version change

---
 tests/Support/Data/dump.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Support/Data/dump.sql b/tests/Support/Data/dump.sql
index 713e442b6..ba1ffe735 100644
--- a/tests/Support/Data/dump.sql
+++ b/tests/Support/Data/dump.sql
@@ -168,7 +168,7 @@ INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`
 (43,  'html_type',  'text/html',  'on'),
 (44,  'use_trackback',  '0',  'on'),
 (45,  'default_role', 'subscriber', 'on'),
-(46,  'db_version', '61696',  'on'),
+(46,  'db_version', '60717',  'on'),
 (47,  'uploads_use_yearmonth_folders',  '1',  'on'),
 (48,  'upload_path',  '', 'on'),
 (49,  'blog_public',  '1',  'on'),
@@ -221,7 +221,7 @@ INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`
 (96,  'auto_update_core_minor', 'enabled',  'on'),
 (97,  'auto_update_core_major', 'enabled',  'on'),
 (98,  'wp_force_deactivated_plugins', 'a:0:{}', 'on'),
-(99,  'initial_db_version', '61696',  'on'),
+(99,  'initial_db_version', '60717',  'on'),
 (100, 'wp_user_roles',  'a:5:{s:13:\"administrator\";a:2:{s:4:\"name\";s:13:\"Administrator\";s:12:\"capabilities\";a:61:{s:13:\"switch_themes\";b:1;s:11:\"edit_themes\";b:1;s:16:\"activate_plugins\";b:1;s:12:\"edit_plugins\";b:1;s:10:\"edit_users\";b:1;s:10:\"edit_files\";b:1;s:14:\"manage_options\";b:1;s:17:\"moderate_comments\";b:1;s:17:\"manage_categories\";b:1;s:12:\"manage_links\";b:1;s:12:\"upload_files\";b:1;s:6:\"import\";b:1;s:15:\"unfiltered_html\";b:1;s:10:\"edit_posts\";b:1;s:17:\"edit_others_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:10:\"edit_pages\";b:1;s:4:\"read\";b:1;s:8:\"level_10\";b:1;s:7:\"level_9\";b:1;s:7:\"level_8\";b:1;s:7:\"level_7\";b:1;s:7:\"level_6\";b:1;s:7:\"level_5\";b:1;s:7:\"level_4\";b:1;s:7:\"level_3\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:17:\"edit_others_pages\";b:1;s:20:\"edit_published_pages\";b:1;s:13:\"publish_pages\";b:1;s:12:\"delete_pages\";b:1;s:19:\"delete_others_pages\";b:1;s:22:\"delete_published_pages\";b:1;s:12:\"delete_posts\";b:1;s:19:\"delete_others_posts\";b:1;s:22:\"delete_published_posts\";b:1;s:20:\"delete_private_posts\";b:1;s:18:\"edit_private_posts\";b:1;s:18:\"read_private_posts\";b:1;s:20:\"delete_private_pages\";b:1;s:18:\"edit_private_pages\";b:1;s:18:\"read_private_pages\";b:1;s:12:\"delete_users\";b:1;s:12:\"create_users\";b:1;s:17:\"unfiltered_upload\";b:1;s:14:\"edit_dashboard\";b:1;s:14:\"update_plugins\";b:1;s:14:\"delete_plugins\";b:1;s:15:\"install_plugins\";b:1;s:13:\"update_themes\";b:1;s:14:\"install_themes\";b:1;s:11:\"update_core\";b:1;s:10:\"list_users\";b:1;s:12:\"remove_users\";b:1;s:13:\"promote_users\";b:1;s:18:\"edit_theme_options\";b:1;s:13:\"delete_themes\";b:1;s:6:\"export\";b:1;}}s:6:\"editor\";a:2:{s:4:\"name\";s:6:\"Editor\";s:12:\"capabilities\";a:34:{s:17:\"moderate_comments\";b:1;s:17:\"manage_categories\";b:1;s:12:\"manage_links\";b:1;s:12:\"upload_files\";b:1;s:15:\"unfiltered_html\";b:1;s:10:\"edit_posts\";b:1;s:17:\"edit_others_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:10:\"edit_pages\";b:1;s:4:\"read\";b:1;s:7:\"level_7\";b:1;s:7:\"level_6\";b:1;s:7:\"level_5\";b:1;s:7:\"level_4\";b:1;s:7:\"level_3\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:17:\"edit_others_pages\";b:1;s:20:\"edit_published_pages\";b:1;s:13:\"publish_pages\";b:1;s:12:\"delete_pages\";b:1;s:19:\"delete_others_pages\";b:1;s:22:\"delete_published_pages\";b:1;s:12:\"delete_posts\";b:1;s:19:\"delete_others_posts\";b:1;s:22:\"delete_published_posts\";b:1;s:20:\"delete_private_posts\";b:1;s:18:\"edit_private_posts\";b:1;s:18:\"read_private_posts\";b:1;s:20:\"delete_private_pages\";b:1;s:18:\"edit_private_pages\";b:1;s:18:\"read_private_pages\";b:1;}}s:6:\"author\";a:2:{s:4:\"name\";s:6:\"Author\";s:12:\"capabilities\";a:10:{s:12:\"upload_files\";b:1;s:10:\"edit_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:4:\"read\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:12:\"delete_posts\";b:1;s:22:\"delete_published_posts\";b:1;}}s:11:\"contributor\";a:2:{s:4:\"name\";s:11:\"Contributor\";s:12:\"capabilities\";a:5:{s:10:\"edit_posts\";b:1;s:4:\"read\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:12:\"delete_posts\";b:1;}}s:10:\"subscriber\";a:2:{s:4:\"name\";s:10:\"Subscriber\";s:12:\"capabilities\";a:2:{s:4:\"read\";b:1;s:7:\"level_0\";b:1;}}}',  'on'),
 (101, 'fresh_site', '1',  'on'),
 (102, 'user_count', '1',  'off'),

From 40f6020ce935bc96ebc1cc3f5f9dbce19e0c17f2 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 5 Mar 2026 10:59:37 +0800
Subject: [PATCH 09/12] Tests: Revert named selector on pre-publish actions

---
 .../broadcasts/import-export/BroadcastsExportPostCest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php b/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php
index 14d83937b..a276f5f2e 100644
--- a/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php
+++ b/tests/EndToEnd/broadcasts/import-export/BroadcastsExportPostCest.php
@@ -168,7 +168,7 @@ public function testCreateBroadcastWhenEnabledInPost(EndToEndTester $I)
 		$I->waitForElementVisible('.editor-post-publish-panel__header-publish-button');
 
 		// Enable the Create Broadcast option.
-		$I->click('.convertkit-pre-publish-actions input#convertkit_action_broadcast_export');
+		$I->click('.convertkit-pre-publish-actions #inspector-toggle-control-0');
 
 		// Publish the Post.
 		$I->clickPublishOnPrePublishChecksForGutenbergPage($I);

From 51edf92f7f1b1abe568062fd89dc9d04ed5670e0 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 10 Mar 2026 16:42:30 +0800
Subject: [PATCH 10/12] Coding standards

---
 includes/class-convertkit-gutenberg.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-convertkit-gutenberg.php b/includes/class-convertkit-gutenberg.php
index 567f1c929..eaa557449 100644
--- a/includes/class-convertkit-gutenberg.php
+++ b/includes/class-convertkit-gutenberg.php
@@ -247,7 +247,7 @@ public function add_plugin_sidebars() {
 
 	}
 
-	/*
+	/**
 	 * Determines the block API version to use for registering blocks.
 	 *
 	 * @since   3.2.0

From b6ed48d0b6fe6a030bbc8fb647235d7f85a0ed9a Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 12:42:58 +0800
Subject: [PATCH 11/12] Use Kit Logo for Sidebar Icon

---
 .../class-convertkit-plugin-sidebar-post-settings.php         | 2 +-
 includes/plugin-sidebars/class-convertkit-plugin-sidebar.php  | 1 +
 resources/backend/images/kit-logo.svg                         | 4 ++--
 resources/backend/js/gutenberg.js                             | 2 +-
 4 files changed, 5 insertions(+), 4 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 6a359ac55..9e4d934aa 100644
--- a/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar-post-settings.php
@@ -70,7 +70,7 @@ public function get_title() {
 	 */
 	public function get_icon() {
 
-		return 'resources/backend/images/block-icon-form.svg';
+		return 'resources/backend/images/kit-logo.svg';
 
 	}
 
diff --git a/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php b/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
index 50742bc68..c3be8af11 100644
--- a/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
+++ b/includes/plugin-sidebars/class-convertkit-plugin-sidebar.php
@@ -30,6 +30,7 @@ public function register( $plugin_sidebars ) {
 			'meta_key'           => $this->get_meta_key(), // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key
 			'title'              => $this->get_title(),
 			'icon'               => $this->get_icon(),
+			'gutenberg_icon'     => convertkit_get_file_contents( CONVERTKIT_PLUGIN_PATH . '/' . $this->get_icon() ),
 			'fields'             => $this->get_fields(),
 			'attributes'         => $this->get_attributes(),
 			'default_values'     => $this->get_default_values(),
diff --git a/resources/backend/images/kit-logo.svg b/resources/backend/images/kit-logo.svg
index 946f6e5cc..dc2c1b69e 100644
--- a/resources/backend/images/kit-logo.svg
+++ b/resources/backend/images/kit-logo.svg
@@ -1,6 +1,6 @@
-<svg width="400" height="182" viewBox="0 0 400 182" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="400" height="182" viewBox="0 0 400 182" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_563_12784)">
-<path d="M109.562 75.903C158.772 85.438 174.05 131 174.465 176.833C174.465 177.862 173.634 178.711 172.605 178.711H110.646C109.616 178.711 108.786 177.88 108.786 176.869C108.605 141.312 102.844 109.944 67.6117 108.589C66.5643 108.553 65.6795 109.384 65.6795 110.449V176.869C65.6795 177.898 64.8488 178.729 63.8194 178.729H1.86005C0.8307 178.729 0 177.898 0 176.869V7.58693C0 6.55758 0.8307 5.72688 1.86005 5.72688H63.8375C64.8668 5.72688 65.6975 6.55758 65.6975 7.58693V70.991C65.6975 71.93 66.456 72.6885 67.395 72.6885C68.1354 72.6885 68.8036 72.2009 69.0203 71.4966C84.9661 19.1987 114.781 6.05194 163.196 5.74494C164.226 5.74494 165.056 6.57564 165.056 7.60499V70.8465C165.056 71.8759 164.226 72.7066 163.196 72.7066H109.869C108.966 72.7066 108.244 73.4289 108.244 74.3319C108.244 75.0903 108.804 75.7585 109.562 75.903ZM279.223 115.542V74.5486C279.223 73.5192 280.054 72.6885 281.084 72.6885H326.682C327.585 72.6885 328.307 71.9662 328.307 71.0632C328.307 70.2867 327.747 69.6185 326.989 69.4741C291.305 62.3951 274.835 41.8623 274.275 7.58693C274.257 6.57564 275.07 5.72688 276.099 5.72688H343.061C344.09 5.72688 344.921 6.55758 344.921 7.58693V36.4628C344.921 37.4921 345.752 38.3228 346.781 38.3228H385.174C386.203 38.3228 387.034 39.1535 387.034 40.1829V70.8646C387.034 71.8939 386.203 72.7246 385.174 72.7246H346.781C345.752 72.7246 344.921 73.5553 344.921 74.5847V107.65C344.921 119.334 352.09 123.181 361.607 123.181C376.524 123.181 391.26 116.463 397.165 113.411C398.393 112.779 399.874 113.664 399.874 115.054V166.521C399.874 167.894 399.115 169.158 397.905 169.808C392.072 172.878 374.05 181.384 353.445 181.384C310.989 181.348 279.223 164.065 279.223 115.542ZM192.054 176.851V74.5486C192.054 73.5192 192.885 72.6885 193.914 72.6885H255.892C256.921 72.6885 257.752 73.5192 257.752 74.5486V176.851C257.752 177.88 256.921 178.711 255.892 178.711H193.914C192.885 178.693 192.054 177.862 192.054 176.851ZM188.533 32.2912C188.533 49.6998 200.831 63.8217 224.451 63.8217C248.072 63.8217 260.37 49.6998 260.37 32.2912C260.37 14.8826 248.09 0.760742 224.451 0.760742C200.831 0.760742 188.533 14.8826 188.533 32.2912Z" fill="#1E1E1E"/>
+<path d="M109.562 75.903C158.772 85.438 174.05 131 174.465 176.833C174.465 177.862 173.634 178.711 172.605 178.711H110.646C109.616 178.711 108.786 177.88 108.786 176.869C108.605 141.312 102.844 109.944 67.6117 108.589C66.5643 108.553 65.6795 109.384 65.6795 110.449V176.869C65.6795 177.898 64.8488 178.729 63.8194 178.729H1.86005C0.8307 178.729 0 177.898 0 176.869V7.58693C0 6.55758 0.8307 5.72688 1.86005 5.72688H63.8375C64.8668 5.72688 65.6975 6.55758 65.6975 7.58693V70.991C65.6975 71.93 66.456 72.6885 67.395 72.6885C68.1354 72.6885 68.8036 72.2009 69.0203 71.4966C84.9661 19.1987 114.781 6.05194 163.196 5.74494C164.226 5.74494 165.056 6.57564 165.056 7.60499V70.8465C165.056 71.8759 164.226 72.7066 163.196 72.7066H109.869C108.966 72.7066 108.244 73.4289 108.244 74.3319C108.244 75.0903 108.804 75.7585 109.562 75.903ZM279.223 115.542V74.5486C279.223 73.5192 280.054 72.6885 281.084 72.6885H326.682C327.585 72.6885 328.307 71.9662 328.307 71.0632C328.307 70.2867 327.747 69.6185 326.989 69.4741C291.305 62.3951 274.835 41.8623 274.275 7.58693C274.257 6.57564 275.07 5.72688 276.099 5.72688H343.061C344.09 5.72688 344.921 6.55758 344.921 7.58693V36.4628C344.921 37.4921 345.752 38.3228 346.781 38.3228H385.174C386.203 38.3228 387.034 39.1535 387.034 40.1829V70.8646C387.034 71.8939 386.203 72.7246 385.174 72.7246H346.781C345.752 72.7246 344.921 73.5553 344.921 74.5847V107.65C344.921 119.334 352.09 123.181 361.607 123.181C376.524 123.181 391.26 116.463 397.165 113.411C398.393 112.779 399.874 113.664 399.874 115.054V166.521C399.874 167.894 399.115 169.158 397.905 169.808C392.072 172.878 374.05 181.384 353.445 181.384C310.989 181.348 279.223 164.065 279.223 115.542ZM192.054 176.851V74.5486C192.054 73.5192 192.885 72.6885 193.914 72.6885H255.892C256.921 72.6885 257.752 73.5192 257.752 74.5486V176.851C257.752 177.88 256.921 178.711 255.892 178.711H193.914C192.885 178.693 192.054 177.862 192.054 176.851ZM188.533 32.2912C188.533 49.6998 200.831 63.8217 224.451 63.8217C248.072 63.8217 260.37 49.6998 260.37 32.2912C260.37 14.8826 248.09 0.760742 224.451 0.760742C200.831 0.760742 188.533 14.8826 188.533 32.2912Z" fill="currentColor"/>
 </g>
 <defs>
 <clipPath id="clip0_563_12784">
diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index 90fd70750..9c2cbc03b 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -1069,7 +1069,7 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 					title: sidebar.title,
 					className: sidebar.name,
 					icon: element.RawHTML({
-						children: sidebar.icon,
+						children: sidebar.gutenberg_icon,
 					}),
 				},
 				getFields(sidebar.fields)

From 671b50a264b314175ad3ea64a6f8465f86e05f96 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 17:02:00 +0800
Subject: [PATCH 12/12] Use window.wp.editPost for < WordPress 6.6 compat

---
 resources/backend/js/gutenberg.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/backend/js/gutenberg.js b/resources/backend/js/gutenberg.js
index 9c2cbc03b..a45df3db2 100644
--- a/resources/backend/js/gutenberg.js
+++ b/resources/backend/js/gutenberg.js
@@ -1082,7 +1082,7 @@ function convertKitGutenbergRegisterPluginSidebar(sidebar) {
 		});
 	})(
 		window.wp.plugins,
-		window.wp.editor,
+		window.wp.editPost,
 		window.wp.element,
 		window.wp.components,
 		window.wp.data
@@ -1161,7 +1161,7 @@ function convertKitGutenbergRegisterPrePublishActions(actions) {
 		});
 	})(
 		window.wp.plugins,
-		window.wp.editor,
+		window.wp.editPost,
 		window.wp.element,
 		window.wp.components,
 		window.wp.data