Skip to content

#696 Info Tool Hotkeys #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tariqksoliman merged 1 commit into from
May 27, 2025
Merged

#696 Info Tool Hotkeys #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/essence/Ancillary/Description.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
})

Expand Down Expand Up @@ -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',
})
Expand Down
30 changes: 30 additions & 0 deletions src/essence/Basics/UserInterface_/BottomBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'>`,
Expand Down
83 changes: 59 additions & 24 deletions src/essence/Tools/Info/InfoTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
})
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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')
}
}
}
},
}

//
Expand All @@ -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
Expand Down