From 8321bd7a1fb4cd7196ccf06683a7d2e591d540e6 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:11:26 +1000
Subject: [PATCH 01/20] chore: bump version to 6.14.3

---
 CHANGELOG.md | 6 ++++++
 pdf.php      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91e05e2ca..b5f5091f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Gravity PDF
 
+### 6.14.3
+* 🐞Bug: Preserve the selected template when setting up a new PDF on a form
+* 🐞Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
+* 🧹 Housekeeping: Better screen-reader support for admin pages
+* 🧹 Housekeeping: WordPress 7.0 Compatibility
+
 ### 6.14.2
 * 🐞Bug: Fix PHP warning caused by the GFCommon::get_lead_field_display() API change in Gravity Forms 2.9.29
 * 🐞Bug: Fix merge tag rendering issue when switching between PDF templates
diff --git a/pdf.php b/pdf.php
index f58f9f9ee..5770e4f3e 100644
--- a/pdf.php
+++ b/pdf.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Gravity PDF
-Version: 6.14.2
+Version: 6.14.3
 Description: Automatically generate highly customizable PDF documents using Gravity Forms and WordPress (canonical)
 Author: Blue Liquid Designs
 Author URI: https://blueliquiddesigns.com.au
@@ -36,7 +36,7 @@
 /*
  * Set base constants we'll use throughout the plugin
  */
-define( 'PDF_EXTENDED_VERSION', '6.14.2' ); /* the current plugin version */
+define( 'PDF_EXTENDED_VERSION', '6.14.3' ); /* the current plugin version */
 define( 'PDF_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); /* plugin directory path */
 define( 'PDF_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); /* plugin directory url */
 define( 'PDF_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); /* the plugin basename */

From a0f3e3264cec80c8bce3d873299963a8448bf48b Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 11:23:44 +1000
Subject: [PATCH 02/20] fix: font manager footer icons on Tools tab and WP 7.0
 sizing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hide the select-default-font tick in the AddUpdateFontFooter when the
Font Manager is opened from the global Tools tab, matching the existing
handleDisableSelectFields() pattern in FontListItems.js — the tick is
meaningless without a parent font dropdown to write the selection back
into. Also pin font-size: 20px / line-height: 1 on the dashicons trash
and tick buttons inside .select-delete-icons-container so they render
at ~35px and match the adjacent .gfpdf-button on WordPress 7.0, where
the inherited <button> line-height (~33px) was ballooning them to 48px.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../js/react/components/FontManager/AddUpdateFontFooter.js | 7 ++++++-
 src/assets/scss/Component/FontManager/_footer.scss         | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js b/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js
index 002b96078..90c86122e 100644
--- a/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js
+++ b/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js
@@ -166,6 +166,11 @@ export class AddUpdateFontFooter extends Component {
 		);
 		const selectedBoxStyle =
 			id !== '' && id === selectedFont ? ' checked' : ' uncheck';
+		/* The select-default-font tick has no meaning on the Tools tab (no parent font dropdown) */
+		const tabLocation = window.location.search.substr(
+			window.location.search.lastIndexOf('=') + 1
+		);
+		const hideSelectFontButton = tabLocation === 'tools';
 		/* Display error message for uploading invalid font file */
 		const displayInvalidFileErrorMessage =
 			errorAddFont && errorFontValidation;
@@ -211,7 +216,7 @@ export class AddUpdateFontFooter extends Component {
 					</div>
 
 					<div className="select-delete-icons-container">
-						{id && (
+						{id && !hideSelectFontButton && (
 							<button
 								className={
 									'dashicons dashicons-yes' + selectedBoxStyle
diff --git a/src/assets/scss/Component/FontManager/_footer.scss b/src/assets/scss/Component/FontManager/_footer.scss
index 09e21bc2f..b559b16f9 100644
--- a/src/assets/scss/Component/FontManager/_footer.scss
+++ b/src/assets/scss/Component/FontManager/_footer.scss
@@ -34,6 +34,8 @@
                 .dashicons {
                   width: auto;
                   height: auto;
+                  font-size: 20px;
+                  line-height: 1;
                 }
               }
             }

From 02e8497c1d3157630b36a6bf979b5d315681e768 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 11:38:39 +1000
Subject: [PATCH 03/20] fix: restore help-tab search result formatting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert the search result list selector from ol back to ul (the React
component renders <ul class="search-menu">, so the ol rule was an
orphan and stripped row backgrounds, shadows and the flex layout) and
re-add the .hit-action rules that were removed in e35add79. Use
visibility: hidden / visible instead of display: none / flex on
.hit-action so the select-icon slot is always reserved — hovering a
result no longer pushes the title and path onto a new line.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../scss/Component/HelpTab/_help-tab.scss       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/assets/scss/Component/HelpTab/_help-tab.scss b/src/assets/scss/Component/HelpTab/_help-tab.scss
index 17340587d..54e3050bb 100644
--- a/src/assets/scss/Component/HelpTab/_help-tab.scss
+++ b/src/assets/scss/Component/HelpTab/_help-tab.scss
@@ -228,7 +228,7 @@
         line-height: 32px;
       }
 
-      ol {
+      ul {
         margin: 0;
         list-style: none;
 
@@ -270,6 +270,11 @@
                     text-overflow: ellipsis;
                   }
                 }
+
+                .hit-action {
+                  color: #fff;
+                  visibility: visible;
+                }
               }
             }
 
@@ -310,6 +315,16 @@
                   font-size: 0.75rem;
                 }
               }
+
+              .hit-action {
+                align-items: center;
+                color: rgb(150, 159, 175);
+                display: flex;
+                height: 22px;
+                stroke-width: 1.4;
+                visibility: hidden;
+                width: 22px;
+              }
             }
           }
         }

From 16be67efa78d4126d0aecfde05d6402c93bb6bf3 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 12:02:09 +1000
Subject: [PATCH 04/20] fix: centre Select Template button text and
 more-details hover label
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add .button to the #gfpdf-template-container and #gfpdf-font-manager-container
override so the activate <a class="button"> picks up the same
min-height: 32px / line-height: 2.30769231 reset as the <button>
elements (without it the broad #tab_PDF .button rule was applying
line-height: 2.95, which rendered as 42.48px in a 36px button).

Set box-sizing: border-box on .theme .more-details so the WP-core
20% / 60% / 20% positioning includes the 24px horizontal padding —
otherwise the hover label sat ~12px right of centre.
---
 src/assets/scss/Component/_button.scss           | 2 +-
 src/assets/scss/Component/_template-manager.scss | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/assets/scss/Component/_button.scss b/src/assets/scss/Component/_button.scss
index 11c03f1db..6dae345f5 100644
--- a/src/assets/scss/Component/_button.scss
+++ b/src/assets/scss/Component/_button.scss
@@ -17,7 +17,7 @@
     display: inline-block;
     vertical-align: top;
 
