@codbex/harmonia 1.11.0 → 1.11.1

package/dist/harmonia.js

@@ -9295,8 +9295,13 @@
         if (!storageKey) return;
         if (saveTimer) clearTimeout(saveTimer);
         saveTimer = setTimeout(() => {
+          const usable = usableSize();
+          if (usable <= 0) {
+            saveTimer = null;
+            return;
+          }
           const visible = panels.filter((p) => !p.hidden);
-          const sizes = visible.map((p) => p.size / usableSize());
+          const sizes = visible.map((p) => p.size / usable);
           localStorage.setItem(storageKey, JSON.stringify(sizes));
           saveTimer = null;
         }, SAVE_DELAY);
@@ -9331,26 +9336,44 @@
         const total = usableSize();
         if (!initialized) {
           initialized = true;
-          const visible2 = panels.filter((p) => !p.hidden);
-          const stored = loadSizes();
-          if (stored && stored.length === visible2.length) {
-            visible2.forEach((p, i) => {
-              p.size = stored[i] * usableSize();
-              p.explicit = true;
-            });
-          } else {
-            const explicitTotal = visible2.filter((p) => p.explicit).reduce((sum, p) => sum + p.declaredSize, 0);
-            const autoPanels = visible2.filter((p) => !p.explicit);
-            const remaining = total - explicitTotal;
-            const share = autoPanels.length ? remaining / autoPanels.length : 0;
-            visible2.forEach((p) => {
-              if (p.explicit) {
-                p.size = p.declaredSize;
+          const anyRestore = visible.some((p) => p.restoreFraction != null);
+          if (anyRestore) {
+            const restoreFractionSum = visible.reduce((sum, p) => sum + (p.restoreFraction ?? 0), 0);
+            const remainingSpace = total * (1 - restoreFractionSum);
+            const nonRestorePanels = visible.filter((p) => p.restoreFraction == null);
+            const nonRestoreDeclaredTotal = nonRestorePanels.reduce((s, p) => s + (p.declaredSize ?? 0), 0);
+            visible.forEach((p) => {
+              if (p.restoreFraction != null) {
+                p.size = p.restoreFraction * total;
+                p.explicit = true;
+                p.restoreFraction = null;
+              } else if (nonRestoreDeclaredTotal > 0) {
+                p.size = (p.declaredSize ?? 0) / nonRestoreDeclaredTotal * remainingSpace;
               } else {
-                p.size = share;
+                p.size = nonRestorePanels.length > 0 ? remainingSpace / nonRestorePanels.length : 0;
               }
-              p.size = Math.min(Math.max(p.size ?? share, p.min), p.max);
             });
+          } else {
+            const stored = loadSizes();
+            if (stored && stored.length === visible.length) {
+              visible.forEach((p, i) => {
+                p.size = stored[i] * usableSize();
+                p.explicit = true;
+              });
+            } else {
+              const explicitTotal = visible.filter((p) => p.explicit).reduce((sum, p) => sum + p.declaredSize, 0);
+              const autoPanels = visible.filter((p) => !p.explicit);
+              const remaining = total - explicitTotal;
+              const share = autoPanels.length ? remaining / autoPanels.length : 0;
+              visible.forEach((p) => {
+                if (p.explicit) {
+                  p.size = p.declaredSize;
+                } else {
+                  p.size = share;
+                }
+                p.size = Math.min(Math.max(p.size ?? share, p.min), p.max);
+              });
+            }
           }
         }
         visible.forEach((p) => {
@@ -9363,6 +9386,10 @@
         let delta = total - currentTotal;
         if (Math.abs(delta) < DELTA_ABS) {
           visible.forEach((p) => p.apply());
+          if (total > 0)
+            visible.forEach((p) => {
+              p.savedFraction = p.size / total;
+            });
           return;
         }
         let flexible = visible.filter((p) => {
@@ -9396,6 +9423,10 @@
           if (Math.abs(consumed) < DELTA_ABS) break;
         }
         visible.forEach((p) => p.apply());
+        if (total > 0)
+          visible.forEach((p) => {
+            p.savedFraction = p.size / total;
+          });
       };
       let layoutFrame = null;
       const queueLayout = () => {
@@ -9430,7 +9461,6 @@
           queueLayout();
         },
         panelHidden() {
-          initialized = false;
           refreshGutters();
           queueLayout();
         },
@@ -9441,6 +9471,9 @@
         panelChange() {
           queueLayout();
         },
+        resetInit() {
+          initialized = false;
+        },
         normalize,
         saveSizes
       };
@@ -9604,6 +9637,9 @@
         max: split._h_split.normalize(el.getAttribute("data-max")) ?? Infinity,
         collapsed: false,
         prevSize: null,
+        prevHiddenFraction: null,
+        savedFraction: null,
+        restoreFraction: null,
         apply() {
           el.style.flexBasis = `${this.size.toFixed(2)}px`;
           if (split._h_split.state.isBorder) {
@@ -9708,7 +9744,7 @@
       gutter.addEventListener("pointerdown", drag);
       const collapse = () => {
         if (panel.collapsed) return;
-        panel.prevSize = panel.size;
+        panel.prevSize = panel.size > (panel.min ?? 0) ? panel.size : panel.declaredSize;
         panel.size = panel.min ?? 0;
         panel.collapsed = true;
         panel.explicit = true;
@@ -9732,19 +9768,32 @@
         panel.explicit = true;
         split._h_split.panelChange();
       };
+      const setState = () => {
+        if (panel.hidden) {
+          el.classList.add("hidden");
+        } else {
+          el.classList.remove("hidden");
+        }
+        split._h_split.panelHidden();
+      };
+      setState();
       const observer = new MutationObserver((mutations) => {
         mutations.forEach((mutation) => {
           if (mutation.attributeName === "data-gutterless") {
             gutterless = el.getAttribute("data-gutterless") === "true";
             split._h_split.gutterHidden();
           } else if (mutation.attributeName === "data-hidden") {
-            panel.hidden = el.getAttribute("data-hidden") === "true";
-            if (panel.hidden) {
-              el.classList.add("hidden");
-            } else {
-              el.classList.remove("hidden");
+            const newHidden = el.getAttribute("data-hidden") === "true";
+            if (!panel.hidden && newHidden) {
+              panel.prevHiddenFraction = panel.savedFraction;
+            } else if (panel.hidden && !newHidden) {
+              if (panel.prevHiddenFraction != null) {
+                panel.restoreFraction = panel.prevHiddenFraction;
+              }
+              split._h_split.resetInit();
             }
-            split._h_split.panelHidden();
+            panel.hidden = newHidden;
+            setState();
           } else if (mutation.attributeName === "data-locked") {
             panel.setLocked();
           } else {
@@ -11717,7 +11766,7 @@
   }
 
   // package.json
-  var version = "1.11.0";
+  var version = "1.11.1";
 
   // src/index.js
   window.Harmonia = { getBreakpointListener, addColorSchemeListener, getColorScheme, removeColorSchemeListener, setColorScheme, getSystemColorScheme, version };