Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"tslib": "2.3.0",
"zrender": "npm:zrender-nightly@^5.3.3-dev.20220720"
"zrender": "npm:zrender-nightly@^5.3.3-dev.20220820"
},
"devDependencies": {
"@babel/code-frame": "7.10.4",
Expand Down
1 change: 1 addition & 0 deletions src/chart/bar/BarView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,7 @@ function createLarge(
const el = new LargePath({
shape: {points: data.getLayout('largePoints')},
incremental: !!incremental,
ignoreCoarsePointer: true,
z2: 1
});
el.baseDimIdx = baseDimIdx;
Expand Down
7 changes: 4 additions & 3 deletions src/chart/candlestick/CandlestickView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,14 @@ function createLarge(

const elP = new LargeBoxPath({
shape: {points: largePoints},
__sign: 1
__sign: 1,
ignoreCoarsePointer: true
});
group.add(elP);
const elN = new LargeBoxPath({
shape: {points: largePoints},
__sign: -1
__sign: -1,
ignoreCoarsePointer: true
});
group.add(elN);

Expand Down Expand Up @@ -397,4 +399,3 @@ function setLargeStyle(sign: number, el: LargeBoxPath, seriesModel: CandlestickS


export default CandlestickView;

3 changes: 2 additions & 1 deletion src/chart/helper/LargeLineDraw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ class LargeLineDraw {

private _create() {
const lineEl = new LargeLinesPath({
cursor: 'default'
cursor: 'default',
ignoreCoarsePointer: true
});
this._newAdded.push(lineEl);
this.group.add(lineEl);
Expand Down
1 change: 1 addition & 0 deletions src/chart/helper/LargeSymbolDraw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ class LargeSymbolDraw {
const symbolEl = new LargeSymbolPath({
cursor: 'default'
});
symbolEl.ignoreCoarsePointer = true;
this.group.add(symbolEl);
this._newAdded.push(symbolEl);
return symbolEl;
Expand Down
12 changes: 10 additions & 2 deletions src/core/echarts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ import {
isDom,
isArray,
noop,
isString
isString,
retrieve2
} from 'zrender/src/core/util';
import env from 'zrender/src/core/env';
import timsort from 'zrender/src/core/timsort';
Expand Down Expand Up @@ -324,6 +325,8 @@ type EChartsInitOpts = {
renderer?: RendererType,
devicePixelRatio?: number,
useDirtyRect?: boolean,
useCoarsePointer?: boolean,
pointerSize?: number,
ssr?: boolean,
width?: number,
height?: number
Expand Down Expand Up @@ -409,6 +412,7 @@ class ECharts extends Eventful<ECEventDefinition> {
this._dom = dom;

let defaultRenderer = 'canvas';
let defaultCoarsePointer: 'auto' | boolean = 'auto';
let defaultUseDirtyRect = false;
if (__DEV__) {
const root = (
Expand All @@ -418,6 +422,8 @@ class ECharts extends Eventful<ECEventDefinition> {

defaultRenderer = root.__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;

defaultCoarsePointer = retrieve2(root.__ECHARTS__DEFAULT__COARSE_POINTER, defaultCoarsePointer);

const devUseDirtyRect = root.__ECHARTS__DEFAULT__USE_DIRTY_RECT__;
defaultUseDirtyRect = devUseDirtyRect == null
? defaultUseDirtyRect
Expand All @@ -430,7 +436,9 @@ class ECharts extends Eventful<ECEventDefinition> {
width: opts.width,
height: opts.height,
ssr: opts.ssr,
useDirtyRect: opts.useDirtyRect == null ? defaultUseDirtyRect : opts.useDirtyRect
useDirtyRect: retrieve2(opts.useDirtyRect, defaultUseDirtyRect),
useCoarsePointer: retrieve2(opts.useCoarsePointer, defaultCoarsePointer),
pointerSize: opts.pointerSize
});
this._ssr = opts.ssr;

Expand Down
164 changes: 164 additions & 0 deletions test/coarse-pointer.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions test/lib/caseFrame.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions test/lib/config.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion test/lib/testHelper.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/runTest/actions/__meta__.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/runTest/actions/coarse-pointer.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading