@koine/react 1.1.6 → 1.1.8

package/hooks/useSmoothScroll.d.ts

@@ -1,2 +1,8 @@
+/**
+ *
+ * @param disregardAutomaticFixedOffset When the `to` scroll argument is a DOM
+ * selector we will keep into account the _fixedOffset_ despite this option.
+ * @returns
+ */
 export declare function useSmoothScroll(disregardAutomaticFixedOffset?: boolean): (to?: number | string, customOffset?: number, callback?: () => void, fallbackTimeout?: number, behavior?: ScrollBehavior) => void;
 export default useSmoothScroll;

package/hooks/useSmoothScroll.js

@@ -2,24 +2,34 @@ import { useCallback } from "react";
 import { isNumber } from "@koine/utils";
 import { getOffsetTopSlim, scrollTo } from "@koine/dom";
 import { useFixedOffset } from "./useFixedOffset";
+/**
+ *
+ * @param disregardAutomaticFixedOffset When the `to` scroll argument is a DOM
+ * selector we will keep into account the _fixedOffset_ despite this option.
+ * @returns
+ */
 export function useSmoothScroll(disregardAutomaticFixedOffset) {
     var fixedOffset = useFixedOffset();
     var scroll = useCallback(function (to, customOffset, callback, fallbackTimeout, behavior) {
         var top = undefined;
+        var toIsElement = false;
         if (isNumber(to)) {
             top = to;
         }
         else if (to) {
             var el = document.getElementById(to);
             if (el) {
-                top = getOffsetTopSlim(el);
+                top = getOffsetTopSlim(el) - fixedOffset.current;
+                toIsElement = true;
             }
         }
         if (isNumber(top)) {
             top =
                 top +
                     (customOffset || 0) +
-                    (disregardAutomaticFixedOffset ? 0 : fixedOffset.current);
+                    (disregardAutomaticFixedOffset || toIsElement
+                        ? 0
+                        : fixedOffset.current);
             scrollTo(top, callback, fallbackTimeout, behavior);
         }
     }, [disregardAutomaticFixedOffset, fixedOffset]);

package/node/hooks/useSmoothScroll.js

@@ -5,24 +5,34 @@ var react_1 = require("react");
 var utils_1 = require("@koine/utils");
 var dom_1 = require("@koine/dom");
 var useFixedOffset_1 = require("./useFixedOffset");
+/**
+ *
+ * @param disregardAutomaticFixedOffset When the `to` scroll argument is a DOM
+ * selector we will keep into account the _fixedOffset_ despite this option.
+ * @returns
+ */
 function useSmoothScroll(disregardAutomaticFixedOffset) {
     var fixedOffset = (0, useFixedOffset_1.useFixedOffset)();
     var scroll = (0, react_1.useCallback)(function (to, customOffset, callback, fallbackTimeout, behavior) {
         var top = undefined;
+        var toIsElement = false;
         if ((0, utils_1.isNumber)(to)) {
             top = to;
         }
         else if (to) {
             var el = document.getElementById(to);
             if (el) {
-                top = (0, dom_1.getOffsetTopSlim)(el);
+                top = (0, dom_1.getOffsetTopSlim)(el) - fixedOffset.current;
+                toIsElement = true;
             }
         }
         if ((0, utils_1.isNumber)(top)) {
             top =
                 top +
                     (customOffset || 0) +
-                    (disregardAutomaticFixedOffset ? 0 : fixedOffset.current);
+                    (disregardAutomaticFixedOffset || toIsElement
+                        ? 0
+                        : fixedOffset.current);
             (0, dom_1.scrollTo)(top, callback, fallbackTimeout, behavior);
         }
     }, [disregardAutomaticFixedOffset, fixedOffset]);

package/package.json

@@ -50,7 +50,7 @@
     "framer-motion": "8.5.5",
     "react": "18.2.0",
     "@mui/base": "5.0.0-alpha.115",
-    "@koine/utils": "1.1.6",
+    "@koine/utils": "1.1.8",
     "ts-debounce": "4.0.0",
     "type-fest": "3.5.3",
     "react-icons": "4.7.1",
@@ -60,10 +60,10 @@
     "@tiptap/starter-kit": "2.0.0-beta.209",
     "@kuus/yup": "1.0.0-beta.7",
     "react-hook-form": "7.42.1",
-    "@koine/dom": "1.1.6",
+    "@koine/dom": "1.1.8",
     "react-popper": "2.3.0",
     "tslib": "2.5.0"
   },
-  "version": "1.1.6",
+  "version": "1.1.8",
   "module": "./index.js"
 }