Ensure heading levels step up properly

mgmeyers · Apr 30, 2021 · a37293f · a37293f
1 parent d4682ce
commit a37293f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-style-settings",
   "name": "Style Settings",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "minAppVersion": "0.11.5",
   "description": "Offers controls for adjusting theme, plugin, and snippet CSS variables.",
   "author": "mgmeyers",

diff --git a/src/settingHandlers.ts b/src/settingHandlers.ts
@@ -88,7 +88,7 @@ export function createHeading(opts: {
       if (opts.config.resetFn) {
         setting.addExtraButton((b) => {
           b.setIcon("reset")
-            .setTooltip('Reset all settings to default')
+            .setTooltip("Reset all settings to default")
             .onClick(opts.config.resetFn);
         });
       }
@@ -645,34 +645,30 @@ export function createSettings(opts: {
         let targetContainer = getTargetContainer(containerStack);
 
         if (config.level > containerLevel) {
+          // Nest one level
           createHeading({
             config,
             containerEl: targetContainer,
           });
-
-          targetContainer.createDiv(
-            { cls: "style-settings-container" },
-            (container) => {
-              containerStack.push(container);
-            }
-          );
         } else if (config.level === containerLevel) {
+          // Same level
           containerStack.pop();
           targetContainer = getTargetContainer(containerStack);
 
           createHeading({
             config,
             containerEl: targetContainer,
           });
-
-          targetContainer.createDiv(
-            { cls: "style-settings-container" },
-            (container) => {
-              containerStack.push(container);
-            }
-          );
         } else {
-          containerStack.pop();
+          // Step up to the appropriate level
+          while (
+            containerStack.length > 1 &&
+            parseInt(containerStack[containerStack.length - 1].dataset.level) >
+              config.level
+          ) {
+            containerStack.pop();
+          }
+
           targetContainer = getTargetContainer(containerStack);
 
           createHeading({
@@ -681,6 +677,13 @@ export function createSettings(opts: {
           });
         }
 
+        targetContainer.createDiv(
+          { cls: "style-settings-container" },
+          (container) => {
+            container.dataset.level = config.level.toString();
+            containerStack.push(container);
+          }
+        );
         containerLevel = config.level;
 
         break;

diff --git a/versions.json b/versions.json
@@ -1,4 +1,5 @@
 {
+	"0.2.4": "0.11.5",
 	"0.2.3": "0.11.5",
 	"0.2.2": "0.11.5",
 	"0.2.1": "0.11.5",