cleanup

Author: anamone26

src/lib/toolbar.ts

@@ -89,43 +89,12 @@ function makeIconButton(parent, opts) {
   const btnNode = btn.node();
   const tipNode = tip.node();
 
-  function positionTip() {
-    if (!btnNode || !tipNode) return;
-
-    const rect = btnNode.getBoundingClientRect();
-    const gap = 8;
-
-    tipNode.style.left = '0';
-    tipNode.style.top = '0';
-
-    const tipRect = tipNode.getBoundingClientRect();
-
-    let left = rect.left + rect.width / 2 - tipRect.width / 2;
-    let top = rect.bottom + gap;
-
-    const padding = 0.5;
-
-    if (left < padding) left = padding;
-    if (left + tipRect.width > window.innerWidth - padding) {
-      left = window.innerWidth - tipRect.width - padding;
-    }
-
-    if (top + tipRect.height > window.innerHeight - padding) {
-      top = rect.top - tipRect.height - gap;
-    }
-
-    if (top < padding) top = padding;
-
-    tipNode.style.left = `${left/16}rem`;
-    tipNode.style.top = `${top/16}rem`;
-  }
-
   function show() {
     if (!tipNode) return;
     if (!tipNode.matches(':popover-open')) {
       tipNode.showPopover();
     }
-    positionTip();
+    positionTip(btnNode, tipNode);
   }
 
   function hide() {
@@ -142,19 +111,50 @@ function makeIconButton(parent, opts) {
 
   d3.select(window).on(`resize.${id}`, () => {
     if (tipNode?.matches(':popover-open')) {
-      positionTip();
+      positionTip(btnNode, tipNode);
     }
   });
 
   d3.select(window).on(`scroll.${id}`, () => {
     if (tipNode?.matches(':popover-open')) {
-      positionTip();
+      positionTip(btnNode, tipNode);
     }
   });
 
   return { btn, tip };
 }
 
+function positionTip(btnNode: any, tipNode: any) {
+    if (!btnNode || !tipNode) return;
+
+    const rect = btnNode.getBoundingClientRect();
+    const gap = 8;
+
+    tipNode.style.left = '0';
+    tipNode.style.top = '0';
+
+    const tipRect = tipNode.getBoundingClientRect();
+
+    let left = rect.left + rect.width / 2 - tipRect.width / 2;
+    let top = rect.bottom + gap;
+
+    const padding = 0.5;
+
+    if (left < padding) left = padding;
+    if (left + tipRect.width > window.innerWidth - padding) {
+      left = window.innerWidth - tipRect.width - padding;
+    }
+
+    if (top + tipRect.height > window.innerHeight - padding) {
+      top = rect.top - tipRect.height - gap;
+    }
+
+    if (top < padding) top = padding;
+
+    tipNode.style.left = `${left/16}rem`;
+    tipNode.style.top = `${top/16}rem`;
+  }
+
 function showModalWithData(dataset: any[]): void {
 
     const overlay = d3.select('body')