From ed05605e9b5834b85108e660533ec23fd6eb2b67 Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Thu, 18 Dec 2025 16:21:18 -0600
Subject: [PATCH 01/11] Adding direct file limits.

---
 simpletoc-admin-settings.php     | 5 +++++
 simpletoc-class-headline-ids.php | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/simpletoc-admin-settings.php b/simpletoc-admin-settings.php
index 692b61e..a59fb8a 100644
--- a/simpletoc-admin-settings.php
+++ b/simpletoc-admin-settings.php
@@ -7,6 +7,11 @@
 
 namespace MToensing\SimpleTOC;
 
+if ( ! defined( 'ABSPATH' ) ) {
+	header( 'Status: 403 Forbidden' );
+	header( 'HTTP/1.1 403 Forbidden' );
+	exit;
+}
 /**
  * Add SimpleTOC global settings page.
  */
diff --git a/simpletoc-class-headline-ids.php b/simpletoc-class-headline-ids.php
index 85b95e9..e4b9de5 100644
--- a/simpletoc-class-headline-ids.php
+++ b/simpletoc-class-headline-ids.php
@@ -9,6 +9,12 @@
 
 namespace MToensing\SimpleTOC;
 
+if ( ! defined( 'ABSPATH' ) ) {
+	header( 'Status: 403 Forbidden' );
+	header( 'HTTP/1.1 403 Forbidden' );
+	exit;
+}
+
 /**
  * Class to manage headline IDs.
  *

From 9079fe180f7b44d90ca569096b7a753d51b5548a Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Thu, 18 Dec 2025 16:46:10 -0600
Subject: [PATCH 02/11] Fixing recursion for Table of Content IDs.

---
 plugin.php                               |  9 ++--
 simpletoc-class-headline-ids-wrapper.php | 57 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 simpletoc-class-headline-ids-wrapper.php

diff --git a/plugin.php b/plugin.php
index 3d364ce..4d889c3 100644
--- a/plugin.php
+++ b/plugin.php
@@ -17,6 +17,7 @@
 
 require_once __DIR__ . '/simpletoc-admin-settings.php';
 require_once __DIR__ . '/simpletoc-class-headline-ids.php';
+require_once __DIR__ . '/simpletoc-class-headline-ids-wrapper.php';
 
 /**
  * Prevents direct execution of the plugin file.
@@ -166,6 +167,8 @@ function simpletoc_add_ids_to_content( $content ) {
 
 add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_add_ids_to_content', 1 );
 
+
+
 /**
  * Recursively adds IDs to the headings of a nested block structure.
  *
@@ -187,9 +190,9 @@ function add_ids_to_blocks_recursive( $blocks ) {
 	 */
 	$supported_blocks = apply_filters( 'simpletoc_supported_blocks_for_ids', $supported_blocks );
 
