fix table of contents color not working

DotCamp · Feb 4, 2024 · 3c3e8b3 · 3c3e8b3
1 parent c579fb0
commit 3c3e8b3
Show file tree

Hide file tree

Showing 7 changed files with 133,754 additions and 20 deletions.
diff --git a/dist/blocks.build.asset.php b/dist/blocks.build.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => 'e9d234bba9157d0307bb');
+<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '2eaa6e7bfd9c3fc3f669');
diff --git a/dist/blocks.build.js b/dist/blocks.build.js
diff --git a/dist/blocks.build.js.map b/dist/blocks.build.js.map
diff --git a/dist/priority.build.asset.php b/dist/priority.build.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '31d6cfe0d16ae931b73c');
+<?php return array('dependencies' => array(), 'version' => 'bf4427955793c56378a0');
diff --git a/dist/priority.build.js b/dist/priority.build.js
diff --git a/dist/priority.build.js.map b/dist/priority.build.js.map
diff --git a/src/blocks/table-of-contents/components.js b/src/blocks/table-of-contents/components.js
@@ -716,33 +716,29 @@ export const inspectorControls = (props) => {
 	const { updateBlockAttributes } =
 		dispatch("core/block-editor") || dispatch("core/editor");
 	const { getBlocks } = select("core/block-editor") || select("core/editor");
-	const createColorSetting = (
-		value,
-		label,
-		onChange = (newValue) => setAttributes({ [label]: newValue }),
-	) => ({
-		value,
-		onChange,
+	const createColorSetting = (attrKey, label) => ({
+		value: attributes[attrKey],
+		onChange: (newValue) => setAttributes({ [attrKey]: newValue }),
 		label: __(label),
 	});
-
 	const getColorSettings = () => {
 		const settings = [
-			createColorSetting(titleColor, "Title Color"),
-			createColorSetting(titleBackgroundColor, "Title Background Color"),
-			createColorSetting(listColor, "List Color"),
-			createColorSetting(listBackgroundColor, "List Background Color"),
+			createColorSetting("titleColor", "Title Color", "titleColor"),
+			createColorSetting("titleBackgroundColor", "Title Background Color"),
+			createColorSetting("listColor", "List Color"),
+			createColorSetting("listBackgroundColor", "List Background Color"),
 			...(listStyle !== "plain"
 				? [
 						createColorSetting(
-							listIconColor,
+							"listIconColor",
 							listStyle === "numbered"
 								? "Item number color"
 								: "List icon color",
 						),
 					]
 				: []),
 		];
+
 		return settings.filter((setting) => Object.keys(setting).length > 0);
 	};
 
@@ -1143,10 +1139,10 @@ export const editorDisplay = (props) => {
 			{
 				<style
 					dangerouslySetInnerHTML={{
-						__html: `#ub_table-of-contents-${blockID} .ub_table-of-contents-container li{
+						__html: `#block-${blockID} .ub_table-of-contents-container li{
 							color: ${listIconColor};
 						}
-						#ub_table-of-contents-${blockID} .ub_table-of-contents-container a{
+						#block-${blockID} .ub_table-of-contents-container a{
 							color: ${listColor};
 						}`,
 					}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => 'e9d234bba9157d0307bb');
		<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-api', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '2eaa6e7bfd9c3fc3f669');