From 5f7e628cc298e162072a4cb9ca2bdd4e7c05c7d3 Mon Sep 17 00:00:00 2001 From: Remi Planel Date: Tue, 4 Jun 2019 16:41:34 +0200 Subject: [PATCH] Add type for genomeBrowserData layout callbacks --- src/scripts/layout/genome-browser.ts | 10 +++++++--- tests/genome-browser.test.ts | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/scripts/layout/genome-browser.ts b/src/scripts/layout/genome-browser.ts index d7c7cf3..376f7fd 100644 --- a/src/scripts/layout/genome-browser.ts +++ b/src/scripts/layout/genome-browser.ts @@ -1,4 +1,8 @@ -import { GenomeBrowserState, GeneData, GenomeBrowserData } from "../types"; +import { + GenomeBrowserState, + GeneData, + GenomeBrowserData +} from "../types"; import { format as d3Format } from "d3-format"; import { scaleOrdinal } from "d3-scale"; import { color } from "d3"; @@ -11,8 +15,8 @@ const geneColor = scaleOrdinal( ); export default function genomeBrowserData( state: GenomeBrowserState, - brushHandler: any, - clickHandler: any + brushHandler: (scale: any, state: GenomeBrowserState) => void, + clickHandler: (geneLocation: [number, number], state: GenomeBrowserState) => void ): GenomeBrowserData { const { window, diff --git a/tests/genome-browser.test.ts b/tests/genome-browser.test.ts index f9499ad..4e033bf 100644 --- a/tests/genome-browser.test.ts +++ b/tests/genome-browser.test.ts @@ -1,6 +1,6 @@ import GenomeBrowser from "../src/scripts/component/genome-browser"; import genomeBrowserDataLayout from "../src/scripts/layout/genome-browser"; -import { GenomeBrowserData, GeneData } from "../src/scripts/types"; +import { GenomeBrowserData, GeneData, GenomeBrowserState } from "../src/scripts/types"; import { select } from "d3-selection"; describe("Test Genome Browser", () => { @@ -47,10 +47,11 @@ describe("Test Genome Browser", () => { } } + const genomeBrowserData = genomeBrowserDataLayout( genomeBrowserState, - () => console.log("brush"), - () => console.log("click") + (scale, state: GenomeBrowserState) => console.log(scale), + (geneLocation, state: GenomeBrowserState) => console.log(geneLocation) ); const data: GenomeBrowserData[] = [genomeBrowserData]; document.body.innerHTML = -- GitLab