-	// Need two separate instances so that IDs aren't double coubnted.
-	$inner_html_id_instance    = new SimpleTOC_Headline_Ids();
-	$inner_content_id_instance = new SimpleTOC_Headline_Ids();
+	// Need two separate instances so that IDs aren't double counted.
+	$inner_html_id_instance    = SimpleTOC_Headline_Ids_Wrapper::get_inner_html_id_instance();
+	$inner_content_id_instance = SimpleTOC_Headline_Ids_Wrapper::get_inner_content_id_instance();
 
 	foreach ( $blocks as &$block ) {
 		if ( isset( $block['blockName'] ) && in_array( $block['blockName'], $supported_blocks, true ) && isset( $block['innerHTML'] ) && isset( $block['innerContent'] ) && isset( $block['innerContent'][0] ) ) {
diff --git a/simpletoc-class-headline-ids-wrapper.php b/simpletoc-class-headline-ids-wrapper.php
new file mode 100644
index 0000000..37e5676
--- /dev/null
+++ b/simpletoc-class-headline-ids-wrapper.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Class to manage headline IDs for the wrapper.
+ *
+ * @package simpletoc
+ */
+
+namespace MToensing\SimpleTOC;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	header( 'Status: 403 Forbidden' );
+	header( 'HTTP/1.1 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Wrapper for the IDs. This ensures that IDs are not double-counted or lost in recursion.
+ */
+class SimpleTOC_Headline_Ids_Wrapper {
+	/**
+	 * The instance of the SimpleTOC_Headline_Ids class for the wrapper.
+	 *
+	 * @var SimpleTOC_Headline_Ids
+	 */
+	private static $inner_content_id_instance = null;
+
+	/**
+	 * The instance of the SimpleTOC_Headline_Ids class for the wrapper.
+	 *
+	 * @var SimpleTOC_Headline_Ids
+	 */
+	private static $inner_html_id_instance = null;
+
+	/**
+	 * Get the instance of the SimpleTOC_Headline_Ids class for the wrapper for inner content.
+	 *
+	 * @return SimpleTOC_Headline_Ids
+	 */
+	public static function get_inner_content_id_instance() {
+		if ( null === self::$inner_content_id_instance ) {
+			self::$inner_content_id_instance = new SimpleTOC_Headline_Ids();
+		}
+		return self::$inner_content_id_instance;
+	}
+
+	/**
+	 * Get the instance of the SimpleTOC_Headline_Ids class for the wrapper for inner HTML.
+	 *
+	 * @return SimpleTOC_Headline_Ids
+	 */
+	public static function get_inner_html_id_instance() {
+		if ( null === self::$inner_html_id_instance ) {
+			self::$inner_html_id_instance = new SimpleTOC_Headline_Ids();
+		}
+		return self::$inner_html_id_instance;
+	}
+}

From 95d913989b76a304cf0fea8a9dfe50f3a1a32bfb Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Tue, 13 Jan 2026 17:41:27 -0600
Subject: [PATCH 03/11] Getting block to render conditionally in the editor
 late.

---
 plugin.php | 104 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 33 deletions(-)

diff --git a/plugin.php b/plugin.php
index eee2692..a61f1e5 100644
--- a/plugin.php
+++ b/plugin.php
@@ -165,9 +165,74 @@ function simpletoc_add_ids_to_content( $content ) {
 	return $content;
 }
 
-add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_add_ids_to_content', 1 ); 
+add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_add_ids_to_content', 100 );
 
+add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_render_toc', 101 );
 
+/**
+ * Renders the Table of Contents block.
+ *
+ * @param string $content The content to render the Table of Contents block for.
+ * @return string The rendered Table of Contents block.
+ */
+function simpletoc_render_toc( $content ) {
+	// Try to get the [simpletoc] block attributes.
+	$maybe_shortcode_result = preg_match( '/\[simpletoc ([^\]]*)\]/m', $content, $matches );
+
+	if ( ! $maybe_shortcode_result ) {
+		return $content;
+	}
+
+	// Decode HTML entities and convert curly quotes to straight quotes for valid JSON.
+	$json_string = html_entity_decode( $matches[1], ENT_QUOTES | ENT_HTML5, 'UTF-8' );
+	// Convert curly quotes (left and right) back to straight quotes for valid JSON.
+	$json_string = str_replace( array( "\u{201C}", "\u{201D}", "\u{2018}", "\u{2019}" ), array( '"', '"', "'", "'" ), $json_string );
+
+	$attributes = json_decode( $json_string, true );
+
+	if ( null === $attributes ) {
+		return $content;
+	}
+
+	$is_backend  = defined( 'REST_REQUEST' ) && REST_REQUEST && 'edit' === filter_input( INPUT_GET, 'context' );
+	$title_text  = $attributes['title_text'] ? esc_html( trim( $attributes['title_text'] ) ) : __( 'Table of Contents', 'simpletoc' );
+	$alignclass  = ! empty( $attributes['align'] ) ? 'align' . $attributes['align'] : '';
+	$class_name  = ! empty( $attributes['className'] ) ? wp_strip_all_tags( $attributes['className'] ) : '';
+	$title_level = $attributes['title_level'];
+
+	$wrapper_enabled = apply_filters( 'simpletoc_wrapper_enabled', false ) || true === (bool) get_option( 'simpletoc_wrapper_enabled', false ) || true === (bool) get_option( 'simpletoc_accordion_enabled', false );
+
+	$wrapper_attrs = get_block_wrapper_attributes( array( 'class' => 'simpletoc' ) );
+	$pre_html      = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '<div role="navigation" aria-label="' . __( 'Table of Contents', 'simpletoc' ) . '" ' . $wrapper_attrs . '>' : '';
+	$post_html     = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '</div>' : '';
+
+	$post   = get_post();
+	$blocks = ! is_null( $post ) && ! is_null( $post->post_content ) ? parse_blocks( $post->post_content ) : '';
+
+	$headings       = array_reverse( filter_headings_recursive( $blocks ) );
+	$headings       = simpletoc_add_pagenumber( $blocks, $headings );
+	$headings_clean = array_map( 'trim', $headings );
+	$toc_html       = generate_toc( $headings_clean, $attributes );
+
+	if ( empty( $blocks ) ) {
+		$toc_html .= get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No blocks found.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
+	}
+
+	if ( empty( $headings_clean ) ) {
+		$toc_html .= get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No headings found.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
+	}
+
+	if ( empty( $toc_html ) ) {
+		$toc_html .= get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No headings found.', 'simpletoc' ), __( 'Check minimal and maximum level block settings.', 'simpletoc' ) );
+	}
+
+	$toc_html = $pre_html . $toc_html . $post_html;
+
+	// Replace the [simpletoc] block with the rendered Table of Contents block.
+	$content = str_replace( $matches[0], $toc_html, $content );
+
+	return $content;
+}
 
 /**
  * Recursively adds IDs to the headings of a nested block structure.
@@ -218,39 +283,12 @@ function add_ids_to_blocks_recursive( $blocks ) {
  * @return string The HTML output for the Table of Contents block
  */
 function render_callback_simpletoc( $attributes ) {
-	$is_backend  = defined( 'REST_REQUEST' ) && REST_REQUEST && 'edit' === filter_input( INPUT_GET, 'context' );
-	$title_text  = $attributes['title_text'] ? esc_html( trim( $attributes['title_text'] ) ) : __( 'Table of Contents', 'simpletoc' );
-	$alignclass  = ! empty( $attributes['align'] ) ? 'align' . $attributes['align'] : '';
-	$class_name  = ! empty( $attributes['className'] ) ? wp_strip_all_tags( $attributes['className'] ) : '';
-	$title_level = $attributes['title_level'];
-
-	$wrapper_enabled = apply_filters( 'simpletoc_wrapper_enabled', false ) || true === (bool) get_option( 'simpletoc_wrapper_enabled', false ) || true === (bool) get_option( 'simpletoc_accordion_enabled', false );
-
-	$wrapper_attrs = get_block_wrapper_attributes( array( 'class' => 'simpletoc' ) );
-	$pre_html      = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '<div role="navigation" aria-label="' . __( 'Table of Contents', 'simpletoc' ) . '" ' . $wrapper_attrs . '>' : '';
-	$post_html     = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '</div>' : '';
-
-	$post   = get_post();
-	$blocks = ! is_null( $post ) && ! is_null( $post->post_content ) ? parse_blocks( $post->post_content ) : '';
-
-	$headings       = array_reverse( filter_headings_recursive( $blocks ) );
-	$headings       = simpletoc_add_pagenumber( $blocks, $headings );
-	$headings_clean = array_map( 'trim', $headings );
-	$toc_html       = generate_toc( $headings_clean, $attributes );
-
-	if ( empty( $blocks ) ) {
-		return get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No blocks found.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
-	}
-
-	if ( empty( $headings_clean ) ) {
-		return get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No headings found.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
+	$return = sprintf( '[simpletoc %s]', wp_json_encode( $attributes ) );
+	if ( defined( 'REST_REQUEST' ) && REST_REQUEST && 'edit' === filter_input( INPUT_GET, 'context' ) ) {
+		// This ensures simple TOC is rendered in the editor.
+		$return = apply_filters( 'the_content', $return );
 	}
-
-	if ( empty( $toc_html ) ) {
-		return get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No headings found.', 'simpletoc' ), __( 'Check minimal and maximum level block settings.', 'simpletoc' ) );
-	}
-
-	return $pre_html . $toc_html . $post_html;
+	return $return;
 }
 
 /**

From cef7dc49793092b215cd649341b9c810267f555a Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Tue, 13 Jan 2026 19:14:02 -0600
Subject: [PATCH 04/11] Adding late dom parsing for Headlines and shortcode
 replaceemnt.

---
 plugin.php | 119 +++++++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 64 deletions(-)

diff --git a/plugin.php b/plugin.php
index a61f1e5..1bb53e4 100644
--- a/plugin.php
+++ b/plugin.php
@@ -15,6 +15,8 @@
 
 namespace MToensing\SimpleTOC;
 
+use WP_HTML_Token;
+
 require_once __DIR__ . '/simpletoc-admin-settings.php';
 require_once __DIR__ . '/simpletoc-class-headline-ids.php';
 require_once __DIR__ . '/simpletoc-class-headline-ids-wrapper.php';
@@ -206,20 +208,18 @@ function simpletoc_render_toc( $content ) {
 	$pre_html      = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '<div role="navigation" aria-label="' . __( 'Table of Contents', 'simpletoc' ) . '" ' . $wrapper_attrs . '>' : '';
 	$post_html     = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '</div>' : '';
 
-	$post   = get_post();
-	$blocks = ! is_null( $post ) && ! is_null( $post->post_content ) ? parse_blocks( $post->post_content ) : '';
-
-	$headings       = array_reverse( filter_headings_recursive( $blocks ) );
-	$headings       = simpletoc_add_pagenumber( $blocks, $headings );
-	$headings_clean = array_map( 'trim', $headings );
-	$toc_html       = generate_toc( $headings_clean, $attributes );
-
-	if ( empty( $blocks ) ) {
-		$toc_html .= get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No blocks found.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
+	$post = get_post();
+	if ( ! $post ) {
+		return $content;
 	}
 
-	if ( empty( $headings_clean ) ) {
-		$toc_html .= get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No headings found.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
+	$post_content = $post->post_content;
+	$headings     = filter_headings( $post_content );
+	// $headings       = simpletoc_add_pagenumber( $blocks, $headings );
+	$toc_html = generate_toc( $headings, $attributes );
+
+	if ( empty( $headings ) ) {
+		$toc_html .= get_empty_blocks_message( $is_backend, $attributes, $title_level, $alignclass, $title_text, __( 'No headings found. Please save your post and ensure headings are present.', 'simpletoc' ), __( 'Save or update post first.', 'simpletoc' ) );
 	}
 
 	if ( empty( $toc_html ) ) {
@@ -286,7 +286,7 @@ function render_callback_simpletoc( $attributes ) {
 	$return = sprintf( '[simpletoc %s]', wp_json_encode( $attributes ) );
 	if ( defined( 'REST_REQUEST' ) && REST_REQUEST && 'edit' === filter_input( INPUT_GET, 'context' ) ) {
 		// This ensures simple TOC is rendered in the editor.
-		$return = apply_filters( 'the_content', $return );
+		$return = simpletoc_render_toc( $return );
 	}
 	return $return;
 }
@@ -348,71 +348,62 @@ function simpletoc_add_pagenumber( $blocks, $headings ) {
 }
 
 /**
- * Return all headings with a recursive walk through all blocks.
- * This includes groups and reusable block with groups within reusable blocks.
+ * Filter through all headings. Only return headings that have IDs, do not have SimpleTOC excluded class. Optional filter for ignoring headings inside container blocks..
  *
- * @param array[] $blocks The blocks to filter headings from.
- * @return array[]
+ * @param string $content The content to filter headings from.
+ * @return array[] - Array of headings with HTML tags.
  */
-function filter_headings_recursive( $blocks ) {
+function filter_headings( $content ) {
+
 	$arr = array();
 
-	if ( ! is_array( $blocks ) ) {
+	if ( empty( $content ) ) {
 		return $arr;
 	}
 
-	// allow developers to ignore specific blocks.
-	$ignored_blocks = apply_filters( 'simpletoc_excluded_blocks', array() );
-
-	foreach ( $blocks as $inner_block ) {
-		if ( is_array( $inner_block ) ) {
-			// if block is ignored, skip.
-			if ( isset( $inner_block['blockName'] ) && in_array( $inner_block['blockName'], $ignored_blocks, true ) ) {
-				continue;
-			}
+	$dom = new \DOMDocument();
+	try {
+		$dom->loadHTML( '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
+	} catch ( \Exception $e ) {
+		return $arr;
+	}
 
-			if ( isset( $inner_block['attrs']['ref'] ) ) {
-				// search in reusable blocks.
-				$post = get_post( $inner_block['attrs']['ref'] );
-				if ( $post ) {
-					$e_arr = parse_blocks( $post->post_content );
-					$arr   = array_merge( filter_headings_recursive( $e_arr ), $arr );
-				}
-			} else {
-				// search in groups.
-				$arr = array_merge( filter_headings_recursive( $inner_block ), $arr );
-			}
-		} else {
-			if ( isset( $blocks['blockName'] ) && ( 'core/heading' === $blocks['blockName'] ) && 'core/heading' !== $inner_block ) {
-				// make sure it's a headline.
-				if ( preg_match( '/(<h1|<h2|<h3|<h4|<h5|<h6)/i', $inner_block ) ) {
-					$arr[] = $inner_block;
-				}
-			}
+	// use xpath to select the Heading html tags.
+	$xpath = new \DOMXPath( $dom );
+	$tags  = $xpath->evaluate( '//*[self::h1 or self::h2 or self::h3 or self::h4 or self::h5 or self::h6]' );
 
-			$supported_third_party_blocks = array(
-				'generateblocks/headline', /* GenerateBlocks 1.x */
-				'generateblocks/text', /* GenerateBlocks 2.0 */
-			);
+	foreach ( $tags as $tag ) {
+		$tag_id = 'simple-toc'; // $tag->getAttribute( 'id' );
+		if ( ! $tag_id ) {
+			continue;
+		}
 
-			/**
-			 * Filter to add supported third party blocks.
-			 *
-			 * @param array $supported_third_party_blocks The array of supported third party blocks.
-			 * @return array The modified array of supported third party blocks.
-			 */
-			$supported_third_party_blocks = apply_filters(
-				'simpletoc_supported_third_party_blocks',
-				$supported_third_party_blocks
-			);
+		// check if the heading has the SimpleTOC excluded class.
+		$tag_classes = $tag->getAttribute( 'class' );
+		if ( $tag_classes ) {
+			if ( strpos( $tag_classes, 'simpletoc-excluded' ) !== false ) {
+				continue;
+			}
+		}
 
-			if ( isset( $blocks['blockName'] ) && in_array( $blocks['blockName'], $supported_third_party_blocks, true ) && 'core/heading' !== $inner_block ) {
-				// make sure it's a headline.
-				if ( preg_match( '/(<h1|<h2|<h3|<h4|<h5|<h6)/i', $inner_block ) ) {
-					$arr[] = $inner_block;
+		/**
+		 * Filter to skip headings inside container blocks.
+		 *
+		 * @param bool $skip_in_wrapper Whether to skip headings inside container blocks.
+		 * @return bool The filtered value.
+		 */
+		$skip_in_wrapper = apply_filters( 'simpletoc_skip_in_wrapper', false );
+		if ( $skip_in_wrapper ) {
+			// Try to get parent tag.
+			$parent_tag = $tag->parentNode;
+			if ( $parent_tag && isset( $parent_tag->tagName ) ) {
+				if ( in_array( strtolower( $parent_tag->tag_name ), array( 'div', 'section', 'article', 'main', 'header', 'footer' ), true ) ) {
+					continue;
 				}
 			}
 		}
+
+		$arr[] = $tag->ownerDocument->saveHTML( $tag ); // This gets the full HTML of the heading tag.
 	}
 
 	return $arr;

From d062912937ecbff72e22d19c7992ac9154cbe74e Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Tue, 13 Jan 2026 21:55:15 -0600
Subject: [PATCH 05/11] Fixing rendering in the block editor.

---
 plugin.php                               | 154 +++++++++++++----------
 simpletoc-class-headline-ids-wrapper.php |  57 ---------
 simpletoc-class-headline-ids.php         |  35 +++---
 3 files changed, 109 insertions(+), 137 deletions(-)
 delete mode 100644 simpletoc-class-headline-ids-wrapper.php

diff --git a/plugin.php b/plugin.php
index 1bb53e4..8796f27 100644
--- a/plugin.php
+++ b/plugin.php
@@ -19,7 +19,6 @@
 
 require_once __DIR__ . '/simpletoc-admin-settings.php';
 require_once __DIR__ . '/simpletoc-class-headline-ids.php';
-require_once __DIR__ . '/simpletoc-class-headline-ids-wrapper.php';
 
 /**
  * Prevents direct execution of the plugin file.
@@ -158,15 +157,12 @@ function ( $toc_plugins ) {
  */
 function simpletoc_add_ids_to_content( $content ) {
 
-	$blocks = parse_blocks( $content );
-
-	$blocks = add_ids_to_blocks_recursive( $blocks );
-
-	$content = serialize_blocks( $blocks );
+	$content = add_ids_to_blocks( $content );
 
 	return $content;
 }
 
+// Run late, but before toc is rendered as to be able to track and add IDs to the headings.
 add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_add_ids_to_content', 100 );
 
 add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_render_toc', 101 );
@@ -175,24 +171,25 @@ function simpletoc_add_ids_to_content( $content ) {
  * Renders the Table of Contents block.
  *
  * @param string $content The content to render the Table of Contents block for.
+ * @param bool   $return_toc_html Whether to return the TOC HTML only, without the content included.
+ * @param array  $attributes The attributes of the Table of Contents block.
  * @return string The rendered Table of Contents block.
  */
-function simpletoc_render_toc( $content ) {
-	// Try to get the [simpletoc] block attributes.
-	$maybe_shortcode_result = preg_match( '/\[simpletoc ([^\]]*)\]/m', $content, $matches );
+function simpletoc_render_toc( $content, $return_toc_html = false, $attributes = array() ) {
+	if ( ! $return_toc_html ) {
+		$maybe_shortcode_result = preg_match( '/\[simpletoc ([^\]]*)\]/m', $content, $matches );
 
-	if ( ! $maybe_shortcode_result ) {
-		return $content;
-	}
+		// Decode HTML entities and convert curly quotes to straight quotes for valid JSON.
+		$json_string = html_entity_decode( $matches[1], ENT_QUOTES | ENT_HTML5, 'UTF-8' );
+		// Convert curly quotes (left and right) back to straight quotes for valid JSON.
+		$json_string = str_replace( array( "\u{201C}", "\u{201D}", "\u{2018}", "\u{2019}" ), array( '"', '"', "'", "'" ), $json_string );
 
-	// Decode HTML entities and convert curly quotes to straight quotes for valid JSON.
-	$json_string = html_entity_decode( $matches[1], ENT_QUOTES | ENT_HTML5, 'UTF-8' );
-	// Convert curly quotes (left and right) back to straight quotes for valid JSON.
-	$json_string = str_replace( array( "\u{201C}", "\u{201D}", "\u{2018}", "\u{2019}" ), array( '"', '"', "'", "'" ), $json_string );
-
-	$attributes = json_decode( $json_string, true );
+		$attributes = json_decode( $json_string, true );
+	} else {
+		$attributes = $attributes;
+	}
 
-	if ( null === $attributes ) {
+	if ( empty( $attributes ) ) {
 		return $content;
 	}
 
@@ -208,13 +205,7 @@ function simpletoc_render_toc( $content ) {
 	$pre_html      = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '<div role="navigation" aria-label="' . __( 'Table of Contents', 'simpletoc' ) . '" ' . $wrapper_attrs . '>' : '';
 	$post_html     = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '</div>' : '';
 
-	$post = get_post();
-	if ( ! $post ) {
-		return $content;
-	}
-
-	$post_content = $post->post_content;
-	$headings     = filter_headings( $post_content );
+	$headings = filter_headings( $content );
 	// $headings       = simpletoc_add_pagenumber( $blocks, $headings );
 	$toc_html = generate_toc( $headings, $attributes );
 
@@ -228,6 +219,10 @@ function simpletoc_render_toc( $content ) {
 
 	$toc_html = $pre_html . $toc_html . $post_html;
 
+	if ( $return_toc_html ) {
+		return $toc_html;
+	}
+
 	// Replace the [simpletoc] block with the rendered Table of Contents block.
 	$content = str_replace( $matches[0], $toc_html, $content );
 
@@ -237,43 +232,57 @@ function simpletoc_render_toc( $content ) {
 /**
  * Recursively adds IDs to the headings of a nested block structure.
  *
- * @param array $blocks The blocks to add IDs to.
+ * @param string $content The content to add IDs to.
  * @return array The blocks with IDs added to their headings
  */
-function add_ids_to_blocks_recursive( $blocks ) {
+function add_ids_to_blocks( $content ) {
 
-	$supported_blocks = array(
-		'core/heading',
-		'generateblocks/text',
-		'generateblocks/headline',
-	);
+	$dom = new \DOMDocument();
+	try {
+		@$dom->loadHTML( '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
+	} catch ( \Exception $e ) {
+		return $content;
+	}
 
-	/**
-	 * Filter to add supported blocks for IDs.
-	 *
-	 * @param array $supported_blocks The array of supported blocks.
-	 */
-	$supported_blocks = apply_filters( 'simpletoc_supported_blocks_for_ids', $supported_blocks );
-
-	// Need two separate instances so that IDs aren't double counted.
-	$inner_html_id_instance    = SimpleTOC_Headline_Ids_Wrapper::get_inner_html_id_instance();
-	$inner_content_id_instance = SimpleTOC_Headline_Ids_Wrapper::get_inner_content_id_instance();
-
-	foreach ( $blocks as &$block ) {
-		if ( isset( $block['blockName'] ) && in_array( $block['blockName'], $supported_blocks, true ) && isset( $block['innerHTML'] ) && isset( $block['innerContent'] ) && isset( $block['innerContent'][0] ) ) {
-			$block['innerHTML']       = add_anchor_attribute( $block['innerHTML'], $inner_html_id_instance );
-			$block['innerContent'][0] = add_anchor_attribute( $block['innerContent'][0], $inner_content_id_instance );
-		} elseif ( isset( $block['attrs']['ref'] ) ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedElseif
-			// search in reusable blocks (this is not finished because I ran out of ideas.)
-			// $reusable_block_id = $block['attrs']['ref'];
-			// $reusable_block_content = parse_blocks(get_post($reusable_block_id)->post_content);.
-		} elseif ( ! empty( $block['innerBlocks'] ) ) {
-			// search in groups.
-			$block['innerBlocks'] = add_ids_to_blocks_recursive( $block['innerBlocks'] );
+	// use xpath to select the Heading html tags.
+	$xpath = new \DOMXPath( $dom );
+	$tags  = $xpath->evaluate( '//*[self::h1 or self::h2 or self::h3 or self::h4 or self::h5 or self::h6]' );
+
+	foreach ( $tags as $tag ) {
+		// check if the heading has the SimpleTOC excluded class.
+		$tag_classes = $tag->getAttribute( 'class' );
+		if ( $tag_classes ) {
+			if ( strpos( $tag_classes, 'simpletoc-excluded' ) !== false ) {
+				continue;
+			}
+		}
+
+		/**
+		 * Filter to skip headings inside container blocks.
+		 *
+		 * @param bool $skip_in_wrapper Whether to skip headings inside container blocks.
+		 * @return bool The filtered value.
+		 */
+		$skip_in_wrapper = apply_filters( 'simpletoc_skip_in_wrapper', true );
+		if ( $skip_in_wrapper ) {
+			// Try to get parent tag.
+			$parent_tag = $tag->parentNode;
+			if ( $parent_tag && isset( $parent_tag->tagName ) ) {
+				if ( in_array( strtolower( strtolower( $parent_tag->tagName ) ), array( 'div', 'section', 'article', 'main', 'header', 'footer' ), true ) ) {
+					continue;
+				}
+			}
+		}
+
+		// Set the ID attribute of the headline anchor if it doesn't exist.
+		$tag_id          = $tag->getAttribute( 'id' );
+		$headline_anchor = SimpleTOC_Headline_Ids::get_headline_anchor( $tag->ownerDocument->saveHTML( $tag ), true );
+		if ( empty( $tag_id ) ) {
+			$tag->setAttribute( 'id', $headline_anchor );
 		}
 	}
 
-	return $blocks;
+	return $dom->saveHTML();
 }
 
 /**
@@ -285,8 +294,23 @@ function add_ids_to_blocks_recursive( $blocks ) {
 function render_callback_simpletoc( $attributes ) {
 	$return = sprintf( '[simpletoc %s]', wp_json_encode( $attributes ) );
 	if ( defined( 'REST_REQUEST' ) && REST_REQUEST && 'edit' === filter_input( INPUT_GET, 'context' ) ) {
-		// This ensures simple TOC is rendered in the editor.
-		$return = simpletoc_render_toc( $return );
+		// Strip out the simple toc block from the content.
+		$post = get_post();
+		if ( ! $post ) {
+			return $return;
+		}
+		$post_content = $post->post_content;
+
+		// <!-- wp:simpletoc
+		$simple_toc_regex = '/(<!-- wp:simpletoc[^>]*>)/m';
+		$post_content     = preg_replace( $simple_toc_regex, '', $post_content );
+
+		// This processes post content and stores the toc content for later rendering.
+		$post_content = do_blocks( $post_content );
+		$post_content = simpletoc_add_ids_to_content( $post_content );
+
+		// Now get the toc html.
+		$return = simpletoc_render_toc( $post_content, true, $attributes );
 	}
 	return $return;
 }
@@ -392,12 +416,12 @@ function filter_headings( $content ) {
 		 * @param bool $skip_in_wrapper Whether to skip headings inside container blocks.
 		 * @return bool The filtered value.
 		 */
-		$skip_in_wrapper = apply_filters( 'simpletoc_skip_in_wrapper', false );
+		$skip_in_wrapper = apply_filters( 'simpletoc_skip_in_wrapper', true );
 		if ( $skip_in_wrapper ) {
 			// Try to get parent tag.
 			$parent_tag = $tag->parentNode;
 			if ( $parent_tag && isset( $parent_tag->tagName ) ) {
-				if ( in_array( strtolower( $parent_tag->tag_name ), array( 'div', 'section', 'article', 'main', 'header', 'footer' ), true ) ) {
+				if ( in_array( strtolower( strtolower( $parent_tag->tagName ) ), array( 'div', 'section', 'article', 'main', 'header', 'footer' ), true ) ) {
 					continue;
 				}
 			}
@@ -485,7 +509,7 @@ function add_anchor_attribute( $html, $headline_class_instance = null ) {
 		}
 		// Set id attribute.
 		$heading_text = trim( wp_strip_all_tags( $html ) );
-		$anchor       = $headline_class_instance->get_headline_anchor( $heading_text );
+		$anchor       = $headline_class_instance->get_headline_anchor( $heading_text, false );
 		$tag->setAttribute( 'id', $anchor );
 	}
 
@@ -515,15 +539,17 @@ function generate_toc( $headings, $attributes ) {
 
 	list($min_depth, $initial_depth) = find_min_depth( $headings, $attributes );
 
-	$item_count   = 0;
-	$headline_ids = new SimpleTOC_Headline_Ids();
+	$item_count = 0;
 	foreach ( $headings as $line => $headline ) {
 		$this_depth       = (int) $headings[ $line ][2];
 		$next_depth       = isset( $headings[ $line + 1 ][2] ) ? (int) $headings[ $line + 1 ][2] : '';
 		$exclude_headline = should_exclude_headline( $headline, $attributes, $this_depth );
 		$title            = trim( wp_strip_all_tags( $headline ) );
 		$custom_id        = extract_id( $headline );
-		$link             = $custom_id ? $custom_id : $headline_ids->get_headline_anchor( $title );
+		if ( empty( $custom_id ) ) {
+			continue;
+		}
+		$link = $custom_id;
 		if ( ! $exclude_headline ) {
 			++$item_count;
 			open_list( $list, $list_type, $min_depth, $this_depth );
diff --git a/simpletoc-class-headline-ids-wrapper.php b/simpletoc-class-headline-ids-wrapper.php
deleted file mode 100644
index 37e5676..0000000
--- a/simpletoc-class-headline-ids-wrapper.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Class to manage headline IDs for the wrapper.
- *
- * @package simpletoc
- */
-
-namespace MToensing\SimpleTOC;
-
-if ( ! defined( 'ABSPATH' ) ) {
-	header( 'Status: 403 Forbidden' );
-	header( 'HTTP/1.1 403 Forbidden' );
-	exit;
-}
-
-/**
- * Wrapper for the IDs. This ensures that IDs are not double-counted or lost in recursion.
- */
-class SimpleTOC_Headline_Ids_Wrapper {
-	/**
-	 * The instance of the SimpleTOC_Headline_Ids class for the wrapper.
-	 *
-	 * @var SimpleTOC_Headline_Ids
-	 */
-	private static $inner_content_id_instance = null;
-
-	/**
-	 * The instance of the SimpleTOC_Headline_Ids class for the wrapper.
-	 *
-	 * @var SimpleTOC_Headline_Ids
-	 */
-	private static $inner_html_id_instance = null;
-
-	/**
-	 * Get the instance of the SimpleTOC_Headline_Ids class for the wrapper for inner content.
-	 *
-	 * @return SimpleTOC_Headline_Ids
-	 */
-	public static function get_inner_content_id_instance() {
-		if ( null === self::$inner_content_id_instance ) {
-			self::$inner_content_id_instance = new SimpleTOC_Headline_Ids();
-		}
-		return self::$inner_content_id_instance;
-	}
-
-	/**
-	 * Get the instance of the SimpleTOC_Headline_Ids class for the wrapper for inner HTML.
-	 *
-	 * @return SimpleTOC_Headline_Ids
-	 */
-	public static function get_inner_html_id_instance() {
-		if ( null === self::$inner_html_id_instance ) {
-			self::$inner_html_id_instance = new SimpleTOC_Headline_Ids();
-		}
-		return self::$inner_html_id_instance;
-	}
-}
diff --git a/simpletoc-class-headline-ids.php b/simpletoc-class-headline-ids.php
index e4b9de5..4bbef4b 100644
--- a/simpletoc-class-headline-ids.php
+++ b/simpletoc-class-headline-ids.php
@@ -26,34 +26,34 @@ class SimpleTOC_Headline_Ids {
 	 *
 	 * @var array
 	 */
-	private $headlines = array();
+	public static $headlines = array();
 
 	/**
 	 * Add a headline to the array
 	 *
 	 * @param string $headline_slug The slug of the headline.
 	 */
-	private function add_headline( $headline_slug ) {
+	protected static function add_headline( $headline_slug ) {
 		if ( empty( $headline_slug ) ) {
 			return;
 		}
 
-		if ( ! isset( $this->headlines[ $headline_slug ] ) ) {
-			$this->headlines[ $headline_slug ] = 1;
+		if ( ! isset( self::$headlines[ $headline_slug ] ) ) {
+			self::$headlines[ $headline_slug ] = 1;
 		} else {
-			$this->headlines[ $headline_slug ] = $this->get_headline_count( $headline_slug ) + 1;
+			self::$headlines[ $headline_slug ] = self::get_headline_count( $headline_slug ) + 1;
 		}
-		if ( $this->headlines[ $headline_slug ] > 1 ) {
-			$new_headline_slug = $headline_slug . '-' . $this->headlines[ $headline_slug ];
-			if ( isset( $this->headlines[ $new_headline_slug ] ) ) {
-				$new_headline_slug = $this->add_headline( $new_headline_slug );
+		if ( self::$headlines[ $headline_slug ] > 1 ) {
+			$new_headline_slug = $headline_slug . '-' . self::$headlines[ $headline_slug ];
+			if ( isset( self::$headlines[ $new_headline_slug ] ) ) {
+				$new_headline_slug = self::add_headline( $new_headline_slug );
 			}
-			$new_headline_count = $this->get_headline_count( $new_headline_slug );
+			$new_headline_count = self::get_headline_count( $new_headline_slug );
 			if ( 0 === $new_headline_count ) {
 				$new_headline_count = 1;
 			}
-			$this->headlines[ $new_headline_slug ] = $new_headline_count;
-			return $new_headline_slug;
+			self::$headlines[ $new_headline_slug ] = $new_headline_count;
+			$headline_slug                         = $new_headline_slug;
 		}
 		return $headline_slug;
 	}
@@ -62,16 +62,19 @@ private function add_headline( $headline_slug ) {
 	 * Get the anchor for a headline
 	 *
 	 * @param string $headline The headline.
+	 * @param bool   $add_headline Whether to add the headline to the array.
 	 * @return string The anchor for the headline
 	 */
-	public function get_headline_anchor( $headline ) {
+	public static function get_headline_anchor( $headline, $add_headline = false ) {
 		if ( empty( $headline ) ) {
 			return '';
 		}
 
 		$headline_slug = simpletoc_sanitize_string( $headline );
 
-		$headline_slug = $this->add_headline( $headline_slug );
+		if ( $add_headline ) {
+			$headline_slug = self::add_headline( $headline_slug );
+		}
 		return $headline_slug;
 	}
 
@@ -81,7 +84,7 @@ public function get_headline_anchor( $headline ) {
 	 * @param string $headline_slug The slug of the headline.
 	 * @return mixed The count of the headline slug.
 	 */
-	private function get_headline_count( $headline_slug = '' ) {
-		return $this->headlines[ $headline_slug ] ?? 0;
+	private static function get_headline_count( $headline_slug = '' ) {
+		return self::$headlines[ $headline_slug ] ?? 0;
 	}
 }

From e6fad39d9eab99564d470898905e45413e908d23 Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Tue, 13 Jan 2026 22:07:36 -0600
Subject: [PATCH 06/11] Removing placeholder.

---
 plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.php b/plugin.php
index 8796f27..e519f63 100644
--- a/plugin.php
+++ b/plugin.php
@@ -397,7 +397,7 @@ function filter_headings( $content ) {
 	$tags  = $xpath->evaluate( '//*[self::h1 or self::h2 or self::h3 or self::h4 or self::h5 or self::h6]' );
 
 	foreach ( $tags as $tag ) {
-		$tag_id = 'simple-toc'; // $tag->getAttribute( 'id' );
+		$tag_id = $tag->getAttribute( 'id' );
 		if ( ! $tag_id ) {
 			continue;
 		}

From dd71b33c6213958dc444ca35ec65cc7b8bef7d23 Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Tue, 13 Jan 2026 23:57:04 -0600
Subject: [PATCH 07/11] Adding wrapper attributes and making shortcode more
 declarative.

---
 plugin.php | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/plugin.php b/plugin.php
index e519f63..1422e2d 100644
--- a/plugin.php
+++ b/plugin.php
@@ -173,20 +173,28 @@ function simpletoc_add_ids_to_content( $content ) {
  * @param string $content The content to render the Table of Contents block for.
  * @param bool   $return_toc_html Whether to return the TOC HTML only, without the content included.
  * @param array  $attributes The attributes of the Table of Contents block.
+ * @param array  $wrapper_attrs The wrapper attributes of the Table of Contents block.
  * @return string The rendered Table of Contents block.
  */
-function simpletoc_render_toc( $content, $return_toc_html = false, $attributes = array() ) {
+function simpletoc_render_toc( $content, $return_toc_html = false, $attributes = array(), $wrapper_attrs = array() ) {
 	if ( ! $return_toc_html ) {
 		$maybe_shortcode_result = preg_match( '/\[simpletoc ([^\]]*)\]/m', $content, $matches );
 
+		if ( ! $maybe_shortcode_result ) {
+			return $content;
+		}
+
 		// Decode HTML entities and convert curly quotes to straight quotes for valid JSON.
 		$json_string = html_entity_decode( $matches[1], ENT_QUOTES | ENT_HTML5, 'UTF-8' );
 		// Convert curly quotes (left and right) back to straight quotes for valid JSON.
 		$json_string = str_replace( array( "\u{201C}", "\u{201D}", "\u{2018}", "\u{2019}" ), array( '"', '"', "'", "'" ), $json_string );
 
-		$attributes = json_decode( $json_string, true );
-	} else {
-		$attributes = $attributes;
+		// Extract out attributes and wrapper attributes from the shortcode.
+		preg_match( '/attributes=\'([^\']*)\'/', $json_string, $attributes_match );
+		preg_match( '/wrapper_attrs=\'([^\']*)\'/', $json_string, $wrapper_attrs_match );
+
+		$attributes    = json_decode( $attributes_match[1], true );
+		$wrapper_attrs = json_decode( $wrapper_attrs_match[1], true );
 	}
 
 	if ( empty( $attributes ) ) {
@@ -201,9 +209,8 @@ function simpletoc_render_toc( $content, $return_toc_html = false, $attributes =
 
 	$wrapper_enabled = apply_filters( 'simpletoc_wrapper_enabled', false ) || true === (bool) get_option( 'simpletoc_wrapper_enabled', false ) || true === (bool) get_option( 'simpletoc_accordion_enabled', false );
 
-	$wrapper_attrs = get_block_wrapper_attributes( array( 'class' => 'simpletoc' ) );
-	$pre_html      = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '<div role="navigation" aria-label="' . __( 'Table of Contents', 'simpletoc' ) . '" ' . $wrapper_attrs . '>' : '';
-	$post_html     = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '</div>' : '';
+	$pre_html  = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '<div role="navigation" aria-label="' . __( 'Table of Contents', 'simpletoc' ) . '" ' . $wrapper_attrs . '>' : '';
+	$post_html = ( ! empty( $class_name ) || $wrapper_enabled || $attributes['accordion'] || $attributes['wrapper'] ) ? '</div>' : '';
 
 	$headings = filter_headings( $content );
 	// $headings       = simpletoc_add_pagenumber( $blocks, $headings );
@@ -292,8 +299,14 @@ function add_ids_to_blocks( $content ) {
  * @return string The HTML output for the Table of Contents block
  */
 function render_callback_simpletoc( $attributes ) {
-	$return = sprintf( '[simpletoc %s]', wp_json_encode( $attributes ) );
+	$wrapper_attrs = get_block_wrapper_attributes( array( 'class' => 'simpletoc' ) );
+	$return        = sprintf(
+		'[simpletoc attributes=\'%s\' wrapper_attrs=\'%s\']',
+		wp_json_encode( $attributes ),
+		wp_json_encode( $wrapper_attrs )
+	); // Placeholder to be replaced in `the_content` filters later.
 	if ( defined( 'REST_REQUEST' ) && REST_REQUEST && 'edit' === filter_input( INPUT_GET, 'context' ) ) {
+		// We're in the block editor rendering a server-side preview.
 		// Strip out the simple toc block from the content.
 		$post = get_post();
 		if ( ! $post ) {
@@ -305,12 +318,12 @@ function render_callback_simpletoc( $attributes ) {
 		$simple_toc_regex = '/(<!-- wp:simpletoc[^>]*>)/m';
 		$post_content     = preg_replace( $simple_toc_regex, '', $post_content );
 
-		// This processes post content and stores the toc content for later rendering.
+		// This processes post content and stores the toc headlines for later rendering. Very simple content processing and fast. The placeholder is skipped.
 		$post_content = do_blocks( $post_content );
 		$post_content = simpletoc_add_ids_to_content( $post_content );
 
-		// Now get the toc html.
-		$return = simpletoc_render_toc( $post_content, true, $attributes );
+		// Now get the toc html only.
+		$return = simpletoc_render_toc( $post_content, true, $attributes, $wrapper_attrs );
 	}
 	return $return;
 }

From 3dc7ff3798cddba020eb3a70584c896b8d4358b3 Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Wed, 14 Jan 2026 00:01:34 -0600
Subject: [PATCH 08/11] Hiding error message.

---
 plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.php b/plugin.php
index 1422e2d..8beabd0 100644
--- a/plugin.php
+++ b/plugin.php
@@ -400,7 +400,7 @@ function filter_headings( $content ) {
 
 	$dom = new \DOMDocument();
 	try {
-		$dom->loadHTML( '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
+		@$dom->loadHTML( '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
 	} catch ( \Exception $e ) {
 		return $arr;
 	}

From 4eebe7add3d215a6d25f115e08753d488804d270 Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Wed, 14 Jan 2026 01:08:31 -0600
Subject: [PATCH 09/11] Simplifying logic.

---
 plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.php b/plugin.php
index 8beabd0..7f70a38 100644
--- a/plugin.php
+++ b/plugin.php
@@ -159,14 +159,14 @@ function simpletoc_add_ids_to_content( $content ) {
 
 	$content = add_ids_to_blocks( $content );
 
+	$content = simpletoc_render_toc( $content );
+
 	return $content;
 }
 
 // Run late, but before toc is rendered as to be able to track and add IDs to the headings.
 add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_add_ids_to_content', 100 );
 
-add_filter( 'the_content', __NAMESPACE__ . '\simpletoc_render_toc', 101 );
-
 /**
  * Renders the Table of Contents block.
  *

From a332d26faea0da833d404bb935f382b477431141 Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Wed, 14 Jan 2026 02:13:53 -0600
Subject: [PATCH 10/11] Adding `simpletoc-include` class for explicit headline
 rendering.

---
 plugin.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugin.php b/plugin.php
index 7f70a38..8822f8c 100644
--- a/plugin.php
+++ b/plugin.php
@@ -271,6 +271,10 @@ function add_ids_to_blocks( $content ) {
 		 * @return bool The filtered value.
 		 */
 		$skip_in_wrapper = apply_filters( 'simpletoc_skip_in_wrapper', true );
+		if ( strpos( $tag_classes, 'simpletoc-include' ) !== false ) {
+			// If someone has added the simpletoc-include class, then don't skip it, regardless of wrapper.
+			$skip_in_wrapper = false;
+		}
 		if ( $skip_in_wrapper ) {
 			// Try to get parent tag.
 			$parent_tag = $tag->parentNode;
@@ -430,6 +434,10 @@ function filter_headings( $content ) {
 		 * @return bool The filtered value.
 		 */
 		$skip_in_wrapper = apply_filters( 'simpletoc_skip_in_wrapper', true );
+		if ( strpos( $tag_classes, 'simpletoc-include' ) !== false ) {
+			// If someone has added the simpletoc-include class, then don't skip it, regardless of wrapper.
+			$skip_in_wrapper = false;
+		}
 		if ( $skip_in_wrapper ) {
 			// Try to get parent tag.
 			$parent_tag = $tag->parentNode;

From 0b235935fd0307f915da4f2c07ed4507dde882fd Mon Sep 17 00:00:00 2001
From: Ronald Huereca <ronald@mediaron.com>
Date: Wed, 14 Jan 2026 02:48:03 -0600
Subject: [PATCH 11/11] Return early if shortcode isn't found in content.

---
 plugin.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugin.php b/plugin.php
index 8822f8c..cd5814a 100644
--- a/plugin.php
+++ b/plugin.php
@@ -157,8 +157,16 @@ function ( $toc_plugins ) {
  */
 function simpletoc_add_ids_to_content( $content ) {
 
+	// Return early if the content does not contain a simpletoc shortcode.
+	$maybe_shortcode_result = preg_match( '/\[simpletoc ([^\]]*)\]/m', $content, $matches );
+	if ( ! $maybe_shortcode_result ) {
+		return $content;
+	}
+
+	// Add IDs to the headings of the content.
 	$content = add_ids_to_blocks( $content );
 
+	// Render the Table of Contents block.
 	$content = simpletoc_render_toc( $content );
 
 	return $content;