From f27a1e2886b1e410a5bb740b9b1ab91e352abe55 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Tue, 1 Oct 2024 16:42:39 +0800
Subject: fix: keep data-mode=editing when HTML refresh

---
 src/css/dumbymap.css |  2 +-
 src/dumbymap.mjs     |  2 --
 src/editor.mjs       | 28 ++++++++++++++++------------
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/css/dumbymap.css b/src/css/dumbymap.css
index 4d0282b..84b6036 100644
--- a/src/css/dumbymap.css
+++ b/src/css/dumbymap.css
@@ -249,8 +249,8 @@ root {
   display: flex;
   justify-content: space-between;
   padding: 0.5rem;
-  position: relative;
 
+  position: relative;
   z-index: 9999;
 
   cursor: pointer;
diff --git a/src/dumbymap.mjs b/src/dumbymap.mjs
index cb528cd..5457959 100644
--- a/src/dumbymap.mjs
+++ b/src/dumbymap.mjs
@@ -274,8 +274,6 @@ export const generateMaps = (container, { delay, mapCallback }) => {
   // }}}
   // Layout {{{
   // press key to switch layout
-  const defaultLayout = layouts[0];
-  container.setAttribute('data-layout', defaultLayout.name);
 
   // observe layout change
   const layoutObserver = new MutationObserver(mutations => {
diff --git a/src/editor.mjs b/src/editor.mjs
index 3dc5df7..6f046e6 100644
--- a/src/editor.mjs
+++ b/src/editor.mjs
@@ -10,17 +10,17 @@ const HtmlContainer = document.querySelector('.DumbyMap');
 const textArea = document.querySelector('.editor textarea');
 let dumbymap;
 
-new MutationObserver(() => {
-  if (
-    document.querySelector('[data-mode]').getAttribute('data-mode') ===
-      'editing' &&
-    HtmlContainer.getAttribute('data-layout') !== 'normal'
-  ) {
+new MutationObserver(mutations => {
+  const mutation = mutations.at(-1);
+  const mode = mutation.target.getAttribute('data-mode');
+  const layout = HtmlContainer.getAttribute('data-layout');
+  if (mode === 'editing' && layout !== 'normal') {
     HtmlContainer.setAttribute('data-layout', 'normal');
   }
 }).observe(document.querySelector('[data-mode]'), {
   attributes: true,
   attributeFilter: ['data-mode'],
+  attributeOldValue: true,
 });
 const toggleEditing = () => {
   const mode = document.body.getAttribute('data-mode');
@@ -280,7 +280,8 @@ window.onhashchange = () => {
 // Completion in Code Blok {{{
 // Elements about suggestions {{{
 const menu = document.createElement('div');
-menu.className = 'menu';
+menu.className = 'menu editor-menu';
+menu.style.display = 'none';
 menu.onclick = () => (menu.style.display = 'none');
 new MutationObserver(() => {
   if (menu.style.display === 'none') {
@@ -564,9 +565,12 @@ cm.on('cursorActivity', _ => {
   }
 });
 cm.on('blur', () => {
-  menu.style.display = 'none';
-  cm.getWrapperElement().classList.remove('focus');
-  HtmlContainer.classList.add('focus');
+  if (menu.checkVisibility()) {
+    cm.focus() && cm.setCursor(anchor);
+  } else {
+    cm.getWrapperElement().classList.remove('focus');
+    HtmlContainer.classList.add('focus');
+  }
 });
 // }}}
 // EVENT: keydown for suggestions {{{
@@ -607,9 +611,9 @@ cm.on('keydown', (_, e) => {
       currentSuggestion.onclick();
       break;
     case 'Escape':
-      menu.style.display = 'none';
+      if (!menu.checkVisibility()) break;
       // Focus editor again
-      setTimeout(() => cm.focus() && cm.setCursor(anchor), 100);
+      setTimeout(() => (menu.style.display = 'none'), 50);
       break;
   }
 });
-- 
cgit v1.2.3-70-g09d2