Skip to content
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

Refactor Multi-selection state #1711

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Refactor Multi-selection state #1711

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
2 changes: 2 additions & 0 deletions js/trackBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ class TrackBase {
this.minHeight = config.minHeight || Math.min(25, this.height)
this.maxHeight = config.maxHeight || Math.max(1000, this.height)

this.isMultiSelection = config.isMultiSelection || false

if (config.onclick) {
this.onclick = config.onclick
config.onclick = undefined // functions cannot be saved in sessions, clear it here.
Expand Down
17 changes: 9 additions & 8 deletions js/trackView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TrackView {
this.browser = browser
this.track = track
track.trackView = this

this.addDOMToColumnContainer(browser, columnContainer, browser.referenceFrameList)

}
Expand Down Expand Up @@ -132,12 +132,14 @@ class TrackView {
event.preventDefault()
event.stopPropagation()

setDragHandleSelectionState(this, this.dragHandle, event.target.checked)
this.track.isMultiSelection = event.target.checked

if (this.track.autoscaleGroup && false === event.target.checked) {
this.track.autoscaleGroup = undefined
}

setDragHandleSelectionState(this, this.dragHandle, event.target.checked)

})

setMultiTrackSelectionState(this, axis, ENABLE_MULTI_TRACK_SELECTION)
Expand Down Expand Up @@ -631,7 +633,6 @@ class TrackView {
} else {
this.dragHandle = DOMUtils.div({ class: 'igv-track-drag-handle' })
this.dragHandle.classList.add('igv-track-drag-handle-color')
this.dragHandle.dataset.selected = 'no'
}

browser.columnContainer.querySelector('.igv-track-drag-column').appendChild(this.dragHandle)
Expand Down Expand Up @@ -736,7 +737,7 @@ class TrackView {
event.preventDefault()

currentDragHandle = event.target
if ('no' === currentDragHandle.dataset.selected) {
if (false === this.track.isMultiSelection) {
currentDragHandle.classList.remove('igv-track-drag-handle-color')
currentDragHandle.classList.add('igv-track-drag-handle-hover-color')
}
Expand All @@ -755,7 +756,7 @@ class TrackView {

if (currentDragHandle && event.target !== currentDragHandle) {

if ('no' === currentDragHandle.dataset.selected) {
if (false === this.track.isMultiSelection) {
currentDragHandle.classList.remove('igv-track-drag-handle-hover-color')
currentDragHandle.classList.add('igv-track-drag-handle-color')
}
Expand All @@ -773,7 +774,7 @@ class TrackView {
event.preventDefault()

if (undefined === currentDragHandle) {
if ('no' === event.target.dataset.selected) {
if (false === this.track.isMultiSelection) {
event.target.classList.remove('igv-track-drag-handle-color')
event.target.classList.add('igv-track-drag-handle-hover-color')
}
Expand All @@ -788,7 +789,7 @@ class TrackView {
event.preventDefault()

if (undefined === currentDragHandle) {
if ('no' === event.target.dataset.selected) {
if (false === this.track.isMultiSelection) {
event.target.classList.remove('igv-track-drag-handle-hover-color')
event.target.classList.add('igv-track-drag-handle-color')
}
Expand All @@ -802,7 +803,7 @@ class TrackView {
event.preventDefault()

if (undefined === currentDragHandle) {
if ('no' === event.target.dataset.selected) {
if (false === this.track.isMultiSelection) {
event.target.classList.remove('igv-track-drag-handle-hover-color')
event.target.classList.add('igv-track-drag-handle-color')
}
Expand Down
2 changes: 1 addition & 1 deletion js/ui/menuUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ function getMultiSelectedTrackViews(browser) {

const candidates = browser.trackViews.filter(({ track }) => { return false === multiTrackSelectExclusionTypes.has(track.type) })

let selected = candidates.filter(({ namespace, dragHandle }) => { return namespace === dragHandle.dataset.selected })
let selected = candidates.filter(trackView => true === trackView.track.isMultiSelection)

selected = 0 === selected.length ? undefined : selected

Expand Down
13 changes: 6 additions & 7 deletions js/ui/multiTrackSelectButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,19 @@ function setMultiTrackSelectionState(trackView, axis, doEnableMultiSelection) {
container.style.display = 'grid'
} else {

const trackSelectInput = container.querySelector('[name=track-select]')

if (trackView.dragHandle) {
setDragHandleSelectionState(trackView, trackView.dragHandle, trackSelectInput.checked)
}
trackView.track.isMultiSelection = false

if (trackView.track.autoscaleGroup) {
trackView.track.autoscaleGroup = undefined
}

const trackSelectInput = container.querySelector('[name=track-select]')
trackSelectInput.checked = false

if (trackView.dragHandle) {
setDragHandleSelectionState(trackView, trackView.dragHandle, false)
}

container.style.display = 'none'
}

Expand All @@ -76,12 +77,10 @@ function setMultiTrackSelectionState(trackView, axis, doEnableMultiSelection) {
function setDragHandleSelectionState(trackView, dragHandle, isSelected) {

if (isSelected) {
dragHandle.dataset.selected = trackView.namespace
dragHandle.classList.remove('igv-track-drag-handle-color')
dragHandle.classList.remove('igv-track-drag-handle-hover-color')
dragHandle.classList.add('igv-track-drag-handle-selected-color')
} else {
dragHandle.dataset.selected = 'no'
dragHandle.classList.remove('igv-track-drag-handle-hover-color')
dragHandle.classList.remove('igv-track-drag-handle-selected-color')
dragHandle.classList.add('igv-track-drag-handle-color')
Expand Down