Simplify auto scrolling logic

tztsai · Nov 10, 2024 · 3523d09 · 3523d09
1 parent 9fb046f
commit 3523d09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/content/index.css b/content/index.css
@@ -22,7 +22,7 @@ details summary {
   h1, h2, h3, h4, h5, h6 {
     display: inline;
   }
-  blockquote {
+  p {
     font-weight: normal;
     font-style: italic;
     opacity: 0.8;

diff --git a/content/index.js b/content/index.js
@@ -180,16 +180,10 @@ var focusOnDetails = (details, scroll = 'follow') => {
   } 
 
   scrollLock = true;
-  isDownward = true;
-  isNewSection = false;
   details.open = true;
 
   const rect1 = details.getBoundingClientRect();
   while (focusedDetails && !focusedDetails.contains(details)) {
-    if (focusedDetails.getBoundingClientRect().top > rect1.top)
-      isDownward = false;
-    if (details.firstChild.firstChild < focusedDetails.firstChild.firstChild)
-      isNewSection = true;
     focusedDetails.open = false;
     focusedDetails = focusedDetails.parentElement.closest('details');
   }
@@ -207,13 +201,13 @@ var focusOnDetails = (details, scroll = 'follow') => {
   const rect2 = details.getBoundingClientRect();
 
   // keep the top of the section at the same position
-  dy = rect2.top - rect1.top;
-  if (isNewSection && isDownward) {
-    // dy += rect2.height + 30;
-    // focusedDetails = details.nextElementSibling;
+  var dy = 0;
+  if (rect2.top < rect1.top && details.firstChild.firstChild.tagName === 'H2') {
+    dy += rect2.bottom - rect1.top - 30;
+    focusedDetails = details.lastChild.lastChild;
   }
-  else if (isDownward) {  // move towards the end of the block
-    dy += Math.max(Math.min(rect1.top, rect1.height - 50), 0);
+  else if (rect2.bottom > window.innerHeight) {
+    dy += Math.min(rect2.top, rect2.bottom - window.innerHeight);
   }
 
   if (Math.abs(dy) > 200) {

diff --git a/content/mdwise.js b/content/mdwise.js
@@ -67,7 +67,7 @@ function writeSummary(details, txt) {
   } else {
     var summary = details.querySelector('summary');
 
-    const p = document.createElement('blockquote');
+    const p = document.createElement('p');
     p.textContent = txt.trim();
     summary.appendChild(p);
 
@@ -107,8 +107,7 @@ function writeSummary(details, txt) {
             });
 
           createInput();
-          // m.redraw();
-          update();
+          update();  // render the new content
         }
       });
       return input;