Skip to content
Snippets Groups Projects
Commit b6273205 authored by Alexander Rose's avatar Alexander Rose
Browse files

removed duplicate type

parent b38193aa
Branches
Tags
No related merge requests found
...@@ -9,7 +9,7 @@ import * as React from 'react' ...@@ -9,7 +9,7 @@ import * as React from 'react'
import { PluginUIComponent } from '../base'; import { PluginUIComponent } from '../base';
import { Interactivity } from '../../util/interactivity'; import { Interactivity } from '../../util/interactivity';
import { MarkerAction } from '../../../mol-util/marker-action'; import { MarkerAction } from '../../../mol-util/marker-action';
import { ButtonsType, ModifiersKeys, getButtons, getModifiers, MouseModifiers } from '../../../mol-util/input/input-observer'; import { ButtonsType, ModifiersKeys, getButtons, getModifiers } from '../../../mol-util/input/input-observer';
import { SequenceWrapper } from './wrapper'; import { SequenceWrapper } from './wrapper';
import { StructureElement } from '../../../mol-model/structure'; import { StructureElement } from '../../../mol-model/structure';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
...@@ -22,7 +22,7 @@ type SequenceProps = { sequenceWrapper: SequenceWrapper.Any } ...@@ -22,7 +22,7 @@ type SequenceProps = { sequenceWrapper: SequenceWrapper.Any }
export class Sequence<P extends SequenceProps> extends PluginUIComponent<P> { export class Sequence<P extends SequenceProps> extends PluginUIComponent<P> {
private parentDiv = React.createRef<HTMLDivElement>(); private parentDiv = React.createRef<HTMLDivElement>();
private lastMouseOverSeqIdx = -1; private lastMouseOverSeqIdx = -1;
private highlightQueue = new Subject<{ seqIdx: number, buttons: number, modifiers: MouseModifiers }>(); private highlightQueue = new Subject<{ seqIdx: number, buttons: number, modifiers: ModifiersKeys }>();
private lociHighlightProvider = (loci: Interactivity.Loci, action: MarkerAction) => { private lociHighlightProvider = (loci: Interactivity.Loci, action: MarkerAction) => {
const changed = this.props.sequenceWrapper.markResidue(loci.loci, action) const changed = this.props.sequenceWrapper.markResidue(loci.loci, action)
...@@ -38,7 +38,7 @@ export class Sequence<P extends SequenceProps> extends PluginUIComponent<P> { ...@@ -38,7 +38,7 @@ export class Sequence<P extends SequenceProps> extends PluginUIComponent<P> {
this.plugin.interactivity.lociHighlights.addProvider(this.lociHighlightProvider) this.plugin.interactivity.lociHighlights.addProvider(this.lociHighlightProvider)
this.plugin.interactivity.lociSelects.addProvider(this.lociSelectionProvider) this.plugin.interactivity.lociSelects.addProvider(this.lociSelectionProvider)
this.subscribe(debounceTime<{ seqIdx: number, buttons: number, modifiers: MouseModifiers }>(15)(this.highlightQueue), (e) => { this.subscribe(debounceTime<{ seqIdx: number, buttons: number, modifiers: ModifiersKeys }>(15)(this.highlightQueue), (e) => {
this.hover(e.seqIdx < 0 ? void 0 : e.seqIdx, e.buttons, e.modifiers); this.hover(e.seqIdx < 0 ? void 0 : e.seqIdx, e.buttons, e.modifiers);
}); });
} }
......
...@@ -37,8 +37,7 @@ export function getButtons(event: MouseEvent | Touch) { ...@@ -37,8 +37,7 @@ export function getButtons(event: MouseEvent | Touch) {
return 0 return 0
} }
export type MouseModifiers = { alt: boolean, shift: boolean, control: boolean, meta: boolean } export function getModifiers(event: MouseEvent | Touch): ModifiersKeys {
export function getModifiers(event: MouseEvent | Touch): MouseModifiers {
return { return {
alt: 'altKey' in event ? event.altKey : false, alt: 'altKey' in event ? event.altKey : false,
shift: 'shiftKey' in event ? event.shiftKey : false, shift: 'shiftKey' in event ? event.shiftKey : false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment