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

fix: fix click events in a few examples #123

Merged
merged 2 commits into from
Sep 29, 2023
Merged

fix: fix click events in a few examples #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75a4af9
chore: useLayoutEffect
sehilyi Sep 29, 2023
b91741b
chore: minor
sehilyi Sep 29, 2023
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
210 changes: 105 additions & 105 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useMemo, useRef, useState } from 'react';
import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
import { GoslingComponent, GoslingRef, embed } from 'gosling.js';
import { debounce, sample } from 'lodash';
import type { RouteComponentProps } from 'react-router-dom';
Expand Down Expand Up @@ -198,110 +198,6 @@ function App(props: RouteComponentProps) {
);
}, [filterSampleBy]);

useEffect(() => {
if (!gosRef.current) return;

gosRef.current.api.subscribe('click', (_, e) => {
// console.log(e);

let x = +e.data[0].start1;
let xe = +e.data[0].end1;
let x1 = +e.data[0].start2;
let x1e = +e.data[0].end2;

// safetly swap
if (x > x1) {
x = +e.data[0].start2;
xe = +e.data[0].end2;
x1 = +e.data[0].start1;
x1e = +e.data[0].end1;
}

let zoomStart = x;
let zoomEnd = x1e;
let padding = (zoomEnd - zoomStart) / 4.0;
if (e.data[0].svclass === 'Translocation') {
zoomStart = x;
zoomEnd = xe;
padding = 10000;
}

gosRef.current.api.zoomTo(
`${demo.id}-mid-ideogram`,
`chr1:${zoomStart}-${zoomEnd}`,
padding,
ZOOM_DURATION
);

// we will show the bam files, so set the initial positions
setBreakpoints([+x - ZOOM_PADDING, +xe + ZOOM_PADDING, +x1 - ZOOM_PADDING, +x1e + ZOOM_PADDING]);
setBpIntervals([x, xe, x1, x1e]);
setSelectedSvId(e.data[0].sv_id + '');

// move to the bottom
setTimeout(
() => document.getElementById('gosling-panel')?.scrollTo({ top: 1000000, behavior: 'smooth' }),
2000
);

leftReads.current = [];
rightReads.current = [];
});

gosRef.current.api.subscribe('mouseOver', (_, e) => {
const sanitizedChr = (c: string | number) => {
return `${c}`.replace('chr', '');
};
const calDir = (c1: string | number, c2: string | number) => {
c1 = sanitizedChr(c1);
c2 = sanitizedChr(c2);
if (+c1 && +c1 <= 9) {
c1 = '0' + c1;
}
if (+c2 && +c2 <= 9) {
c2 = '0' + c2;
}
return c1 < c2 ? 'rightward' : 'leftward';
};
if (e.id.includes('-mid-sv') && e.data[0].svclass === 'Translocation') {
const { chromosome: c, position: p } = e.genomicPosition;
const padding = 100000;
if (sanitizedChr(c) === sanitizedChr(e.data[0].chrom1)) {
const direction = calDir(c, e.data[0].chrom2);
const id = e.data[0].sv_id + '-' + direction;
if (id === prevJumpId.current) return;
const { start2, end2 } = e.data[0];
setJumpButtonInfo({
id,
x: mousePos.current.x,
y: mousePos.current.y,
direction,
zoomTo: () => gosRef.current.api.zoomTo(e.id, `chr1:${start2}-${end2}`, padding, ZOOM_DURATION)
});
} else {
const direction = calDir(c, e.data[0].chrom1);
const id = e.data[0].sv_id + '-' + direction;
if (id === prevJumpId.current) return;
const { start1, end1 } = e.data[0];
setJumpButtonInfo({
id,
x: mousePos.current.x,
y: mousePos.current.y,
direction,
zoomTo: () => gosRef.current.api.zoomTo(e.id, `chr1:${start1}-${end1}`, padding, ZOOM_DURATION)
});
}
} else {
setJumpButtonInfo(undefined);
}
});

return () => {
gosRef.current.api.unsubscribe('click');
gosRef.current.api.unsubscribe('mouseOver');
};
}, [gosRef, drivers]); // !! instead of `[demo]`, we use drivers which are updated as a side effect of a demo

