2 files changed, 16 insertions, 14 deletions

diff --git a/src/Layout.mjs b/src/Layout.mjs
index 746dda2..2f90278 100644
--- a/src/Layout.mjs
+++ b/src/Layout.mjs
@@ -44,10 +44,7 @@ export class SideBySide extends Layout {
     }).observe(container);
   }
 
-  leaveHandler = ({ container, htmlHolder, showcase }) => {
-    container.removeAttribute('style')
-    htmlHolder.removeAttribute('style')
-    showcase.removeAttribute('style')
+  leaveHandler = ({ container }) => {
     container.querySelector('.bar')?.remove()
   }
 }
@@ -95,7 +92,7 @@ export class Overlay extends Layout {
 
       // Close button
       draggableBlock.querySelector('#close').onclick = () => {
-          draggableBlock.setAttribute("data-state", "hide")
+        draggableBlock.setAttribute("data-state", "hide")
       }
       // Plus/Minus font-size of content
       draggableBlock.querySelector('#plus-font-size').onclick = () => {
@@ -149,16 +146,15 @@ export class Overlay extends Layout {
         }
       })
   }
-  leaveHandler = (dumbymap) => {
-    const container = dumbymap.htmlHolder
+
+  leaveHandler = ({ htmlHolder, blocks }) => {
     const resumeFromDraggable = (block) => {
       const draggableContainer = block.closest('.draggable-block')
       if (!draggableContainer) return
-      container.appendChild(block)
-      block.removeAttribute('style')
+      htmlHolder.appendChild(block)
       draggableContainer.remove()
     }
-    dumbymap.blocks.forEach(resumeFromDraggable)
+    blocks.forEach(resumeFromDraggable)
   }
 }
 
diff --git a/src/dumbymap.mjs b/src/dumbymap.mjs
index 7f5c75c..7079286 100644
--- a/src/dumbymap.mjs
+++ b/src/dumbymap.mjs
@@ -140,15 +140,16 @@ export const markdown2HTML = (container, mdContent) => {
 export const generateMaps = async (container, callback) => {
   container.classList.add('Dumby')
   const htmlHolder = container.querySelector('.SemanticHtml') ?? container
+  const blocks = Array.from(htmlHolder.querySelectorAll('.dumby-block'))
   const showcase = document.createElement('div')
   container.appendChild(showcase)
   showcase.classList.add('Showcase')
 
   const dumbymap = {
-    container: container,
-    htmlHolder: htmlHolder,
-    showcase: showcase,
-    blocks: Array.from(htmlHolder.querySelectorAll('.dumby-block')),
+    container,
+    htmlHolder,
+    showcase,
+    blocks,
   }
 
   // LeaderLine {{{
@@ -354,6 +355,11 @@ export const generateMaps = async (container, callback) => {
         ?.leaveHandler
         ?.call(this, dumbymap)
     }
+
+    Object.values(dumbymap)
+      .flat()
+      .forEach(e => e.removeAttribute('style'))
+
     if (newLayout) {
       layouts.find(l => l.name === newLayout)
         ?.enterHandler