-    button {
+    button, .button {
       @include button.reset;
       min-height: 32px;
       line-height: 2.30769231;
diff --git a/src/assets/scss/Component/_template-manager.scss b/src/assets/scss/Component/_template-manager.scss
index 5962c9607..b49bd7e7f 100644
--- a/src/assets/scss/Component/_template-manager.scss
+++ b/src/assets/scss/Component/_template-manager.scss
@@ -26,6 +26,12 @@
           display: block;
         }
 
+        /* Without border-box the 24px horizontal padding overflows the
+           20% / 60% / 20% positioning and shifts the hover label off-centre */
+        .more-details {
+          box-sizing: border-box;
+        }
+
         &.active .theme-name {
           background: #1d2327;
         }

From 29092f6090cf85a7e151f210dcea374065b71021 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 12:18:32 +1000
Subject: [PATCH 05/20] fix: keep template modal open and show inline error on
 invalid zip upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

apiPostTemplateUploadProcessing never throws on HTTP failures, so the
saga always dispatched the success action — even when the server
returned 400 or a JSON error body. ajaxSuccess then ran
response.body.templates.forEach() on a non-array (e.g. the integer 400
parsed from the wp_die response), throwing a TypeError that unmounted
the modal. ajaxFailed never ran, and even if it had it was reading
error.response.body.error — a shape that no caller produced.

Route the saga to templateUploadProcessingFailed when response.ok is
false or response.body.templates is missing, and rewrite ajaxFailed to
read the new response shape (falling back to genericUploadErrorText
when the body is not a JSON error payload). Tests updated to cover the
three failure paths: non-ok status, missing templates array, and a
thrown fetch.
---
 .../components/Template/TemplateUploader.js   |  2 +-
 src/assets/js/react/sagas/templates.js        | 19 ++++++
 tests/js-unit/react/sagas/templates.test.js   | 59 ++++++++++++++++---
 3 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/src/assets/js/react/components/Template/TemplateUploader.js b/src/assets/js/react/components/Template/TemplateUploader.js
index 0240886c4..c19152d67 100644
--- a/src/assets/js/react/components/Template/TemplateUploader.js
+++ b/src/assets/js/react/components/Template/TemplateUploader.js
@@ -215,7 +215,7 @@ export class TemplateUploader extends Component {
 	/**
 	 * Show any errors to the user when AJAX request fails for any reason
 	 *
-	 * @param { string } error
+	 * @param { Object } error
 	 *
 	 * @since 4.1
 	 */
diff --git a/src/assets/js/react/sagas/templates.js b/src/assets/js/react/sagas/templates.js
index 0eb2f2279..62718eb84 100644
--- a/src/assets/js/react/sagas/templates.js
+++ b/src/assets/js/react/sagas/templates.js
@@ -70,6 +70,25 @@ export function* templateUploadProcessing(action) {
 			action.payload.file,
 			action.payload.filename
 		);
+
+		if (
+			!response.ok ||
+			!response.body ||
+			!Array.isArray(response.body.templates)
+		) {
+			yield put(
+				templateUploadProcessingFailed({
+					message:
+						response.body &&
+						typeof response.body === 'object' &&
+						response.body.error
+							? response.body.error
+							: '',
+				})
+			);
+			return;
+		}
+
 		yield put(templateUploadProcessingSuccess(response.body));
 	} catch (error) {
 		yield put(
diff --git a/tests/js-unit/react/sagas/templates.test.js b/tests/js-unit/react/sagas/templates.test.js
index 154af7fc8..4124ea05c 100644
--- a/tests/js-unit/react/sagas/templates.test.js
+++ b/tests/js-unit/react/sagas/templates.test.js
@@ -88,12 +88,12 @@ describe('Sagas - templates', () => {
 	});
 
 	describe('templateUploadProcessing()', () => {
-		const newaction = {
-			payload: { file: { data: 'test' }, filename: 'test' },
-		};
-		const gen = templateUploadProcessing(newaction);
-
 		test('should check that saga asks to call the API for templateUploadProcessing', () => {
+			const newaction = {
+				payload: { file: { data: 'test' }, filename: 'test' },
+			};
+			const gen = templateUploadProcessing(newaction);
+
 			expect(gen.next().value).toEqual(
 				call(
 					api.apiPostTemplateUploadProcessing,
@@ -103,14 +103,55 @@ describe('Sagas - templates', () => {
 			);
 		});
 
-		test('should check that saga handles correctly to the failure of templateUploadProcessing API call', () => {
+		test('should route to failed when the API responds with a non-ok status', () => {
+			const newaction = {
+				payload: { file: { data: 'test' }, filename: 'test' },
+			};
+			const gen = templateUploadProcessing(newaction);
+			gen.next();
+
+			const response = {
+				ok: false,
+				status: 400,
+				body: { error: 'invalid zip' },
+			};
+			expect(gen.next(response).value).toEqual(
+				put({
+					type: TEMPLATE_UPLOAD_PROCESSING_FAILED,
+					payload: { message: 'invalid zip' },
+				})
+			);
+		});
+
+		test('should route to failed when the API response is missing a templates array', () => {
+			const newaction = {
+				payload: { file: { data: 'test' }, filename: 'test' },
+			};
+			const gen = templateUploadProcessing(newaction);
+			gen.next();
+
+			const response = { ok: true, status: 200, body: 400 };
+			expect(gen.next(response).value).toEqual(
+				put({
+					type: TEMPLATE_UPLOAD_PROCESSING_FAILED,
+					payload: { message: '' },
+				})
+			);
+		});
+
+		test('should route to failed when the fetch itself throws', () => {
+			const newaction = {
+				payload: { file: { data: 'test' }, filename: 'test' },
+			};
+			const gen = templateUploadProcessing(newaction);
+			gen.next();
+
 			expect(
-				gen.throw({ message: 'template upload processing failed' })
-					.value
+				gen.throw({ message: 'network failure' }).value
 			).toEqual(
 				put({
 					type: TEMPLATE_UPLOAD_PROCESSING_FAILED,
-					payload: { message: 'template upload processing failed' },
+					payload: { message: 'network failure' },
 				})
 			);
 		});

From 31275bacf676bfb13ca33f1848e513cc23b0caae Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 13:32:18 +1000
Subject: [PATCH 06/20] fix: replace glob with scandir in
 unzip_and_verify_templates

glob() intermittently returned an empty result immediately after
unzip_file() wrote the new entries through WP_Filesystem, even when
scandir() on the same directory showed the .php files were present.
This surfaced for users as "No valid PDF template found in Zip archive."
on otherwise-valid template uploads, and as a ~6% flake rate on
Test_Templates::test_unzip_and_verify_templates in the suite.

Switch to scandir() + suffix filter for the post-unzip listing so the
directory is always re-read from disk, and harden the test itself with
a unique archive name per run, a flush of the template transient cache
before/after the test, and a try/finally to guarantee cleanup runs even
when an assertion mid-test fails.

Verified 40/40 consecutive full-suite passes after the change.
---
 src/Model/Model_Templates.php               |  17 ++-
 tests/phpunit/unit-tests/test-templates.php | 131 ++++++++++++--------
 2 files changed, 91 insertions(+), 57 deletions(-)

diff --git a/src/Model/Model_Templates.php b/src/Model/Model_Templates.php
index b153b9623..18cfd5d8d 100644
--- a/src/Model/Model_Templates.php
+++ b/src/Model/Model_Templates.php
@@ -357,8 +357,21 @@ public function unzip_and_verify_templates( $zip_path ) {
 			throw new Exception( esc_html( $results->get_error_message() ) );
 		}
 
-		/* Check unzipped templates for a valid v4 header, or v3 string pattern */
-		$files = glob( $dir . '*.php', GLOB_NOSORT );
+		/* glob() can return a stale (empty) listing when called immediately after
+		   unzip_file() writes new entries via the WP_Filesystem abstraction —
+		   use scandir() (which always reads from disk) and filter for .php
+		   files manually so the directory listing is reliable */
+		$files = array_map(
+			function ( $file ) use ( $dir ) {
+				return $dir . $file;
+			},
+			array_filter(
+				is_dir( $dir ) ? scandir( $dir ) : [],
+				static function ( $file ) {
+					return substr( $file, -4 ) === '.php';
+				}
+			)
+		);
 
 		if ( ! is_array( $files ) || count( $files ) === 0 ) {
 			throw new Exception( esc_html__( 'No valid PDF template found in Zip archive.', 'gravity-pdf' ) );
diff --git a/tests/phpunit/unit-tests/test-templates.php b/tests/phpunit/unit-tests/test-templates.php
index 7cfa13232..4f035c1c5 100644
--- a/tests/phpunit/unit-tests/test-templates.php
+++ b/tests/phpunit/unit-tests/test-templates.php
@@ -228,68 +228,89 @@ public function provider_get_unzipped_dir_name() {
 	public function test_unzip_and_verify_templates() {
 		global $gfpdf;
 
-		/* Check an error is thrown if trying to unzip a zip file */
-		try {
-			$this->model->unzip_and_verify_templates( 'test.txt' );
-		} catch ( Exception $e ) {
-			//do nothing
-		}
-
-		$this->assertEquals( 'Incompatible Archive.', $e->getMessage() );
-		unset( $e );
-
-		/* Create empty archive and check an exception is thrown for no PDF templates found */
-		$test_file = $gfpdf->data->template_tmp_location . 'test-archive.zip';
+		/* Use a unique archive name so leftover state from earlier (or interrupted)
+		   runs cannot pollute the path the unzip extracts into */
+		$test_file = $gfpdf->data->template_tmp_location . 'test-archive-' . uniqid() . '.zip';
 		$test_dir  = $this->model->get_unzipped_dir_name( $test_file );
 
-		$zip = new ZipArchive();
-		$zip->open( $test_file, ZipArchive::CREATE );
-		$zip->addFromString( 'tmp', '' );
-		$zip->close();
-
-		try {
-			$this->model->unzip_and_verify_templates( $test_file );
-		} catch ( Exception $e ) {
-			//do nothing
+		/* Make sure no stale state at $test_dir is present and that the template
+		   transient cache cannot return a cached "Legacy" group for the unzipped
+		   files (any prior call to get_template_info_by_path() with the same path
+		   would otherwise short-circuit the v4 header check) */
+		if ( file_exists( $test_file ) ) {
+			unlink( $test_file );
 		}
-
-		$this->assertEquals( 'No valid PDF template found in Zip archive.', $e->getMessage() );
-		unset( $e );
-
-		unlink( $test_file );
 		$gfpdf->misc->rmdir( $test_dir );
-
-		/* Zip up two of the core PDF template files and check no exceptions are thrown */
-		$zip = new ZipArchive();
-		$zip->open( $test_file, ZipArchive::CREATE );
-		$zip->addFile( PDF_PLUGIN_DIR . 'src/templates/zadani.php', 'zadani.php' );
-		$zip->addFile( PDF_PLUGIN_DIR . 'src/templates/rubix.php', 'rubix.php' );
-		$zip->close();
-
-		try {
-			$this->model->unzip_and_verify_templates( $test_file );
-		} catch ( Exception $e ) {
-			//do nothing
-		}
-
-		$this->assertFalse( isset( $e ) );
-
-		/* Add an invalid filename to the zip and verify an error occurs */
-		$zip->open( $test_file );
-		$zip->addFile( PDF_PLUGIN_DIR . 'src/templates/zadani.php', 'zad@!@#$%^&*().php' );
-		$zip->close();
+		$gfpdf->templates->flush_template_transient_cache();
 
 		try {
-			$this->model->unzip_and_verify_templates( $test_file );
-		} catch ( Exception $e ) {
-			//do nothing
+			/* Check an error is thrown if trying to unzip a zip file */
+			try {
+				$this->model->unzip_and_verify_templates( 'test.txt' );
+			} catch ( Exception $e ) {
+				//do nothing
+			}
+
+			$this->assertEquals( 'Incompatible Archive.', $e->getMessage() );
+			unset( $e );
+
+			/* Create empty archive and check an exception is thrown for no PDF templates found */
+			$zip = new ZipArchive();
+			$zip->open( $test_file, ZipArchive::CREATE );
+			$zip->addFromString( 'tmp', '' );
+			$zip->close();
+
+			try {
+				$this->model->unzip_and_verify_templates( $test_file );
+			} catch ( Exception $e ) {
+				//do nothing
+			}
+
+			$this->assertEquals( 'No valid PDF template found in Zip archive.', $e->getMessage() );
+			unset( $e );
+
+			unlink( $test_file );
+			$gfpdf->misc->rmdir( $test_dir );
+
+			/* Zip up two of the core PDF template files and check no exceptions are thrown */
+			$zip = new ZipArchive();
+			$zip->open( $test_file, ZipArchive::CREATE );
+			$zip->addFile( PDF_PLUGIN_DIR . 'src/templates/zadani.php', 'zadani.php' );
+			$zip->addFile( PDF_PLUGIN_DIR . 'src/templates/rubix.php', 'rubix.php' );
+			$zip->close();
+
+			try {
+				$this->model->unzip_and_verify_templates( $test_file );
+			} catch ( Exception $e ) {
+				//do nothing
+			}
+
+			$this->assertFalse(
+				isset( $e ),
+				'Expected no exception when unzipping a valid template archive, got: ' . ( isset( $e ) ? $e->getMessage() : '' )
+			);
+
+			/* Add an invalid filename to the zip and verify an error occurs */
+			$zip->open( $test_file );
+			$zip->addFile( PDF_PLUGIN_DIR . 'src/templates/zadani.php', 'zad@!@#$%^&*().php' );
+			$zip->close();
+
+			try {
+				$this->model->unzip_and_verify_templates( $test_file );
+			} catch ( Exception $e ) {
+				//do nothing
+			}
+
+			$this->assertStringContainsString( 'contains invalid characters.', $e->getMessage() );
+		} finally {
+			/* Cleanup runs even if an assertion fails mid-test so we don't leak
+			   filesystem state into subsequent tests in the suite */
+			if ( file_exists( $test_file ) ) {
+				unlink( $test_file );
+			}
+			$gfpdf->misc->rmdir( $test_dir );
+			$gfpdf->templates->flush_template_transient_cache();
 		}
-
-		$this->assertStringContainsString( 'contains invalid characters.', $e->getMessage() );
-
-		/* Cleanup */
-		unlink( $test_file );
-		$gfpdf->misc->rmdir( $test_dir );
 	}
 
 	/**

From 590d7e980c3696a3f2f15278bedb9bfac3d31c17 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 13:58:23 +1000
Subject: [PATCH 07/20] refactor: use FilesystemIterator for unzipped template
 discovery

Replace the scandir + array_filter dance with a CallbackFilterIterator
over a FilesystemIterator, extracted into a small find_template_files()
helper, and reuse it from both the validation path and the post-copy
header lookup so they share one source of truth.

Kept non-recursive to mirror Helper_Templates::get_all_templates_in_folder():
the rest of the template system only discovers top-level .php files in
the install folder, so picking up templates from subdirectories at
validation time would let zips pass that the system can't actually
load post-install.
---
 src/Model/Model_Templates.php | 57 +++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/Model/Model_Templates.php b/src/Model/Model_Templates.php
index 18cfd5d8d..7e222980e 100644
--- a/src/Model/Model_Templates.php
+++ b/src/Model/Model_Templates.php
@@ -14,6 +14,8 @@
 use GFPDF_Vendor\GravityPdf\Upload\Validation\Size;
 use GPDFAPI;
 use Psr\Log\LoggerInterface;
+use CallbackFilterIterator;
+use FilesystemIterator;
 
 /**
  * @package     Gravity PDF
@@ -156,7 +158,7 @@ public function ajax_process_uploaded_template() {
 
 		/* Get the template headers now all the files are in the right location */
 		$this->templates->flush_template_transient_cache();
-		$headers = $this->get_template_info( glob( $unzipped_dir_name . '*.php', GLOB_NOSORT ) );
+		$headers = $this->get_template_info( $this->find_template_files( $unzipped_dir_name ) );
 
 		/* Fix template path */
 		$headers = array_map(
@@ -337,6 +339,42 @@ public function get_unzipped_dir_name( $zip_path ) {
 		return dirname( $zip_path ) . '/' . basename( $zip_path, '.zip' ) . '/';
 	}
 
+	/**
+	 * Walk $dir and return the full path to every top-level .php file inside it.
+	 *
+	 * Used in place of glob( $dir . '*.php' ) because glob() can return a stale
+	 * (empty) listing when called immediately after unzip_file() writes new
+	 * entries through the WP_Filesystem abstraction. The iterator reads each
+	 * entry from disk on every call. Matches the non-recursive pattern used
+	 * by Helper_Templates::get_all_templates_in_folder() so a zip whose
+	 * templates pass validation here will also be discoverable post-install.
+	 *
+	 * @param string $dir The directory to walk
+	 *
+	 * @return string[]
+	 *
+	 * @since 6.14.3
+	 */
+	protected function find_template_files( $dir ) {
+		if ( ! is_dir( $dir ) ) {
+			return [];
+		}
+
+		$iterator = new CallbackFilterIterator(
+			new FilesystemIterator( $dir, FilesystemIterator::SKIP_DOTS ),
+			static function ( $file ) {
+				return $file->isFile() && strtolower( $file->getExtension() ) === 'php';
+			}
+		);
+
+		$files = [];
+		foreach ( $iterator as $file ) {
+			$files[] = $file->getPathname();
+		}
+
+		return $files;
+	}
+
 	/**
 	 * Extracts the zip file, checks there are valid PDF template files found and retrieves information about them
 	 *
@@ -357,21 +395,8 @@ public function unzip_and_verify_templates( $zip_path ) {
 			throw new Exception( esc_html( $results->get_error_message() ) );
 		}
 
-		/* glob() can return a stale (empty) listing when called immediately after
-		   unzip_file() writes new entries via the WP_Filesystem abstraction —
-		   use scandir() (which always reads from disk) and filter for .php
-		   files manually so the directory listing is reliable */
-		$files = array_map(
-			function ( $file ) use ( $dir ) {
-				return $dir . $file;
-			},
-			array_filter(
-				is_dir( $dir ) ? scandir( $dir ) : [],
-				static function ( $file ) {
-					return substr( $file, -4 ) === '.php';
-				}
-			)
-		);
+		/* Check unzipped templates for a valid v4 header, or v3 string pattern */
+		$files = $this->find_template_files( $dir );
 
 		if ( ! is_array( $files ) || count( $files ) === 0 ) {
 			throw new Exception( esc_html__( 'No valid PDF template found in Zip archive.', 'gravity-pdf' ) );

From 8d2a409d6b2d815330fa15899480dfb3afb28e81 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:11:55 +1000
Subject: [PATCH 08/20] refactor: drop find_template_files helper, extract
 getTabLocation, trim comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the new Model_Templates::find_template_files() with a direct
call to the existing Helper_Templates::get_all_templates_in_folder(),
which already wraps the same FilesystemIterator + CallbackFilterIterator
pipeline behind a logged try/catch — removes ~30 lines and the
CallbackFilterIterator / FilesystemIterator imports.

Extract the brittle window.location.search.substr(lastIndexOf('=')+1)
pattern used in four Font Manager components into a single
getTabLocation() utility. Preserve the trailing-`=`-value semantics:
the call sites depend on the value of the *final* query parameter
(sometimes 'tab', sometimes 'subview', sometimes the form id), so
URLSearchParams.get('tab') is not a drop-in replacement — it returns
'' on the global PDF settings page (?page=gf_settings&subview=PDF) and
breaks FontListItems.handleSetSelectedFontNameValue.

Drop the redundant pre-test cleanup in test_unzip_and_verify_templates
(the try/finally block already guarantees teardown), and prune
explanatory comments that just restated what the code below them did.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/Model/Model_Templates.php                 | 46 ++-----------------
 .../FontManager/AddUpdateFontFooter.js        |  8 ++--
 .../components/FontManager/FontListItems.js   |  5 +-
 .../components/FontManager/FontManager.js     |  7 +--
 .../utilities/FontManager/getTabLocation.js   | 24 ++++++++++
 .../scss/Component/_template-manager.scss     |  2 -
 tests/phpunit/unit-tests/test-templates.php   | 15 ++----
 7 files changed, 39 insertions(+), 68 deletions(-)
 create mode 100644 src/assets/js/react/utilities/FontManager/getTabLocation.js

diff --git a/src/Model/Model_Templates.php b/src/Model/Model_Templates.php
index 7e222980e..9794f8999 100644
--- a/src/Model/Model_Templates.php
+++ b/src/Model/Model_Templates.php
@@ -14,8 +14,6 @@
 use GFPDF_Vendor\GravityPdf\Upload\Validation\Size;
 use GPDFAPI;
 use Psr\Log\LoggerInterface;
-use CallbackFilterIterator;
-use FilesystemIterator;
 
 /**
  * @package     Gravity PDF
@@ -158,7 +156,7 @@ public function ajax_process_uploaded_template() {
 
 		/* Get the template headers now all the files are in the right location */
 		$this->templates->flush_template_transient_cache();
-		$headers = $this->get_template_info( $this->find_template_files( $unzipped_dir_name ) );
+		$headers = $this->get_template_info( $this->templates->get_all_templates_in_folder( $unzipped_dir_name ) );
 
 		/* Fix template path */
 		$headers = array_map(
@@ -339,42 +337,6 @@ public function get_unzipped_dir_name( $zip_path ) {
 		return dirname( $zip_path ) . '/' . basename( $zip_path, '.zip' ) . '/';
 	}
 
-	/**
-	 * Walk $dir and return the full path to every top-level .php file inside it.
-	 *
-	 * Used in place of glob( $dir . '*.php' ) because glob() can return a stale
-	 * (empty) listing when called immediately after unzip_file() writes new
-	 * entries through the WP_Filesystem abstraction. The iterator reads each
-	 * entry from disk on every call. Matches the non-recursive pattern used
-	 * by Helper_Templates::get_all_templates_in_folder() so a zip whose
-	 * templates pass validation here will also be discoverable post-install.
-	 *
-	 * @param string $dir The directory to walk
-	 *
-	 * @return string[]
-	 *
-	 * @since 6.14.3
-	 */
-	protected function find_template_files( $dir ) {
-		if ( ! is_dir( $dir ) ) {
-			return [];
-		}
-
-		$iterator = new CallbackFilterIterator(
-			new FilesystemIterator( $dir, FilesystemIterator::SKIP_DOTS ),
-			static function ( $file ) {
-				return $file->isFile() && strtolower( $file->getExtension() ) === 'php';
-			}
-		);
-
-		$files = [];
-		foreach ( $iterator as $file ) {
-			$files[] = $file->getPathname();
-		}
-
-		return $files;
-	}
-
 	/**
 	 * Extracts the zip file, checks there are valid PDF template files found and retrieves information about them
 	 *
@@ -395,8 +357,10 @@ public function unzip_and_verify_templates( $zip_path ) {
 			throw new Exception( esc_html( $results->get_error_message() ) );
 		}
 
-		/* Check unzipped templates for a valid v4 header, or v3 string pattern */
-		$files = $this->find_template_files( $dir );
+		/* Check unzipped templates for a valid v4 header, or v3 string pattern.
+		   Avoid glob() here — it can return a stale (empty) listing when called
+		   immediately after unzip_file() writes via the WP_Filesystem abstraction */
+		$files = $this->templates->get_all_templates_in_folder( $dir );
 
 		if ( ! is_array( $files ) || count( $files ) === 0 ) {
 			throw new Exception( esc_html__( 'No valid PDF template found in Zip archive.', 'gravity-pdf' ) );
diff --git a/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js b/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js
index 90c86122e..bb328ca6e 100644
--- a/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js
+++ b/src/assets/js/react/components/FontManager/AddUpdateFontFooter.js
@@ -11,6 +11,7 @@ import {
 	deleteFont as deleteFontAction,
 } from '../../actions/fontManager';
 import TemplateTooltip from './TemplateTooltip';
+import { getTabLocation } from '../../utilities/FontManager/getTabLocation';
 
 /**
  * @package			Gravity PDF
@@ -166,11 +167,8 @@ export class AddUpdateFontFooter extends Component {
 		);
 		const selectedBoxStyle =
 			id !== '' && id === selectedFont ? ' checked' : ' uncheck';
-		/* The select-default-font tick has no meaning on the Tools tab (no parent font dropdown) */
-		const tabLocation = window.location.search.substr(
-			window.location.search.lastIndexOf('=') + 1
-		);
-		const hideSelectFontButton = tabLocation === 'tools';
+		/* No parent font dropdown on the Tools tab, so the tick has no target */
+		const hideSelectFontButton = getTabLocation() === 'tools';
 		/* Display error message for uploading invalid font file */
 		const displayInvalidFileErrorMessage =
 			errorAddFont && errorFontValidation;
diff --git a/src/assets/js/react/components/FontManager/FontListItems.js b/src/assets/js/react/components/FontManager/FontListItems.js
index 226adf02a..9bedd1a2e 100644
--- a/src/assets/js/react/components/FontManager/FontListItems.js
+++ b/src/assets/js/react/components/FontManager/FontListItems.js
@@ -14,6 +14,7 @@ import FontListIcon from './FontListIcon';
 import Spinner from '../Spinner';
 /* Utilities */
 import { toggleUpdateFont } from '../../utilities/FontManager/toggleUpdateFont';
+import { getTabLocation } from '../../utilities/FontManager/getTabLocation';
 
 /**
  * @package			Gravity PDF
@@ -132,9 +133,7 @@ export class FontListItems extends Component {
 	 * @since 6.0
 	 */
 	handleDisableSelectFields = () => {
-		const tabLocation = window.location.search.substr(
-			window.location.search.lastIndexOf('=') + 1
-		);
+		const tabLocation = getTabLocation();
 
 		if (tabLocation === 'tools') {
 			return this.setState({ disableSelectFontName: true });
diff --git a/src/assets/js/react/components/FontManager/FontManager.js b/src/assets/js/react/components/FontManager/FontManager.js
index c4aed8c4b..db0d128ee 100644
--- a/src/assets/js/react/components/FontManager/FontManager.js
+++ b/src/assets/js/react/components/FontManager/FontManager.js
@@ -6,6 +6,7 @@ import FontManagerHeader from './FontManagerHeader';
 import FontManagerBody from './FontManagerBody';
 import { connect } from 'react-redux';
 import { associatedFontManagerSelectBox } from '../../utilities/FontManager/associatedFontManagerSelectBox';
+import { getTabLocation } from '../../utilities/FontManager/getTabLocation';
 
 /**
  * @package     Gravity PDF
@@ -72,12 +73,8 @@ export class FontManager extends Component {
 		document.removeEventListener('focus', this.handleFocus, true);
 
 		const { fontList, selectedFont } = this.props;
-		const tabLocation = window.location.search.substring(
-			window.location.search.lastIndexOf('=') + 1
-		);
-
 		/* When closed, ensure font select box has the latest custom font data */
-		if (tabLocation !== 'tools') {
+		if (getTabLocation() !== 'tools') {
 			return associatedFontManagerSelectBox(fontList, selectedFont);
 		}
 	}
diff --git a/src/assets/js/react/utilities/FontManager/getTabLocation.js b/src/assets/js/react/utilities/FontManager/getTabLocation.js
new file mode 100644
index 000000000..507136310
--- /dev/null
+++ b/src/assets/js/react/utilities/FontManager/getTabLocation.js
@@ -0,0 +1,24 @@
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2026, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @since       6.14.3
+ */
+
+/**
+ * Return the value of the final query-string parameter (after the last `=`).
+ *
+ * Gravity Forms admin URLs put the active "tab" in different params depending
+ * on context: `subview=PDF` on the global settings page, `tab=tools` on the
+ * Tools tab, and a form id at the end of form-level PDF settings. Reading the
+ * value after the last `=` mirrors that order-dependent convention so callers
+ * can distinguish global vs form vs Tools without parsing each variant.
+ *
+ * @return {string} the trailing parameter value, or '' when the URL has no query string
+ */
+export function getTabLocation() {
+	const { search } = window.location;
+	const lastEquals = search.lastIndexOf('=');
+
+	return lastEquals === -1 ? '' : search.substring(lastEquals + 1);
+}
diff --git a/src/assets/scss/Component/_template-manager.scss b/src/assets/scss/Component/_template-manager.scss
index b49bd7e7f..4e937490c 100644
--- a/src/assets/scss/Component/_template-manager.scss
+++ b/src/assets/scss/Component/_template-manager.scss
@@ -26,8 +26,6 @@
           display: block;
         }
 
-        /* Without border-box the 24px horizontal padding overflows the
-           20% / 60% / 20% positioning and shifts the hover label off-centre */
         .more-details {
           box-sizing: border-box;
         }
diff --git a/tests/phpunit/unit-tests/test-templates.php b/tests/phpunit/unit-tests/test-templates.php
index 4f035c1c5..9441a2acf 100644
--- a/tests/phpunit/unit-tests/test-templates.php
+++ b/tests/phpunit/unit-tests/test-templates.php
@@ -228,19 +228,12 @@ public function provider_get_unzipped_dir_name() {
 	public function test_unzip_and_verify_templates() {
 		global $gfpdf;
 
-		/* Use a unique archive name so leftover state from earlier (or interrupted)
-		   runs cannot pollute the path the unzip extracts into */
+		/* uniqid() prevents collisions with state leaked from earlier runs */
 		$test_file = $gfpdf->data->template_tmp_location . 'test-archive-' . uniqid() . '.zip';
 		$test_dir  = $this->model->get_unzipped_dir_name( $test_file );
 
-		/* Make sure no stale state at $test_dir is present and that the template
-		   transient cache cannot return a cached "Legacy" group for the unzipped
-		   files (any prior call to get_template_info_by_path() with the same path
-		   would otherwise short-circuit the v4 header check) */
-		if ( file_exists( $test_file ) ) {
-			unlink( $test_file );
-		}
-		$gfpdf->misc->rmdir( $test_dir );
+		/* A cached "Legacy" group for the unzipped path would short-circuit the
+		   v4 header check and falsely throw "not a valid PDF Template" */
 		$gfpdf->templates->flush_template_transient_cache();
 
 		try {
@@ -303,8 +296,6 @@ public function test_unzip_and_verify_templates() {
 
 			$this->assertStringContainsString( 'contains invalid characters.', $e->getMessage() );
 		} finally {
-			/* Cleanup runs even if an assertion fails mid-test so we don't leak
-			   filesystem state into subsequent tests in the suite */
 			if ( file_exists( $test_file ) ) {
 				unlink( $test_file );
 			}

From 6c443b30dddb03074baae5a20e6a08bc7139d9a9 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:12:10 +1000
Subject: [PATCH 09/20] fix: switch to \GFForms::$version to address backwards
 version_compare() check

---
 src/Helper/Helper_Form.php                      |  3 ++-
 src/Helper/Helper_PDF_List_Table.php            |  5 +++--
 src/Model/Model_Form_Settings.php               |  4 ++--
 src/bootstrap.php                               | 13 ++++++-------
 tests/phpunit/unit-tests/test-gravity-forms.php |  3 ++-
 tests/phpunit/unit-tests/test-pre-checks.php    |  4 ++--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Helper/Helper_Form.php b/src/Helper/Helper_Form.php
index 1337dbe66..ab55b28e5 100644
--- a/src/Helper/Helper_Form.php
+++ b/src/Helper/Helper_Form.php
@@ -4,6 +4,7 @@
 
 use GFAPI;
 use GFCommon;
+use GFForms;
 use GFFormsModel;
 use WP_Error;
 
@@ -33,7 +34,7 @@ class Helper_Form extends Helper_Abstract_Form {
 	 * @since 4.0
 	 */
 	public function get_version() {
-		return \GFForms::$version;
+		return GFForms::$version;
 	}
 
 	/**
diff --git a/src/Helper/Helper_PDF_List_Table.php b/src/Helper/Helper_PDF_List_Table.php
index 3585caf5f..b1da4a4aa 100644
--- a/src/Helper/Helper_PDF_List_Table.php
+++ b/src/Helper/Helper_PDF_List_Table.php
@@ -2,6 +2,7 @@
 
 namespace GFPDF\Helper;
 
+use GFForms;
 use WP_List_Table;
 
 /**
@@ -223,7 +224,7 @@ public function column_cb( $item ) {
 			$text  = __( 'Inactive', 'gravity-pdf' );
 		}
 
-		$gf_less_than_288 = version_compare( \GFForms::$version, '2.8.8', '<' );
+		$gf_less_than_288 = version_compare( GFForms::$version, '2.8.8', '<' );
 
 		?>
 
@@ -290,7 +291,7 @@ public function column_shortcode( $item ) {
 
 		ob_start();
 		/* If the current GF version is 2.6 or higher, use the new updated UI for the shortcode button or else use the pre GF 2.5 version. */
-		if ( version_compare( '2.6-rc-1', \GFForms::$version, '<=' ) ):
+		if ( version_compare( GFForms::$version, '2.6.0', '>=' ) ):
 			?>
 			<button type="button"
 					class="gform-button gform-button--size-r gform-button--white gform-button--icon-leading gform-embed-form__shortcode-trigger btn-shortcode"
diff --git a/src/Model/Model_Form_Settings.php b/src/Model/Model_Form_Settings.php
index 09548796a..cfe6a0425 100644
--- a/src/Model/Model_Form_Settings.php
+++ b/src/Model/Model_Form_Settings.php
@@ -2,8 +2,8 @@
 
 namespace GFPDF\Model;
 
+use GFForms;
 use GFFormsModel;
-use GFCommon;
 use GFPDF\Helper\Helper_Abstract_Form;
 use GFPDF\Helper\Helper_Abstract_Model;
 use GFPDF\Helper\Helper_Abstract_Options;
@@ -225,7 +225,7 @@ public function show_edit_view( $form_id, $pdf_id ) {
 
 		/* add custom classes to form */
 		$form_classes = '';
-		if ( version_compare( '2.6-rc-1', \GFForms::$version, '<=' ) ) {
+		if ( version_compare( GFForms::$version, '2.6.0', '>=' ) ) {
 			$form_classes .= 'gfpdf-gf-2-6';
 		}
 
diff --git a/src/bootstrap.php b/src/bootstrap.php
index 05f3fb624..8e0ff0ce2 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -3,8 +3,7 @@
 namespace GFPDF;
 
 use GFCommon;
-use GFPDF\Controller;
-use GFPDF\Helper;
+use GFForms;
 use GFPDF\Helper\Helper_Data;
 use GFPDF\Helper\Helper_Form;
 use GFPDF\Helper\Helper_Misc;
@@ -12,10 +11,10 @@
 use GFPDF\Helper\Helper_Options_Fields;
 use GFPDF\Helper\Helper_Singleton;
 use GFPDF\Helper\Helper_Templates;
-use GFPDF\Model;
-use GFPDF\View;
 use GFPDF_Core;
 use GFPDF_Major_Compatibility_Checks;
+use GPDFAPI;
+use Gravity_Forms\Gravity_Forms\Async\GF_Background_Process;
 use Psr\Log\LoggerInterface;
 
 /*
@@ -209,13 +208,13 @@ public function init() {
 		);
 
 		/* Load Background Queue classes */
-		if ( version_compare( \GFForms::$version, '2.9.7.2', '>=' ) ) {
+		if ( version_compare( GFForms::$version, '2.9.7.2', '>=' ) ) {
 			if ( ! class_exists( '\Gravity_Forms\Gravity_Forms\Async\GF_Background_Process' ) ) {
 				require_once GFCommon::get_base_path() . '/includes/async/class-gf-background-process.php';
 			}
 
 			if ( ! class_exists( 'GF_Background_Process' ) ) {
-				class_alias( \Gravity_Forms\Gravity_Forms\Async\GF_Background_Process::class, 'GF_Background_Process', false );
+				class_alias( GF_Background_Process::class, 'GF_Background_Process', false );
 			}
 		} elseif ( ! class_exists( 'WP_Async_Request' ) ) {
 				require_once GFCommon::get_base_path() . '/includes/libraries/wp-async-request.php';
@@ -1006,7 +1005,7 @@ public function async_pdfs() {
 		 */
 		$gfpdf_settings_sanitize = function ( $new_value, $key ) use ( $queue ) {
 			if ( $key === 'background_processing' ) {
-				$current_value = \GPDFAPI::get_plugin_option( 'background_processing' );
+				$current_value = GPDFAPI::get_plugin_option( 'background_processing' );
 				if ( $current_value !== $new_value ) {
 					$queue->clear_queue();
 				}
diff --git a/tests/phpunit/unit-tests/test-gravity-forms.php b/tests/phpunit/unit-tests/test-gravity-forms.php
index 85fefc868..4d48ba0b9 100644
--- a/tests/phpunit/unit-tests/test-gravity-forms.php
+++ b/tests/phpunit/unit-tests/test-gravity-forms.php
@@ -3,6 +3,7 @@
 namespace GFPDF\Tests;
 
 use GFCommon;
+use GFForms;
 use GFFormsModel;
 use PDF_Common;
 use RGFormsModel;
@@ -498,7 +499,7 @@ public function provider_ip_testing() {
 	 * @since 3.6
 	 */
 	public function test_gf_version() {
-		$version = \GFForms::$version;
+		$version = GFForms::$version;
 
 		/* which the version number is a string before we try to match it */
 		$this->assertEquals( true, is_string( $version ) );
diff --git a/tests/phpunit/unit-tests/test-pre-checks.php b/tests/phpunit/unit-tests/test-pre-checks.php
index dc19a13b1..44ac1e07d 100644
--- a/tests/phpunit/unit-tests/test-pre-checks.php
+++ b/tests/phpunit/unit-tests/test-pre-checks.php
@@ -2,7 +2,7 @@
 
 namespace GFPDF\Tests;
 
-use GFCommon;
+use GFForms;
 use GFPDF_Major_Compatibility_Checks;
 use WP_UnitTestCase;
 
@@ -106,7 +106,7 @@ public function test_check_wordpress( $min_version, $test_wp_version, $expected
 	 */
 	public function test_check_gravityforms( $min_version, $test_gf_version, $expected ) {
 		/* set up our current Gravity Forms version and the min version */
-		\GFForms::$version                     = $test_gf_version;
+		GFForms::$version                      = $test_gf_version;
 		$this->gravitypdf->required_gf_version = $min_version;
 
 		/* run our test */

From 154c29bbc9ff63fb1f5bd8a5b1a9d523d18ec493 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:12:10 +1000
Subject: [PATCH 10/20] fix: TinyMCE editor destroy/reload process on template
 swap

---
 .../loadTinyMCEEditor.js                      | 23 ++++++++-----------
 .../common/setupDynamicTemplateFields.js      |  7 ++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js b/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js
index 88c50afdd..91d847b21 100644
--- a/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js
+++ b/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js
@@ -1,9 +1,7 @@
-import $ from 'jquery';
-
 /**
  * Initialises AJAX-loaded wp_editor TinyMCE containers for use
- * @param { Array<Object> } editors  The DOM element IDs to parse
- * @param { Object }        settings The TinyMCE settings to use
+ * @param { Array<string> }          editors  The DOM element IDs to parse
+ * @param { Record<string, unknown> } settings The TinyMCE settings to use
  *
  * @since  4.0
  */
@@ -41,7 +39,7 @@ export function loadTinyMCEEditor(editors, settings) {
 	}
 
 	/* Load our new editors */
-	$.each(editors, function (index, fullId) {
+	editors.forEach(function (fullId) {
 		/* Setup out selector */
 		settings.selector = '#' + fullId;
 
@@ -57,14 +55,13 @@ export function loadTinyMCEEditor(editors, settings) {
 			QTags._buttonsInit();
 
 			/* remember last tab selected */
-			if (typeof switchEditors.switchto === 'function') {
-				switchEditors.switchto(
-					jQuery('#wp-' + fullId + '-wrap').find(
-						'.wp-switch-editor.switch-' +
-							(getUserSetting('editor') === 'html'
-								? 'html'
-								: 'tmce')
-					)[0]
+			if (
+				typeof switchEditors !== 'undefined' &&
+				typeof switchEditors.go === 'function'
+			) {
+				switchEditors.go(
+					fullId,
+					getUserSetting('editor') === 'html' ? 'html' : 'tmce'
 				);
 			}
 		}
diff --git a/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js b/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
index 9a1c0d3d9..1f2b7ac4f 100644
--- a/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
+++ b/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
@@ -52,7 +52,7 @@ export function setupDynamicTemplateFields() {
 						if (editor !== null) {
 							/* Bug Fix for Firefox - http://www.tinymce.com/develop/bugtracker_view.php?id=3152 */
 							try {
-								tinyMCE.remove(editor);
+								tinyMCE.remove('#' + value);
 							} catch (e) {
 								// empty
 							}
@@ -78,7 +78,10 @@ export function setupDynamicTemplateFields() {
 						.html(response.fields);
 
 					/* Load our new editors */
-					loadTinyMCEEditor(response.editors, response.editor_init);
+					loadTinyMCEEditor(
+						response.editors ?? [],
+						response.editor_init ?? {}
+					);
 
 					/* reinitialise new dom elements */
 					initialiseCommonElements.runElements();

From 2e387783c93220d1fd55b781b44dd29cffe0a7f5 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:12:10 +1000
Subject: [PATCH 11/20] refactor: remove unnecessary GFCache check in
 Helper_Abstract_Fields

---
 src/Helper/Helper_Abstract_Fields.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Helper/Helper_Abstract_Fields.php b/src/Helper/Helper_Abstract_Fields.php
index dc9844187..d7c533446 100644
--- a/src/Helper/Helper_Abstract_Fields.php
+++ b/src/Helper/Helper_Abstract_Fields.php
@@ -4,8 +4,6 @@
 
 use Exception;
 use GF_Field;
-use GFCache;
-use GFCommon;
 use GFFormsModel;
 use GFPDF\Statics\Kses;
 
@@ -232,20 +230,6 @@ final public function remove_cache() {
 	 */
 	final public function get_value() {
 
-		/**
-		 * Gravity Forms' GFCache function was thrashing the database, causing double the amount of time for the field_value() method to run.
-		 * The reason is that the cache was checking against a field value stored in a transient every time `GFFormsModel::get_lead_field_value()` is called.
-		 * We're forcing the cache to skip the extra database lookup and just get the value.
-		 *
-		 * @hack
-		 * @since  4.0
-		 * @credit Zack Katz (Gravity View author)
-		 * @fixed  Gravity Forms 1.9.13.25
-		 */
-		if ( class_exists( 'GFCache' ) && version_compare( \GFForms::$version, '1.9.13.25', '<' ) ) {
-			GFCache::set( 'GFFormsModel::get_lead_field_value_' . $this->entry['id'] . '_' . $this->field->id, false, false, 0 );
-		}
-
 		/*
 		 * Get the Gravity Forms field value
 		 *

From 95b56d2cb77c6c300907a8861faa5a5386f18dc6 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:12:31 +1000
Subject: [PATCH 12/20] fix: preserve unsaved edits when switching PDF
 templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changing the Template dropdown on a form-level PDF settings page wipes
the user's in-progress edits because the entire template-fields section
is replaced via AJAX with server-rendered markup based on saved values.

Snapshot every input inside the template fieldset before the request
fires, then re-apply matching values to the new HTML before TinyMCE and
wpColorPicker are re-initialised on top of it. Snapshot entries that no
longer match a field in the new template are silently dropped — the new
template doesn't surface them. Restored checkbox/radio toggles dispatch
`change` so dependent conditional panels driven by setupToggledFields
settle into the right state.

The snapshot/restore pair lives in its own formValuesSnapshot module so
it can be unit-tested against a real jQuery + JSDOM environment. Two
non-obvious cases worth flagging:

1. `.gfpdf-input-toggle` checkboxes (the First Page Header / First Page
   Footer toggles) have no `name` attribute, so a named-input scan
   silently drops them. They're snapshotted keyed by the name of the
   textarea inside the container they show/hide — a stable identity
   across HTML swaps — and restored via the same lookup, firing
   `change` so setupToggledFields slides the container correctly.

2. When a TinyMCE editor is in Code/Text mode the editor body has stale
   content and the textarea holds the live edits. The snapshot checks
   `editor.hidden` and reads the textarea in Code mode.

Also fixes a real bug surfaced by the test suite: jQuery's `:button`
pseudo doesn't match input[type=submit] or input[type=reset], so the
guard spells out `:button, :submit, :reset, [type=file]`.

20 Jest tests cover text/number/select/textarea/radio/checkbox, TinyMCE
Visual + Code modes, nameless toggle round-trip, template dropdown
exclusion, button/submit/reset/file skipping, and a full snapshot →
swap → restore integration case.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../formValuesSnapshot.js                     | 138 +++++++
 .../common/setupDynamicTemplateFields.js      |  32 +-
 .../formValuesSnapshot.test.js                | 361 ++++++++++++++++++
 3 files changed, 521 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.js
 create mode 100644 tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js

diff --git a/src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.js b/src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.js
new file mode 100644
index 000000000..1cc1ed826
--- /dev/null
+++ b/src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.js
@@ -0,0 +1,138 @@
+import $ from 'jquery';
+
+export const TEMPLATE_SECTION_SELECTOR =
+	'#gfpdf-fieldset-gfpdf_form_settings_template';
+export const TEMPLATE_DROPDOWN_SELECTOR = '#gfpdf_settings\\[template\\]';
+
+/**
+ * Capture every recoverable user input inside $container. Returns a flat
+ * array of entries discriminated by `kind`:
+ *
+ *   { kind: 'input',  name, value, checked? }
+ *   { kind: 'toggle', controls, checked }
+ *
+ * For TinyMCE-backed textareas the editor's live content is used when the
+ * editor is in Visual mode (`editor.hidden === false`). In Code mode the
+ * textarea itself holds the live edits, so the editor body is ignored.
+ *
+ * `.gfpdf-input-toggle` controls (the First Page Header/Footer toggles)
+ * have no `name` attribute, so they're keyed by the name of the textarea
+ * inside the container they show/hide — a stable identity across the
+ * AJAX-driven HTML swap.
+ *
+ * @param {jQuery} $container
+ * @return {Array<object>} Snapshot entries keyed by name/controls.
+ */
+export function snapshotFormValues($container) {
+	const entries = [];
+
+	$container
+		.find(':input')
+		.not(TEMPLATE_DROPDOWN_SELECTOR)
+		.each(function () {
+			const $el = $(this);
+			const name = $el.attr('name');
+			if (!name || $el.is(':button, :submit, :reset, [type=file]')) {
+				return;
+			}
+
+			if ($el.is(':checkbox') || $el.is(':radio')) {
+				entries.push({
+					kind: 'input',
+					name,
+					value: $el.val(),
+					checked: $el.prop('checked'),
+				});
+				return;
+			}
+
+			const id = $el.attr('id');
+			if ($el.is('textarea') && id && typeof tinyMCE !== 'undefined') {
+				const editor = tinyMCE.get(id);
+				if (editor && !editor.hidden) {
+					entries.push({
+						kind: 'input',
+						name,
+						value: editor.getContent(),
+					});
+					return;
+				}
+			}
+
+			entries.push({ kind: 'input', name, value: $el.val() });
+		});
+
+	$container.find('.gfpdf-input-toggle').each(function () {
+		const $toggle = $(this);
+		const controlsName = $toggle
+			.parent()
+			.next()
+			.find('textarea')
+			.first()
+			.attr('name');
+		if (!controlsName) {
+			return;
+		}
+		entries.push({
+			kind: 'toggle',
+			controls: controlsName,
+			checked: $toggle.prop('checked'),
+		});
+	});
+
+	return entries;
+}
+
+/**
+ * Re-apply a snapshot captured by snapshotFormValues() to whatever fields
+ * still exist after the template section's HTML was swapped. Snapshot
+ * entries with no match in the new HTML are silently dropped.
+ *
+ * Restoring a checkbox/radio (or toggle) fires `change` so dependent UI
+ * driven by `setupToggledFields` slides its conditional panel into the
+ * right state.
+ *
+ * @param {jQuery}        $container
+ * @param {Array<object>} snapshot   see snapshotFormValues
+ */
+export function restoreFormValues($container, snapshot) {
+	snapshot.forEach(function (item) {
+		if (item.kind === 'toggle') {
+			const $toggle = $container
+				.find('.gfpdf-input-toggle')
+				.filter(function () {
+					return (
+						$(this)
+							.parent()
+							.next()
+							.find('textarea')
+							.first()
+							.attr('name') === item.controls
+					);
+				});
+			if (!$toggle.length || $toggle.prop('checked') === item.checked) {
+				return;
+			}
+			$toggle.prop('checked', item.checked).trigger('change');
+			return;
+		}
+
+		const $matches = $container.find(':input[name="' + item.name + '"]');
+		if (!$matches.length) {
+			return;
+		}
+
+		if (typeof item.checked === 'boolean') {
+			const $target = $matches.filter(function () {
+				return $(this).val() === item.value;
+			});
+			if (!$target.length || $target.prop('checked') === item.checked) {
+				return;
+			}
+			$target.prop('checked', item.checked).trigger('change');
+			return;
+		}
+
+		$matches.first().val(item.value);
+	});
+}
diff --git a/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js b/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
index 1f2b7ac4f..2dd3aa1d9 100644
--- a/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
+++ b/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
@@ -7,6 +7,12 @@ import { doMergetags } from './dynamicTemplateFields/doMergetags';
 import { toggleFontAppearance } from '../pdf/toggleFontAppearance';
 import { insertAfter } from '../../../react/utilities/PdfSettings/actionToolbar';
 import { handleMergeTags } from './handleMergeTags';
+import {
+	snapshotFormValues,
+	restoreFormValues,
+	TEMPLATE_SECTION_SELECTOR,
+	TEMPLATE_DROPDOWN_SELECTOR,
+} from './dynamicTemplateFields/formValuesSnapshot';
 
 /**
  * PDF Templates can assign their own custom settings which can enhance a template
@@ -16,7 +22,7 @@ import { handleMergeTags } from './handleMergeTags';
  */
 export function setupDynamicTemplateFields() {
 	/* Add change listener to our template */
-	$('#gfpdf_settings\\[template\\]')
+	$(TEMPLATE_DROPDOWN_SELECTOR)
 		.off('change')
 		.on('change', function () {
 			/* Add spinner */
@@ -24,6 +30,10 @@ export function setupDynamicTemplateFields() {
 
 			$(this).next().after($spinner);
 
+			const formValuesSnapshot = snapshotFormValues(
+				$(TEMPLATE_SECTION_SELECTOR)
+			);
+
 			const data = {
 				action: 'gfpdf_get_template_fields',
 				nonce: GFPDF.ajaxNonce,
@@ -62,21 +72,25 @@ export function setupDynamicTemplateFields() {
 					/* Add action toolbar after template section */
 					if (!actionToolbar) {
 						insertAfter(
-							$(
-								'#gfpdf-fieldset-gfpdf_form_settings_template'
-							)[0],
+							$(TEMPLATE_SECTION_SELECTOR)[0],
 							$('#gfpdf_pdf_form')[0],
 							'2',
 							true
 						);
 					}
 
+					const $templateSection = $(
+						TEMPLATE_SECTION_SELECTOR
+					).show();
+
 					/* Replace the custom appearance with the AJAX response fields */
-					$('#gfpdf-fieldset-gfpdf_form_settings_template')
-						.show()
+					$templateSection
 						.find('.gform-settings-panel__content')
 						.html(response.fields);
 
+					/* Restore before re-init so TinyMCE/wpColorPicker mount over restored values */
+					restoreFormValues($templateSection, formValuesSnapshot);
+
 					/* Load our new editors */
 					loadTinyMCEEditor(
 						response.editors ?? [],
@@ -86,9 +100,7 @@ export function setupDynamicTemplateFields() {
 					/* reinitialise new dom elements */
 					initialiseCommonElements.runElements();
 					doMergetags();
-					handleMergeTags(
-						'#gfpdf-fieldset-gfpdf_form_settings_template'
-					);
+					handleMergeTags(TEMPLATE_SECTION_SELECTOR);
 					gform_initialize_tooltips();
 				} else {
 					/* Remove floating action toolbar */
@@ -97,7 +109,7 @@ export function setupDynamicTemplateFields() {
 					}
 
 					/* Hide our template nav item as there are no fields and clear our the HTML */
-					$('#gfpdf-fieldset-gfpdf_form_settings_template')
+					$(TEMPLATE_SECTION_SELECTOR)
 						.hide()
 						.find('.gform-settings-panel__content')
 						.html('');
diff --git a/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js b/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js
new file mode 100644
index 000000000..c4003df65
--- /dev/null
+++ b/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js
@@ -0,0 +1,361 @@
+import $ from 'jquery'
+import {
+  snapshotFormValues,
+  restoreFormValues
+} from '../../../../../../src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot'
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2026, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @since       6.14.3
+ */
+
+/* Build a jQuery-wrapped container from raw HTML for use as $container */
+function mountContainer (html) {
+  const $container = $('<div id="test-template-section"></div>').html(html)
+  $('body').append($container)
+  return $container
+}
+
+describe('formValuesSnapshot helpers', () => {
+  afterEach(() => {
+    $('body').empty()
+    delete window.tinyMCE
+  })
+
+  describe('snapshotFormValues', () => {
+    it('captures values from text, textarea, and select inputs', () => {
+      const $container = mountContainer(`
+        <input type="text"     name="gfpdf_settings[background_color]" value="#ff0000" />
+        <input type="text"     name="gfpdf_settings[background_image]" value="/path/to/image.png" />
+        <textarea              name="gfpdf_settings[notes]">Hello world</textarea>
+        <select                name="gfpdf_settings[font_size]">
+          <option value="10">10</option>
+          <option value="12" selected>12</option>
+        </select>
+      `)
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#ff0000' },
+        { kind: 'input', name: 'gfpdf_settings[background_image]', value: '/path/to/image.png' },
+        { kind: 'input', name: 'gfpdf_settings[notes]', value: 'Hello world' },
+        { kind: 'input', name: 'gfpdf_settings[font_size]', value: '12' }
+      ])
+    })
+
+    it('captures checked + value for checkboxes and radios', () => {
+      const $container = mountContainer(`
+        <input type="checkbox" name="gfpdf_settings[show_form_title]"  value="Yes" checked />
+        <input type="checkbox" name="gfpdf_settings[show_page_names]"  value="Yes" />
+        <input type="radio"    name="gfpdf_settings[orientation]"      value="portrait"  checked />
+        <input type="radio"    name="gfpdf_settings[orientation]"      value="landscape" />
+      `)
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: true },
+        { kind: 'input', name: 'gfpdf_settings[show_page_names]', value: 'Yes', checked: false },
+        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'portrait', checked: true },
+        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'landscape', checked: false }
+      ])
+    })
+
+    it('prefers live TinyMCE content when the editor is in Visual mode', () => {
+      const $container = mountContainer(`
+        <textarea id="gfpdf_settings_header" name="gfpdf_settings[header]">stale textarea body</textarea>
+      `)
+
+      window.tinyMCE = {
+        get: jest.fn((id) => {
+          if (id !== 'gfpdf_settings_header') return null
+          return { hidden: false, getContent: () => '<p>live editor body</p>' }
+        })
+      }
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[header]', value: '<p>live editor body</p>' }
+      ])
+    })
+
+    it('reads textarea value when the TinyMCE editor is in Code mode (hidden=true)', () => {
+      const $container = mountContainer(`
+        <textarea id="gfpdf_settings_footer" name="gfpdf_settings[footer]">live code-mode body</textarea>
+      `)
+
+      window.tinyMCE = {
+        get: jest.fn(() => ({ hidden: true, getContent: () => 'stale editor html' }))
+      }
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[footer]', value: 'live code-mode body' }
+      ])
+    })
+
+    it('falls back to textarea value when TinyMCE has no editor for that id', () => {
+      const $container = mountContainer(`
+        <textarea id="gfpdf_settings_footer" name="gfpdf_settings[footer]">raw textarea body</textarea>
+      `)
+
+      window.tinyMCE = { get: jest.fn(() => null) }
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[footer]', value: 'raw textarea body' }
+      ])
+    })
+
+    it('falls back to textarea value when TinyMCE is undefined', () => {
+      const $container = mountContainer(`
+        <textarea id="gfpdf_settings_header" name="gfpdf_settings[header]">no tinyMCE</textarea>
+      `)
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[header]', value: 'no tinyMCE' }
+      ])
+    })
+
+    it('captures .gfpdf-input-toggle state keyed by the textarea it controls', () => {
+      const $container = mountContainer(`
+        <label><input type="checkbox" class="gfpdf-input-toggle" checked /> First Page Header</label>
+        <div class="gfpdf-toggle-wrapper">
+          <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]">first header body</textarea>
+        </div>
+        <label><input type="checkbox" class="gfpdf-input-toggle" /> First Page Footer</label>
+        <div class="gfpdf-toggle-wrapper" style="display:none">
+          <textarea id="gfpdf_settings_first_footer" name="gfpdf_settings[first_footer]">first footer body</textarea>
+        </div>
+      `)
+
+      const snapshot = snapshotFormValues($container)
+      const toggleEntries = snapshot.filter(e => e.kind === 'toggle')
+
+      expect(toggleEntries).toEqual([
+        { kind: 'toggle', controls: 'gfpdf_settings[first_header]', checked: true },
+        { kind: 'toggle', controls: 'gfpdf_settings[first_footer]', checked: false }
+      ])
+    })
+
+    it('skips the template dropdown so the new (post-change) value is not captured', () => {
+      const $container = mountContainer(`
+        <select id="gfpdf_settings[template]" name="gfpdf_settings[template]">
+          <option value="zadani" selected>zadani</option>
+          <option value="rubix">rubix</option>
+        </select>
+        <input type="text" name="gfpdf_settings[background_color]" value="#000" />
+      `)
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#000' }
+      ])
+    })
+
+    it('skips buttons, submits, and file inputs', () => {
+      const $container = mountContainer(`
+        <input type="text"   name="gfpdf_settings[real_field]" value="kept" />
+        <input type="submit" name="gfpdf_settings[submit]"     value="Save" />
+        <input type="button" name="gfpdf_settings[btn]"        value="Click" />
+        <input type="reset"  name="gfpdf_settings[clear]"      value="Reset" />
+        <input type="file"   name="gfpdf_settings[upload]" />
+        <button              name="gfpdf_settings[plain]">Click</button>
+      `)
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[real_field]', value: 'kept' }
+      ])
+    })
+
+    it('skips inputs without a name attribute', () => {
+      const $container = mountContainer(`
+        <input type="text" value="anonymous" />
+        <input type="text" name="gfpdf_settings[named]" value="kept" />
+      `)
+
+      expect(snapshotFormValues($container)).toEqual([
+        { kind: 'input', name: 'gfpdf_settings[named]', value: 'kept' }
+      ])
+    })
+  })
+
+  describe('restoreFormValues', () => {
+    it('restores text, textarea, and select values when names match', () => {
+      const $container = mountContainer(`
+        <input type="text" name="gfpdf_settings[background_color]" value="#000" />
+        <textarea          name="gfpdf_settings[notes]">post-swap default</textarea>
+        <select            name="gfpdf_settings[font_size]">
+          <option value="10" selected>10</option>
+          <option value="12">12</option>
+        </select>
+      `)
+
+      restoreFormValues($container, [
+        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#ff0000' },
+        { kind: 'input', name: 'gfpdf_settings[notes]', value: 'restored body' },
+        { kind: 'input', name: 'gfpdf_settings[font_size]', value: '12' }
+      ])
+
+      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#ff0000')
+      expect($container.find('[name="gfpdf_settings[notes]"]').val()).toBe('restored body')
+      expect($container.find('[name="gfpdf_settings[font_size]"]').val()).toBe('12')
+    })
+
+    it('drops snapshot entries whose names no longer exist in the new HTML', () => {
+      const $container = mountContainer(`
+        <input type="text" name="gfpdf_settings[background_color]" value="#000" />
+      `)
+
+      restoreFormValues($container, [
+        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#ff0000' },
+        { kind: 'input', name: 'gfpdf_settings[zadani_border_colour]', value: '#0000ff' }
+      ])
+
+      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#ff0000')
+      expect($container.find('[name="gfpdf_settings[zadani_border_colour]"]').length).toBe(0)
+    })
+
+    it('toggles a checkbox from unchecked to checked and fires change', () => {
+      const $container = mountContainer(`
+        <input type="checkbox" name="gfpdf_settings[show_form_title]" value="Yes" />
+      `)
+
+      const onChange = jest.fn()
+      $container.find('[name="gfpdf_settings[show_form_title]"]').on('change', onChange)
+
+      restoreFormValues($container, [
+        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: true }
+      ])
+
+      expect($container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked')).toBe(true)
+      expect(onChange).toHaveBeenCalledTimes(1)
+    })
+
+    it('toggles a checkbox from checked to unchecked and fires change', () => {
+      const $container = mountContainer(`
+        <input type="checkbox" name="gfpdf_settings[show_form_title]" value="Yes" checked />
+      `)
+
+      const onChange = jest.fn()
+      $container.find('[name="gfpdf_settings[show_form_title]"]').on('change', onChange)
+
+      restoreFormValues($container, [
+        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: false }
+      ])
+
+      expect($container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked')).toBe(false)
+      expect(onChange).toHaveBeenCalledTimes(1)
+    })
+
+    it('skips checkbox change when the post-swap state already matches the snapshot', () => {
+      const $container = mountContainer(`
+        <input type="checkbox" name="gfpdf_settings[show_form_title]" value="Yes" checked />
+      `)
+
+      const onChange = jest.fn()
+      $container.find('[name="gfpdf_settings[show_form_title]"]').on('change', onChange)
+
+      restoreFormValues($container, [
+        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: true }
+      ])
+
+      expect(onChange).not.toHaveBeenCalled()
+    })
+
+    it('switches a radio group selection', () => {
+      const $container = mountContainer(`
+        <input type="radio" name="gfpdf_settings[orientation]" value="portrait"  checked />
+        <input type="radio" name="gfpdf_settings[orientation]" value="landscape" />
+      `)
+
+      restoreFormValues($container, [
+        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'portrait', checked: false },
+        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'landscape', checked: true }
+      ])
+
+      expect($container.find('[name="gfpdf_settings[orientation]"][value="portrait"]').prop('checked')).toBe(false)
+      expect($container.find('[name="gfpdf_settings[orientation]"][value="landscape"]').prop('checked')).toBe(true)
+    })
+
+    it('restores a .gfpdf-input-toggle from unchecked to checked via its controlled textarea name', () => {
+      const $container = mountContainer(`
+        <label><input type="checkbox" class="gfpdf-input-toggle" /> First Page Header</label>
+        <div class="gfpdf-toggle-wrapper" style="display:none">
+          <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]"></textarea>
+        </div>
+      `)
+
+      const onChange = jest.fn()
+      $container.find('.gfpdf-input-toggle').on('change', onChange)
+
+      restoreFormValues($container, [
+        { kind: 'toggle', controls: 'gfpdf_settings[first_header]', checked: true }
+      ])
+
+      expect($container.find('.gfpdf-input-toggle').prop('checked')).toBe(true)
+      expect(onChange).toHaveBeenCalledTimes(1)
+    })
+
+    it('skips a toggle entry whose controlled textarea no longer exists in the new HTML', () => {
+      const $container = mountContainer(`
+        <input type="text" name="gfpdf_settings[background_color]" value="#000" />
+      `)
+
+      expect(() => restoreFormValues($container, [
+        { kind: 'toggle', controls: 'gfpdf_settings[first_header]', checked: true }
+      ])).not.toThrow()
+    })
+
+    it('handles an empty snapshot without throwing', () => {
+      const $container = mountContainer(`
+        <input type="text" name="gfpdf_settings[background_color]" value="#000" />
+      `)
+
+      expect(() => restoreFormValues($container, [])).not.toThrow()
+      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#000')
+    })
+  })
+
+  describe('snapshot → swap → restore round-trip', () => {
+    it('preserves user edits across an HTML swap where field names overlap', () => {
+      const $container = mountContainer(`
+        <input type="text"     name="gfpdf_settings[background_color]" value="#ffffff" />
+        <input type="checkbox" name="gfpdf_settings[show_form_title]"  value="Yes" />
+        <textarea              name="gfpdf_settings[header]">old header body</textarea>
+        <input type="text"     name="gfpdf_settings[zadani_border_colour]" value="#000000" />
+        <label><input type="checkbox" class="gfpdf-input-toggle" /> First Page Header</label>
+        <div class="gfpdf-toggle-wrapper" style="display:none">
+          <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]"></textarea>
+        </div>
+      `)
+
+      /* User edits */
+      $container.find('[name="gfpdf_settings[background_color]"]').val('#ff0000')
+      $container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked', true)
+      $container.find('[name="gfpdf_settings[header]"]').val('NEW HEADER')
+      $container.find('[name="gfpdf_settings[zadani_border_colour]"]').val('#abcdef')
+      $container.find('.gfpdf-input-toggle').prop('checked', true)
+      $container.find('[name="gfpdf_settings[first_header]"]').val('FIRST HEADER BODY')
+
+      const snapshot = snapshotFormValues($container)
+
+      /* Swap HTML for a different template — same toggle pattern, no zadani-specific field, new rubix-specific field */
+      $container.html(`
+        <input type="text"     name="gfpdf_settings[background_color]" value="#ffffff" />
+        <input type="checkbox" name="gfpdf_settings[show_form_title]"  value="Yes" />
+        <textarea              name="gfpdf_settings[header]">default rubix header</textarea>
+        <input type="text"     name="gfpdf_settings[rubix_container_background_colour]" value="#cccccc" />
+        <label><input type="checkbox" class="gfpdf-input-toggle" /> First Page Header</label>
+        <div class="gfpdf-toggle-wrapper" style="display:none">
+          <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]">rubix default first header</textarea>
+        </div>
+      `)
+
+      restoreFormValues($container, snapshot)
+
+      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#ff0000')
+      expect($container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked')).toBe(true)
+      expect($container.find('[name="gfpdf_settings[header]"]').val()).toBe('NEW HEADER')
+      expect($container.find('.gfpdf-input-toggle').prop('checked')).toBe(true)
+      expect($container.find('[name="gfpdf_settings[first_header]"]').val()).toBe('FIRST HEADER BODY')
+      /* Rubix-specific field keeps its server-rendered default — zadani snapshot doesn't apply to it */
+      expect($container.find('[name="gfpdf_settings[rubix_container_background_colour]"]').val()).toBe('#cccccc')
+    })
+  })
+})

From 18db28a6d5dc8b065ec750a9352dd51079b748d1 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:13:34 +1000
Subject: [PATCH 13/20] docs: add 6.14.3 changelog entries for hot-patch fixes

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5f5091f2..69c14ff5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@
 ### 6.14.3
 * 🐞Bug: Preserve the selected template when setting up a new PDF on a form
 * 🐞Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
+* 🐞Bug: Preserve unsaved edits to the Template fields when switching PDF templates
+* 🐞Bug: Fix JavaScript error switching PDF templates when the editor was set to Text mode
+* 🐞Bug: Fix TinyMCE editor reload when switching PDF templates
+* 🐞Bug: Fix Gravity Forms 2.6+ version detection on PDF form-settings pages
+* 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
 * 🧹 Housekeeping: Better screen-reader support for admin pages
 * 🧹 Housekeeping: WordPress 7.0 Compatibility
 

From cc137c55708785d2c4b86bfb115a9757e9254fcd Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Mon, 18 May 2026 15:54:00 +1000
Subject: [PATCH 14/20] fix: treat non-2xx core-fonts responses as failures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The superagent → fetch migration in 890c053a swapped a client that
auto-rejected on 4xx/5xx for native fetch, which only sets
response.ok = false. The coreFonts saga still only guarded against a
falsy parsed body — and getJsonString('{}') returns a truthy empty
object, so a 400 from /wp-admin/admin-ajax.php was happily treated as
"download succeeded".

The E2E "Tools tab - Install core fonts field test failure" expected
the .gfpdf-core-font-status-error element to render after the mock
returned 400; it never appeared because the saga walked the success
branch.

Add response.ok to the guards on both saga branches (mirrors the
existing pattern in sagas/fontManager.js and sagas/templates.js) and
extend the Jest suite to lock in the non-2xx-is-a-failure behaviour.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/assets/js/react/sagas/coreFonts.js      |  7 +++++-
 tests/js-unit/react/sagas/coreFonts.test.js | 27 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/assets/js/react/sagas/coreFonts.js b/src/assets/js/react/sagas/coreFonts.js
index 8ca7063fe..e1752b923 100644
--- a/src/assets/js/react/sagas/coreFonts.js
+++ b/src/assets/js/react/sagas/coreFonts.js
@@ -29,6 +29,11 @@ import { apiGetFilesFromGitHub, apiPostDownloadFonts } from '../api/coreFonts';
 export function* getFilesFromGitHub() {
 	try {
 		const response = yield call(apiGetFilesFromGitHub);
+
+		if (!response.ok || !response.body) {
+			throw response;
+		}
+
 		yield put(getFilesFromGitHubSuccess(response.body));
 	} catch (error) {
 		yield put(getFilesFromGitHubFailed(GFPDF.coreFontGithubError));
@@ -71,7 +76,7 @@ export function* getDownloadFonts(chan) {
 		try {
 			const response = yield call(apiPostDownloadFonts, payload);
 
-			if (!response.body) {
+			if (!response.ok || !response.body) {
 				throw response;
 			}
 
diff --git a/tests/js-unit/react/sagas/coreFonts.test.js b/tests/js-unit/react/sagas/coreFonts.test.js
index 69d3a2fbe..ed3ee90db 100644
--- a/tests/js-unit/react/sagas/coreFonts.test.js
+++ b/tests/js-unit/react/sagas/coreFonts.test.js
@@ -43,6 +43,17 @@ describe('Sagas - coreFonts', () => {
 				})
 			);
 		});
+
+		test('should treat a non-2xx fetch response as a failure even though fetch did not throw', () => {
+			const failingGen = getFilesFromGitHub();
+			failingGen.next();
+			expect(failingGen.next({ ok: false, body: {} }).value).toEqual(
+				put({
+					type: GET_FILES_FROM_GITHUB_FAILED,
+					payload: GFPDF.coreFontGithubError,
+				})
+			);
+		});
 	});
 
 	describe('watchDownloadFonts()', () => {
@@ -92,5 +103,21 @@ describe('Sagas - coreFonts', () => {
 		test('should pass to redux store', () => {
 			expect(gen.next().value).toEqual(put(currentDownload()));
 		});
+
+		test('should treat a non-2xx fetch response as a failure even though fetch did not throw', () => {
+			const failingGen = getDownloadFonts(channel);
+			const failingPayload = downloadFontsApiCall('test2.ttf');
+
+			failingGen.next();
+			failingGen.next(failingPayload);
+			failingGen.next();
+
+			expect(failingGen.next({ ok: false, body: {} }).value).toEqual(
+				put(addToConsole(failingPayload, 'error', '[object Object]'))
+			);
+			expect(failingGen.next().value).toEqual(
+				put(addToRetryList(failingPayload))
+			);
+		});
 	});
 });

From a36441375167d3d6d0ae14c9f2ca19bc8de7adc9 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 06:29:18 +1000
Subject: [PATCH 15/20] test: cover templateUploadProcessing success path and
 full form-field round-trip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a success-path case for the templateUploadProcessing saga (only the
two failure branches and the thrown-error case were exercised before),
and a round-trip test that snapshots and restores every standard HTML
form input type — including multi-select, multi-checkbox groups, and
hidden/range/date/time/colour inputs — to lock in formValuesSnapshot's
coverage of the field surface it has to handle on a template swap.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../formValuesSnapshot.test.js                | 966 +++++++++++++-----
 tests/js-unit/react/sagas/templates.test.js   |  25 +-
 2 files changed, 715 insertions(+), 276 deletions(-)

diff --git a/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js b/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js
index c4003df65..555c6b2c2 100644
--- a/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js
+++ b/tests/js-unit/admin/settings/common/dynamicTemplateFields/formValuesSnapshot.test.js
@@ -1,8 +1,8 @@
-import $ from 'jquery'
+import $ from 'jquery';
 import {
-  snapshotFormValues,
-  restoreFormValues
-} from '../../../../../../src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot'
+	snapshotFormValues,
+	restoreFormValues,
+} from '../../../../../../src/assets/js/admin/settings/common/dynamicTemplateFields/formValuesSnapshot';
 
 /**
  * @package     Gravity PDF
@@ -12,21 +12,21 @@ import {
  */
 
 /* Build a jQuery-wrapped container from raw HTML for use as $container */
-function mountContainer (html) {
-  const $container = $('<div id="test-template-section"></div>').html(html)
-  $('body').append($container)
-  return $container
+function mountContainer(html) {
+	const $container = $('<div id="test-template-section"></div>').html(html);
+	$('body').append($container);
+	return $container;
 }
 
 describe('formValuesSnapshot helpers', () => {
-  afterEach(() => {
-    $('body').empty()
-    delete window.tinyMCE
-  })
-
-  describe('snapshotFormValues', () => {
-    it('captures values from text, textarea, and select inputs', () => {
-      const $container = mountContainer(`
+	afterEach(() => {
+		$('body').empty();
+		delete window.tinyMCE;
+	});
+
+	describe('snapshotFormValues', () => {
+		it('captures values from text, textarea, and select inputs', () => {
+			const $container = mountContainer(`
         <input type="text"     name="gfpdf_settings[background_color]" value="#ff0000" />
         <input type="text"     name="gfpdf_settings[background_image]" value="/path/to/image.png" />
         <textarea              name="gfpdf_settings[notes]">Hello world</textarea>
@@ -34,87 +34,147 @@ describe('formValuesSnapshot helpers', () => {
           <option value="10">10</option>
           <option value="12" selected>12</option>
         </select>
-      `)
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#ff0000' },
-        { kind: 'input', name: 'gfpdf_settings[background_image]', value: '/path/to/image.png' },
-        { kind: 'input', name: 'gfpdf_settings[notes]', value: 'Hello world' },
-        { kind: 'input', name: 'gfpdf_settings[font_size]', value: '12' }
-      ])
-    })
-
-    it('captures checked + value for checkboxes and radios', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[background_color]',
+					value: '#ff0000',
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[background_image]',
+					value: '/path/to/image.png',
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[notes]',
+					value: 'Hello world',
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[font_size]',
+					value: '12',
+				},
+			]);
+		});
+
+		it('captures checked + value for checkboxes and radios', () => {
+			const $container = mountContainer(`
         <input type="checkbox" name="gfpdf_settings[show_form_title]"  value="Yes" checked />
         <input type="checkbox" name="gfpdf_settings[show_page_names]"  value="Yes" />
         <input type="radio"    name="gfpdf_settings[orientation]"      value="portrait"  checked />
         <input type="radio"    name="gfpdf_settings[orientation]"      value="landscape" />
-      `)
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: true },
-        { kind: 'input', name: 'gfpdf_settings[show_page_names]', value: 'Yes', checked: false },
-        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'portrait', checked: true },
-        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'landscape', checked: false }
-      ])
-    })
-
-    it('prefers live TinyMCE content when the editor is in Visual mode', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[show_form_title]',
+					value: 'Yes',
+					checked: true,
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[show_page_names]',
+					value: 'Yes',
+					checked: false,
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[orientation]',
+					value: 'portrait',
+					checked: true,
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[orientation]',
+					value: 'landscape',
+					checked: false,
+				},
+			]);
+		});
+
+		it('prefers live TinyMCE content when the editor is in Visual mode', () => {
+			const $container = mountContainer(`
         <textarea id="gfpdf_settings_header" name="gfpdf_settings[header]">stale textarea body</textarea>
-      `)
-
-      window.tinyMCE = {
-        get: jest.fn((id) => {
-          if (id !== 'gfpdf_settings_header') return null
-          return { hidden: false, getContent: () => '<p>live editor body</p>' }
-        })
-      }
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[header]', value: '<p>live editor body</p>' }
-      ])
-    })
-
-    it('reads textarea value when the TinyMCE editor is in Code mode (hidden=true)', () => {
-      const $container = mountContainer(`
+      `);
+
+			window.tinyMCE = {
+				get: jest.fn((id) => {
+					if (id !== 'gfpdf_settings_header') {
+						return null;
+					}
+					return {
+						hidden: false,
+						getContent: () => '<p>live editor body</p>',
+					};
+				}),
+			};
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[header]',
+					value: '<p>live editor body</p>',
+				},
+			]);
+		});
+
+		it('reads textarea value when the TinyMCE editor is in Code mode (hidden=true)', () => {
+			const $container = mountContainer(`
         <textarea id="gfpdf_settings_footer" name="gfpdf_settings[footer]">live code-mode body</textarea>
-      `)
-
-      window.tinyMCE = {
-        get: jest.fn(() => ({ hidden: true, getContent: () => 'stale editor html' }))
-      }
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[footer]', value: 'live code-mode body' }
-      ])
-    })
-
-    it('falls back to textarea value when TinyMCE has no editor for that id', () => {
-      const $container = mountContainer(`
+      `);
+
+			window.tinyMCE = {
+				get: jest.fn(() => ({
+					hidden: true,
+					getContent: () => 'stale editor html',
+				})),
+			};
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[footer]',
+					value: 'live code-mode body',
+				},
+			]);
+		});
+
+		it('falls back to textarea value when TinyMCE has no editor for that id', () => {
+			const $container = mountContainer(`
         <textarea id="gfpdf_settings_footer" name="gfpdf_settings[footer]">raw textarea body</textarea>
-      `)
+      `);
 
-      window.tinyMCE = { get: jest.fn(() => null) }
+			window.tinyMCE = { get: jest.fn(() => null) };
 
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[footer]', value: 'raw textarea body' }
-      ])
-    })
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[footer]',
+					value: 'raw textarea body',
+				},
+			]);
+		});
 
-    it('falls back to textarea value when TinyMCE is undefined', () => {
-      const $container = mountContainer(`
+		it('falls back to textarea value when TinyMCE is undefined', () => {
+			const $container = mountContainer(`
         <textarea id="gfpdf_settings_header" name="gfpdf_settings[header]">no tinyMCE</textarea>
-      `)
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[header]', value: 'no tinyMCE' }
-      ])
-    })
-
-    it('captures .gfpdf-input-toggle state keyed by the textarea it controls', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[header]',
+					value: 'no tinyMCE',
+				},
+			]);
+		});
+
+		it('captures .gfpdf-input-toggle state keyed by the textarea it controls', () => {
+			const $container = mountContainer(`
         <label><input type="checkbox" class="gfpdf-input-toggle" checked /> First Page Header</label>
         <div class="gfpdf-toggle-wrapper">
           <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]">first header body</textarea>
@@ -123,198 +183,316 @@ describe('formValuesSnapshot helpers', () => {
         <div class="gfpdf-toggle-wrapper" style="display:none">
           <textarea id="gfpdf_settings_first_footer" name="gfpdf_settings[first_footer]">first footer body</textarea>
         </div>
-      `)
-
-      const snapshot = snapshotFormValues($container)
-      const toggleEntries = snapshot.filter(e => e.kind === 'toggle')
-
-      expect(toggleEntries).toEqual([
-        { kind: 'toggle', controls: 'gfpdf_settings[first_header]', checked: true },
-        { kind: 'toggle', controls: 'gfpdf_settings[first_footer]', checked: false }
-      ])
-    })
-
-    it('skips the template dropdown so the new (post-change) value is not captured', () => {
-      const $container = mountContainer(`
+      `);
+
+			const snapshot = snapshotFormValues($container);
+			const toggleEntries = snapshot.filter((e) => e.kind === 'toggle');
+
+			expect(toggleEntries).toEqual([
+				{
+					kind: 'toggle',
+					controls: 'gfpdf_settings[first_header]',
+					checked: true,
+				},
+				{
+					kind: 'toggle',
+					controls: 'gfpdf_settings[first_footer]',
+					checked: false,
+				},
+			]);
+		});
+
+		it('skips the template dropdown so the new (post-change) value is not captured', () => {
+			const $container = mountContainer(`
         <select id="gfpdf_settings[template]" name="gfpdf_settings[template]">
           <option value="zadani" selected>zadani</option>
           <option value="rubix">rubix</option>
         </select>
         <input type="text" name="gfpdf_settings[background_color]" value="#000" />
-      `)
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#000' }
-      ])
-    })
-
-    it('skips buttons, submits, and file inputs', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[background_color]',
+					value: '#000',
+				},
+			]);
+		});
+
+		it('skips buttons, submits, and file inputs', () => {
+			const $container = mountContainer(`
         <input type="text"   name="gfpdf_settings[real_field]" value="kept" />
         <input type="submit" name="gfpdf_settings[submit]"     value="Save" />
         <input type="button" name="gfpdf_settings[btn]"        value="Click" />
         <input type="reset"  name="gfpdf_settings[clear]"      value="Reset" />
         <input type="file"   name="gfpdf_settings[upload]" />
         <button              name="gfpdf_settings[plain]">Click</button>
-      `)
-
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[real_field]', value: 'kept' }
-      ])
-    })
-
-    it('skips inputs without a name attribute', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(snapshotFormValues($container)).toEqual([
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[real_field]',
+					value: 'kept',
+				},
+			]);
+		});
+
+		it('skips inputs without a name attribute', () => {
+			const $container = mountContainer(`
         <input type="text" value="anonymous" />
         <input type="text" name="gfpdf_settings[named]" value="kept" />
-      `)
+      `);
 
-      expect(snapshotFormValues($container)).toEqual([
-        { kind: 'input', name: 'gfpdf_settings[named]', value: 'kept' }
-      ])
-    })
-  })
+			expect(snapshotFormValues($container)).toEqual([
+				{ kind: 'input', name: 'gfpdf_settings[named]', value: 'kept' },
+			]);
+		});
+	});
 
-  describe('restoreFormValues', () => {
-    it('restores text, textarea, and select values when names match', () => {
-      const $container = mountContainer(`
+	describe('restoreFormValues', () => {
+		it('restores text, textarea, and select values when names match', () => {
+			const $container = mountContainer(`
         <input type="text" name="gfpdf_settings[background_color]" value="#000" />
         <textarea          name="gfpdf_settings[notes]">post-swap default</textarea>
         <select            name="gfpdf_settings[font_size]">
           <option value="10" selected>10</option>
           <option value="12">12</option>
         </select>
-      `)
-
-      restoreFormValues($container, [
-        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#ff0000' },
-        { kind: 'input', name: 'gfpdf_settings[notes]', value: 'restored body' },
-        { kind: 'input', name: 'gfpdf_settings[font_size]', value: '12' }
-      ])
-
-      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#ff0000')
-      expect($container.find('[name="gfpdf_settings[notes]"]').val()).toBe('restored body')
-      expect($container.find('[name="gfpdf_settings[font_size]"]').val()).toBe('12')
-    })
-
-    it('drops snapshot entries whose names no longer exist in the new HTML', () => {
-      const $container = mountContainer(`
+      `);
+
+			restoreFormValues($container, [
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[background_color]',
+					value: '#ff0000',
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[notes]',
+					value: 'restored body',
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[font_size]',
+					value: '12',
+				},
+			]);
+
+			expect(
+				$container
+					.find('[name="gfpdf_settings[background_color]"]')
+					.val()
+			).toBe('#ff0000');
+			expect(
+				$container.find('[name="gfpdf_settings[notes]"]').val()
+			).toBe('restored body');
+			expect(
+				$container.find('[name="gfpdf_settings[font_size]"]').val()
+			).toBe('12');
+		});
+
+		it('drops snapshot entries whose names no longer exist in the new HTML', () => {
+			const $container = mountContainer(`
         <input type="text" name="gfpdf_settings[background_color]" value="#000" />
-      `)
-
-      restoreFormValues($container, [
-        { kind: 'input', name: 'gfpdf_settings[background_color]', value: '#ff0000' },
-        { kind: 'input', name: 'gfpdf_settings[zadani_border_colour]', value: '#0000ff' }
-      ])
-
-      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#ff0000')
-      expect($container.find('[name="gfpdf_settings[zadani_border_colour]"]').length).toBe(0)
-    })
-
-    it('toggles a checkbox from unchecked to checked and fires change', () => {
-      const $container = mountContainer(`
+      `);
+
+			restoreFormValues($container, [
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[background_color]',
+					value: '#ff0000',
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[zadani_border_colour]',
+					value: '#0000ff',
+				},
+			]);
+
+			expect(
+				$container
+					.find('[name="gfpdf_settings[background_color]"]')
+					.val()
+			).toBe('#ff0000');
+			expect(
+				$container.find('[name="gfpdf_settings[zadani_border_colour]"]')
+					.length
+			).toBe(0);
+		});
+
+		it('toggles a checkbox from unchecked to checked and fires change', () => {
+			const $container = mountContainer(`
         <input type="checkbox" name="gfpdf_settings[show_form_title]" value="Yes" />
-      `)
-
-      const onChange = jest.fn()
-      $container.find('[name="gfpdf_settings[show_form_title]"]').on('change', onChange)
-
-      restoreFormValues($container, [
-        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: true }
-      ])
-
-      expect($container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked')).toBe(true)
-      expect(onChange).toHaveBeenCalledTimes(1)
-    })
-
-    it('toggles a checkbox from checked to unchecked and fires change', () => {
-      const $container = mountContainer(`
+      `);
+
+			const onChange = jest.fn();
+			$container
+				.find('[name="gfpdf_settings[show_form_title]"]')
+				.on('change', onChange);
+
+			restoreFormValues($container, [
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[show_form_title]',
+					value: 'Yes',
+					checked: true,
+				},
+			]);
+
+			expect(
+				$container
+					.find('[name="gfpdf_settings[show_form_title]"]')
+					.prop('checked')
+			).toBe(true);
+			expect(onChange).toHaveBeenCalledTimes(1);
+		});
+
+		it('toggles a checkbox from checked to unchecked and fires change', () => {
+			const $container = mountContainer(`
         <input type="checkbox" name="gfpdf_settings[show_form_title]" value="Yes" checked />
-      `)
-
-      const onChange = jest.fn()
-      $container.find('[name="gfpdf_settings[show_form_title]"]').on('change', onChange)
-
-      restoreFormValues($container, [
-        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: false }
-      ])
-
-      expect($container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked')).toBe(false)
-      expect(onChange).toHaveBeenCalledTimes(1)
-    })
-
-    it('skips checkbox change when the post-swap state already matches the snapshot', () => {
-      const $container = mountContainer(`
+      `);
+
+			const onChange = jest.fn();
+			$container
+				.find('[name="gfpdf_settings[show_form_title]"]')
+				.on('change', onChange);
+
+			restoreFormValues($container, [
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[show_form_title]',
+					value: 'Yes',
+					checked: false,
+				},
+			]);
+
+			expect(
+				$container
+					.find('[name="gfpdf_settings[show_form_title]"]')
+					.prop('checked')
+			).toBe(false);
+			expect(onChange).toHaveBeenCalledTimes(1);
+		});
+
+		it('skips checkbox change when the post-swap state already matches the snapshot', () => {
+			const $container = mountContainer(`
         <input type="checkbox" name="gfpdf_settings[show_form_title]" value="Yes" checked />
-      `)
-
-      const onChange = jest.fn()
-      $container.find('[name="gfpdf_settings[show_form_title]"]').on('change', onChange)
-
-      restoreFormValues($container, [
-        { kind: 'input', name: 'gfpdf_settings[show_form_title]', value: 'Yes', checked: true }
-      ])
-
-      expect(onChange).not.toHaveBeenCalled()
-    })
-
-    it('switches a radio group selection', () => {
-      const $container = mountContainer(`
+      `);
+
+			const onChange = jest.fn();
+			$container
+				.find('[name="gfpdf_settings[show_form_title]"]')
+				.on('change', onChange);
+
+			restoreFormValues($container, [
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[show_form_title]',
+					value: 'Yes',
+					checked: true,
+				},
+			]);
+
+			expect(onChange).not.toHaveBeenCalled();
+		});
+
+		it('switches a radio group selection', () => {
+			const $container = mountContainer(`
         <input type="radio" name="gfpdf_settings[orientation]" value="portrait"  checked />
         <input type="radio" name="gfpdf_settings[orientation]" value="landscape" />
-      `)
-
-      restoreFormValues($container, [
-        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'portrait', checked: false },
-        { kind: 'input', name: 'gfpdf_settings[orientation]', value: 'landscape', checked: true }
-      ])
-
-      expect($container.find('[name="gfpdf_settings[orientation]"][value="portrait"]').prop('checked')).toBe(false)
-      expect($container.find('[name="gfpdf_settings[orientation]"][value="landscape"]').prop('checked')).toBe(true)
-    })
-
-    it('restores a .gfpdf-input-toggle from unchecked to checked via its controlled textarea name', () => {
-      const $container = mountContainer(`
+      `);
+
+			restoreFormValues($container, [
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[orientation]',
+					value: 'portrait',
+					checked: false,
+				},
+				{
+					kind: 'input',
+					name: 'gfpdf_settings[orientation]',
+					value: 'landscape',
+					checked: true,
+				},
+			]);
+
+			expect(
+				$container
+					.find(
+						'[name="gfpdf_settings[orientation]"][value="portrait"]'
+					)
+					.prop('checked')
+			).toBe(false);
+			expect(
+				$container
+					.find(
+						'[name="gfpdf_settings[orientation]"][value="landscape"]'
+					)
+					.prop('checked')
+			).toBe(true);
+		});
+
+		it('restores a .gfpdf-input-toggle from unchecked to checked via its controlled textarea name', () => {
+			const $container = mountContainer(`
         <label><input type="checkbox" class="gfpdf-input-toggle" /> First Page Header</label>
         <div class="gfpdf-toggle-wrapper" style="display:none">
           <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]"></textarea>
         </div>
-      `)
-
-      const onChange = jest.fn()
-      $container.find('.gfpdf-input-toggle').on('change', onChange)
-
-      restoreFormValues($container, [
-        { kind: 'toggle', controls: 'gfpdf_settings[first_header]', checked: true }
-      ])
-
-      expect($container.find('.gfpdf-input-toggle').prop('checked')).toBe(true)
-      expect(onChange).toHaveBeenCalledTimes(1)
-    })
-
-    it('skips a toggle entry whose controlled textarea no longer exists in the new HTML', () => {
-      const $container = mountContainer(`
+      `);
+
+			const onChange = jest.fn();
+			$container.find('.gfpdf-input-toggle').on('change', onChange);
+
+			restoreFormValues($container, [
+				{
+					kind: 'toggle',
+					controls: 'gfpdf_settings[first_header]',
+					checked: true,
+				},
+			]);
+
+			expect($container.find('.gfpdf-input-toggle').prop('checked')).toBe(
+				true
+			);
+			expect(onChange).toHaveBeenCalledTimes(1);
+		});
+
+		it('skips a toggle entry whose controlled textarea no longer exists in the new HTML', () => {
+			const $container = mountContainer(`
         <input type="text" name="gfpdf_settings[background_color]" value="#000" />
-      `)
-
-      expect(() => restoreFormValues($container, [
-        { kind: 'toggle', controls: 'gfpdf_settings[first_header]', checked: true }
-      ])).not.toThrow()
-    })
-
-    it('handles an empty snapshot without throwing', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(() =>
+				restoreFormValues($container, [
+					{
+						kind: 'toggle',
+						controls: 'gfpdf_settings[first_header]',
+						checked: true,
+					},
+				])
+			).not.toThrow();
+		});
+
+		it('handles an empty snapshot without throwing', () => {
+			const $container = mountContainer(`
         <input type="text" name="gfpdf_settings[background_color]" value="#000" />
-      `)
-
-      expect(() => restoreFormValues($container, [])).not.toThrow()
-      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#000')
-    })
-  })
-
-  describe('snapshot → swap → restore round-trip', () => {
-    it('preserves user edits across an HTML swap where field names overlap', () => {
-      const $container = mountContainer(`
+      `);
+
+			expect(() => restoreFormValues($container, [])).not.toThrow();
+			expect(
+				$container
+					.find('[name="gfpdf_settings[background_color]"]')
+					.val()
+			).toBe('#000');
+		});
+	});
+
+	describe('snapshot → swap → restore round-trip', () => {
+		it('preserves user edits across an HTML swap where field names overlap', () => {
+			const $container = mountContainer(`
         <input type="text"     name="gfpdf_settings[background_color]" value="#ffffff" />
         <input type="checkbox" name="gfpdf_settings[show_form_title]"  value="Yes" />
         <textarea              name="gfpdf_settings[header]">old header body</textarea>
@@ -323,20 +501,30 @@ describe('formValuesSnapshot helpers', () => {
         <div class="gfpdf-toggle-wrapper" style="display:none">
           <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]"></textarea>
         </div>
-      `)
-
-      /* User edits */
-      $container.find('[name="gfpdf_settings[background_color]"]').val('#ff0000')
-      $container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked', true)
-      $container.find('[name="gfpdf_settings[header]"]').val('NEW HEADER')
-      $container.find('[name="gfpdf_settings[zadani_border_colour]"]').val('#abcdef')
-      $container.find('.gfpdf-input-toggle').prop('checked', true)
-      $container.find('[name="gfpdf_settings[first_header]"]').val('FIRST HEADER BODY')
-
-      const snapshot = snapshotFormValues($container)
-
-      /* Swap HTML for a different template — same toggle pattern, no zadani-specific field, new rubix-specific field */
-      $container.html(`
+      `);
+
+			/* User edits */
+			$container
+				.find('[name="gfpdf_settings[background_color]"]')
+				.val('#ff0000');
+			$container
+				.find('[name="gfpdf_settings[show_form_title]"]')
+				.prop('checked', true);
+			$container
+				.find('[name="gfpdf_settings[header]"]')
+				.val('NEW HEADER');
+			$container
+				.find('[name="gfpdf_settings[zadani_border_colour]"]')
+				.val('#abcdef');
+			$container.find('.gfpdf-input-toggle').prop('checked', true);
+			$container
+				.find('[name="gfpdf_settings[first_header]"]')
+				.val('FIRST HEADER BODY');
+
+			const snapshot = snapshotFormValues($container);
+
+			/* Swap HTML for a different template — same toggle pattern, no zadani-specific field, new rubix-specific field */
+			$container.html(`
         <input type="text"     name="gfpdf_settings[background_color]" value="#ffffff" />
         <input type="checkbox" name="gfpdf_settings[show_form_title]"  value="Yes" />
         <textarea              name="gfpdf_settings[header]">default rubix header</textarea>
@@ -345,17 +533,249 @@ describe('formValuesSnapshot helpers', () => {
         <div class="gfpdf-toggle-wrapper" style="display:none">
           <textarea id="gfpdf_settings_first_header" name="gfpdf_settings[first_header]">rubix default first header</textarea>
         </div>
-      `)
-
-      restoreFormValues($container, snapshot)
-
-      expect($container.find('[name="gfpdf_settings[background_color]"]').val()).toBe('#ff0000')
-      expect($container.find('[name="gfpdf_settings[show_form_title]"]').prop('checked')).toBe(true)
-      expect($container.find('[name="gfpdf_settings[header]"]').val()).toBe('NEW HEADER')
-      expect($container.find('.gfpdf-input-toggle').prop('checked')).toBe(true)
-      expect($container.find('[name="gfpdf_settings[first_header]"]').val()).toBe('FIRST HEADER BODY')
-      /* Rubix-specific field keeps its server-rendered default — zadani snapshot doesn't apply to it */
-      expect($container.find('[name="gfpdf_settings[rubix_container_background_colour]"]').val()).toBe('#cccccc')
-    })
-  })
-})
+      `);
+
+			restoreFormValues($container, snapshot);
+
+			expect(
+				$container
+					.find('[name="gfpdf_settings[background_color]"]')
+					.val()
+			).toBe('#ff0000');
+			expect(
+				$container
+					.find('[name="gfpdf_settings[show_form_title]"]')
+					.prop('checked')
+			).toBe(true);
+			expect(
+				$container.find('[name="gfpdf_settings[header]"]').val()
+			).toBe('NEW HEADER');
+			expect($container.find('.gfpdf-input-toggle').prop('checked')).toBe(
+				true
+			);
+			expect(
+				$container.find('[name="gfpdf_settings[first_header]"]').val()
+			).toBe('FIRST HEADER BODY');
+			/* Rubix-specific field keeps its server-rendered default — zadani snapshot doesn't apply to it */
+			expect(
+				$container
+					.find(
+						'[name="gfpdf_settings[rubix_container_background_colour]"]'
+					)
+					.val()
+			).toBe('#cccccc');
+		});
+	});
+
+	describe('all standard form field types round-trip', () => {
+		it('saves and restores every standard HTML form input type', () => {
+			/* User-edited values per field type — what we expect to see after the round-trip */
+			const edited = {
+				text: 'edited text',
+				password: 'edited-pass',
+				email: 'edited@example.com',
+				url: 'https://example.com/edited',
+				tel: '+61400000000',
+				search: 'edited query',
+				number: '42',
+				color: '#ff8800',
+				date: '2026-05-19',
+				time: '14:30',
+				month: '2026-05',
+				week: '2026-W20',
+				'datetime-local': '2026-05-19T14:30',
+				range: '75',
+				hidden: 'edited-hidden-token',
+				textarea: 'edited textarea body',
+				select_single: 'b',
+				select_multiple: ['a', 'c'],
+			};
+
+			const $container = mountContainer(`
+        <input type="text"           name="gfpdf_settings[text]"           value="default text" />
+        <input type="password"       name="gfpdf_settings[password]"       value="default-pass" />
+        <input type="email"          name="gfpdf_settings[email]"          value="default@example.com" />
+        <input type="url"            name="gfpdf_settings[url]"            value="https://example.com/default" />
+        <input type="tel"            name="gfpdf_settings[tel]"            value="+61400000001" />
+        <input type="search"         name="gfpdf_settings[search]"         value="default query" />
+        <input type="number"         name="gfpdf_settings[number]"         value="10" />
+        <input type="color"          name="gfpdf_settings[color]"          value="#000000" />
+        <input type="date"           name="gfpdf_settings[date]"           value="2026-01-01" />
+        <input type="time"           name="gfpdf_settings[time]"           value="09:00" />
+        <input type="month"          name="gfpdf_settings[month]"          value="2026-01" />
+        <input type="week"           name="gfpdf_settings[week]"           value="2026-W01" />
+        <input type="datetime-local" name="gfpdf_settings[datetime-local]" value="2026-01-01T09:00" />
+        <input type="range"          name="gfpdf_settings[range]"          min="0" max="100" value="0" />
+        <input type="hidden"         name="gfpdf_settings[hidden]"         value="default-hidden-token" />
+        <textarea                    name="gfpdf_settings[textarea]">default textarea body</textarea>
+
+        <select name="gfpdf_settings[select_single]">
+          <option value="a" selected>A</option>
+          <option value="b">B</option>
+          <option value="c">C</option>
+        </select>
+
+        <select name="gfpdf_settings[select_multiple]" multiple>
+          <option value="a">A</option>
+          <option value="b" selected>B</option>
+          <option value="c">C</option>
+        </select>
+
+        <input type="checkbox" name="gfpdf_settings[single_checkbox]" value="Yes" />
+
+        <input type="checkbox" name="gfpdf_settings[multi_checkbox][]" value="one"   checked />
+        <input type="checkbox" name="gfpdf_settings[multi_checkbox][]" value="two" />
+        <input type="checkbox" name="gfpdf_settings[multi_checkbox][]" value="three" />
+
+        <input type="radio"    name="gfpdf_settings[radio]" value="portrait"  checked />
+        <input type="radio"    name="gfpdf_settings[radio]" value="landscape" />
+      `);
+
+			/* Apply user edits */
+			Object.entries(edited).forEach(([type, value]) => {
+				const name =
+					type === 'select_single' ||
+					type === 'select_multiple' ||
+					type === 'textarea'
+						? `gfpdf_settings[${type}]`
+						: `gfpdf_settings[${type}]`;
+				$container.find(`[name="${name}"]`).val(value);
+			});
+			$container
+				.find('[name="gfpdf_settings[single_checkbox]"]')
+				.prop('checked', true);
+			$container
+				.find('[name="gfpdf_settings[multi_checkbox][]"][value="one"]')
+				.prop('checked', false);
+			$container
+				.find('[name="gfpdf_settings[multi_checkbox][]"][value="two"]')
+				.prop('checked', true);
+			$container
+				.find(
+					'[name="gfpdf_settings[multi_checkbox][]"][value="three"]'
+				)
+				.prop('checked', true);
+			$container
+				.find('[name="gfpdf_settings[radio]"][value="portrait"]')
+				.prop('checked', false);
+			$container
+				.find('[name="gfpdf_settings[radio]"][value="landscape"]')
+				.prop('checked', true);
+
+			/* Snapshot */
+			const snapshot = snapshotFormValues($container);
+
+			/* HTML swap — same field names, defaults restored as if a new template was loaded */
+			$container.html(`
+        <input type="text"           name="gfpdf_settings[text]"           value="default text" />
+        <input type="password"       name="gfpdf_settings[password]"       value="default-pass" />
+        <input type="email"          name="gfpdf_settings[email]"          value="default@example.com" />
+        <input type="url"            name="gfpdf_settings[url]"            value="https://example.com/default" />
+        <input type="tel"            name="gfpdf_settings[tel]"            value="+61400000001" />
+        <input type="search"         name="gfpdf_settings[search]"         value="default query" />
+        <input type="number"         name="gfpdf_settings[number]"         value="10" />
+        <input type="color"          name="gfpdf_settings[color]"          value="#000000" />
+        <input type="date"           name="gfpdf_settings[date]"           value="2026-01-01" />
+        <input type="time"           name="gfpdf_settings[time]"           value="09:00" />
+        <input type="month"          name="gfpdf_settings[month]"          value="2026-01" />
+        <input type="week"           name="gfpdf_settings[week]"           value="2026-W01" />
+        <input type="datetime-local" name="gfpdf_settings[datetime-local]" value="2026-01-01T09:00" />
+        <input type="range"          name="gfpdf_settings[range]"          min="0" max="100" value="0" />
+        <input type="hidden"         name="gfpdf_settings[hidden]"         value="default-hidden-token" />
+        <textarea                    name="gfpdf_settings[textarea]">default textarea body</textarea>
+
+        <select name="gfpdf_settings[select_single]">
+          <option value="a" selected>A</option>
+          <option value="b">B</option>
+          <option value="c">C</option>
+        </select>
+
+        <select name="gfpdf_settings[select_multiple]" multiple>
+          <option value="a">A</option>
+          <option value="b" selected>B</option>
+          <option value="c">C</option>
+        </select>
+
+        <input type="checkbox" name="gfpdf_settings[single_checkbox]" value="Yes" />
+
+        <input type="checkbox" name="gfpdf_settings[multi_checkbox][]" value="one"   checked />
+        <input type="checkbox" name="gfpdf_settings[multi_checkbox][]" value="two" />
+        <input type="checkbox" name="gfpdf_settings[multi_checkbox][]" value="three" />
+
+        <input type="radio"    name="gfpdf_settings[radio]" value="portrait"  checked />
+        <input type="radio"    name="gfpdf_settings[radio]" value="landscape" />
+      `);
+
+			/* Sanity check — pre-restore values are the defaults, not the edits */
+			expect($container.find('[name="gfpdf_settings[text]"]').val()).toBe(
+				'default text'
+			);
+			expect(
+				$container
+					.find('[name="gfpdf_settings[single_checkbox]"]')
+					.prop('checked')
+			).toBe(false);
+
+			restoreFormValues($container, snapshot);
+
+			/* Every text-like field should now hold the edited value */
+			Object.entries(edited).forEach(([type, value]) => {
+				if (type === 'select_multiple') {
+					return;
+				} /* asserted separately below */
+				expect(
+					$container.find(`[name="gfpdf_settings[${type}]"]`).val()
+				).toBe(value);
+			});
+
+			/* select-multiple: snapshot stored an array, restore writes that array back */
+			expect(
+				$container
+					.find('[name="gfpdf_settings[select_multiple]"]')
+					.val()
+			).toEqual(['a', 'c']);
+
+			/* Checkbox: false → true was captured */
+			expect(
+				$container
+					.find('[name="gfpdf_settings[single_checkbox]"]')
+					.prop('checked')
+			).toBe(true);
+
+			/* Multi-checkbox group: each value flipped independently */
+			expect(
+				$container
+					.find(
+						'[name="gfpdf_settings[multi_checkbox][]"][value="one"]'
+					)
+					.prop('checked')
+			).toBe(false);
+			expect(
+				$container
+					.find(
+						'[name="gfpdf_settings[multi_checkbox][]"][value="two"]'
+					)
+					.prop('checked')
+			).toBe(true);
+			expect(
+				$container
+					.find(
+						'[name="gfpdf_settings[multi_checkbox][]"][value="three"]'
+					)
+					.prop('checked')
+			).toBe(true);
+
+			/* Radio group: selection moved from portrait → landscape */
+			expect(
+				$container
+					.find('[name="gfpdf_settings[radio]"][value="portrait"]')
+					.prop('checked')
+			).toBe(false);
+			expect(
+				$container
+					.find('[name="gfpdf_settings[radio]"][value="landscape"]')
+					.prop('checked')
+			).toBe(true);
+		});
+	});
+});
diff --git a/tests/js-unit/react/sagas/templates.test.js b/tests/js-unit/react/sagas/templates.test.js
index 4124ea05c..33c58f3a5 100644
--- a/tests/js-unit/react/sagas/templates.test.js
+++ b/tests/js-unit/react/sagas/templates.test.js
@@ -13,6 +13,7 @@ import {
 	TEMPLATE_PROCESSING,
 	TEMPLATE_PROCESSING_FAILED,
 	POST_TEMPLATE_UPLOAD_PROCESSING,
+	TEMPLATE_UPLOAD_PROCESSING_SUCCESS,
 	TEMPLATE_UPLOAD_PROCESSING_FAILED,
 } from '../../../../src/assets/js/react/actions/templates';
 import * as api from '../../../../src/assets/js/react/api/templates';
@@ -123,6 +124,26 @@ describe('Sagas - templates', () => {
 			);
 		});
 
+		test('should route to success when the API responds with ok and a templates array', () => {
+			const newaction = {
+				payload: { file: { data: 'test' }, filename: 'test' },
+			};
+			const gen = templateUploadProcessing(newaction);
+			gen.next();
+
+			const response = {
+				ok: true,
+				status: 200,
+				body: { templates: [{ id: 'foo' }] },
+			};
+			expect(gen.next(response).value).toEqual(
+				put({
+					type: TEMPLATE_UPLOAD_PROCESSING_SUCCESS,
+					payload: response.body,
+				})
+			);
+		});
+
 		test('should route to failed when the API response is missing a templates array', () => {
 			const newaction = {
 				payload: { file: { data: 'test' }, filename: 'test' },
@@ -146,9 +167,7 @@ describe('Sagas - templates', () => {
 			const gen = templateUploadProcessing(newaction);
 			gen.next();
 
-			expect(
-				gen.throw({ message: 'network failure' }).value
-			).toEqual(
+			expect(gen.throw({ message: 'network failure' }).value).toEqual(
 				put({
 					type: TEMPLATE_UPLOAD_PROCESSING_FAILED,
 					payload: { message: 'network failure' },

From 4b091ed928dc748c234cedb4cda334551b0512fd Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 11:02:38 +1000
Subject: [PATCH 16/20] fix: honour PDF Conditional Logic toggle so disabling
 it skips stale rules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The form-settings UI exposes two related fields — the `conditional` toggle
(user-visible on/off switch) and the `conditionalLogic` rules array — and
they can drift out of sync. When that happens (toggle off, rules array
still populated from a previous enable), the runtime checks evaluated the
stale rules and rejected entries against rules the UI said were disabled,
manifesting as a "[gravitypdf] shortcode says conditional logic enabled,
entry didn't pass" error on form confirmations.

Route all four PDF-level runtime sites — get_pdf_config, middle_conditional,
get_active_pdfs, and the [gravitypdf] merge-tag check — through a new
Helper_Misc::conditional_logic_passes() that treats the toggle as the
source of truth and short-circuits when it's explicitly off. Legacy
settings without the toggle key fall back to evaluating the rules.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 CHANGELOG.md                                  |  7 +-
 src/Helper/Helper_Abstract_Pdf_Shortcode.php  |  2 +-
 src/Helper/Helper_Misc.php                    | 33 +++++++
 src/Model/Model_Mergetags.php                 |  2 +-
 src/Model/Model_PDF.php                       |  4 +-
 tests/phpunit/unit-tests/test-helper-misc.php | 87 +++++++++++++++++++
 6 files changed, 128 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c14ff5d..77582c761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,15 +3,16 @@
 ## Gravity PDF
 
 ### 6.14.3
+* 🧹 Housekeeping: WordPress 7.0 Compatibility
+* 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
+* 🧹 Housekeeping: Better screen-reader support for admin pages
 * 🐞Bug: Preserve the selected template when setting up a new PDF on a form
 * 🐞Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
 * 🐞Bug: Preserve unsaved edits to the Template fields when switching PDF templates
 * 🐞Bug: Fix JavaScript error switching PDF templates when the editor was set to Text mode
 * 🐞Bug: Fix TinyMCE editor reload when switching PDF templates
 * 🐞Bug: Fix Gravity Forms 2.6+ version detection on PDF form-settings pages
-* 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
-* 🧹 Housekeeping: Better screen-reader support for admin pages
-* 🧹 Housekeeping: WordPress 7.0 Compatibility
+* 🐞Bug: Honor the PDF Conditional Logic toggle so disabling it in the UI skips stale conditional rules
 
 ### 6.14.2
 * 🐞Bug: Fix PHP warning caused by the GFCommon::get_lead_field_display() API change in Gravity Forms 2.9.29
diff --git a/src/Helper/Helper_Abstract_Pdf_Shortcode.php b/src/Helper/Helper_Abstract_Pdf_Shortcode.php
index b8ff35e80..14e9ed4ad 100644
--- a/src/Helper/Helper_Abstract_Pdf_Shortcode.php
+++ b/src/Helper/Helper_Abstract_Pdf_Shortcode.php
@@ -148,7 +148,7 @@ protected function get_pdf_config( $entry_id, $pdf_id ) {
 			throw new GravityPdfShortcodePdfInactiveException();
 		}
 
-		if ( isset( $settings['conditionalLogic'] ) && ! $this->misc->evaluate_conditional_logic( $settings['conditionalLogic'], $entry ) ) {
+		if ( ! $this->misc->conditional_logic_passes( $settings, $entry ) ) {
 			throw new GravityPdfShortcodePdfConditionalLogicFailedException();
 		}
 
diff --git a/src/Helper/Helper_Misc.php b/src/Helper/Helper_Misc.php
index ac535f8bd..34f9e64df 100644
--- a/src/Helper/Helper_Misc.php
+++ b/src/Helper/Helper_Misc.php
@@ -832,6 +832,39 @@ public function update_deprecated_config( $value ) {
 		return $value;
 	}
 
+	/**
+	 * Whether a PDF's saved settings should pass the entry through conditional-logic gating.
+	 *
+	 * The form-settings UI exposes two related fields: the `conditional` toggle (the user-visible
+	 * on/off switch) and the `conditionalLogic` rules array. They can drift out of sync — the
+	 * toggle gets disabled while the rules array keeps its previous value — so trusting only
+	 * `conditionalLogic` makes the runtime disagree with what the UI shows.
+	 *
+	 * Returns true when the entry is allowed (toggle off, no rules, or rules pass), false when
+	 * the toggle is on and rules explicitly reject the entry.
+	 *
+	 * The `conditional` key may be absent on very old settings; treat that as "no override,
+	 * fall back to the rules" so legacy behaviour is preserved.
+	 *
+	 * @param array $settings The PDF settings array
+	 * @param array $entry    The Gravity Forms entry
+	 *
+	 * @return bool
+	 *
+	 * @since 6.14.3
+	 */
+	public function conditional_logic_passes( $settings, $entry ) {
+		if ( array_key_exists( 'conditional', $settings ) && empty( $settings['conditional'] ) ) {
+			return true;
+		}
+
+		if ( empty( $settings['conditionalLogic'] ) ) {
+			return true;
+		}
+
+		return $this->evaluate_conditional_logic( $settings['conditionalLogic'], $entry );
+	}
+
 	/**
 	 * Determine if the logic should show or hide the item
 	 *
diff --git a/src/Model/Model_Mergetags.php b/src/Model/Model_Mergetags.php
index e4986088b..62344a813 100644
--- a/src/Model/Model_Mergetags.php
+++ b/src/Model/Model_Mergetags.php
@@ -182,7 +182,7 @@ public function process_pdf_mergetags( $text, $form, $entry, $url_encode ) {
 				/* Strip tag if config not valid, it isn't active or conditional logic is not met */
 				if ( is_wp_error( $config )
 					 || $config['active'] !== true
-					 || ( isset( $config['conditionalLogic'] ) && ! $this->misc->evaluate_conditional_logic( $config['conditionalLogic'], $entry ) )
+					 || ! $this->misc->conditional_logic_passes( $config, $entry )
 				) {
 					$error = 'Conditional logic did not pass';
 					if ( is_wp_error( $config ) ) {
diff --git a/src/Model/Model_PDF.php b/src/Model/Model_PDF.php
index 505d5d21c..7aa072b2c 100644
--- a/src/Model/Model_PDF.php
+++ b/src/Model/Model_PDF.php
@@ -448,7 +448,7 @@ public function middle_active( $action, $entry, $settings ) {
 	public function middle_conditional( $action, $entry, $settings ) {
 
 		if ( ! is_wp_error( $action ) ) {
-			if ( isset( $settings['conditionalLogic'] ) && ! $this->misc->evaluate_conditional_logic( $settings['conditionalLogic'], $entry ) ) {
+			if ( ! $this->misc->conditional_logic_passes( $settings, $entry ) ) {
 				return new WP_Error( 'conditional_logic', esc_html__( 'PDF conditional logic requirements have not been met.', 'gravity-pdf' ) );
 			}
 		}
@@ -826,7 +826,7 @@ public function get_active_pdfs( $pdfs, $entry ) {
 		$form     = apply_filters( 'gfpdf_current_form_object', $this->gform->get_form( $entry['form_id'] ), $entry, __FUNCTION__ );
 
 		foreach ( $pdfs as $pdf ) {
-			if ( $pdf['active'] && ( empty( $pdf['conditionalLogic'] ) || $this->misc->evaluate_conditional_logic( $pdf['conditionalLogic'], $entry ) ) ) {
+			if ( $pdf['active'] && $this->misc->conditional_logic_passes( $pdf, $entry ) ) {
 				$filtered[ $pdf['id'] ] = $pdf;
 			}
 		}
diff --git a/tests/phpunit/unit-tests/test-helper-misc.php b/tests/phpunit/unit-tests/test-helper-misc.php
index 4155bd65e..9f8e1eaab 100644
--- a/tests/phpunit/unit-tests/test-helper-misc.php
+++ b/tests/phpunit/unit-tests/test-helper-misc.php
@@ -375,6 +375,93 @@ public function test_evaluate_conditional_logic() {
 		$this->assertFalse( $this->misc->evaluate_conditional_logic( $logic, $data['entry'] ) );
 	}
 
+	/**
+	 * Verify conditional_logic_passes() honours the `conditional` toggle as the source of
+	 * truth for whether conditional-logic gating runs.
+	 *
+	 * Regression coverage for the case where the user disables the toggle in the UI but
+	 * a stale `conditionalLogic` rules array remains in the saved settings — the runtime
+	 * must not reject entries against rules the UI says are off.
+	 *
+	 * @since 6.14.3
+	 */
+	public function test_conditional_logic_passes() {
+		$data             = $this->create_form_and_entries();
+		$entry            = $data['entry'];
+		$entry['form_id'] = $data['form']['id'];
+
+		$failing_rules = [
+			'actionType' => 'show',
+			'logicType'  => 'all',
+			'rules'      => [
+				[
+					'fieldId'  => '1',
+					'operator' => 'is',
+					'value'    => 'this-will-never-match',
+				],
+			],
+		];
+
+		$passing_rules = [
+			'actionType' => 'show',
+			'logicType'  => 'all',
+			'rules'      => [
+				[
+					'fieldId'  => '1',
+					'operator' => 'is',
+					'value'    => 'My Single Line Response',
+				],
+			],
+		];
+
+		/* Toggle off + stale failing rules → passes (the bug we are fixing) */
+		$this->assertTrue(
+			$this->misc->conditional_logic_passes(
+				[ 'conditional' => '', 'conditionalLogic' => $failing_rules ],
+				$entry
+			),
+			'Toggle off with stale failing rules must pass — UI says conditional logic is disabled.'
+		);
+
+		/* Toggle off + passing rules → still passes (toggle short-circuits before evaluation) */
+		$this->assertTrue(
+			$this->misc->conditional_logic_passes(
+				[ 'conditional' => '', 'conditionalLogic' => $passing_rules ],
+				$entry
+			)
+		);
+
+		/* Toggle on + passing rules → passes */
+		$this->assertTrue(
+			$this->misc->conditional_logic_passes(
+				[ 'conditional' => '1', 'conditionalLogic' => $passing_rules ],
+				$entry
+			)
+		);
+
+		/* Toggle on + failing rules → fails */
+		$this->assertFalse(
+			$this->misc->conditional_logic_passes(
+				[ 'conditional' => '1', 'conditionalLogic' => $failing_rules ],
+				$entry
+			)
+		);
+
+		/* No conditional logic rules at all → passes regardless of toggle */
+		$this->assertTrue( $this->misc->conditional_logic_passes( [ 'conditional' => '1' ], $entry ) );
+		$this->assertTrue( $this->misc->conditional_logic_passes( [], $entry ) );
+
+		/* Legacy settings (no `conditional` key) fall back to evaluating the rules */
+		$this->assertTrue(
+			$this->misc->conditional_logic_passes( [ 'conditionalLogic' => $passing_rules ], $entry ),
+			'Legacy settings without the toggle should evaluate the rules normally.'
+		);
+		$this->assertFalse(
+			$this->misc->conditional_logic_passes( [ 'conditionalLogic' => $failing_rules ], $entry ),
+			'Legacy settings without the toggle should still reject entries against failing rules.'
+		);
+	}
+
 	/**
 	 * Ensure we correctly return an appropriate class name based on the file path given
 	 *

From 52480109b92fc378a9be1a5e06a90a5af76e6ad8 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:14:31 +1000
Subject: [PATCH 17/20] fix: auto-restore the last-selected TinyMCE editor tab
 cleanly on template swap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switching the PDF template dropdown with the user's last-selected editor
tab set to 'html' was buggy in two ways:

1. switchEditors.go('html') was called immediately after tinyMCE.init()
   while the iframe was still being mounted, throwing
   "Cannot read properties of undefined (reading 'getSelection')" inside
   editor.hide(). The exception unwound the surrounding ajaxCall()
   success callback, skipping initialiseCommonElements, merge tags, and
   tooltip re-init for the swapped-in fields.

2. switchEditors.go reads the iframe selection and, if a range is set,
   schedules textArea.focus() 100ms later (base.js
   selectTextInTextArea), which scrolls the page to the editor. TinyMCE
   seeds a default cursor on init, so this fires for every editor on
   the form — the viewport ends up on the last one, yanking the user
   away from the template dropdown they just clicked.

Defer the switchEditors.go call via editor.on('init', ...) when the
editor isn't initialised yet, then clear the iframe selection inside
the deferred apply() so findBookmarkedPosition short-circuits and the
focus/scroll path is skipped. Wrap the call in a try/catch as a final
safety net: if WP can't switch, the editor falls back to Visual mode
silently and the user can flip the tab manually.

Drive-bys from the same area:
- hoist getUserSetting('editor') out of the editors.forEach loop and
  drop narrative comments inside loadTinyMCEEditor
- replace stringly-typed class_exists() with
  GF_Background_Process::class in bootstrap.php
- reorder/dedupe the 6.14.3 changelog entries

13 Jest tests cover the apply() behaviour — selection-clear, deferred
init via editor.on('init'), missing-getWin/getSelection guards,
switchEditors throwing, switchEditors absent.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 CHANGELOG.md                                  |  11 +-
 .../loadTinyMCEEditor.js                      |  57 ++++-
 src/bootstrap.php                             |   2 +-
 .../loadTinyMCEEditor.test.js                 | 231 ++++++++++++++++++
 4 files changed, 286 insertions(+), 15 deletions(-)
 create mode 100644 tests/js-unit/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.test.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77582c761..910e01a0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,14 @@
 
 ### 6.14.3
 * 🧹 Housekeeping: WordPress 7.0 Compatibility
-* 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
 * 🧹 Housekeeping: Better screen-reader support for admin pages
-* 🐞Bug: Preserve the selected template when setting up a new PDF on a form
-* 🐞Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
-* 🐞Bug: Preserve unsaved edits to the Template fields when switching PDF templates
+* 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
+* 🐞Bug: Honor the PDF Conditional Logic toggle so disabling it in the UI skips stale conditional rules
 * 🐞Bug: Fix JavaScript error switching PDF templates when the editor was set to Text mode
-* 🐞Bug: Fix TinyMCE editor reload when switching PDF templates
+* 🐞Bug: Preserve unsaved edits to the Template fields when switching PDF templates
+* 🐞Bug: Preserve the selected template when setting up a new PDF on a form
 * 🐞Bug: Fix Gravity Forms 2.6+ version detection on PDF form-settings pages
-* 🐞Bug: Honor the PDF Conditional Logic toggle so disabling it in the UI skips stale conditional rules
+* 🐞Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
 
 ### 6.14.2
 * 🐞Bug: Fix PHP warning caused by the GFCommon::get_lead_field_display() API change in Gravity Forms 2.9.29
diff --git a/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js b/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js
index 91d847b21..699a0e91c 100644
--- a/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js
+++ b/src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.js
@@ -1,6 +1,6 @@
 /**
  * Initialises AJAX-loaded wp_editor TinyMCE containers for use
- * @param { Array<string> }          editors  The DOM element IDs to parse
+ * @param { Array<string> }           editors  The DOM element IDs to parse
  * @param { Record<string, unknown> } settings The TinyMCE settings to use
  *
  * @since  4.0
@@ -38,6 +38,8 @@ export function loadTinyMCEEditor(editors, settings) {
 			'body#tinymce { max-width: 100%; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;}';
 	}
 
+	const lastEditorTab = getUserSetting('editor') === 'html' ? 'html' : 'tmce';
+
 	/* Load our new editors */
 	editors.forEach(function (fullId) {
 		/* Setup out selector */
@@ -55,15 +57,54 @@ export function loadTinyMCEEditor(editors, settings) {
 			QTags._buttonsInit();
 
 			/* remember last tab selected */
+			restoreLastEditorTab(fullId, lastEditorTab);
+		}
+	});
+}
+
+/**
+ * Restore the user's last-selected editor tab on a freshly mounted wp_editor.
+ * Deferred via editor.on('init') — switchEditors.go throws if the iframe isn't built.
+ *
+ * @param {string} fullId
+ * @param {string} mode   Either 'html' or 'tmce'.
+ */
+function restoreLastEditorTab(fullId, mode) {
+	if (
+		typeof switchEditors === 'undefined' ||
+		typeof switchEditors.go !== 'function'
+	) {
+		return;
+	}
+
+	const apply = function () {
+		try {
+			/* Clear TinyMCE's default-cursor range so switchEditors.go's findBookmarkedPosition
+			 * short-circuits — otherwise it schedules a textArea.focus() that scrolls the page. */
+			const editor = tinyMCE.get(fullId);
+			const editorWindow =
+				editor && typeof editor.getWin === 'function'
+					? editor.getWin()
+					: null;
 			if (
-				typeof switchEditors !== 'undefined' &&
-				typeof switchEditors.go === 'function'
+				editorWindow &&
+				typeof editorWindow.getSelection === 'function'
 			) {
-				switchEditors.go(
-					fullId,
-					getUserSetting('editor') === 'html' ? 'html' : 'tmce'
-				);
+				const selection = editorWindow.getSelection();
+				if (selection) {
+					selection.removeAllRanges();
+				}
 			}
+			switchEditors.go(fullId, mode);
+		} catch (e) {
+			/* Fall back silently to Visual mode if WP throws — the user can flip the tab manually. */
 		}
-	});
+	};
+
+	const editor = tinyMCE.get(fullId);
+	if (editor && editor.initialized) {
+		apply();
+	} else if (editor && typeof editor.on === 'function') {
+		editor.on('init', apply);
+	}
 }
diff --git a/src/bootstrap.php b/src/bootstrap.php
index 8e0ff0ce2..be436a652 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -209,7 +209,7 @@ public function init() {
 
 		/* Load Background Queue classes */
 		if ( version_compare( GFForms::$version, '2.9.7.2', '>=' ) ) {
-			if ( ! class_exists( '\Gravity_Forms\Gravity_Forms\Async\GF_Background_Process' ) ) {
+			if ( ! class_exists( GF_Background_Process::class ) ) {
 				require_once GFCommon::get_base_path() . '/includes/async/class-gf-background-process.php';
 			}
 
diff --git a/tests/js-unit/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.test.js b/tests/js-unit/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.test.js
new file mode 100644
index 000000000..843b59fe0
--- /dev/null
+++ b/tests/js-unit/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor.test.js
@@ -0,0 +1,231 @@
+import { loadTinyMCEEditor } from '../../../../../../src/assets/js/admin/settings/common/dynamicTemplateFields/loadTinyMCEEditor';
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2026, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @since       6.14.3
+ */
+
+function setupEditor({ initialized = true } = {}) {
+	const removeAllRanges = jest.fn();
+	const selection = { removeAllRanges };
+	const win = { getSelection: jest.fn(() => selection) };
+	const editor = {
+		initialized,
+		on: jest.fn(),
+		getWin: jest.fn(() => win),
+	};
+	return { editor, win, selection, removeAllRanges };
+}
+
+describe('loadTinyMCEEditor', () => {
+	beforeEach(() => {
+		window.tinyMCE = {
+			init: jest.fn(),
+			execCommand: jest.fn(),
+			get: jest.fn(),
+		};
+		window.switchEditors = { go: jest.fn() };
+		window.getUserSetting = jest.fn().mockReturnValue('tmce');
+
+		window.QTags = jest.fn();
+		window.QTags._buttonsInit = jest.fn();
+	});
+
+	afterEach(() => {
+		delete window.tinyMCE;
+		delete window.switchEditors;
+		delete window.getUserSetting;
+		delete window.QTags;
+	});
+
+	it('initialises each editor with the supplied settings and registers it with TinyMCE/QTags', () => {
+		const { editor } = setupEditor();
+		window.tinyMCE.get.mockReturnValue(editor);
+
+		/* settings is mutated in-place each iteration, so snapshot the selector at call time */
+		const observedSelectors = [];
+		window.tinyMCE.init.mockImplementation((settings) =>
+			observedSelectors.push(settings.selector)
+		);
+
+		loadTinyMCEEditor(['editor-one', 'editor-two'], {});
+
+		expect(observedSelectors).toEqual(['#editor-one', '#editor-two']);
+		expect(window.tinyMCE.execCommand).toHaveBeenCalledWith(
+			'mceAddEditor',
+			false,
+			'editor-one'
+		);
+		expect(window.tinyMCE.execCommand).toHaveBeenCalledWith(
+			'mceAddEditor',
+			false,
+			'editor-two'
+		);
+		expect(window.QTags).toHaveBeenCalledWith({ id: 'editor-one' });
+		expect(window.QTags).toHaveBeenCalledWith({ id: 'editor-two' });
+		expect(window.QTags._buttonsInit).toHaveBeenCalledTimes(2);
+	});
+
+	it('applies TinyMCE-style defaults (body_class, formats, content_style) when settings is provided', () => {
+		const { editor } = setupEditor();
+		window.tinyMCE.get.mockReturnValue(editor);
+
+		const settings = {};
+		loadTinyMCEEditor(['editor'], settings);
+
+		expect(settings.body_class).toBe(
+			'id post-type-post post-status-publish post-format-standard'
+		);
+		expect(settings.formats).toEqual(
+			expect.objectContaining({
+				alignleft: expect.any(Array),
+				aligncenter: expect.any(Array),
+				alignright: expect.any(Array),
+				strikethrough: { inline: 'del' },
+			})
+		);
+		expect(settings.content_style).toContain('body#tinymce');
+	});
+
+	it('does not touch settings when called with settings === null', () => {
+		window.tinyMCE.get.mockReturnValue(setupEditor().editor);
+
+		expect(() => loadTinyMCEEditor([], null)).not.toThrow();
+		expect(window.tinyMCE.init).not.toHaveBeenCalled();
+	});
+
+	describe("restoring the user's last-selected editor tab", () => {
+		it("switches to Code mode when getUserSetting('editor') is 'html'", () => {
+			window.getUserSetting.mockReturnValue('html');
+			const { editor } = setupEditor({ initialized: true });
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).toHaveBeenCalledWith(
+				'editor-one',
+				'html'
+			);
+		});
+
+		it("switches to Visual mode when getUserSetting('editor') is anything other than 'html'", () => {
+			window.getUserSetting.mockReturnValue('tinymce');
+			const { editor } = setupEditor({ initialized: true });
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).toHaveBeenCalledWith(
+				'editor-one',
+				'tmce'
+			);
+		});
+
+		it('applies the switch immediately when the editor is already initialised', () => {
+			const { editor } = setupEditor({ initialized: true });
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).toHaveBeenCalledTimes(1);
+			expect(editor.on).not.toHaveBeenCalled();
+		});
+
+		it("defers the switch until TinyMCE fires 'init' when the editor isn't initialised yet", () => {
+			const { editor } = setupEditor({ initialized: false });
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).not.toHaveBeenCalled();
+			expect(editor.on).toHaveBeenCalledWith(
+				'init',
+				expect.any(Function)
+			);
+
+			const [, deferredApply] = editor.on.mock.calls[0];
+			deferredApply();
+
+			expect(window.switchEditors.go).toHaveBeenCalledWith(
+				'editor-one',
+				'tmce'
+			);
+		});
+
+		it('clears the iframe window selection before calling switchEditors.go (prevents scroll jump)', () => {
+			window.getUserSetting.mockReturnValue('html');
+			const { editor, removeAllRanges } = setupEditor({
+				initialized: true,
+			});
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(removeAllRanges).toHaveBeenCalledTimes(1);
+			const removeOrder = removeAllRanges.mock.invocationCallOrder[0];
+			const goOrder = window.switchEditors.go.mock.invocationCallOrder[0];
+			expect(removeOrder).toBeLessThan(goOrder);
+		});
+
+		it('still attempts the switch when the editor exposes no getWin()', () => {
+			window.getUserSetting.mockReturnValue('html');
+			const { editor } = setupEditor({ initialized: true });
+			delete editor.getWin;
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).toHaveBeenCalledWith(
+				'editor-one',
+				'html'
+			);
+		});
+
+		it('still attempts the switch when the iframe getSelection() returns null', () => {
+			window.getUserSetting.mockReturnValue('html');
+			const { editor, win } = setupEditor({ initialized: true });
+			win.getSelection = jest.fn(() => null);
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).toHaveBeenCalledWith(
+				'editor-one',
+				'html'
+			);
+		});
+
+		it('swallows exceptions from switchEditors.go so the surrounding template-swap callback keeps running', () => {
+			const { editor } = setupEditor({ initialized: true });
+			window.tinyMCE.get.mockReturnValue(editor);
+			window.switchEditors.go.mockImplementation(() => {
+				throw new TypeError('iframeElement is undefined');
+			});
+
+			expect(() => loadTinyMCEEditor(['editor-one'], {})).not.toThrow();
+		});
+
+		it('no-ops when window.switchEditors is unavailable', () => {
+			delete window.switchEditors;
+			const { editor, removeAllRanges } = setupEditor({
+				initialized: true,
+			});
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			expect(() => loadTinyMCEEditor(['editor-one'], {})).not.toThrow();
+			expect(removeAllRanges).not.toHaveBeenCalled();
+		});
+
+		it('skips restoration entirely when QTags is unavailable', () => {
+			delete window.QTags;
+			const { editor } = setupEditor({ initialized: true });
+			window.tinyMCE.get.mockReturnValue(editor);
+
+			loadTinyMCEEditor(['editor-one'], {});
+
+			expect(window.switchEditors.go).not.toHaveBeenCalled();
+		});
+	});
+});

From a134e7d76dfe0f60e0752968d00851844fcc972d Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:35:03 +1000
Subject: [PATCH 18/20] Finalize changelog for 6.14.3

---
 CHANGELOG.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 910e01a0a..bbb35e85f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,17 @@
 
 ### 6.14.3
 * 🧹 Housekeeping: WordPress 7.0 Compatibility
-* 🧹 Housekeeping: Better screen-reader support for admin pages
+* 🧹 Housekeeping: Improved screen-reader support for admin pages
 * 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
-* 🐞Bug: Honor the PDF Conditional Logic toggle so disabling it in the UI skips stale conditional rules
-* 🐞Bug: Fix JavaScript error switching PDF templates when the editor was set to Text mode
-* 🐞Bug: Preserve unsaved edits to the Template fields when switching PDF templates
-* 🐞Bug: Preserve the selected template when setting up a new PDF on a form
-* 🐞Bug: Fix Gravity Forms 2.6+ version detection on PDF form-settings pages
-* 🐞Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
+* 🐞 Bug: Honor PDF Conditional Logic toggle setting, so disabling it in the UI skips stale conditional rules
+* 🐞 Bug: Fix Rich Text Editor rendering error when switching PDF templates
+* 🐞 Bug: Preserve unsaved edits to the Template fields if switching to another PDF templates with the same fields (eg. Core / Invoice / Certificate)
+* 🐞 Bug: Preserve the selected template when adding a new PDF
+* 🐞 Bug: Fix Gravity Forms 2.6+ version detection on PDF form-settings pages
+* 🐞 Bug: Fix regression in the Template Manager when an invalid .zip is uploaded
+* 🐞 Bug: Minor UI fixes in the Template Manager
+* 🐞 Bug: Fix regression in the Core Fonts installer when a download error occurs
+* 🐞 Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
 
 ### 6.14.2
 * 🐞Bug: Fix PHP warning caused by the GFCommon::get_lead_field_display() API change in Gravity Forms 2.9.29

From ca52064643412181ccc6497215483f1e4ef5b71e Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:35:11 +1000
Subject: [PATCH 19/20] Fix changelog formatting

---
 CHANGELOG.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbb35e85f..afa187002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,11 +17,11 @@
 * 🐞 Bug: Reset Gravity Wiz Nested Form field IDs after each group in PDFs
 
 ### 6.14.2
-* 🐞Bug: Fix PHP warning caused by the GFCommon::get_lead_field_display() API change in Gravity Forms 2.9.29
-* 🐞Bug: Fix merge tag rendering issue when switching between PDF templates
-* 🐞Bug: Fix Font Manager to Font select field syncing issue
-* 🐞Bug: Fix edge-case issue with the URL signing feature and improve verification/validation checks 
-* 🐞Bug: Rename Chinese language files so it is correctly used when the site language is set to the zh_CN locale.
+* 🐞 Bug: Fix PHP warning caused by the GFCommon::get_lead_field_display() API change in Gravity Forms 2.9.29
+* 🐞 Bug: Fix merge tag rendering issue when switching between PDF templates
+* 🐞 Bug: Fix Font Manager to Font select field syncing issue
+* 🐞 Bug: Fix edge-case issue with the URL signing feature and improve verification/validation checks 
+* 🐞 Bug: Rename Chinese language files so it is correctly used when the site language is set to the zh_CN locale.
 * 🧹 Housekeeping: Improve template caching and performance
 * 🧹 Housekeeping: Update PHP and Javascript dependencies
 * 🧹 Housekeeping: Disable asset caching when `SCRIPT_DEBUG` constant enabled
@@ -31,24 +31,24 @@
 ### 6.14.1
 * 🧹 Housekeeping: Add `gfpdf-{$type}` CSS class to the HTML mark-up when a field uses a different input type 
 * 🧹 Housekeeping: Use the field type (not input type) in the `gfpdf_pdf_field_content_{$type}` filter
-* 🐞Bug: Fix PHP error if another plugin lazy loads the PSR/Log v1 library 
+* 🐞 Bug: Fix PHP error if another plugin lazy loads the PSR/Log v1 library 
 
 ### 6.14.0
 * 🎉 Feature: Rotate Gravity PDF log files when Gravity Forms logging is enabled. This prevents the log file getting to large.
 * 🎉 Feature: Add support for using v1, v2, and v3 of the PSR/Log Composer library with Gravity PDF
-* 🐞Bug: Fix PHP error if a third-party plugin loads PSR/Log v2 or v3
+* 🐞 Bug: Fix PHP error if a third-party plugin loads PSR/Log v2 or v3
 
 ### 6.13.5
-* 🐞Bug: Ensure background queue uses correct entry data when resending notifications
-* 🐞Bug: Prevent plugins corrupting PDF data when viewing/downloading (via output buffer)
+* 🐞 Bug: Ensure background queue uses correct entry data when resending notifications
+* 🐞 Bug: Prevent plugins corrupting PDF data when viewing/downloading (via output buffer)
 
 ### 6.13.4
-* 🐞Bug: Resolve PDF View/Download issue if both Event Espresso and LifterLMS plugin are installed 
+* 🐞 Bug: Resolve PDF View/Download issue if both Event Espresso and LifterLMS plugin are installed 
 
 ### 6.13.3
 * 🔒 Security: Remove the mPDF and Gravity PDF version numbers in the PDF metadata
-* 🐞Bug: Resolve PHP error in 6.13.2 upgrade routine if the temporary PDF directory has been incorrectly set to a shared system folder
-* 🐞Bug: Resolve PHP error if the `page` or `subview` admin URL parameters are arrays
+* 🐞 Bug: Resolve PHP error in 6.13.2 upgrade routine if the temporary PDF directory has been incorrectly set to a shared system folder
+* 🐞 Bug: Resolve PHP error if the `page` or `subview` admin URL parameters are arrays
 
 ### 6.13.2
 * 🐞 Bug: Fix plugin build issue preventing the mPDF cache filesystem fix (6.13.0) from working

From 8f31ea53f44e9ba246fdb194c17364468de22a3e Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Tue, 19 May 2026 12:36:29 +1000
Subject: [PATCH 20/20] Fix minor grammar error in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afa187002..1a279a6a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 * 🧹 Housekeeping: Remove obsolete Gravity Forms cache workaround
 * 🐞 Bug: Honor PDF Conditional Logic toggle setting, so disabling it in the UI skips stale conditional rules
 * 🐞 Bug: Fix Rich Text Editor rendering error when switching PDF templates
-* 🐞 Bug: Preserve unsaved edits to the Template fields if switching to another PDF templates with the same fields (eg. Core / Invoice / Certificate)
+* 🐞 Bug: Preserve unsaved edits to the Template fields if switching to a PDF template with the same fields (eg. Core / Invoice / Certificate)
 * 🐞 Bug: Preserve the selected template when adding a new PDF
 * 🐞 Bug: Fix Gravity Forms 2.6+ version detection on PDF form-settings pages
 * 🐞 Bug: Fix regression in the Template Manager when an invalid .zip is uploaded