useEffect(() => {
if (!gosRef.current || !demo.bai || !demo.bam) return;

Expand Down Expand Up @@ -609,6 +505,110 @@ function App(props: RouteComponentProps) {
// !! Removed `demo` not to update twice since `drivers` are updated right after a demo update.
}, [ready, xDomain, visPanelWidth, drivers, showOverview, showPutativeDriver, selectedSvId, breakpoints, svReads]);

useLayoutEffect(() => {
if (!gosRef.current) return;

gosRef.current.api.subscribe('click', (_, e) => {
// console.log(e);

let x = +e.data[0].start1;
let xe = +e.data[0].end1;
let x1 = +e.data[0].start2;
let x1e = +e.data[0].end2;

// safetly swap
if (x > x1) {
x = +e.data[0].start2;
xe = +e.data[0].end2;
x1 = +e.data[0].start1;
x1e = +e.data[0].end1;
}

let zoomStart = x;
let zoomEnd = x1e;
let padding = (zoomEnd - zoomStart) / 4.0;
if (e.data[0].svclass === 'Translocation') {
zoomStart = x;
zoomEnd = xe;
padding = 10000;
}

gosRef.current.api.zoomTo(
`${demo.id}-mid-ideogram`,
`chr1:${zoomStart}-${zoomEnd}`,
padding,
ZOOM_DURATION
);

// we will show the bam files, so set the initial positions
setBreakpoints([+x - ZOOM_PADDING, +xe + ZOOM_PADDING, +x1 - ZOOM_PADDING, +x1e + ZOOM_PADDING]);
setBpIntervals([x, xe, x1, x1e]);
setSelectedSvId(e.data[0].sv_id + '');

// move to the bottom
setTimeout(
() => document.getElementById('gosling-panel')?.scrollTo({ top: 1000000, behavior: 'smooth' }),
2000
);

leftReads.current = [];
rightReads.current = [];
});

gosRef.current.api.subscribe('mouseOver', (_, e) => {
const sanitizedChr = (c: string | number) => {
return `${c}`.replace('chr', '');
};
const calDir = (c1: string | number, c2: string | number) => {
c1 = sanitizedChr(c1);
c2 = sanitizedChr(c2);
if (+c1 && +c1 <= 9) {
c1 = '0' + c1;
}
if (+c2 && +c2 <= 9) {
c2 = '0' + c2;
}
return c1 < c2 ? 'rightward' : 'leftward';
};
if (e.id.includes('-mid-sv') && e.data[0].svclass === 'Translocation') {
const { chromosome: c, position: p } = e.genomicPosition;
const padding = 100000;
if (sanitizedChr(c) === sanitizedChr(e.data[0].chrom1)) {
const direction = calDir(c, e.data[0].chrom2);
const id = e.data[0].sv_id + '-' + direction;
if (id === prevJumpId.current) return;
const { start2, end2 } = e.data[0];
setJumpButtonInfo({
id,
x: mousePos.current.x,
y: mousePos.current.y,
direction,
zoomTo: () => gosRef.current.api.zoomTo(e.id, `chr1:${start2}-${end2}`, padding, ZOOM_DURATION)
});
} else {
const direction = calDir(c, e.data[0].chrom1);
const id = e.data[0].sv_id + '-' + direction;
if (id === prevJumpId.current) return;
const { start1, end1 } = e.data[0];
setJumpButtonInfo({
id,
x: mousePos.current.x,
y: mousePos.current.y,
direction,
zoomTo: () => gosRef.current.api.zoomTo(e.id, `chr1:${start1}-${end1}`, padding, ZOOM_DURATION)
});
}
} else {
setJumpButtonInfo(undefined);
}
});

return () => {
gosRef.current?.api.unsubscribe('click');
gosRef.current?.api.unsubscribe('mouseOver');
};
});

return (
<ErrorBoundary>
<div
Expand Down
2 changes: 1 addition & 1 deletion src/track/boundary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from '.';

const hex = 'lightgray';
Expand Down
2 changes: 1 addition & 1 deletion src/track/cnv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack, OverlaidTracks } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack, OverlaidTracks } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from './index';

export default function cnv(
Expand Down
2 changes: 1 addition & 1 deletion src/track/coverage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack } from 'gosling.js/dist/src/gosling-schema';
import { SpecOption } from '../main-spec';

export default function coverage(option: SpecOption, isLeft: boolean): Partial<SingleTrack> {
Expand Down
2 changes: 1 addition & 1 deletion src/track/driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from './index';

export default function driver(
Expand Down
2 changes: 1 addition & 1 deletion src/track/gain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from './index';

export default function gain(
Expand Down
2 changes: 1 addition & 1 deletion src/track/indel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { OverlaidTracks } from 'gosling.js/dist/src/core/gosling.schema';
import { OverlaidTracks } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from './index';

export default function indel(
Expand Down
2 changes: 1 addition & 1 deletion src/track/loh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from './index';

export default function loh(
Expand Down
2 changes: 1 addition & 1 deletion src/track/mutation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SingleTrack } from 'gosling.js/dist/src/core/gosling.schema';
import { SingleTrack } from 'gosling.js/dist/src/gosling-schema';
import { TrackMode } from './index';

export default function mutation(
Expand Down
2 changes: 1 addition & 1 deletion src/track/sv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
SingleTrack,
StrReplaceTransform,
SvTypeTransform
} from 'gosling.js/dist/src/core/gosling.schema';
} from 'gosling.js/dist/src/gosling-schema';
import { consistentSv } from '../constants';
import defaults from '../default-encoding';
import { TrackMode } from '.';
Expand Down