Compare commits
No commits in common. 'main' and 'marker-callback-#25' have entirely different histories.
main
...
marker-cal
33 changed files with 289 additions and 2139 deletions
@ -1,42 +0,0 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="utf-8" http-equiv="encoding"> |
||||
|
||||
<script src="../dist/index.dev.js" type="text/javascript"></script> |
||||
</head> |
||||
<body> |
||||
<div id="chart" style="width: 50%; height: 500px;"></div> |
||||
|
||||
<script type="text/javascript"> |
||||
let options = { |
||||
renderLegend: false, usePanning: false, |
||||
axis: { |
||||
x: { format: 'numeric', range: [0, 100] }, |
||||
y: { invert: true, range: [0, 100] }, |
||||
y1: { isActive: true, format: 'numeric', range: [0, 1000] }, |
||||
}, |
||||
zoomEvents: { |
||||
mouse: { zoom: { isActive: false, orientation: 'horizontal' } }, |
||||
scroll: { zoom: { isActive: false, orientation: 'horizontal' } } |
||||
}, |
||||
} |
||||
const data1 = [[0,0], [35, 40], [65, 60], [100, 100]]; |
||||
const data2 = [[0,0], [35, 50], [65, 65], [80, 100]]; |
||||
const data3 = [[0,0], [35, 20], [65, 50], [100, 80]]; |
||||
const data4 = [[0,900], [35, 800], [65, 700], [100, 600]]; |
||||
var pod = new LinePod( |
||||
document.getElementById('chart'), |
||||
[ |
||||
{ target: 'test1', datapoints: data1, color: 'green', renderArea: 'Above' }, |
||||
{ target: 'test2', datapoints: data2, color: 'blue', renderArea: 'Below' }, |
||||
{ target: 'test3', datapoints: data3, color: 'orange', renderArea: 'Below', yOrientation: 'right' }, |
||||
{ target: 'test4', datapoints: data4, color: 'purple', renderArea: 'Above', yOrientation: 'right' }, |
||||
], |
||||
options |
||||
); |
||||
pod.render(); |
||||
</script> |
||||
</body> |
||||
</html> |
||||
@ -1,33 +0,0 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="utf-8" http-equiv="encoding"> |
||||
<script src="../dist/index.dev.js" type="text/javascript"></script> |
||||
</head> |
||||
<body> |
||||
<div id="chart" style="width: 50%; height: 500px;"></div> |
||||
<script type="text/javascript"> |
||||
const startTime = 1590590148; |
||||
const data = Array.from( |
||||
{ length: 20 }, |
||||
(el, idx) => [startTime + idx * 10000, Math.floor(Math.random() * 30)] |
||||
); |
||||
let options = { |
||||
renderLegend: false, usePanning: false, |
||||
axis: { y: { range: [0, 50] } }, |
||||
zoomEvents: { mouse: { |
||||
zoom: { isActive: false }, |
||||
pan: { isActive: false }, |
||||
} }, |
||||
eventsCallbacks: { mouseClick: console.log } |
||||
} |
||||
var pod = new LinePod( |
||||
document.getElementById('chart'), |
||||
[{ datapoints: data }], |
||||
options |
||||
); |
||||
pod.render(); |
||||
</script> |
||||
</body> |
||||
</html> |
||||
@ -1,29 +0,0 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="utf-8" http-equiv="encoding"> |
||||
<script src="../dist/index.dev.js" type="text/javascript"></script> |
||||
</head> |
||||
<body> |
||||
<div id="chart" style="width: 50%; height: 500px;"></div> |
||||
<script type="text/javascript"> |
||||
const startTime = 1590590148; |
||||
const data = Array.from( |
||||
{ length: 20 }, |
||||
(el, idx) => [startTime + idx * 10000, Math.floor(Math.random() * 30)] |
||||
); |
||||
let options = { |
||||
renderLegend: false, usePanning: false, |
||||
axis: { y: { range: [0, 50] } }, |
||||
eventsCallbacks: { mouseMove: console.log } |
||||
} |
||||
var pod = new LinePod( |
||||
document.getElementById('chart'), |
||||
[{ datapoints: data }], |
||||
options |
||||
); |
||||
pod.render(); |
||||
</script> |
||||
</body> |
||||
</html> |
||||
@ -1,33 +0,0 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="utf-8" http-equiv="encoding"> |
||||
<script src="../dist/index.dev.js" type="text/javascript"></script> |
||||
</head> |
||||
<body> |
||||
<div id="chart" style="width: 50%; height: 500px;"></div> |
||||
<script type="text/javascript"> |
||||
const startTime = 1590590148; |
||||
const data = Array.from( |
||||
{ length: 20 }, |
||||
(el, idx) => [startTime + idx * 10000, Math.floor(Math.random() * 30)] |
||||
); |
||||
let options = { |
||||
renderLegend: false, usePanning: false, |
||||
axis: { y: { range: [0, 50] } }, |
||||
zoomEvents: { mouse: { |
||||
zoom: { isActive: false }, |
||||
pan: { isActive: false }, |
||||
} }, |
||||
eventsCallbacks: { contextMenu: (position) => console.log('contextMenu', position) } |
||||
} |
||||
var pod = new LinePod( |
||||
document.getElementById('chart'), |
||||
[{ datapoints: data }], |
||||
options |
||||
); |
||||
pod.render(); |
||||
</script> |
||||
</body> |
||||
</html> |
||||
@ -1,46 +0,0 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="utf-8" http-equiv="encoding"> |
||||
|
||||
<script src="../dist/index.dev.js" type="text/javascript"></script> |
||||
</head> |
||||
<body> |
||||
<div id="chart" style="width: 100%; height: 500px;"></div> |
||||
|
||||
<script type="text/javascript"> |
||||
const startTime = 1701790172908; |
||||
const timeSerieData = [5, 6, 3, 7, 5, 6, 8, 4, 5, 6, 4, 3, 5, 7, 8] |
||||
.map((el, idx) => [startTime + idx * 1000, el]); |
||||
const segmentsData = [3, 6, 9].map(el => [startTime + el * 1000, startTime + (el + 1) * 1100]); |
||||
let options = { |
||||
renderLegend: false, |
||||
axis: { |
||||
y: { range: [0, 10] }, |
||||
x: { format: 'time' } |
||||
}, |
||||
} |
||||
var pod = new LinePod( |
||||
document.getElementById('chart'), |
||||
[ |
||||
{ datapoints: timeSerieData, color: 'black' }, |
||||
], |
||||
options, |
||||
undefined, |
||||
[ |
||||
{ |
||||
data: segmentsData, |
||||
color:'#FFE545', |
||||
select: true, |
||||
opacity: 0.4, |
||||
opacitySelect: 0.8, |
||||
onSelect: console.log, |
||||
onUnselect: console.log |
||||
} |
||||
] |
||||
); |
||||
pod.render(); |
||||
</script> |
||||
</body> |
||||
</html> |
||||
@ -1,37 +0,0 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="utf-8" http-equiv="encoding"> |
||||
<script src="../dist/index.dev.js" type="text/javascript"></script> |
||||
</head> |
||||
<body> |
||||
<div id="chart" style="width: 50%; height: 500px;"></div> |
||||
<script type="text/javascript"> |
||||
const startTime = 1590590148; |
||||
const data = Array.from( |
||||
{ length: 20 }, |
||||
(el, idx) => [startTime + idx * 10000, Math.floor(Math.random() * 30)] |
||||
); |
||||
let options = { |
||||
renderLegend: false, usePanning: false, |
||||
axis: { y: { range: [0, 50] } }, |
||||
zoomEvents: { mouse: { |
||||
zoom: { isActive: true, orientation: "horizontal" }, |
||||
pan: { isActive: false }, |
||||
}}, |
||||
events: { |
||||
zoomOut: function(centers, ranges) { |
||||
console.log('zoomOut', centers, ranges); |
||||
} |
||||
} |
||||
} |
||||
var pod = new LinePod( |
||||
document.getElementById('chart'), |
||||
[{ datapoints: data }], |
||||
options |
||||
); |
||||
pod.render(); |
||||
</script> |
||||
</body> |
||||
</html> |
||||
@ -0,0 +1,117 @@
|
||||
import { LineTimeSerie, LineOptions, LinePod } from '@chartwerk/line-pod'; |
||||
|
||||
import { AxisRange } from '@chartwerk/core/dist/types'; |
||||
import { MarkersConf } from '@chartwerk/line-pod/dist/models/marker'; |
||||
import { SegmentSerie } from '@chartwerk/line-pod/dist/models/segment'; |
||||
|
||||
import { useEffect, useRef, useState } from 'react'; |
||||
|
||||
import _ from 'lodash'; |
||||
|
||||
|
||||
export type ChartwerkLinePodProps = { |
||||
id?: string; |
||||
series: LineTimeSerie[]; |
||||
options?: LineOptions; |
||||
markersConf?: MarkersConf, |
||||
segments?: SegmentSerie[], |
||||
className?: string; |
||||
// TODO: callback types should be exported from chartwerk
|
||||
onZoomIn?: (ranges: AxisRange[]) => void; |
||||
onZoomOut?: (centers: { x: number, y: number }) => void; |
||||
onMouseMove?: (event: any) => void; |
||||
onMouseOut?: () => void; |
||||
onLegendClick?: (idx: number) => void, |
||||
onPanning?: (event: { ranges: AxisRange[], d3Event: any }) => void; |
||||
onPanningEnd?: (ranges: AxisRange[]) => void; |
||||
onContextMenu?: (evt: any) => void; |
||||
onSharedCrosshairMove?: (evt: any) => void; |
||||
onRenderStart?: () => void, |
||||
onRenderEnd?: () => void, |
||||
} |
||||
|
||||
export function ChartwerkLinePod(props: ChartwerkLinePodProps) { |
||||
|
||||
const [pod, setPod] = useState<LinePod | null>(null); |
||||
const [hack, setHack] = useState<number | null>(null); |
||||
|
||||
const chartRef = useRef(null); |
||||
const chart = chartRef.current; |
||||
|
||||
useEffect(() => { |
||||
// this function will be called on component unmount
|
||||
return () => { |
||||
if(pod === null) { return; } |
||||
// @ts-ignore
|
||||
pod.removeEventListeners(); |
||||
} |
||||
}, []); |
||||
|
||||
useEffect(() => { |
||||
if(chart === null) { return; } |
||||
|
||||
let eventsCallbacks = _.cloneDeep(props.options?.eventsCallbacks || {}); |
||||
if (props.onZoomIn) { |
||||
eventsCallbacks.zoomIn = props.onZoomIn; |
||||
} |
||||
if (props.onZoomOut) { |
||||
eventsCallbacks.zoomOut = props.onZoomOut; |
||||
} |
||||
if (props.onMouseMove) { |
||||
eventsCallbacks.mouseMove = props.onMouseMove; |
||||
} |
||||
if (props.onMouseOut) { |
||||
eventsCallbacks.mouseOut = props.onMouseOut; |
||||
} |
||||
if (props.onLegendClick) { |
||||
eventsCallbacks.onLegendClick = props.onLegendClick; |
||||
} |
||||
if (props.onPanning) { |
||||
eventsCallbacks.panning = props.onPanning; |
||||
} |
||||
if (props.onPanningEnd) { |
||||
eventsCallbacks.panningEnd = props.onPanningEnd; |
||||
} |
||||
if (props.onContextMenu) { |
||||
eventsCallbacks.contextMenu = props.onContextMenu; |
||||
} |
||||
if (props.onSharedCrosshairMove) { |
||||
eventsCallbacks.sharedCrosshairMove = props.onSharedCrosshairMove; |
||||
} |
||||
if (props.onRenderStart) { |
||||
eventsCallbacks.renderStart = props.onRenderStart; |
||||
} |
||||
|
||||
if(pod === null) { |
||||
const newPod = new LinePod( |
||||
// @ts-ignore
|
||||
chart, |
||||
props.series, |
||||
{ |
||||
...props.options, |
||||
eventsCallbacks |
||||
}, |
||||
props.markersConf, |
||||
props.segments |
||||
); |
||||
setPod(newPod); |
||||
newPod.render(); |
||||
} else { |
||||
pod.updateData(props.series, props.options); |
||||
} |
||||
}, [chart, pod, props.id, props.options, props.markersConf, props.segments]); |
||||
|
||||
// TODO: it's a hack to render the LinePod right after the div appears in DOM
|
||||
setTimeout(() => { |
||||
if(hack === null) { |
||||
setHack(1); |
||||
} |
||||
}, 1); |
||||
|
||||
|
||||
return ( |
||||
<div id={props.id} className={props.className} ref={chartRef}></div> |
||||
); |
||||
} |
||||
|
||||
export default ChartwerkLinePod; |
||||
@ -1,26 +0,0 @@
|
||||
const path = require('path'); |
||||
|
||||
module.exports = { |
||||
entry: './src/index.tsx', |
||||
module: { |
||||
rules: [ |
||||
{ |
||||
test: /\.tsx?$/, |
||||
use: 'ts-loader', |
||||
exclude: /node_modules/, |
||||
}, |
||||
], |
||||
}, |
||||
resolve: { |
||||
extensions: ['.tsx', '.ts', '.js'], |
||||
}, |
||||
output: { |
||||
filename: 'index.js', |
||||
path: path.resolve(__dirname, '../dist'), |
||||
libraryTarget: 'umd', |
||||
umdNamedDefine: true, |
||||
}, |
||||
externals: [ |
||||
'@chartwerk/line-pod', 'react' |
||||
] |
||||
}; |
||||
@ -1,8 +0,0 @@
|
||||
const baseWebpackConfig = require('./webpack.base.conf'); |
||||
|
||||
var conf = baseWebpackConfig; |
||||
conf.devtool = 'inline-source-map'; |
||||
conf.mode = 'development'; |
||||
conf.output.filename = 'index.dev.js'; |
||||
|
||||
module.exports = conf; |
||||
@ -1,6 +0,0 @@
|
||||
const baseWebpackConfig = require('./webpack.base.conf'); |
||||
|
||||
var conf = baseWebpackConfig; |
||||
conf.mode = 'production'; |
||||
|
||||
module.exports = baseWebpackConfig; |
||||
@ -1,23 +0,0 @@
|
||||
{ |
||||
"name": "line-pod-react", |
||||
"version": "0.0.1", |
||||
"description": "React wrapper around line-pod", |
||||
"main": "dist/index.js", |
||||
"repository": "http://code.corpglory.net/chartwerk/line-pod.git", |
||||
"author": "CorpGlory Inc.", |
||||
"license": "ISC", |
||||
"scripts": { |
||||
"build": "webpack --config build/webpack.prod.conf.js", |
||||
"dev": "webpack --config build/webpack.dev.conf.js" |
||||
}, |
||||
"dependencies": { |
||||
"@chartwerk/line-pod": "workspace:*", |
||||
"react": "^18.2.0", |
||||
"react-dom": "^18.2.0" |
||||
}, |
||||
"devDependencies": { |
||||
"ts-loader": "^9.5.1", |
||||
"typescript": "^5.4.3", |
||||
"webpack": "^5.87.0" |
||||
} |
||||
} |
||||
@ -1,74 +0,0 @@
|
||||
import { LineTimeSerie, LineOptions, LinePod } from '@chartwerk/line-pod'; |
||||
import { MarkersConf } from '@chartwerk/line-pod/dist/models/marker'; |
||||
import { SegmentSerie } from '@chartwerk/line-pod/dist/models/segment'; |
||||
|
||||
import React, { useEffect, useRef, useState } from 'react'; |
||||
|
||||
import _ from 'lodash'; |
||||
|
||||
|
||||
export type ChartwerkLinePodProps = { |
||||
id?: string; |
||||
series: LineTimeSerie[]; |
||||
options?: LineOptions; |
||||
markersConf?: MarkersConf, |
||||
segments?: SegmentSerie[], |
||||
className?: string; |
||||
} |
||||
|
||||
export function ChartwerkLinePod(props: ChartwerkLinePodProps) { |
||||
|
||||
const [pod, setPod] = useState<LinePod | null>(null); |
||||
const [hack, setHack] = useState<number | null>(null); |
||||
|
||||
const chartRef = useRef(null); |
||||
const chart = chartRef.current; |
||||
|
||||
useEffect(() => { |
||||
// this function will be called on component unmount
|
||||
return () => { |
||||
if(pod === null) { return; } |
||||
// @ts-ignore
|
||||
pod.removeEventListeners(); |
||||
} |
||||
}, []); |
||||
|
||||
useEffect(() => { |
||||
if(chart === null) { return; } |
||||
if(pod === null) { |
||||
const newPod = new LinePod( |
||||
// @ts-ignore
|
||||
chart, |
||||
props.series, |
||||
props.options, |
||||
props.markersConf, |
||||
props.segments |
||||
); |
||||
setPod(newPod); |
||||
newPod.render(); |
||||
} else { |
||||
if(props.markersConf) { |
||||
pod.updateMarkers(props.markersConf); |
||||
} |
||||
if(props.segments) { |
||||
pod.updateSegments(props.segments); |
||||
} |
||||
// TODO: actually it's wrong logic with updates
|
||||
// because it creates new pod anyway
|
||||
pod.updateData(props.series, props.options); |
||||
} |
||||
}, [chart, props.id, props.options, props.markersConf, props.segments]); |
||||
|
||||
// TODO: it's a hack to render the LinePod right after the div appears in DOM
|
||||
setTimeout(() => { |
||||
if(hack === null) { |
||||
setHack(1); |
||||
} |
||||
}, 1); |
||||
|
||||
return ( |
||||
<div id={props.id} className={props.className} ref={chartRef}></div> |
||||
); |
||||
} |
||||
|
||||
export default ChartwerkLinePod; |
||||
@ -1,23 +0,0 @@
|
||||
{ |
||||
"compilerOptions": { |
||||
"target": "es5", |
||||
"rootDir": "./src", |
||||
"module": "esnext", |
||||
"moduleResolution": "node", |
||||
"declaration": true, |
||||
"declarationDir": "dist", |
||||
"allowSyntheticDefaultImports": true, |
||||
"inlineSourceMap": false, |
||||
"sourceMap": true, |
||||
"noEmitOnError": false, |
||||
"emitDecoratorMetadata": false, |
||||
"experimentalDecorators": true, |
||||
"noImplicitReturns": true, |
||||
"noImplicitThis": false, |
||||
"noImplicitUseStrict": false, |
||||
"noImplicitAny": false, |
||||
"noUnusedLocals": false, |
||||
"baseUrl": "./src", |
||||
"jsx": "react" |
||||
} |
||||
} |
||||
@ -1,139 +1,59 @@
|
||||
import { MarkerElem, MarkersConf, MarkerSerie } from '../models/marker'; |
||||
import { LineTimeSerie, LineOptions } from '../types'; |
||||
import { MarkersConf, MarkerSerie } from "../models/marker"; |
||||
import { PodState } from "@chartwerk/core"; |
||||
import { LineTimeSerie, LineOptions } from "../types"; |
||||
|
||||
import { Margin, PodState } from '@chartwerk/core'; |
||||
|
||||
import d3 from 'd3'; |
||||
import d3 from "d3"; |
||||
|
||||
export class Markers { |
||||
private _layerContainer = null; |
||||
private _chartHeight = 0; |
||||
// TODO: more semantic name
|
||||
private _d3Holder = null; |
||||
|
||||
constructor( |
||||
private _chartContainer: d3.Selection<HTMLElement, unknown, null, undefined>, |
||||
private _markerConf: MarkersConf, |
||||
private _state: PodState<LineTimeSerie, LineOptions>, |
||||
private _margin: Margin, |
||||
) { } |
||||
constructor(private _markerConf: MarkersConf, private _state: PodState<LineTimeSerie, LineOptions>) { |
||||
|
||||
clear() { |
||||
if(this._layerContainer !== null) { |
||||
this._layerContainer.remove(); |
||||
} |
||||
this._chartContainer.selectAll('.marker-content').remove(); |
||||
} |
||||
|
||||
render(metricContainer: d3.Selection<SVGGElement, unknown, null, undefined>, chartHeight: number) { |
||||
this._chartHeight = chartHeight; |
||||
this._layerContainer = metricContainer |
||||
.append('g') |
||||
.attr('class', 'markers-layer'); |
||||
for(const serie of this._markerConf.series) { |
||||
this.renderSerie(serie); |
||||
render(metricContainer: d3.Selection<SVGGElement, unknown, null, undefined>) { |
||||
if(this._d3Holder !== null) { |
||||
this._d3Holder.remove(); |
||||
} |
||||
} |
||||
|
||||
private _getLinePosition(marker: MarkerElem): number { |
||||
return this._state.xScale(marker.x); |
||||
} |
||||
|
||||
private _renderCircle(marker: MarkerElem) { |
||||
const linePosition = this._getLinePosition(marker); |
||||
|
||||
let circle = this._layerContainer.append('circle') |
||||
.attr('class', 'gap-circle') |
||||
.attr('stroke', marker.color) |
||||
.attr('stroke-width', '2px') |
||||
.attr('r', 4) |
||||
.attr('cx', linePosition) |
||||
.attr('cy', 5) |
||||
|
||||
circle |
||||
.attr('pointer-events', 'all') |
||||
.style('cursor', 'pointer') |
||||
.on('mousemove', () => { |
||||
const onMouseMove = this._markerConf.events?.onMouseMove; |
||||
if(onMouseMove) { |
||||
onMouseMove(marker); |
||||
return |
||||
} |
||||
if(marker.alwaysDisplay) { |
||||
return; |
||||
} |
||||
this._chartContainer |
||||
.selectAll(`.marker-content-${marker.x}`) |
||||
.style('visibility', 'visible') |
||||
.style('z-index', 9999); |
||||
}) |
||||
.on('mouseout', () => { |
||||
const onMouseOut = this._markerConf.events?.onMouseOut; |
||||
if(onMouseOut) { |
||||
onMouseOut() |
||||
return |
||||
} |
||||
if(marker.alwaysDisplay) { |
||||
return; |
||||
} |
||||
this._chartContainer |
||||
.selectAll(`.marker-content-${marker.x}`) |
||||
.style('visibility', 'hidden') |
||||
.style('z-index', 1); |
||||
}); |
||||
} |
||||
|
||||
private _renderLine(marker: MarkerElem) { |
||||
const linePosition = this._getLinePosition(marker); |
||||
|
||||
this._layerContainer.append('line') |
||||
.attr('class', 'gap-line') |
||||
.attr('stroke', marker.color) |
||||
.attr('stroke-width', '1px') |
||||
.attr('stroke-opacity', '0.3') |
||||
.attr('stroke-dasharray', '4') |
||||
.attr('x1', linePosition) |
||||
.attr('x2', linePosition) |
||||
.attr('y1', 0) |
||||
// @ts-ignore // TODO: remove ignore but boxParams are protected
|
||||
.attr('y2', this._state.boxParams.height) |
||||
.attr('pointer-events', 'none'); |
||||
} |
||||
|
||||
private _renderTooltip(marker: MarkerElem) { |
||||
if(marker.html === undefined) { |
||||
return; |
||||
this._d3Holder = metricContainer.append('g').attr('class', 'markers-layer'); |
||||
for (const ms of this._markerConf.series) { |
||||
this.renderSerie(ms); |
||||
} |
||||
|
||||
const linePosition = this._getLinePosition(marker); |
||||
|
||||
const div = this._chartContainer |
||||
.append('div') |
||||
.attr('class', `marker-content marker-content-${marker.x}`) |
||||
// @ts-ignore // TODO: remove ignore but boxParams are protected
|
||||
.style('top', `${this._state.boxParams.height - this._chartHeight}px`) |
||||
.style('visibility', marker.alwaysDisplay ? 'visible' : 'hidden') |
||||
.style('position', 'absolute') |
||||
.style('border', '1px solid black') |
||||
.style('background-color', 'rgb(33, 37, 41)') |
||||
.style('color', 'rgb(255, 255, 255)') |
||||
.style('line-height', '1.55') |
||||
.style('font-size', '0.875rem') |
||||
.style('border-radius', '0.5rem') |
||||
.style('padding', 'calc(0.3125rem) 0.625rem') |
||||
.style('position', 'absolute') |
||||
.style('white-space', 'nowrap') |
||||
.style('pointer-events', 'none') |
||||
.style('z-index', 1) |
||||
.html(marker.html); |
||||
|
||||
// align tooltip: center (we need it to be rendered first)
|
||||
div.style('left', `${linePosition + this._margin.left - div.node().getBoundingClientRect().width / 2}px`) |
||||
} |
||||
|
||||
protected renderSerie(serie: MarkerSerie) { |
||||
serie.data.forEach((marker: MarkerElem) => { |
||||
this._renderLine(marker); |
||||
this._renderCircle(marker); |
||||
this._renderTooltip(marker); |
||||
serie.data.forEach((d) => { |
||||
let linePosition = this._state.xScale(d[0]) as number; |
||||
this._d3Holder.append('line') |
||||
.attr('class', 'gap-line') |
||||
.attr('stroke', serie.color) |
||||
.attr('stroke-width', '1px') |
||||
.attr('stroke-opacity', '0.3') |
||||
.attr('stroke-dasharray', '4') |
||||
.attr('x1', linePosition) |
||||
.attr('x2', linePosition) |
||||
.attr('y1', 0) |
||||
// @ts-ignore // TODO: remove ignore but boxParams are protected
|
||||
.attr('y2', this._state.boxParams.height) |
||||
.attr('pointer-events', 'none'); |
||||
let circle = this._d3Holder.append('circle') |
||||
.attr('class', 'gap-circle') |
||||
.attr('stroke', serie.color) |
||||
.attr('stroke-width', '2px') |
||||
.attr('r', 4) |
||||
.attr('cx', linePosition) |
||||
.attr('cy', 5) |
||||
|
||||
if(this._markerConf !== undefined) { |
||||
circle |
||||
.attr('pointer-events', 'all') |
||||
.style('cursor', 'pointer') |
||||
.on('mousemove', () => this._markerConf.events.onMouseMove(d)) |
||||
.on('mouseout', () => this._markerConf.events.onMouseOut()) |
||||
} |
||||
|
||||
}); |
||||
|
||||
} |
||||
} |
||||
@ -1,11 +1,4 @@
|
||||
export type SegmentElement = [number, number, any?]; |
||||
|
||||
export type SegmentSerie = { |
||||
color: string; |
||||
data: SegmentElement[] // [from, to, payload?] payload is any data for tooltip,
|
||||
select?: boolean, |
||||
opacity?: number, |
||||
opacitySelect?: number, |
||||
onSelect?: (SegmentElement) => void |
||||
onUnselect?: (SegmentElement) => void |
||||
data: [number, number, any][] // [from, to, payload] payload is any data for tooltip
|
||||
} |
||||
@ -1,41 +1,13 @@
|
||||
import { Serie, Options } from '@chartwerk/core'; |
||||
import { AxisRange } from '@chartwerk/core/dist/types'; |
||||
|
||||
type LineTimeSerieParams = { |
||||
maxLength: number; |
||||
renderDots: boolean; |
||||
renderLines: boolean; // TODO: refactor same as scatter-pod
|
||||
maxLength: number, |
||||
renderDots: boolean, |
||||
renderLines: boolean, // TODO: refactor same as scatter-pod
|
||||
dashArray: string; // dasharray attr, only for lines
|
||||
class: string; // option to add custom class to each serie element
|
||||
renderArea: AreaType; // default is none
|
||||
} |
||||
|
||||
export enum AreaType { |
||||
NONE = 'None', |
||||
ABOVE = 'Above', |
||||
BELOW = 'Below', |
||||
renderArea: boolean; // TODO: move to render type
|
||||
} |
||||
|
||||
export type LineTimeSerie = Serie & Partial<LineTimeSerieParams>; |
||||
export type LineOptions = Options & { |
||||
events? : { |
||||
zoomOut?: (centers: { |
||||
x: number; |
||||
y: number; |
||||
}, range: AxisRange[]) => void; |
||||
contextMenu?: (position: { |
||||
x: number; |
||||
y: number; |
||||
}) => void; |
||||
} |
||||
} |
||||
|
||||
export type MouseObj = { |
||||
x: number, |
||||
y: number, |
||||
xVal: number, |
||||
yVal: number, |
||||
series: { value: [number, number], color: string, label: string }[], |
||||
chartX: number, |
||||
chartWidth: number |
||||
} |
||||
export type LineOptions = Options; |
||||
|
||||
Loading…
Reference in new issue