From ce78ab53dc4980119a077fcfe94e8aa1e91055e1 Mon Sep 17 00:00:00 2001
From: tariqksoliman <tariqksoliman@gmail.com>
Date: Tue, 27 May 2025 10:48:10 -0700
Subject: [PATCH] #696 Info Tool Hotkeys

---
 src/essence/Ancillary/Description.js          | 14 ++--
 .../Basics/UserInterface_/BottomBar.js        | 30 +++++++
 src/essence/Tools/Info/InfoTool.js            | 83 +++++++++++++------
 3 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/src/essence/Ancillary/Description.js b/src/essence/Ancillary/Description.js
index 2e7ef73b6..ef3c464b6 100644
--- a/src/essence/Ancillary/Description.js
+++ b/src/essence/Ancillary/Description.js
@@ -180,10 +180,12 @@ const Description = {
         })
 
         document.addEventListener('keydown', function (event) {
-            if (event.key === 'ArrowLeft') {
-                Description.navPrevious()
-            } else if (event.key === 'ArrowRight') {
-                Description.navNext()
+            if (!event.ctrlKey && !event.shiftKey) {
+                if (event.key === 'ArrowLeft') {
+                    Description.navPrevious()
+                } else if (event.key === 'ArrowRight') {
+                    Description.navNext()
+                }
             }
         })
 
@@ -1227,13 +1229,13 @@ const Description = {
                 })
             if (Description.tippyPrevious == null)
                 Description.tippyPrevious = tippy('#mainDescNavBarPrevious', {
-                    content: 'Previous Feature',
+                    content: 'Previous Feature (Arrow-Left)',
                     placement: 'bottom',
                     theme: 'blue',
                 })
             if (Description.tippyNext == null)
                 Description.tippyNext = tippy('#mainDescNavBarNext', {
-                    content: 'Next Feature',
+                    content: 'Next Feature (Arrow-Right)',
                     placement: 'bottom',
                     theme: 'blue',
                 })
