Merge branch 'feature/lrc-script' into enhancement/23-add-tests-to-in…

…crease-coverage-of-3.17 # Conflicts: # src/BeaconLrc.js
wp-media · Sep 9, 2024 · 9004d72 · 9004d72
2 parents 82e19b5 + 6463cee
commit 9004d72
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/BeaconLrc.js b/src/BeaconLrc.js
@@ -1,7 +1,6 @@
 'use strict';
 
 import BeaconUtils from "./Utils.js";
-import BeaconManager from "./BeaconManager.js";
 
 class BeaconLrc {
     constructor(config, logger) {
@@ -53,7 +52,7 @@ class BeaconLrc {
         const rect = element.getBoundingClientRect();
         const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
         console.log( rect, scrollTop );
-        return Math.max(0, rect.top + scrollTop);
+        return Math.max(0, rect.top + scrollTop - BeaconUtils.getScreenHeight());
     }
 
     _skipElement(element) {
@@ -84,10 +83,10 @@ class BeaconLrc {
                 return;
             }
 
-            const can_push_hash = element.parentElement && this._getElementDistance(element.parentElement) < this.config.lrc_threshold && distance > this.config.lrc_threshold;
+            const can_push_hash = element.parentElement && this._getElementDistance(element.parentElement) < this.config.lrc_threshold && distance >= this.config.lrc_threshold;
 
             const color = can_push_hash ? "green" : distance === 0 ? "red" : "";
-            this.logger.logColoredMessage( `${'\t'.repeat(depth)}${element.tagName} (Depth: ${depth}, Distance from viewport top: ${distance}px)`, color );
+            this.logger.logColoredMessage( `${'\t'.repeat(depth)}${element.tagName} (Depth: ${depth}, Distance from viewport bottom: ${distance}px)`, color );
 
             //const xpath = this._getXPath(element);
             //console.log(`%c${'\t'.repeat(depth)}Xpath: ${xpath}`, style);

diff --git a/src/Utils.js b/src/Utils.js
@@ -1,9 +1,17 @@
 'use strict';
 
 class BeaconUtils {
+    static getScreenWidth() {
+        return window.innerWidth || document.documentElement.clientWidth;
+    }
+
+    static getScreenHeight() {
+        return window.innerHeight || document.documentElement.clientHeight;
+    }
+
     static isNotValidScreensize( is_mobile, threshold ) {
-        const screenWidth = window.innerWidth || document.documentElement.clientWidth;
-        const screenHeight = window.innerHeight || document.documentElement.clientHeight;
+        const screenWidth = this.getScreenWidth();
+        const screenHeight = this.getScreenHeight();
 
         const isNotValidForMobile = is_mobile &&
           (screenWidth > threshold.width || screenHeight > threshold.height);