From 89d1c58f974a19aa8c363a04219ca088077186ac Mon Sep 17 00:00:00 2001
From: olayway <ola@yway.pl>
Date: Mon, 6 Jun 2022 18:54:37 +0200
Subject: [PATCH] [hooks/headingsObserver][s]: behavior adjustments

---
 site/hooks/useHeadingsObserver.js | 37 ++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/site/hooks/useHeadingsObserver.js b/site/hooks/useHeadingsObserver.js
index 3b60a66..83a5d9d 100644
--- a/site/hooks/useHeadingsObserver.js
+++ b/site/hooks/useHeadingsObserver.js
@@ -3,18 +3,7 @@ import { useState, useEffect } from "react";
 /* Creates an Intersection Observer to keep track of headings intersecting
  * a section of the viewport defined by the rootMargin */
 const getIntersectionObserver = (callback) => {
-  return new IntersectionObserver(
-    (entries) => {
-      entries.forEach((entry) => {
-        callback(entry);
-      });
-    },
-    {
-      root: null,
-      threshold: 0.55,
-      rootMargin: "-65px 0% -85% 0%", // 65px is a navbar height
-    }
-  );
+  return;
 };
 
 const useHeadingsObserver = () => {
@@ -24,11 +13,27 @@ const useHeadingsObserver = () => {
   /* Runs only after the first render, in order to preserve the observer
    * between component rerenderings (e.g. after activeHeading change). */
   useEffect(() => {
-    const observer = getIntersectionObserver((entry) => {
-      if (entry.isIntersecting) {
-        setActiveHeading(entry.target.id);
+    const observer = new IntersectionObserver(
+      (entries) => {
+        // entries.forEach((entry) => {
+        //   if (entry.isIntersecting) {
+        //     setActiveHeading(entry.target.id);
+        //   }
+        // });
+        const firstIntersectingHeading = entries.find(
+          (entry) => entry.isIntersecting
+        );
+        if (firstIntersectingHeading) {
+          setActiveHeading(firstIntersectingHeading.target.id);
+        }
+      },
+      {
+        root: null,
+        threshold: 0.55,
+        rootMargin: "-65px 0% -85% 0%", // 65px is a navbar height
       }
-    });
+    );
+
     setObserver(observer);
 
     return () => {