diff --git a/src/essence/Basics/UserInterface_/BottomBar.js b/src/essence/Basics/UserInterface_/BottomBar.js
index 5e54323fd..2ac685c64 100644
--- a/src/essence/Basics/UserInterface_/BottomBar.js
+++ b/src/essence/Basics/UserInterface_/BottomBar.js
@@ -405,6 +405,36 @@ let BottomBar = {
                                 `</li>`,
                             `</ul>`,
                         `</div>`,
+                        `<div class='mainHotkeysModalSection'>`,
+                            `<div class='mainHotkeysModalSectionTitle'>Info</div>`,
+                            `<ul class='mainHotkeysModalSectionOptions'>`,
+                                `<li class='mainHotkeysModalSectionSubtitle'>Navigate</li>`,
+                                `<li>`,
+                                    `<div>Next (Ordered) Feature (Top-Bar)</div>`,
+                                    `<div>Arrow-Right</div>`,
+                                `</li>`,
+                                `<li>`,
+                                    `<div>Previous (Ordered) Feature (Top-Bar)</div>`,
+                                    `<div>Arrow-Left</div>`,
+                                `</li>`,
+                                `<li>`,
+                                    `<div>Next (Overlapping) Feature</div>`,
+                                    `<div>SHIFT + Arrow-Right</div>`,
+                                `</li>`,
+                                `<li>`,
+                                    `<div>Previous (Overlapping) Feature</div>`,
+                                    `<div>SHIFT + Arrow-Left</div>`,
+                                `</li>`,
+                                `<li>`,
+                                    `<div>Next (Associated) Feature</div>`,
+                                    `<div>CTRL/CMD + Arrow-Right</div>`,
+                                `</li>`,
+                                `<li>`,
+                                    `<div>Previous (Associated) Feature</div>`,
+                                    `<div>CTRL/CMD + Arrow-Left</div>`,
+                                `</li>`,
+                            `</ul>`,
+                        `</div>`,
                         `<div class='mainHotkeysModalSection'>`,
                             `<div class='mainHotkeysModalSectionTitle'>Map</div>`,
                             `<ul class='mainHotkeysModalSectionOptions'>`,
diff --git a/src/essence/Tools/Info/InfoTool.js b/src/essence/Tools/Info/InfoTool.js
index d73376a42..476269662 100644
--- a/src/essence/Tools/Info/InfoTool.js
+++ b/src/essence/Tools/Info/InfoTool.js
@@ -169,17 +169,17 @@ var InfoTool = {
         tools.html(markup)
 
         tippy('#infoToolSelected', {
-            content: 'Select An Overlapping Feature',
+            content: 'Select An Overlapping Feature (Shift + ⇆)',
             placement: 'right',
             theme: 'blue',
         })
         tippy('#infoToolSelectedGeoDataset', {
-            content: 'Select An Associated Dataset',
+            content: 'Select An Associated Dataset (Ctrl/Cmd + ⇆)',
             placement: 'right',
             theme: 'blue',
         })
         tippy('#infoToolSelectedDataset', {
-            content: 'Select An Associated Dataset',
+            content: 'Select An Associated Dataset (Ctrl/Cmd + ⇆)',
             placement: 'right',
             theme: 'blue',
         })
@@ -263,26 +263,7 @@ var InfoTool = {
             )
         )
         Dropy.init($('#infoToolSelectedDropdown'), function (idx) {
-            let e = JSON.parse(JSON.stringify(InfoTool.initialEvent))
-            MetadataCapturer.populateMetadata(
-                InfoTool.featureLayers[idx] || InfoTool.currentLayer,
-                () => {
-                    Kinds.use(
-                        L_.layers.data[InfoTool.currentLayerName]?.kind || null,
-                        Map_,
-                        InfoTool.info[idx],
-                        InfoTool.featureLayers[idx] || InfoTool.currentLayer,
-                        InfoTool.currentLayerName,
-                        null,
-                        e,
-                        { idx: idx },
-                        InfoTool.info,
-                        InfoTool.featureLayers[idx]
-                            ? InfoTool.featureLayers
-                            : null
-                    )
-                }
-            )
+            InfoTool.selectedDropdownChange(idx)
         })
 
         InfoTool.createInfo()
@@ -686,6 +667,56 @@ var InfoTool = {
         $('#infoToolFilter').css('display', 'none')
         $('#infoToolNoneSelected').css('display', 'block')
     },
+    selectedDropdownChange: function (idx) {
+        let e = JSON.parse(JSON.stringify(InfoTool.initialEvent))
+        MetadataCapturer.populateMetadata(
+            InfoTool.featureLayers[idx] || InfoTool.currentLayer,
+            () => {
+                Kinds.use(
+                    L_.layers.data[InfoTool.currentLayerName]?.kind || null,
+                    Map_,
+                    InfoTool.info[idx],
+                    InfoTool.featureLayers[idx] || InfoTool.currentLayer,
+                    InfoTool.currentLayerName,
+                    null,
+                    e,
+                    { idx: idx },
+                    InfoTool.info,
+                    InfoTool.featureLayers[idx] ? InfoTool.featureLayers : null
+                )
+            }
+        )
+    },
+    hotKeyEvents: function (event) {
+        if (event.shiftKey && !event.ctrlKey && !event.metaKey) {
+            // Shift
+            // Nav Overlap
+            if (event.key === 'ArrowLeft') {
+                if (InfoTool.activeFeatureI > 0)
+                    InfoTool.selectedDropdownChange(InfoTool.activeFeatureI - 1)
+            } else if (event.key === 'ArrowRight') {
+                if (InfoTool.activeFeatureI < InfoTool.info.length - 1)
+                    InfoTool.selectedDropdownChange(InfoTool.activeFeatureI + 1)
+            }
+        } else if ((event.ctrlKey || event.metaKey) && !event.shiftKey) {
+            // Ctrl/Cmd
+            if (InfoTool.hasDataset) {
+                // Nav Dataset
+                if (event.key === 'ArrowLeft') {
+                    $('#infoToolSelectedDatasetLeft').trigger('click')
+                } else if (event.key === 'ArrowRight') {
+                    $('#infoToolSelectedDatasetRight').trigger('click')
+                }
+            } else if (InfoTool.hasGeoDatasetMetadata) {
+                // Nav Geodataset
+                if (event.key === 'ArrowLeft') {
+                    $('#infoToolSelectedGeoDatasetLeft').trigger('click')
+                } else if (event.key === 'ArrowRight') {
+                    $('#infoToolSelectedGeoDatasetRight').trigger('click')
+                }
+            }
+        }
+    },
 }
 
 //
@@ -709,9 +740,13 @@ function interfaceWithMMGIS() {
         InfoTool.featureLayers
     )
 
+    document.addEventListener('keydown', InfoTool.hotKeyEvents)
+
     //Share everything. Don't take things that aren't yours.
     // Put things back where you found them.
-    function separateFromMMGIS() {}
+    function separateFromMMGIS() {
+        document.removeEventListener('keydown', InfoTool.hotKeyEvents)
+    }
 }
 
 //Other functions