diff --git a/.vscode/settings.json b/.vscode/settings.json index 5b819f261..1e482b2db 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,4 @@ { - "cSpell.words": [ - "bbox", - "Sparkline", - "timebar" - ] -} \ No newline at end of file + "cSpell.words": ["bbox", "Sparkline", "timebar"], + "svg.preview.background": "white" +} diff --git a/__tests__/integration/components/axis/axis-animation-update-12.ts b/__tests__/integration/components/axis/axis-animation-update-12.ts index bdcd304e5..6c34e8e3a 100644 --- a/__tests__/integration/components/axis/axis-animation-update-12.ts +++ b/__tests__/integration/components/axis/axis-animation-update-12.ts @@ -14,8 +14,7 @@ export const AxisAnimationUpdate12 = () => { const g1 = group.appendChild( new Group({ style: { - x: 100, - y: 100, + transform: 'translate(100, 100)', }, }) ); @@ -23,8 +22,7 @@ export const AxisAnimationUpdate12 = () => { const g2 = group.appendChild( new Group({ style: { - x: 50, - y: 50, + transform: 'translate(50, 50)', }, }) ); diff --git a/__tests__/integration/components/axis/axis-animation-update-13.ts b/__tests__/integration/components/axis/axis-animation-update-13.ts index ab12b6bf7..a8c18028d 100644 --- a/__tests__/integration/components/axis/axis-animation-update-13.ts +++ b/__tests__/integration/components/axis/axis-animation-update-13.ts @@ -13,8 +13,7 @@ export const AxisAnimationUpdate13 = () => { group.appendChild( new Group({ style: { - x: 100, - y: 100, + transform: 'translate(100, 100)', }, }) ); @@ -22,8 +21,7 @@ export const AxisAnimationUpdate13 = () => { const g2 = group.appendChild( new Group({ style: { - x: 50, - y: 50, + transform: 'translate(50, 50)', }, }) ); @@ -57,7 +55,7 @@ export const AxisAnimationUpdate13 = () => { titleTransformOrigin: 'center', titleTextBaseline: 'middle', titlePosition: 'left', - titleTransform: 'translate(50%, 0) rotate(-90)', + titleTransform: 'translate(-100%, 0) rotate(-90)', labelDirection: 'positive', tickDirection: 'positive', gridDirection: 'negative', @@ -117,3 +115,4 @@ export const AxisAnimationUpdate13 = () => { AxisAnimationUpdate13.tags = ['坐标轴', '动画', '更新', '标题']; AxisAnimationUpdate13.wait = 500; +AxisAnimationUpdate13.skip = true; diff --git a/__tests__/integration/components/axis/axis-animation-update-5.ts b/__tests__/integration/components/axis/axis-animation-update-5.ts index dc881a254..4d64ebc67 100644 --- a/__tests__/integration/components/axis/axis-animation-update-5.ts +++ b/__tests__/integration/components/axis/axis-animation-update-5.ts @@ -49,7 +49,6 @@ export const AxisAnimationUpdate5 = () => { new Button({ style: { x: 80, - y: 0, text: 'reset', onClick: reset, }, diff --git a/__tests__/integration/components/axis/axis-animation-update-9.ts b/__tests__/integration/components/axis/axis-animation-update-9.ts index be0bbd065..f902eb5b3 100644 --- a/__tests__/integration/components/axis/axis-animation-update-9.ts +++ b/__tests__/integration/components/axis/axis-animation-update-9.ts @@ -80,8 +80,3 @@ export const AxisAnimationUpdate9 = () => { AxisAnimationUpdate9.tags = ['坐标轴', '动画', '更新']; AxisAnimationUpdate9.wait = 500; - -// FIXME: skip for now -// - transform="matrix(1,0,0,1,54.239998,265.750000)" -// + transform="matrix(1,0,0,1,54.240002,265.750000)" -AxisAnimationUpdate9.skip = true; diff --git a/__tests__/integration/components/axis/axis-linear-basis-5.ts b/__tests__/integration/components/axis/axis-linear-basis-5.ts index eb8c24556..ac6ec2345 100644 --- a/__tests__/integration/components/axis/axis-linear-basis-5.ts +++ b/__tests__/integration/components/axis/axis-linear-basis-5.ts @@ -24,7 +24,7 @@ export const AxisLinearBasis5 = () => { lineExtension: [10, 10], tickLength: 10, labelSpacing: 5, - labelTransform: 'rotate(90)', + labelTransform: 'rotate(45)', type: 'linear', tickLineWidth: 5, }, diff --git a/__tests__/integration/components/axis/axis-linear-custom-tick.ts b/__tests__/integration/components/axis/axis-linear-custom-tick.ts index cce9ddb9c..f763634ed 100644 --- a/__tests__/integration/components/axis/axis-linear-custom-tick.ts +++ b/__tests__/integration/components/axis/axis-linear-custom-tick.ts @@ -17,9 +17,12 @@ export const AxisLinearCustomTick = () => { data: mockData, labelFormatter: () => '', tickFormatter: (datum: any, index: number, data: any, [cx, cy]: any) => { - if (index === 3) return new Rect({ style: { width: 20, height: 20, fill: 'green', anchor: '0.5 0.5' } }); + if (index === 3) + return new Rect({ + style: { x: 0, y: 0, width: 20, height: 20, fill: 'green', transform: 'translate(-10, -10)' }, + }); return index % 5 === 0 - ? new Circle({ style: { r: index % 10 === 0 ? 10 : 5 } }) + ? new Circle({ style: { cx: 0, cy: 0, r: index % 10 === 0 ? 10 : 5 } }) : new Line({ style: { x1: 0, x2: 0, y1: 50 * cx, y2: 10 * cy } }); }, type: 'linear', diff --git a/__tests__/integration/components/axis/axis-linear-label.ts b/__tests__/integration/components/axis/axis-linear-label.ts index aa363956b..a28e0f46a 100644 --- a/__tests__/integration/components/axis/axis-linear-label.ts +++ b/__tests__/integration/components/axis/axis-linear-label.ts @@ -39,9 +39,11 @@ export const AxisLinearLabel = () => { const labelIcon = new Image({ style: { src: icon, + x: 0, + y: 0, width: 30, height: 30, - anchor: '0.5 0.5', + transform: 'translate(-15, -15)', }, }); const labelText = new Text({ diff --git a/__tests__/integration/components/axis/axis-linear-title-position.ts b/__tests__/integration/components/axis/axis-linear-title-position.ts index 796342e7f..7db56f32a 100644 --- a/__tests__/integration/components/axis/axis-linear-title-position.ts +++ b/__tests__/integration/components/axis/axis-linear-title-position.ts @@ -33,7 +33,7 @@ export const AxisLinearTitlePosition = () => { titleText: 'left', titlePosition: 'l', titleSpacing: 10, - titleTransform: 'translate(50%, 0) rotate(-90)', + titleTransform: 'rotate(-90)', }); createAxis({ startPos: [50, 500], @@ -46,8 +46,7 @@ export const AxisLinearTitlePosition = () => { endPos: [550, 500], titleText: 'right', titlePosition: 'r', - titleSpacing: 10, - titleTransform: 'translate(-50%, 0) rotate(-90)', + titleTransform: 'rotate(-90)', }); const g1 = group.appendChild( @@ -63,15 +62,14 @@ export const AxisLinearTitlePosition = () => { titleText: 'right', titlePosition: 'r', titleSpacing: 10, - titleTransform: 'translate(-50%, 0) rotate(-90)', + titleTransform: 'rotate(-90)', }) ); const g2 = group.appendChild( new Group({ style: { - x: 60, - y: 60, + transform: 'translate(60, 60)', }, }) ); @@ -83,7 +81,7 @@ export const AxisLinearTitlePosition = () => { titleText: 'right', titlePosition: 'r', titleSpacing: 10, - titleTransform: 'translate(-50%, 0) rotate(-90)', + titleTransform: 'rotate(-90)', }) ); diff --git a/__tests__/integration/components/axis/axis-linear-title.ts b/__tests__/integration/components/axis/axis-linear-title.ts index 4084424cf..78f33b475 100644 --- a/__tests__/integration/components/axis/axis-linear-title.ts +++ b/__tests__/integration/components/axis/axis-linear-title.ts @@ -78,7 +78,6 @@ export const AxisLinearTitle = () => { src: 'https://gw.alipayobjects.com/mdn/rms_6ae20b/afts/img/A*N4ZMS7gHsUIAAAAAAAAAAABkARQnAQ', height: 30, width: 30, - anchor: '0 0', }, }) ); diff --git a/__tests__/integration/components/bugs/axis-title-position.ts b/__tests__/integration/components/bugs/axis-title-position.ts index 3d07dee5b..c447b70c0 100644 --- a/__tests__/integration/components/bugs/axis-title-position.ts +++ b/__tests__/integration/components/bugs/axis-title-position.ts @@ -35,14 +35,10 @@ export const BugAxisTitlePosition = () => { titleSpacing: 10, titleTextBaseline: 'middle', titleTransformOrigin: 'center', - titleAnchor: '0.5 0.5', - titleTransform: 'translate(50%, 0) rotate(-90)', + titleTransform: 'rotate(-90)', labelAlign: 'horizontal', labelSpacing: 4, labelDirection: 'positive', - lineArrow: undefined, - gridLength: 565, - gridDirection: 'negative', tickDirection: 'positive', lineOpacity: 1, }, diff --git a/__tests__/integration/components/bugs/category-give-shape-1.ts b/__tests__/integration/components/bugs/category-give-shape-1.ts index c5687bec7..5542e908d 100644 --- a/__tests__/integration/components/bugs/category-give-shape-1.ts +++ b/__tests__/integration/components/bugs/category-give-shape-1.ts @@ -21,6 +21,8 @@ export const BugCategoryWithShape1 = () => { rect.appendChild( new Category({ style: { + x: 50, + y: 50, width, height, gridCol: 10, diff --git a/__tests__/integration/components/bugs/category-give-shape-2.ts b/__tests__/integration/components/bugs/category-give-shape-2.ts index 58b874657..1febdeb1d 100644 --- a/__tests__/integration/components/bugs/category-give-shape-2.ts +++ b/__tests__/integration/components/bugs/category-give-shape-2.ts @@ -21,6 +21,8 @@ export const BugCategoryWithShape2 = () => { rect2.appendChild( new Category({ style: { + x: 50, + y: 50, titleText: 'title', titleFontSize: 20, width, diff --git a/__tests__/integration/components/bugs/category-marker.ts b/__tests__/integration/components/bugs/category-marker.ts index 883201255..c25b5152b 100644 --- a/__tests__/integration/components/bugs/category-marker.ts +++ b/__tests__/integration/components/bugs/category-marker.ts @@ -21,7 +21,7 @@ export const BugCategoryMarker = () => { group.appendChild( new Category({ style: { - itemMarker: (d: any, i: number) => () => new Path({ style: { path: circle(0, 0, 6) } }), + itemMarker: (d: any, i: number) => () => new Path({ style: { d: circle(0, 0, 6) } }), itemMarkerStroke: (_: any, index: number) => data[index].color, data, diff --git a/__tests__/integration/components/checkbox/checkbox1.ts b/__tests__/integration/components/checkbox/checkbox1.ts index 9e876c76a..47c8a3c6c 100644 --- a/__tests__/integration/components/checkbox/checkbox1.ts +++ b/__tests__/integration/components/checkbox/checkbox1.ts @@ -7,8 +7,7 @@ export function Checkbox1() { group.appendChild( new Checkbox({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', labelText: 'Checkbox', }, }) @@ -17,8 +16,7 @@ export function Checkbox1() { const ck = group.appendChild( new Checkbox({ style: { - x: 10, - y: 30, + transform: 'translate(10, 30)', labelText: 'Checkbox', checked: true, }, diff --git a/__tests__/integration/components/indicator/indicator.ts b/__tests__/integration/components/indicator/indicator.ts index 56ab5fdf0..3c048620f 100644 --- a/__tests__/integration/components/indicator/indicator.ts +++ b/__tests__/integration/components/indicator/indicator.ts @@ -6,8 +6,7 @@ import { createGrid } from '../../utils/grid'; export const IndicatorDemo = () => { const group = new Group({ style: { - x: 30, - y: 30, + transform: 'translate(30, 30)', }, }); @@ -218,10 +217,11 @@ export const IndicatorDemo = () => { const mi = createIndicator({ x: 250, y: 100, labelText: 0.5, position: 'bottom' }); group.addEventListener('mousemove', (e: any) => { - console.log(e.offset, e.canvas); const { x, y } = e.offset; const [dx, dy] = group.getLocalPosition(); - mi.setLocalPosition(x - dx, y - dy); + mi.style.x = x - dx; + mi.style.y = y - dy; + mi.update(); }); return group; diff --git a/__tests__/integration/components/legend/category-item-10.ts b/__tests__/integration/components/legend/category-item-10.ts index 8ce00e9de..903d14764 100644 --- a/__tests__/integration/components/legend/category-item-10.ts +++ b/__tests__/integration/components/legend/category-item-10.ts @@ -21,7 +21,7 @@ export const CategoryItem10 = () => { marker: () => new Path({ style: { - path: shape(0, 0, 6), + d: shape(0, 0, 6), }, }), markerStroke: 'green', diff --git a/__tests__/integration/components/legend/category-item-marker-2.ts b/__tests__/integration/components/legend/category-item-marker-2.ts index 21db89e32..e45e9084d 100644 --- a/__tests__/integration/components/legend/category-item-marker-2.ts +++ b/__tests__/integration/components/legend/category-item-marker-2.ts @@ -79,11 +79,17 @@ export const CategoryItemMarker2 = () => { gridCol: 10, height: 40, titleText: 'Legend Title', + // titleFill: '#1D2129', + // titleFillOpacity: 0.65, + // titleFontSize: 12, + // titleFontWeight: 'normal', + // titleSpacing: 4, + // showTitle: false, width: 500, itemMarker: (d: any, i: number) => () => new Path({ style: { - path: paths[i], + d: paths[i], }, }), itemMarkerStroke: 'red', diff --git a/__tests__/integration/components/legend/category-items-11.ts b/__tests__/integration/components/legend/category-items-11.ts index 6c4a3979c..8ba806451 100644 --- a/__tests__/integration/components/legend/category-items-11.ts +++ b/__tests__/integration/components/legend/category-items-11.ts @@ -24,7 +24,7 @@ export const CategoryItems11 = () => { itemValueFill: 'green', colPadding: 5, itemMarker: (d: any, i: number) => () => - new Path({ style: { path: [circle, triangle, diamond][i % 3](0, 0, 6) } }), + new Path({ style: { d: [circle, triangle, diamond][i % 3](0, 0, 6) } }), itemMarkerStroke: (_: any, index: number) => colors[index % colors.length], itemMarkerStrokeWidth: 2, }, diff --git a/__tests__/integration/components/legend/category-items-12.ts b/__tests__/integration/components/legend/category-items-12.ts index 9ccfdcd13..d62be3522 100644 --- a/__tests__/integration/components/legend/category-items-12.ts +++ b/__tests__/integration/components/legend/category-items-12.ts @@ -22,7 +22,7 @@ export const CategoryItems12 = () => { new CategoryItems({ style: { data, - itemMarker: (d: any, i: number) => () => new Path({ style: { path: circle(0, 0, 6) } }), + itemMarker: (d: any, i: number) => () => new Path({ style: { d: circle(0, 0, 6) } }), itemMarkerStroke: (_: any, index: number) => data[index].color, width: 565, diff --git a/__tests__/integration/components/legend/category-items-9.ts b/__tests__/integration/components/legend/category-items-9.ts index 182788158..e1f1e5e63 100644 --- a/__tests__/integration/components/legend/category-items-9.ts +++ b/__tests__/integration/components/legend/category-items-9.ts @@ -10,7 +10,7 @@ export const CategoryItems9 = () => { group.appendChild( new CategoryItems({ style: { - data: flowItemData, + data: flowItemData.slice(0, 5), layout: 'flex', itemLabelFill: 'red', itemValueFill: 'green', diff --git a/__tests__/integration/components/legend/category-layout-3.ts b/__tests__/integration/components/legend/category-layout-3.ts index ee72259cc..5a46cc45d 100644 --- a/__tests__/integration/components/legend/category-layout-3.ts +++ b/__tests__/integration/components/legend/category-layout-3.ts @@ -29,7 +29,7 @@ export const CategoryLayout3 = () => { itemMarker: () => () => new Path({ style: { - path: smooth(0, 0, 6), + d: smooth(0, 0, 6), }, }), }, diff --git a/__tests__/integration/components/legend/category-layout-7.ts b/__tests__/integration/components/legend/category-layout-7.ts index 534217d47..bf2120536 100644 --- a/__tests__/integration/components/legend/category-layout-7.ts +++ b/__tests__/integration/components/legend/category-layout-7.ts @@ -27,7 +27,7 @@ export const CategoryLayout7 = () => { itemMarker: () => () => new Path({ style: { - path: smooth(0, 0, 6), + d: smooth(0, 0, 6), }, }), itemValueText: '', diff --git a/__tests__/integration/components/legend/category-position-2.ts b/__tests__/integration/components/legend/category-position-2.ts index 9a49a765d..700ec4384 100644 --- a/__tests__/integration/components/legend/category-position-2.ts +++ b/__tests__/integration/components/legend/category-position-2.ts @@ -8,8 +8,7 @@ export const CategoryPosition2 = () => { const g = group.appendChild( new Group({ style: { - x: 50, - y: 50, + transform: 'translate(50, 50)', }, }) ); diff --git a/__tests__/integration/components/legend/continuous-1.ts b/__tests__/integration/components/legend/continuous-1.ts index 30701e250..971a6c461 100644 --- a/__tests__/integration/components/legend/continuous-1.ts +++ b/__tests__/integration/components/legend/continuous-1.ts @@ -43,8 +43,7 @@ export const Continuous1 = () => { handleMarkerSize: 30, ribbonTrackFill: 'pink', showLabel: false, - x: 0, - y, + transform: `translateY(${y})`, ...con, }, }) diff --git a/__tests__/integration/components/legend/continuous-2.ts b/__tests__/integration/components/legend/continuous-2.ts index 591cbd787..895eb8016 100644 --- a/__tests__/integration/components/legend/continuous-2.ts +++ b/__tests__/integration/components/legend/continuous-2.ts @@ -39,8 +39,7 @@ export const Continuous2 = () => { ribbonTrackFill: 'pink', showLabel: false, type: 'size', - x: 0, - y, + transform: `translateY(${y})`, ...con, }, }) diff --git a/__tests__/integration/components/legend/continuous-3.ts b/__tests__/integration/components/legend/continuous-3.ts index a8ac02d04..35e0beb8d 100644 --- a/__tests__/integration/components/legend/continuous-3.ts +++ b/__tests__/integration/components/legend/continuous-3.ts @@ -39,8 +39,7 @@ export const Continuous3 = () => { ribbonTrackFill: 'pink', showLabel: false, type: 'size', - x: 0, - y, + transform: `translateY(${y})`, ...con, }, }) diff --git a/__tests__/integration/components/legend/continuous-4.ts b/__tests__/integration/components/legend/continuous-4.ts index 15f556b9a..1cfe9608d 100644 --- a/__tests__/integration/components/legend/continuous-4.ts +++ b/__tests__/integration/components/legend/continuous-4.ts @@ -52,8 +52,7 @@ export const Continuous4 = () => { labelFontSize: 10, labelSpacing: 10, labelTickStroke: 'red', - x, - y, + transform: `translate(${x}, ${y})`, ...shape, ...con, }, diff --git a/__tests__/integration/components/legend/continuous-5.ts b/__tests__/integration/components/legend/continuous-5.ts index 0609855c2..765c232ad 100644 --- a/__tests__/integration/components/legend/continuous-5.ts +++ b/__tests__/integration/components/legend/continuous-5.ts @@ -55,8 +55,7 @@ export const Continuous5 = () => { labelSpacing: 10, orientation: 'vertical', showLabel: true, - x, - y, + transform: `translate(${x}, ${y})`, ...shape, ...con, }, diff --git a/__tests__/integration/components/legend/continuous-d3-color-legend.ts b/__tests__/integration/components/legend/continuous-d3-color-legend.ts index 8bf6c9e88..968bb3196 100644 --- a/__tests__/integration/components/legend/continuous-d3-color-legend.ts +++ b/__tests__/integration/components/legend/continuous-d3-color-legend.ts @@ -38,8 +38,7 @@ export const ContinuousD3ColorLegend = () => { showLabel: true, showHandle: false, showTick: true, - x: 0, - y: 60, + transform: `translate(0, 60)`, width: 400, height: 60, block: true, @@ -60,8 +59,7 @@ export const ContinuousD3ColorLegend = () => { showTick: true, showLabel: true, showHandle: false, - x: 0, - y: 120, + transform: `translate(0, 120)`, width: 400, height: 60, block: true, @@ -82,8 +80,7 @@ export const ContinuousD3ColorLegend = () => { showTick: true, showHandle: false, showLabel: true, - x: 0, - y: 180, + transform: `translate(0, 180)`, width: 400, height: 60, block: true, diff --git a/__tests__/integration/components/legend/continuous.ts b/__tests__/integration/components/legend/continuous.ts index 99f3e814f..6e03f8e37 100644 --- a/__tests__/integration/components/legend/continuous.ts +++ b/__tests__/integration/components/legend/continuous.ts @@ -21,6 +21,7 @@ export const ContinuousDemo = () => { handleFormatter: (str: any) => `${str}°C`, titleText: 'Title', handleMarkerSize: 30, + transform: `translate(${x}, ${y})`, ...args, }, }) diff --git a/__tests__/integration/components/legend/handle.ts b/__tests__/integration/components/legend/handle.ts index f5a414992..75ab2efcb 100644 --- a/__tests__/integration/components/legend/handle.ts +++ b/__tests__/integration/components/legend/handle.ts @@ -9,8 +9,7 @@ export const HandleDemo = () => { group.appendChild( new Handle({ style: { - x: 100, - y: 100, + transform: `translate(${args.x || 100}, ${args.y || 100})`, orientation: 'horizontal', labelText: 'labelText', ...args, diff --git a/__tests__/integration/components/legend/ribbon-color.ts b/__tests__/integration/components/legend/ribbon-color.ts index af6d2efd5..881dbb99d 100644 --- a/__tests__/integration/components/legend/ribbon-color.ts +++ b/__tests__/integration/components/legend/ribbon-color.ts @@ -12,7 +12,14 @@ export const RibbonColor = () => { const createRibbon = (args: any = {}) => { return group.appendChild( new Ribbon({ - style: { type: 'color', orientation: 'horizontal', size: 30, length: 200, ...args }, + style: { + type: 'color', + orientation: 'horizontal', + size: 30, + length: 200, + transform: `translate(${args.x}, ${args.y})`, + ...args, + }, }) ); }; diff --git a/__tests__/integration/components/legend/ribbon.ts b/__tests__/integration/components/legend/ribbon.ts index 28657b32d..cdcab7541 100644 --- a/__tests__/integration/components/legend/ribbon.ts +++ b/__tests__/integration/components/legend/ribbon.ts @@ -14,8 +14,7 @@ export const RibbonDemo = () => { return group.appendChild( new Ribbon({ style: { - x: 100, - y: 100, + transform: `translate(${args.x || 100}, ${args.y || 100})`, type: 'color', orientation: 'horizontal', size: 30, diff --git a/__tests__/integration/components/marker/marker-1.ts b/__tests__/integration/components/marker/marker-1.ts index be35f115b..c97c6b53c 100644 --- a/__tests__/integration/components/marker/marker-1.ts +++ b/__tests__/integration/components/marker/marker-1.ts @@ -7,11 +7,17 @@ export const Marker1 = () => { const markers = Marker.getSymbols(); markers.forEach((marker, index) => { + const x = 20 + (index % 10) * 50; + const y = 150 + Math.floor(index / 10) * 50; group.appendChild( new Marker({ style: { - x: 20 + (index % 10) * 50, - y: 150 + Math.floor(index / 10) * 50, + x, + y, + // transform: `translate(${x}, ${y}) rotate(45deg) translate(${-x}, ${-y})`, + // transformOrigin: `0 0`, + transform: 'rotate(45deg)', + transformOrigin: `${x} ${y}`, symbol: marker, size: 16, stroke: 'blue', diff --git a/__tests__/integration/components/sparkline/sparkline-10.ts b/__tests__/integration/components/sparkline/sparkline-10.ts index e44366d74..1f53fa44e 100644 --- a/__tests__/integration/components/sparkline/sparkline-10.ts +++ b/__tests__/integration/components/sparkline/sparkline-10.ts @@ -7,8 +7,7 @@ export const Sparkline10 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'column', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-11.ts b/__tests__/integration/components/sparkline/sparkline-11.ts index dc235511c..433a43459 100644 --- a/__tests__/integration/components/sparkline/sparkline-11.ts +++ b/__tests__/integration/components/sparkline/sparkline-11.ts @@ -7,8 +7,7 @@ export const Sparkline11 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'column', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-12.ts b/__tests__/integration/components/sparkline/sparkline-12.ts index fcd00ceb8..91819df3a 100644 --- a/__tests__/integration/components/sparkline/sparkline-12.ts +++ b/__tests__/integration/components/sparkline/sparkline-12.ts @@ -7,8 +7,7 @@ export const Sparkline12 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'column', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-2.ts b/__tests__/integration/components/sparkline/sparkline-2.ts index 4ab3d563b..d2b76c2f3 100644 --- a/__tests__/integration/components/sparkline/sparkline-2.ts +++ b/__tests__/integration/components/sparkline/sparkline-2.ts @@ -7,8 +7,7 @@ export const Sparkline2 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'line', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-3.ts b/__tests__/integration/components/sparkline/sparkline-3.ts index 2bdcc5f54..0f1a3c982 100644 --- a/__tests__/integration/components/sparkline/sparkline-3.ts +++ b/__tests__/integration/components/sparkline/sparkline-3.ts @@ -7,8 +7,7 @@ export const Sparkline3 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'line', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-4.ts b/__tests__/integration/components/sparkline/sparkline-4.ts index 39d771e03..a93e466e7 100644 --- a/__tests__/integration/components/sparkline/sparkline-4.ts +++ b/__tests__/integration/components/sparkline/sparkline-4.ts @@ -7,8 +7,7 @@ export const Sparkline4 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'line', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-5.ts b/__tests__/integration/components/sparkline/sparkline-5.ts index 27641beae..fb78f0aea 100644 --- a/__tests__/integration/components/sparkline/sparkline-5.ts +++ b/__tests__/integration/components/sparkline/sparkline-5.ts @@ -7,8 +7,7 @@ export const Sparkline5 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'line', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-6.ts b/__tests__/integration/components/sparkline/sparkline-6.ts index f84fc897f..4a106b34a 100644 --- a/__tests__/integration/components/sparkline/sparkline-6.ts +++ b/__tests__/integration/components/sparkline/sparkline-6.ts @@ -7,8 +7,7 @@ export const Sparkline6 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'line', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-7.ts b/__tests__/integration/components/sparkline/sparkline-7.ts index 415d6ea7f..351ef7020 100644 --- a/__tests__/integration/components/sparkline/sparkline-7.ts +++ b/__tests__/integration/components/sparkline/sparkline-7.ts @@ -7,8 +7,7 @@ export const Sparkline7 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'line', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-8.ts b/__tests__/integration/components/sparkline/sparkline-8.ts index 9452eca94..67e08d090 100644 --- a/__tests__/integration/components/sparkline/sparkline-8.ts +++ b/__tests__/integration/components/sparkline/sparkline-8.ts @@ -7,8 +7,7 @@ export const Sparkline8 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'column', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-9.ts b/__tests__/integration/components/sparkline/sparkline-9.ts index 462a73c56..e9d16118c 100644 --- a/__tests__/integration/components/sparkline/sparkline-9.ts +++ b/__tests__/integration/components/sparkline/sparkline-9.ts @@ -7,8 +7,7 @@ export const Sparkline9 = () => { group.appendChild( new Sparkline({ style: { - x: 10, - y: 10, + transform: 'translate(10, 10)', type: 'column', width: 300, height: 50, diff --git a/__tests__/integration/components/sparkline/sparkline-scale-column.ts b/__tests__/integration/components/sparkline/sparkline-scale-column.ts index 5c473bf98..bb8caaf50 100644 --- a/__tests__/integration/components/sparkline/sparkline-scale-column.ts +++ b/__tests__/integration/components/sparkline/sparkline-scale-column.ts @@ -29,7 +29,7 @@ export const SparklineScaleColumn = it((group) => { }) ); - const shape2 = { x: 10, y: 70, width: 300, height: 50 }; + const shape2 = { x: 10, y: 70, transform: `translate(30, 30)`, width: 300, height: 50 }; group.appendChild( new Rect({ diff --git a/__tests__/integration/components/sparkline/sparkline-scale-line.ts b/__tests__/integration/components/sparkline/sparkline-scale-line.ts index 450392f0e..b4c932e8b 100644 --- a/__tests__/integration/components/sparkline/sparkline-scale-line.ts +++ b/__tests__/integration/components/sparkline/sparkline-scale-line.ts @@ -3,7 +3,7 @@ import { it } from '../../utils'; import { Sparkline } from '../../../../src/ui/sparkline'; export const SparklineScaleLine = it((group) => { - const shape1 = { x: 10, y: 10, width: 300, height: 50 }; + const shape1 = { transform: 'translate(10, 10)', width: 300, height: 50 }; group.appendChild( new Rect({ style: { @@ -33,7 +33,7 @@ export const SparklineScaleLine = it((group) => { }) ); - const shape2 = { x: 10, y: 70, width: 300, height: 50 }; + const shape2 = { transform: 'translate(10, 70)', width: 300, height: 50 }; group.appendChild( new Rect({ diff --git a/__tests__/integration/components/switch/switch-1.ts b/__tests__/integration/components/switch/switch-1.ts index 00f737eca..e656890cb 100644 --- a/__tests__/integration/components/switch/switch-1.ts +++ b/__tests__/integration/components/switch/switch-1.ts @@ -15,7 +15,7 @@ export const Switch1 = () => { group.appendChild( new Switch({ style: { - y: 40, + transform: 'translateY(40)', checked: true, }, }) @@ -24,7 +24,7 @@ export const Switch1 = () => { const sw = group.appendChild( new Switch({ style: { - y: 80, + transform: 'translateY(80)', checked: false, }, }) diff --git a/__tests__/integration/components/tag/tag-1.ts b/__tests__/integration/components/tag/tag-1.ts index 89c71c1bf..ca670e998 100644 --- a/__tests__/integration/components/tag/tag-1.ts +++ b/__tests__/integration/components/tag/tag-1.ts @@ -7,8 +7,7 @@ export const Tag1 = () => { group.appendChild( new Tag({ style: { - x: 100, - y: 100, + transform: 'translate(100, 100)', text: 'G2', }, }) @@ -17,8 +16,7 @@ export const Tag1 = () => { group.appendChild( new Tag({ style: { - x: 200, - y: 100, + transform: 'translate(200, 100)', text: 'G6', backgroundFill: '#DBF1B7', labelFill: 'red', @@ -34,8 +32,7 @@ export const Tag1 = () => { const tag = group.appendChild( new Tag({ style: { - x: 300, - y: 100, + transform: 'translate(300, 100)', text: 'L7', radius: 6, padding: [6, 24], diff --git a/__tests__/integration/components/title/title.ts b/__tests__/integration/components/title/title.ts index 7f3ea5aee..1c0ee2ac2 100644 --- a/__tests__/integration/components/title/title.ts +++ b/__tests__/integration/components/title/title.ts @@ -5,16 +5,17 @@ export const TitleDemo = () => { const group = new Group({}); const createTitle = (argsRect = {}, argsTitle = {}) => { + const { x, y, ...rest } = argsRect as any; + const g = group.appendChild(new Group()); const content = g.appendChild( new Rect({ style: { - x: 0, - y: 0, width: 100, height: 100, fill: 'red', - ...argsRect, + transform: `translate(${x}, ${y})`, + ...rest, }, }) ); diff --git a/__tests__/integration/main.tsx b/__tests__/integration/main.tsx index ad0429dd9..7b7697108 100644 --- a/__tests__/integration/main.tsx +++ b/__tests__/integration/main.tsx @@ -17,7 +17,9 @@ const { Option } = Select; const casesName = Object.keys(cases); const renderers = { svg: new SVGRenderer(), - canvas: new CanvasRenderer(), + canvas: new CanvasRenderer({ + // enableDirtyRectangleRendering: false, + }), webgl: new WebGLRenderer(), } as const; renderers.webgl.registerPlugin(new ControlPlugin()); diff --git a/__tests__/integration/snapshots/AxisAnimationDisable.svg b/__tests__/integration/snapshots/AxisAnimationDisable.svg index 65a0b773e..5e1f779bc 100644 --- a/__tests__/integration/snapshots/AxisAnimationDisable.svg +++ b/__tests__/integration/snapshots/AxisAnimationDisable.svg @@ -6,160 +6,139 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - - - + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - 2.2 - - - - - - - 2.4 - - - - - - - 2.6 - - - - - - - 2.8 - - - - - - - 3 - - - - - - - 3.2 - - - - - - - 3.4 - - - - - - - 3.6 - - - - - - - 3.8 - - - - - - - 4 - - - - - - - 4.2 - - - - - - - 4.4 - - - - - - - - - y - - - - - - - - - - - - - update - - - - - - - \ No newline at end of file diff --git a/__tests__/integration/snapshots/AxisAnimationUpdate2.svg b/__tests__/integration/snapshots/AxisAnimationUpdate2.svg index 1788f7e90..20ddb6879 100644 --- a/__tests__/integration/snapshots/AxisAnimationUpdate2.svg +++ b/__tests__/integration/snapshots/AxisAnimationUpdate2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - - - + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcBasis2.svg b/__tests__/integration/snapshots/AxisArcBasis2.svg index 9c1bbfb36..6642d9bc9 100644 --- a/__tests__/integration/snapshots/AxisArcBasis2.svg +++ b/__tests__/integration/snapshots/AxisArcBasis2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcBasis3.svg b/__tests__/integration/snapshots/AxisArcBasis3.svg index 043fd5c1a..165267f3d 100644 --- a/__tests__/integration/snapshots/AxisArcBasis3.svg +++ b/__tests__/integration/snapshots/AxisArcBasis3.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcBasis4.svg b/__tests__/integration/snapshots/AxisArcBasis4.svg index 5d6dd71fd..4aaf6fa0f 100644 --- a/__tests__/integration/snapshots/AxisArcBasis4.svg +++ b/__tests__/integration/snapshots/AxisArcBasis4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection1.svg b/__tests__/integration/snapshots/AxisArcDirection1.svg index da1de46bc..7a050d772 100644 --- a/__tests__/integration/snapshots/AxisArcDirection1.svg +++ b/__tests__/integration/snapshots/AxisArcDirection1.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection10.svg b/__tests__/integration/snapshots/AxisArcDirection10.svg index 1e1f39b66..12c22af3e 100644 --- a/__tests__/integration/snapshots/AxisArcDirection10.svg +++ b/__tests__/integration/snapshots/AxisArcDirection10.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection11.svg b/__tests__/integration/snapshots/AxisArcDirection11.svg index 5e3e58cc8..290d5f175 100644 --- a/__tests__/integration/snapshots/AxisArcDirection11.svg +++ b/__tests__/integration/snapshots/AxisArcDirection11.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection12.svg b/__tests__/integration/snapshots/AxisArcDirection12.svg index 6e84d1b39..fb69bc9dd 100644 --- a/__tests__/integration/snapshots/AxisArcDirection12.svg +++ b/__tests__/integration/snapshots/AxisArcDirection12.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection13.svg b/__tests__/integration/snapshots/AxisArcDirection13.svg index 985b2a253..779722e4a 100644 --- a/__tests__/integration/snapshots/AxisArcDirection13.svg +++ b/__tests__/integration/snapshots/AxisArcDirection13.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection14.svg b/__tests__/integration/snapshots/AxisArcDirection14.svg index 423614b61..0962f6a89 100644 --- a/__tests__/integration/snapshots/AxisArcDirection14.svg +++ b/__tests__/integration/snapshots/AxisArcDirection14.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection15.svg b/__tests__/integration/snapshots/AxisArcDirection15.svg index 81219c5c0..cc34fc540 100644 --- a/__tests__/integration/snapshots/AxisArcDirection15.svg +++ b/__tests__/integration/snapshots/AxisArcDirection15.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection16.svg b/__tests__/integration/snapshots/AxisArcDirection16.svg index 96b6ec263..72b9c1acd 100644 --- a/__tests__/integration/snapshots/AxisArcDirection16.svg +++ b/__tests__/integration/snapshots/AxisArcDirection16.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection17.svg b/__tests__/integration/snapshots/AxisArcDirection17.svg index 666618eeb..324e03e01 100644 --- a/__tests__/integration/snapshots/AxisArcDirection17.svg +++ b/__tests__/integration/snapshots/AxisArcDirection17.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection18.svg b/__tests__/integration/snapshots/AxisArcDirection18.svg index 6ce7ef434..87e2560c0 100644 --- a/__tests__/integration/snapshots/AxisArcDirection18.svg +++ b/__tests__/integration/snapshots/AxisArcDirection18.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection19.svg b/__tests__/integration/snapshots/AxisArcDirection19.svg index e7a60e298..3970166a3 100644 --- a/__tests__/integration/snapshots/AxisArcDirection19.svg +++ b/__tests__/integration/snapshots/AxisArcDirection19.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection2.svg b/__tests__/integration/snapshots/AxisArcDirection2.svg index e4026218e..9cb9e6206 100644 --- a/__tests__/integration/snapshots/AxisArcDirection2.svg +++ b/__tests__/integration/snapshots/AxisArcDirection2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection20.svg b/__tests__/integration/snapshots/AxisArcDirection20.svg index 7c1257b44..690965584 100644 --- a/__tests__/integration/snapshots/AxisArcDirection20.svg +++ b/__tests__/integration/snapshots/AxisArcDirection20.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection3.svg b/__tests__/integration/snapshots/AxisArcDirection3.svg index 8665b7cb9..c030d347f 100644 --- a/__tests__/integration/snapshots/AxisArcDirection3.svg +++ b/__tests__/integration/snapshots/AxisArcDirection3.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection4.svg b/__tests__/integration/snapshots/AxisArcDirection4.svg index a623bc795..ca54661ed 100644 --- a/__tests__/integration/snapshots/AxisArcDirection4.svg +++ b/__tests__/integration/snapshots/AxisArcDirection4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection5.svg b/__tests__/integration/snapshots/AxisArcDirection5.svg index 0a8fa93e2..aab9d4637 100644 --- a/__tests__/integration/snapshots/AxisArcDirection5.svg +++ b/__tests__/integration/snapshots/AxisArcDirection5.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection6.svg b/__tests__/integration/snapshots/AxisArcDirection6.svg index 267a87522..fcdd26146 100644 --- a/__tests__/integration/snapshots/AxisArcDirection6.svg +++ b/__tests__/integration/snapshots/AxisArcDirection6.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection7.svg b/__tests__/integration/snapshots/AxisArcDirection7.svg index 599c5d491..f64937078 100644 --- a/__tests__/integration/snapshots/AxisArcDirection7.svg +++ b/__tests__/integration/snapshots/AxisArcDirection7.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection8.svg b/__tests__/integration/snapshots/AxisArcDirection8.svg index 96e9d34c2..8998e9557 100644 --- a/__tests__/integration/snapshots/AxisArcDirection8.svg +++ b/__tests__/integration/snapshots/AxisArcDirection8.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcDirection9.svg b/__tests__/integration/snapshots/AxisArcDirection9.svg index 0f3687911..045f4d009 100644 --- a/__tests__/integration/snapshots/AxisArcDirection9.svg +++ b/__tests__/integration/snapshots/AxisArcDirection9.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcLabelRotate1.svg b/__tests__/integration/snapshots/AxisArcLabelRotate1.svg index 60362026e..07b3b527e 100644 --- a/__tests__/integration/snapshots/AxisArcLabelRotate1.svg +++ b/__tests__/integration/snapshots/AxisArcLabelRotate1.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcLabelRotate2.svg b/__tests__/integration/snapshots/AxisArcLabelRotate2.svg index 98ec0962d..0f15649b9 100644 --- a/__tests__/integration/snapshots/AxisArcLabelRotate2.svg +++ b/__tests__/integration/snapshots/AxisArcLabelRotate2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcLabelRotate3.svg b/__tests__/integration/snapshots/AxisArcLabelRotate3.svg index fee284e85..1a9d6d891 100644 --- a/__tests__/integration/snapshots/AxisArcLabelRotate3.svg +++ b/__tests__/integration/snapshots/AxisArcLabelRotate3.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcLabelRotate4.svg b/__tests__/integration/snapshots/AxisArcLabelRotate4.svg index 47cadb4ad..4d4c86d4e 100644 --- a/__tests__/integration/snapshots/AxisArcLabelRotate4.svg +++ b/__tests__/integration/snapshots/AxisArcLabelRotate4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcTitle1.svg b/__tests__/integration/snapshots/AxisArcTitle1.svg index 754671ee6..e87fd085f 100644 --- a/__tests__/integration/snapshots/AxisArcTitle1.svg +++ b/__tests__/integration/snapshots/AxisArcTitle1.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcTitle2.svg b/__tests__/integration/snapshots/AxisArcTitle2.svg index 6bcd01664..7297b95d9 100644 --- a/__tests__/integration/snapshots/AxisArcTitle2.svg +++ b/__tests__/integration/snapshots/AxisArcTitle2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcTitle4.svg b/__tests__/integration/snapshots/AxisArcTitle4.svg index 0b72109f9..bf73c6e47 100644 --- a/__tests__/integration/snapshots/AxisArcTitle4.svg +++ b/__tests__/integration/snapshots/AxisArcTitle4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisArcTitle6.svg b/__tests__/integration/snapshots/AxisArcTitle6.svg index a6b962762..5017b626f 100644 --- a/__tests__/integration/snapshots/AxisArcTitle6.svg +++ b/__tests__/integration/snapshots/AxisArcTitle6.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid1.svg b/__tests__/integration/snapshots/AxisGrid1.svg index 86667ab7f..31478eaa2 100644 --- a/__tests__/integration/snapshots/AxisGrid1.svg +++ b/__tests__/integration/snapshots/AxisGrid1.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid10.svg b/__tests__/integration/snapshots/AxisGrid10.svg index 8f60d0e39..a7bc41151 100644 --- a/__tests__/integration/snapshots/AxisGrid10.svg +++ b/__tests__/integration/snapshots/AxisGrid10.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - - - - + + + + - + diff --git a/__tests__/integration/snapshots/AxisGrid11.svg b/__tests__/integration/snapshots/AxisGrid11.svg index 6f52532f2..be853ba65 100644 --- a/__tests__/integration/snapshots/AxisGrid11.svg +++ b/__tests__/integration/snapshots/AxisGrid11.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - - + + + + - + diff --git a/__tests__/integration/snapshots/AxisGrid12.svg b/__tests__/integration/snapshots/AxisGrid12.svg index 7c2c9a825..15704d86f 100644 --- a/__tests__/integration/snapshots/AxisGrid12.svg +++ b/__tests__/integration/snapshots/AxisGrid12.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - - - - + + + + - + diff --git a/__tests__/integration/snapshots/AxisGrid2.svg b/__tests__/integration/snapshots/AxisGrid2.svg index c5b47bc71..67d0833cc 100644 --- a/__tests__/integration/snapshots/AxisGrid2.svg +++ b/__tests__/integration/snapshots/AxisGrid2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - + + - + diff --git a/__tests__/integration/snapshots/AxisGrid3.svg b/__tests__/integration/snapshots/AxisGrid3.svg index a1c98d445..83b9a105a 100644 --- a/__tests__/integration/snapshots/AxisGrid3.svg +++ b/__tests__/integration/snapshots/AxisGrid3.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + diff --git a/__tests__/integration/snapshots/AxisGrid4.svg b/__tests__/integration/snapshots/AxisGrid4.svg index b153da069..cfa65241d 100644 --- a/__tests__/integration/snapshots/AxisGrid4.svg +++ b/__tests__/integration/snapshots/AxisGrid4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid5.svg b/__tests__/integration/snapshots/AxisGrid5.svg index db0cef83e..fc37fecb0 100644 --- a/__tests__/integration/snapshots/AxisGrid5.svg +++ b/__tests__/integration/snapshots/AxisGrid5.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid6.svg b/__tests__/integration/snapshots/AxisGrid6.svg index e858d7943..b77fb4584 100644 --- a/__tests__/integration/snapshots/AxisGrid6.svg +++ b/__tests__/integration/snapshots/AxisGrid6.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid7.svg b/__tests__/integration/snapshots/AxisGrid7.svg index 8c6323e1d..bd22cbbfc 100644 --- a/__tests__/integration/snapshots/AxisGrid7.svg +++ b/__tests__/integration/snapshots/AxisGrid7.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid8.svg b/__tests__/integration/snapshots/AxisGrid8.svg index bdf3d0184..36a1acd7d 100644 --- a/__tests__/integration/snapshots/AxisGrid8.svg +++ b/__tests__/integration/snapshots/AxisGrid8.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisGrid9.svg b/__tests__/integration/snapshots/AxisGrid9.svg index 3fe94b629..d9c18a068 100644 --- a/__tests__/integration/snapshots/AxisGrid9.svg +++ b/__tests__/integration/snapshots/AxisGrid9.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLabelEllipsisUpdate.svg b/__tests__/integration/snapshots/AxisLabelEllipsisUpdate.svg index 08fe5e2e8..d5ba97151 100644 --- a/__tests__/integration/snapshots/AxisLabelEllipsisUpdate.svg +++ b/__tests__/integration/snapshots/AxisLabelEllipsisUpdate.svg @@ -6,42 +6,21 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + October @@ -359,28 +332,30 @@ - + - + November @@ -402,28 +379,30 @@ - + - + December @@ -445,28 +426,30 @@ - + - + 2012 @@ -488,28 +473,30 @@ - + - + February @@ -531,28 +520,30 @@ - + - + March @@ -574,28 +567,30 @@ - + - + April @@ -617,28 +614,30 @@ - + - + May @@ -660,28 +661,30 @@ - + - + June @@ -703,28 +708,30 @@ - + - + July @@ -746,28 +755,30 @@ - + - + August @@ -789,28 +802,30 @@ - + - + September @@ -833,15 +850,10 @@ - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis2.svg b/__tests__/integration/snapshots/AxisLinearBasis2.svg index e10a4591e..9f750af7f 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis2.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis3.svg b/__tests__/integration/snapshots/AxisLinearBasis3.svg index 5ddc73173..f3d16f128 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis3.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis3.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis4.svg b/__tests__/integration/snapshots/AxisLinearBasis4.svg index eba6cad24..1d4d592aa 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis4.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis5.svg b/__tests__/integration/snapshots/AxisLinearBasis5.svg index 511be722a..542ec5635 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis5.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis5.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis6.svg b/__tests__/integration/snapshots/AxisLinearBasis6.svg index 4d3b1ea37..aeea2cd9e 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis6.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis6.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis7.svg b/__tests__/integration/snapshots/AxisLinearBasis7.svg index ef66f819a..eebc2e9d5 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis7.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis7.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasis8.svg b/__tests__/integration/snapshots/AxisLinearBasis8.svg index 76b8d5e0c..5e6549f81 100644 --- a/__tests__/integration/snapshots/AxisLinearBasis8.svg +++ b/__tests__/integration/snapshots/AxisLinearBasis8.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 合规线 @@ -830,7 +783,7 @@ transform="matrix(1,0,0,1,140,45)" class="axis-label" > - + - + - + CFO线 @@ -914,7 +867,7 @@ transform="matrix(1,0,0,1,207.500000,45)" class="axis-label" > - + CTO线 @@ -942,7 +895,7 @@ transform="matrix(1,0,0,1,230,45)" class="axis-label" > - + - + GR线 @@ -998,7 +951,7 @@ transform="matrix(1,0,0,1,275,45)" class="axis-label" > - + - + - + CMO线 @@ -1082,7 +1035,7 @@ transform="matrix(1,0,0,1,342.500000,45)" class="axis-label" > - + - + 天猫事业线 @@ -1138,7 +1091,7 @@ transform="matrix(1,0,0,1,387.500000,45)" class="axis-label" > - + 影业 @@ -1166,7 +1119,7 @@ transform="matrix(1,0,0,1,410,45)" class="axis-label" > - + - + - + 阿里体育 @@ -1250,7 +1203,7 @@ transform="matrix(1,0,0,1,477.500000,45)" class="axis-label" > - + - + diff --git a/__tests__/integration/snapshots/AxisLinearBasisZ.svg b/__tests__/integration/snapshots/AxisLinearBasisZ.svg index d02f1bb08..d6b29954a 100644 --- a/__tests__/integration/snapshots/AxisLinearBasisZ.svg +++ b/__tests__/integration/snapshots/AxisLinearBasisZ.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabel.svg b/__tests__/integration/snapshots/AxisLinearLabel.svg index c1f7aaea5..517a0f488 100644 --- a/__tests__/integration/snapshots/AxisLinearLabel.svg +++ b/__tests__/integration/snapshots/AxisLinearLabel.svg @@ -6,83 +6,46 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - - + + - - + + @@ -121,13 +83,8 @@ transform="matrix(1,0,0,1,100,70)" class="axis-label" > - - + + @@ -166,13 +122,8 @@ transform="matrix(1,0,0,1,150,70)" class="axis-label" > - - + + @@ -211,7 +161,7 @@ transform="matrix(1,0,0,1,200,70)" class="axis-label" > - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign1.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign1.svg index 31ea8e1d8..014fe4df4 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign1.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign1.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign10.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign10.svg index fcf825f29..640b4197f 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign10.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign10.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign11.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign11.svg index 801617d51..8307407d6 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign11.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign11.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign2.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign2.svg index 3c9827754..58c10b1dc 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign2.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign3.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign3.svg index 7ae7fac30..5d4589db0 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign3.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign3.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign4.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign4.svg index 596149f1c..c4045319b 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign4.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign4.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign5.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign5.svg index e5dd98b2b..80d770d1f 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign5.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign5.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign6.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign6.svg index c81c2706b..93e6ac7b3 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign6.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign6.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign7.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign7.svg index 06d638a27..3dac15426 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign7.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign7.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign8.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign8.svg index 8d77a159b..e3eb78e85 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign8.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign8.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelAlign9.svg b/__tests__/integration/snapshots/AxisLinearLabelAlign9.svg index c0ca9a8ce..7f20fdadf 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelAlign9.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelAlign9.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelOverlap.svg b/__tests__/integration/snapshots/AxisLinearLabelOverlap.svg index 177e85622..21e917d6f 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelOverlap.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelOverlap.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelOverlap2.svg b/__tests__/integration/snapshots/AxisLinearLabelOverlap2.svg index f7b47e415..182fea885 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelOverlap2.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelOverlap2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + ABCDEF @@ -493,10 +446,10 @@ - + ABCDEF @@ -519,10 +472,10 @@ - + ABCDEF @@ -545,10 +498,10 @@ - + ABCDEF @@ -571,10 +524,10 @@ - + ABCDEF @@ -597,10 +550,10 @@ - + ABCDEF @@ -623,10 +576,10 @@ - + ABCDEF @@ -649,10 +602,10 @@ - + ABCDEF @@ -675,10 +628,10 @@ - + ABCDEF @@ -701,10 +654,10 @@ - + ABCDEF @@ -727,10 +680,10 @@ - + ABCDEF @@ -753,10 +706,10 @@ - + ABCDEF @@ -781,10 +734,10 @@ - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - 蚂蚁技术... + 蚂... - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - OceanBa... + OceanBase - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelOverlapCrossSizeVertical.svg b/__tests__/integration/snapshots/AxisLinearLabelOverlapCrossSizeVertical.svg index 4764b13df..2b0b0aedd 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelOverlapCrossSizeVertical.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelOverlapCrossSizeVertical.svg @@ -6,45 +6,17 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelOverlapMultiple.svg b/__tests__/integration/snapshots/AxisLinearLabelOverlapMultiple.svg index 59a189ff6..ccd2a8090 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelOverlapMultiple.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelOverlapMultiple.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -817,26 +770,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1619,26 +1531,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2421,26 +2292,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3223,26 +3053,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4025,26 +3814,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4827,26 +4575,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelOverlapWrap.svg b/__tests__/integration/snapshots/AxisLinearLabelOverlapWrap.svg index 0980cba2d..d5af58e92 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelOverlapWrap.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelOverlapWrap.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelOverlapWrapVertical.svg b/__tests__/integration/snapshots/AxisLinearLabelOverlapWrapVertical.svg index 54b19b0c5..fc5c199ea 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelOverlapWrapVertical.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelOverlapWrapVertical.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelRotate.svg b/__tests__/integration/snapshots/AxisLinearLabelRotate.svg index 43a0a5c7a..87abcf0cb 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelRotate.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelRotate.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1513,26 +1466,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2987,26 +2899,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4461,26 +4332,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5935,26 +5765,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7433,26 +7222,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -8907,26 +8655,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -10381,26 +10088,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -11855,26 +11521,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -13329,26 +12954,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -14803,26 +14387,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -16277,26 +15820,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -17751,26 +17253,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -19225,26 +18686,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -20699,26 +20119,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -22173,26 +21552,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearLabelSpacing.svg b/__tests__/integration/snapshots/AxisLinearLabelSpacing.svg index f3216aa4b..5ad7e494d 100644 --- a/__tests__/integration/snapshots/AxisLinearLabelSpacing.svg +++ b/__tests__/integration/snapshots/AxisLinearLabelSpacing.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearTime1.svg b/__tests__/integration/snapshots/AxisLinearTime1.svg index 7960d8083..43882f810 100644 --- a/__tests__/integration/snapshots/AxisLinearTime1.svg +++ b/__tests__/integration/snapshots/AxisLinearTime1.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearTime2.svg b/__tests__/integration/snapshots/AxisLinearTime2.svg index aaae511cb..d3b67cec2 100644 --- a/__tests__/integration/snapshots/AxisLinearTime2.svg +++ b/__tests__/integration/snapshots/AxisLinearTime2.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/AxisLinearTitle.svg b/__tests__/integration/snapshots/AxisLinearTitle.svg index fbf2251c1..1f40c5bcf 100644 --- a/__tests__/integration/snapshots/AxisLinearTitle.svg +++ b/__tests__/integration/snapshots/AxisLinearTitle.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -661,26 +614,11 @@ - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - - - - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/BugAxisLabelPosition.svg b/__tests__/integration/snapshots/BugAxisLabelPosition.svg index 63650d14b..225857cdb 100644 --- a/__tests__/integration/snapshots/BugAxisLabelPosition.svg +++ b/__tests__/integration/snapshots/BugAxisLabelPosition.svg @@ -6,35 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + - + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -617,32 +567,30 @@ - + - + @@ -652,7 +600,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + - - + + - - - + + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -618,32 +573,30 @@ - + - + @@ -653,7 +606,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + @@ -10,31 +10,27 @@ - - - + + + - + - + location @@ -64,49 +62,34 @@ fill="none" width="220" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/BugCategoryMarker.svg b/__tests__/integration/snapshots/BugCategoryMarker.svg index 785985ed9..5d53a9c67 100644 --- a/__tests__/integration/snapshots/BugCategoryMarker.svg +++ b/__tests__/integration/snapshots/BugCategoryMarker.svg @@ -6,95 +6,57 @@ color-interpolation-filters="sRGB" > - - + + - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,86 +10,61 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -647,32 +594,30 @@ - + - + @@ -682,7 +627,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/BugCategoryUpdate2.svg b/__tests__/integration/snapshots/BugCategoryUpdate2.svg index c9748fd52..3f980eb73 100644 --- a/__tests__/integration/snapshots/BugCategoryUpdate2.svg +++ b/__tests__/integration/snapshots/BugCategoryUpdate2.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/BugCategoryUpdate3.svg b/__tests__/integration/snapshots/BugCategoryUpdate3.svg index 9cbd20e8e..f0df85e5c 100644 --- a/__tests__/integration/snapshots/BugCategoryUpdate3.svg +++ b/__tests__/integration/snapshots/BugCategoryUpdate3.svg @@ -1,7 +1,7 @@ @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="400" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -671,32 +612,30 @@ - + - + @@ -706,7 +645,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/3 - + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="400" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -671,32 +612,30 @@ - + - + @@ -706,7 +645,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/3 - + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="400" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -678,32 +619,30 @@ - + - + @@ -713,7 +652,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/3 - + - - + + - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - - - - + + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1144,7 +1087,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/3 - + diff --git a/__tests__/integration/snapshots/BugCategoryWithShape2.svg b/__tests__/integration/snapshots/BugCategoryWithShape2.svg index a82ff2875..7778951de 100644 --- a/__tests__/integration/snapshots/BugCategoryWithShape2.svg +++ b/__tests__/integration/snapshots/BugCategoryWithShape2.svg @@ -10,14 +10,16 @@ - - - - + + + + - + - + title @@ -73,49 +73,34 @@ fill="none" width="350" height="19" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2204,7 +2098,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/9 - + diff --git a/__tests__/integration/snapshots/BugCategoryWithShape3.svg b/__tests__/integration/snapshots/BugCategoryWithShape3.svg index 959d88ebd..4787a6c66 100644 --- a/__tests__/integration/snapshots/BugCategoryWithShape3.svg +++ b/__tests__/integration/snapshots/BugCategoryWithShape3.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,61 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/Button1.svg b/__tests__/integration/snapshots/Button1.svg index 143b9f168..4677ffbf4 100644 --- a/__tests__/integration/snapshots/Button1.svg +++ b/__tests__/integration/snapshots/Button1.svg @@ -6,33 +6,32 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - - + + - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + - + - - - - + + + + - + - + @@ -58,7 +50,7 @@ transform="matrix(1,0,0,1,55,25)" class="legend-category-item-label-group" > - + - + - + @@ -133,7 +123,7 @@ transform="matrix(1,0,0,1,55,25)" class="legend-category-item-label-group" > - + - + - + @@ -208,7 +196,7 @@ transform="matrix(1,0,0,1,55,25)" class="legend-category-item-label-group" > - + diff --git a/__tests__/integration/snapshots/CategoryItem2.svg b/__tests__/integration/snapshots/CategoryItem2.svg index 9419c9bbb..2c1cda6a8 100644 --- a/__tests__/integration/snapshots/CategoryItem2.svg +++ b/__tests__/integration/snapshots/CategoryItem2.svg @@ -6,23 +6,16 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,10,11.500000)" class="legend-category-item-label-group" > - + - + - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + - + - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + diff --git a/__tests__/integration/snapshots/CategoryItem5.svg b/__tests__/integration/snapshots/CategoryItem5.svg index 4eeb5e375..37e65626b 100644 --- a/__tests__/integration/snapshots/CategoryItem5.svg +++ b/__tests__/integration/snapshots/CategoryItem5.svg @@ -6,23 +6,16 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + - + - + diff --git a/__tests__/integration/snapshots/CategoryItem6.svg b/__tests__/integration/snapshots/CategoryItem6.svg index c4f96cb0b..a0d17c0be 100644 --- a/__tests__/integration/snapshots/CategoryItem6.svg +++ b/__tests__/integration/snapshots/CategoryItem6.svg @@ -6,23 +6,16 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + diff --git a/__tests__/integration/snapshots/CategoryItem7.svg b/__tests__/integration/snapshots/CategoryItem7.svg index 3efdc6608..6f1dad5a4 100644 --- a/__tests__/integration/snapshots/CategoryItem7.svg +++ b/__tests__/integration/snapshots/CategoryItem7.svg @@ -6,23 +6,16 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + - + @@ -57,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + - + - - - - + + + + - + - + @@ -62,7 +47,7 @@ transform="matrix(1,0,0,1,15,11.500000)" class="legend-category-item-label-group" > - + - + - - - - + + + + - + - + @@ -65,7 +49,7 @@ transform="matrix(1,0,0,1,55,25)" class="legend-category-item-label-group" > - + diff --git a/__tests__/integration/snapshots/CategoryItemMarker1.svg b/__tests__/integration/snapshots/CategoryItemMarker1.svg index d7115e893..5be790bb4 100644 --- a/__tests__/integration/snapshots/CategoryItemMarker1.svg +++ b/__tests__/integration/snapshots/CategoryItemMarker1.svg @@ -10,37 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="1000" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryItemMarker2.svg b/__tests__/integration/snapshots/CategoryItemMarker2.svg index 93db7019d..52b4a3ad8 100644 --- a/__tests__/integration/snapshots/CategoryItemMarker2.svg +++ b/__tests__/integration/snapshots/CategoryItemMarker2.svg @@ -10,37 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="500" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2106,7 +2029,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/3 - + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/CategoryItems11.svg b/__tests__/integration/snapshots/CategoryItems11.svg index 738a3462b..86163f26b 100644 --- a/__tests__/integration/snapshots/CategoryItems11.svg +++ b/__tests__/integration/snapshots/CategoryItems11.svg @@ -6,66 +6,38 @@ color-interpolation-filters="sRGB" > - - + + - - - - - + + + + + - - + + - + - + @@ -98,10 +69,10 @@ - + - + - - + + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2100,11 +2025,11 @@ class="navigator-next-btn-group" transform="matrix(0,1,-1,0,9.140000,17)" > - + @@ -2116,7 +2041,7 @@ class="navigator-page-info-group" transform="matrix(1,0,0,1,9.140000,0)" > - + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2087,13 +2075,12 @@ transform="matrix(0,1,-1,0,9.260000,17)" class="navigator-next-btn-group" > - + @@ -2103,7 +2090,7 @@ transform="matrix(1,0,0,1,9.260000,0)" class="navigator-page-info-group" > - + 1/4 - + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2150,13 +2116,12 @@ transform="matrix(0.800000,0,0,0.800000,93.680000,0)" class="navigator-next-btn-group" > - + @@ -2166,7 +2131,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 第1页(共5页) - + - + try to hover to the items⬆️ - + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1644,32 +1555,30 @@ - + - + @@ -1679,7 +1588,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryItems7.svg b/__tests__/integration/snapshots/CategoryItems7.svg index 2e9c289b6..447db860c 100644 --- a/__tests__/integration/snapshots/CategoryItems7.svg +++ b/__tests__/integration/snapshots/CategoryItems7.svg @@ -1,65 +1,43 @@ - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryItems8.svg b/__tests__/integration/snapshots/CategoryItems8.svg index 977e11e0b..f6380c6cd 100644 --- a/__tests__/integration/snapshots/CategoryItems8.svg +++ b/__tests__/integration/snapshots/CategoryItems8.svg @@ -1,65 +1,43 @@ - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryItems9.svg b/__tests__/integration/snapshots/CategoryItems9.svg index 994e0ce64..ebeb3c6b6 100644 --- a/__tests__/integration/snapshots/CategoryItems9.svg +++ b/__tests__/integration/snapshots/CategoryItems9.svg @@ -1,65 +1,43 @@ - - + + - - - - - + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - pre-colonial Americas - - - - - - - - - - - - - - - - - - - - the Steppes - - - - @@ -611,50 +409,48 @@ - + - + - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout1.svg b/__tests__/integration/snapshots/CategoryLayout1.svg index 16835c91c..f4c1449fa 100644 --- a/__tests__/integration/snapshots/CategoryLayout1.svg +++ b/__tests__/integration/snapshots/CategoryLayout1.svg @@ -1,7 +1,7 @@ @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="1000" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout10.svg b/__tests__/integration/snapshots/CategoryLayout10.svg index f0ffc39ae..bbe6f6cec 100644 --- a/__tests__/integration/snapshots/CategoryLayout10.svg +++ b/__tests__/integration/snapshots/CategoryLayout10.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout11.svg b/__tests__/integration/snapshots/CategoryLayout11.svg index c9748fd52..3f980eb73 100644 --- a/__tests__/integration/snapshots/CategoryLayout11.svg +++ b/__tests__/integration/snapshots/CategoryLayout11.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout12.svg b/__tests__/integration/snapshots/CategoryLayout12.svg index 91fa5d0d6..59475afd7 100644 --- a/__tests__/integration/snapshots/CategoryLayout12.svg +++ b/__tests__/integration/snapshots/CategoryLayout12.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout13.svg b/__tests__/integration/snapshots/CategoryLayout13.svg index e81307ced..667643130 100644 --- a/__tests__/integration/snapshots/CategoryLayout13.svg +++ b/__tests__/integration/snapshots/CategoryLayout13.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,9.020000,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout14.svg b/__tests__/integration/snapshots/CategoryLayout14.svg index 0f93a4fc6..d8cde3d0a 100644 --- a/__tests__/integration/snapshots/CategoryLayout14.svg +++ b/__tests__/integration/snapshots/CategoryLayout14.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout15.svg b/__tests__/integration/snapshots/CategoryLayout15.svg index 62c73a79f..e68d74860 100644 --- a/__tests__/integration/snapshots/CategoryLayout15.svg +++ b/__tests__/integration/snapshots/CategoryLayout15.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout16.svg b/__tests__/integration/snapshots/CategoryLayout16.svg index 263080230..f0eb9eb5b 100644 --- a/__tests__/integration/snapshots/CategoryLayout16.svg +++ b/__tests__/integration/snapshots/CategoryLayout16.svg @@ -10,91 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -652,32 +593,30 @@ - + - + @@ -687,7 +626,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout17.svg b/__tests__/integration/snapshots/CategoryLayout17.svg index 2d29a798d..d00a201d1 100644 --- a/__tests__/integration/snapshots/CategoryLayout17.svg +++ b/__tests__/integration/snapshots/CategoryLayout17.svg @@ -10,91 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -659,32 +594,30 @@ - + - + @@ -694,7 +627,7 @@ transform="matrix(1,0,0,1,9.140000,0)" class="navigator-page-info-group" > - + 1/3 - + diff --git a/__tests__/integration/snapshots/CategoryLayout18.svg b/__tests__/integration/snapshots/CategoryLayout18.svg index ed77f3866..3e6a09f80 100644 --- a/__tests__/integration/snapshots/CategoryLayout18.svg +++ b/__tests__/integration/snapshots/CategoryLayout18.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,9.020000,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout19.svg b/__tests__/integration/snapshots/CategoryLayout19.svg index a9bcea598..42147a70d 100644 --- a/__tests__/integration/snapshots/CategoryLayout19.svg +++ b/__tests__/integration/snapshots/CategoryLayout19.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="600" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -664,32 +611,30 @@ - + - + @@ -699,7 +644,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout20.svg b/__tests__/integration/snapshots/CategoryLayout20.svg index 658635219..1dd9b2fd1 100644 --- a/__tests__/integration/snapshots/CategoryLayout20.svg +++ b/__tests__/integration/snapshots/CategoryLayout20.svg @@ -1,7 +1,7 @@ @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,85 +10,60 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -646,32 +593,30 @@ - + - + @@ -681,7 +626,7 @@ transform="matrix(1,0,0,1,9.020000,0)" class="navigator-page-info-group" > - + 1/2 - + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="500" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout27.svg b/__tests__/integration/snapshots/CategoryLayout27.svg index f0c5f6654..fe981f6ff 100644 --- a/__tests__/integration/snapshots/CategoryLayout27.svg +++ b/__tests__/integration/snapshots/CategoryLayout27.svg @@ -1,7 +1,7 @@ @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="300" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -664,32 +611,30 @@ - + - + @@ -699,7 +644,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout28.svg b/__tests__/integration/snapshots/CategoryLayout28.svg index de04fda51..db335cf6b 100644 --- a/__tests__/integration/snapshots/CategoryLayout28.svg +++ b/__tests__/integration/snapshots/CategoryLayout28.svg @@ -1,7 +1,7 @@ @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="500" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout29.svg b/__tests__/integration/snapshots/CategoryLayout29.svg index 9d999c13c..8ab0c64b7 100644 --- a/__tests__/integration/snapshots/CategoryLayout29.svg +++ b/__tests__/integration/snapshots/CategoryLayout29.svg @@ -1,6 +1,6 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="200" height="273" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout3.svg b/__tests__/integration/snapshots/CategoryLayout3.svg index fd5eb10f2..c6945ef27 100644 --- a/__tests__/integration/snapshots/CategoryLayout3.svg +++ b/__tests__/integration/snapshots/CategoryLayout3.svg @@ -10,37 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="600" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -663,32 +625,30 @@ - + - + @@ -698,7 +658,7 @@ transform="matrix(1,0,0,1,9.020000,0)" class="navigator-page-info-group" > - + 1/2 - + - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="200" height="273" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -670,32 +611,30 @@ - + - + @@ -705,7 +644,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + diff --git a/__tests__/integration/snapshots/CategoryLayout31.svg b/__tests__/integration/snapshots/CategoryLayout31.svg index 555c7e2a6..adb214c5f 100644 --- a/__tests__/integration/snapshots/CategoryLayout31.svg +++ b/__tests__/integration/snapshots/CategoryLayout31.svg @@ -10,37 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="200" height="53" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -684,32 +613,30 @@ - + - + @@ -719,7 +646,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/4 - + diff --git a/__tests__/integration/snapshots/CategoryLayout32.svg b/__tests__/integration/snapshots/CategoryLayout32.svg index cfc5c3772..f0aaf8dfe 100644 --- a/__tests__/integration/snapshots/CategoryLayout32.svg +++ b/__tests__/integration/snapshots/CategoryLayout32.svg @@ -1,7 +1,7 @@ @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="500" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout33.svg b/__tests__/integration/snapshots/CategoryLayout33.svg index 99ef9b051..e3286ac2b 100644 --- a/__tests__/integration/snapshots/CategoryLayout33.svg +++ b/__tests__/integration/snapshots/CategoryLayout33.svg @@ -1,7 +1,7 @@ @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="500" height="73" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryLayout34.svg b/__tests__/integration/snapshots/CategoryLayout34.svg index 6ffedf8ec..34020d065 100644 --- a/__tests__/integration/snapshots/CategoryLayout34.svg +++ b/__tests__/integration/snapshots/CategoryLayout34.svg @@ -10,37 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="600" height="13" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -684,34 +625,32 @@ - + - + @@ -721,7 +660,7 @@ transform="matrix(1,0,0,1,9.020000,0)" class="navigator-page-info-group" > - + 1/2 - + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="455" height="23" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1705,32 +1601,30 @@ - + - + @@ -1740,7 +1634,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/4 - + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="455" height="23" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -10,31 +10,19 @@ - - - - - + + + + + - + Legend Title @@ -64,49 +54,34 @@ fill="none" width="455" height="23" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1691,32 +1599,30 @@ - + - + @@ -1726,7 +1632,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/2 - + - - - - - + + + + + - + Legend Title @@ -70,49 +54,34 @@ fill="none" width="455" height="23" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1677,32 +1639,30 @@ - + - + @@ -1712,7 +1672,7 @@ transform="matrix(1,0,0,1,9.020000,0)" class="navigator-page-info-group" > - + 1/2 - + - - + + - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1720,32 +1615,30 @@ - + - + @@ -1755,7 +1648,7 @@ transform="matrix(1,0,0,1,9.140000,0)" class="navigator-page-info-group" > - + 1/3 - + - - + + - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/CategoryPosition1.svg b/__tests__/integration/snapshots/CategoryPosition1.svg index 7ead01c13..8e5958279 100644 --- a/__tests__/integration/snapshots/CategoryPosition1.svg +++ b/__tests__/integration/snapshots/CategoryPosition1.svg @@ -1,7 +1,7 @@ @@ -10,32 +10,20 @@ - - - - - - + + + + + + - + Legend Title @@ -65,49 +55,34 @@ fill="none" width="455" height="23" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2168,7 +2076,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/5 - + @@ -10,86 +10,62 @@ - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2150,7 +2059,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/5 - + @@ -10,31 +10,27 @@ - - - + + + - + - + Legend Title @@ -64,49 +62,34 @@ fill="none" width="455" height="23" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2167,7 +2083,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + 1/5 - + - - - + + + - - + + - + - + - - + + - + - + - - - - + + + + - + - + title @@ -162,25 +153,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -313,53 +267,47 @@ - - - + + + - + - + - - + + 1000 @@ -392,18 +337,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -599,53 +490,47 @@ - - - + + + - + - + - - + + 1000 @@ -678,18 +560,9 @@ - - - + + + - + - + - - - - - + + + + + - - + + - + - - - - - + + + + + - + - + - - + + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -1024,53 +800,47 @@ - - - + + + - + - + - - + + 1000 @@ -1103,18 +870,9 @@ - - - + + + - + - + - + title @@ -1185,25 +941,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -1336,53 +1055,47 @@ - - - + + + - + - + - - + + 1000 @@ -1415,18 +1125,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/Continuous2.svg b/__tests__/integration/snapshots/Continuous2.svg index 14389491f..0d5f9a332 100644 --- a/__tests__/integration/snapshots/Continuous2.svg +++ b/__tests__/integration/snapshots/Continuous2.svg @@ -73,42 +73,31 @@ - - - - + + + + - + - + title @@ -132,25 +123,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -283,53 +237,47 @@ - - - + + + - + - + - - + + 1000 @@ -362,18 +307,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -578,53 +468,47 @@ - - - + + + - + - + - - + + 1000 @@ -657,18 +538,9 @@ - - - + + + - + - + - - - - - + + + + + - - + + - + - - - - - + + + + + - + diff --git a/__tests__/integration/snapshots/Continuous3.svg b/__tests__/integration/snapshots/Continuous3.svg index f2e01403b..702245dd2 100644 --- a/__tests__/integration/snapshots/Continuous3.svg +++ b/__tests__/integration/snapshots/Continuous3.svg @@ -100,41 +100,30 @@ - - - - + + + + - + - + title @@ -158,25 +149,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -309,53 +263,47 @@ - - - + + + - + - + - - + + 900 @@ -388,18 +333,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - + + - - - + + + - + - + - - + + 0 @@ -603,53 +493,47 @@ - - - + + + - + - + - - + + 900 @@ -682,18 +563,9 @@ - - - + + + - + - + - - - - - + + + + + - - + + - + - - - - - + + + + + - + diff --git a/__tests__/integration/snapshots/Continuous4.svg b/__tests__/integration/snapshots/Continuous4.svg index 4da838ec8..764b858b7 100644 --- a/__tests__/integration/snapshots/Continuous4.svg +++ b/__tests__/integration/snapshots/Continuous4.svg @@ -241,65 +241,39 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -758,53 +670,47 @@ - - - + + + - + - + - - + + 900 @@ -837,18 +740,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -1378,53 +1191,47 @@ - - - + + + - + - + - - + + 900 @@ -1457,18 +1261,9 @@ - - - + + + - + - + - + title @@ -1539,25 +1332,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -2016,53 +1737,47 @@ - - - + + + - + - + - - + + 900 @@ -2095,18 +1807,9 @@ - - - + + + - + - + - + title @@ -2177,25 +1878,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -2654,53 +2283,47 @@ - - - + + + - + - + - - + + 900 @@ -2733,18 +2353,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -4389,53 +3757,47 @@ - - - + + + - + - + - - + + 900 @@ -4468,18 +3827,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -5210,53 +4479,47 @@ - - - + + + - + - + - - + + 900 @@ -5289,18 +4549,9 @@ - - - + + + - + - + - + title @@ -5371,25 +4620,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -6049,53 +5226,47 @@ - - - + + + - + - + - - + + 900 @@ -6128,18 +5296,9 @@ - - - + + + - + - + - + title @@ -6210,25 +5367,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + 0 @@ -6888,53 +5979,53 @@ - + - + - + - + - - + + 900 @@ -6967,18 +6055,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Continuous5.svg b/__tests__/integration/snapshots/Continuous5.svg index fc487d6fe..57e07b7d4 100644 --- a/__tests__/integration/snapshots/Continuous5.svg +++ b/__tests__/integration/snapshots/Continuous5.svg @@ -362,65 +362,39 @@ /> - - - - + + + + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -869,53 +781,47 @@ - - - + + + - + - + - - + + 900 @@ -948,18 +851,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -1479,53 +1292,47 @@ - - - + + + - + - + - - + + 900 @@ -1558,18 +1362,9 @@ - - - + + + - + - + - + title @@ -1640,25 +1433,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -2107,53 +1828,47 @@ - - - + + + - + - + - - + + 900 @@ -2186,18 +1898,9 @@ - - - + + + - + - + - + title @@ -2268,25 +1969,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -2735,53 +2364,47 @@ - - - + + + - + - + - - + + 900 @@ -2814,18 +2434,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - + - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -4440,53 +3808,47 @@ - - - + + + - + - + - - + + 900 @@ -4519,18 +3878,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -5251,53 +4520,47 @@ - - - + + + - + - + - - + + 900 @@ -5330,18 +4590,9 @@ - - - + + + - + - + - + title @@ -5412,25 +4661,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -6080,53 +5257,47 @@ - - - + + + - + - + - - + + 900 @@ -6159,18 +5327,9 @@ - - - + + + - + - + - + title @@ -6241,25 +5398,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + 0 @@ -6909,53 +6000,53 @@ - + - + - + - + - - + + 900 @@ -6988,18 +6076,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + diff --git a/__tests__/integration/snapshots/ContinuousD3ColorLegend.svg b/__tests__/integration/snapshots/ContinuousD3ColorLegend.svg index 7b45bc966..4f2751de2 100644 --- a/__tests__/integration/snapshots/ContinuousD3ColorLegend.svg +++ b/__tests__/integration/snapshots/ContinuousD3ColorLegend.svg @@ -10,9 +10,9 @@ gradientUnits="userSpaceOnUse" id="g-pattern-0" x1="0" - y1="1.5" + y1="-1.5" x2="391.2" - y2="1.5" + y2="-1.5" > @@ -34,16 +34,16 @@ - - + + @@ -65,16 +65,16 @@ - - + + @@ -97,18 +97,18 @@ - + @@ -131,37 +131,24 @@ - + - - - - + + + + - + Unemployment rate(%) @@ -185,54 +174,36 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -240,49 +211,19 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + @@ -728,10 +640,9 @@ fill="none" width="400" height="60" - transform="matrix(1,0,0,1,0,0)" class="legend-title" > - + Height (cm) @@ -755,54 +668,36 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -810,49 +705,19 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + @@ -1298,10 +1134,9 @@ fill="none" width="400" height="60" - transform="matrix(1,0,0,1,0,0)" class="legend-title" > - + Unemployment rate(%) @@ -1325,54 +1162,36 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -1380,49 +1199,19 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + @@ -1868,10 +1628,9 @@ fill="none" width="400" height="60" - transform="matrix(1,0,0,1,0,0)" class="legend-title" > - + Unemployment rate(%) @@ -1895,54 +1656,36 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -1950,49 +1693,19 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + diff --git a/__tests__/integration/snapshots/ContinuousDemo.svg b/__tests__/integration/snapshots/ContinuousDemo.svg index 80fc50540..65277603e 100644 --- a/__tests__/integration/snapshots/ContinuousDemo.svg +++ b/__tests__/integration/snapshots/ContinuousDemo.svg @@ -45,7 +45,7 @@ - + - + - + - + - - - - + + + + - + - + Title @@ -240,25 +226,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -295,56 +263,26 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 200 @@ -678,53 +592,47 @@ - - - + + + - + - + - - + + 500 @@ -757,18 +662,9 @@ - - - + + + - + - + - - + + - - + + - - + + - + @@ -876,56 +747,26 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 250 @@ -1259,53 +1076,47 @@ - - - + + + - + - + - - + + 500 @@ -1338,18 +1146,9 @@ - - - + + + - + - + - + Title @@ -1420,25 +1219,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + 0 @@ -2070,53 +1797,47 @@ - - - + + + - + - + - - + + 1 @@ -2149,18 +1867,9 @@ - - - + + + - + - + - + Title @@ -2231,25 +1940,10 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - - - - + + + + - - + + - + - - - - - + + + + + - + - + - + Title @@ -2380,25 +2047,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + Title @@ -3104,25 +2699,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -3159,55 +2736,25 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + Title @@ -3666,25 +3167,15 @@ transform="matrix(1,0,0,1,0,27)" class="legend-content-group" > - + - - + + - - + + - + @@ -3721,55 +3204,25 @@ - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + diff --git a/__tests__/integration/snapshots/CrosshairCircle.svg b/__tests__/integration/snapshots/CrosshairCircle.svg index ddfa48143..09a154fbb 100644 --- a/__tests__/integration/snapshots/CrosshairCircle.svg +++ b/__tests__/integration/snapshots/CrosshairCircle.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - - + + - + diff --git a/__tests__/integration/snapshots/CrosshairLine.svg b/__tests__/integration/snapshots/CrosshairLine.svg index e47c9f566..9fae5d008 100644 --- a/__tests__/integration/snapshots/CrosshairLine.svg +++ b/__tests__/integration/snapshots/CrosshairLine.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - - + + - + diff --git a/__tests__/integration/snapshots/Handle1.svg b/__tests__/integration/snapshots/Handle1.svg index 93bbdcc8e..71e79be9f 100644 --- a/__tests__/integration/snapshots/Handle1.svg +++ b/__tests__/integration/snapshots/Handle1.svg @@ -6,54 +6,46 @@ color-interpolation-filters="sRGB" > - - - - - - - + + + + + + + - + - + - - + + - - - - - - - + + + + + + + - + - + - - + + - - - + + + - - - + + + - + - - - - + + + + - - + + labelText @@ -88,47 +65,39 @@ - - - - + + + + - - + + formatted text - labelText @@ -136,47 +105,39 @@ - - - - + + + + - - + + labelText diff --git a/__tests__/integration/snapshots/HandleUpdate.svg b/__tests__/integration/snapshots/HandleUpdate.svg index 9390f7165..c7705dda6 100644 --- a/__tests__/integration/snapshots/HandleUpdate.svg +++ b/__tests__/integration/snapshots/HandleUpdate.svg @@ -6,60 +6,46 @@ color-interpolation-filters="sRGB" > - - - - - - - + + + + + + + - + - + - - + + - - + + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + left - - + + - - + + - - + + - - + + - + left - - + + - - + + - - + + - - + + - + left - - + + - - + + - + - + - + left - + - + - + - + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - - + + + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - - + + + - + - + - + - - + + - - - - - - + + + + + + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - - - + + + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +172,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +248,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous2.svg b/__tests__/integration/snapshots/LayoutContinuous2.svg index 2d4a9a2c3..72273666d 100644 --- a/__tests__/integration/snapshots/LayoutContinuous2.svg +++ b/__tests__/integration/snapshots/LayoutContinuous2.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous3.svg b/__tests__/integration/snapshots/LayoutContinuous3.svg index 6beb5afa1..69aae2c2b 100644 --- a/__tests__/integration/snapshots/LayoutContinuous3.svg +++ b/__tests__/integration/snapshots/LayoutContinuous3.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous4.svg b/__tests__/integration/snapshots/LayoutContinuous4.svg index 01571507b..aaa143ccd 100644 --- a/__tests__/integration/snapshots/LayoutContinuous4.svg +++ b/__tests__/integration/snapshots/LayoutContinuous4.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous5.svg b/__tests__/integration/snapshots/LayoutContinuous5.svg index 4fff314b5..7e22ac1af 100644 --- a/__tests__/integration/snapshots/LayoutContinuous5.svg +++ b/__tests__/integration/snapshots/LayoutContinuous5.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous6.svg b/__tests__/integration/snapshots/LayoutContinuous6.svg index 74b013f67..1e7c43b74 100644 --- a/__tests__/integration/snapshots/LayoutContinuous6.svg +++ b/__tests__/integration/snapshots/LayoutContinuous6.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous7.svg b/__tests__/integration/snapshots/LayoutContinuous7.svg index db1bda95c..be73bdd0a 100644 --- a/__tests__/integration/snapshots/LayoutContinuous7.svg +++ b/__tests__/integration/snapshots/LayoutContinuous7.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous8.svg b/__tests__/integration/snapshots/LayoutContinuous8.svg index 835cb819d..b8ecac576 100644 --- a/__tests__/integration/snapshots/LayoutContinuous8.svg +++ b/__tests__/integration/snapshots/LayoutContinuous8.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutContinuous9.svg b/__tests__/integration/snapshots/LayoutContinuous9.svg index 1836af604..c9f624618 100644 --- a/__tests__/integration/snapshots/LayoutContinuous9.svg +++ b/__tests__/integration/snapshots/LayoutContinuous9.svg @@ -29,16 +29,10 @@ - - - - + + + + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + 0 @@ -227,53 +178,53 @@ - + - + - + - + - - + + 1000 @@ -306,18 +254,9 @@ - - - + + + - + diff --git a/__tests__/integration/snapshots/LayoutFlexAlignItemsFlexCenter.svg b/__tests__/integration/snapshots/LayoutFlexAlignItemsFlexCenter.svg index 9955dc7dd..c56f3e0ca 100644 --- a/__tests__/integration/snapshots/LayoutFlexAlignItemsFlexCenter.svg +++ b/__tests__/integration/snapshots/LayoutFlexAlignItemsFlexCenter.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - + + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - + + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - + + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - + + - + - + - + diff --git a/__tests__/integration/snapshots/LayoutFlexPositionBottom.svg b/__tests__/integration/snapshots/LayoutFlexPositionBottom.svg index b30c3d135..dad430f27 100644 --- a/__tests__/integration/snapshots/LayoutFlexPositionBottom.svg +++ b/__tests__/integration/snapshots/LayoutFlexPositionBottom.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - + + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + column - + flex-start - + flex-start - + - - + + - + - + - + - + column - + flex-start - + center - + - - + + - + - + - + - + column - + flex-start - + flex-end - + - - + + - + - + - + - + column - + center - + flex-start - + - - + + - + - + - + - + column - + center - + center - + - - + + - + - + - + - + column - + center - + flex-end - + - - + + - + - + - + - + column - + flex-end - + flex-start - + - - + + - + - + - + - + column - + flex-end - + center - + - - + + - + - + - + - + column - + flex-end - + flex-end - + - - + + - + - + - + - + row - + flex-start - + flex-start - + - - + + - + - + - + - + row - + flex-start - + center - + - - + + - + - + - + - + row - + flex-start - + flex-end - + - - + + - + - + - + - + row - + center - + flex-start - + - - + + - + - + - + - + row - + center - + center - + - - + + - + - + - + - + row - + center - + flex-end - + - - + + - + - + - + - + row - + flex-end - + flex-start - + - - + + - + - + - + - + row - + flex-end - + center - + - - + + - + - + - + - + row - + flex-end - + flex-end diff --git a/__tests__/integration/snapshots/LayoutLegend1.svg b/__tests__/integration/snapshots/LayoutLegend1.svg index 04f4abf2c..4b8832504 100644 --- a/__tests__/integration/snapshots/LayoutLegend1.svg +++ b/__tests__/integration/snapshots/LayoutLegend1.svg @@ -10,16 +10,10 @@ - - - - + + + + - - - + + + - + @@ -90,49 +68,34 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend2.svg b/__tests__/integration/snapshots/LayoutLegend2.svg index 1b7a112e8..4bf134e9d 100644 --- a/__tests__/integration/snapshots/LayoutLegend2.svg +++ b/__tests__/integration/snapshots/LayoutLegend2.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,49 +74,34 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend3.svg b/__tests__/integration/snapshots/LayoutLegend3.svg index 7918469f6..9ccfa56e4 100644 --- a/__tests__/integration/snapshots/LayoutLegend3.svg +++ b/__tests__/integration/snapshots/LayoutLegend3.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,49 +74,34 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend4.svg b/__tests__/integration/snapshots/LayoutLegend4.svg index e8409612e..05c2ccce9 100644 --- a/__tests__/integration/snapshots/LayoutLegend4.svg +++ b/__tests__/integration/snapshots/LayoutLegend4.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,55 +74,40 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + @@ -147,16 +116,13 @@ - + - + - + @@ -226,16 +192,13 @@ - + - + - + - + - + - + - + - + - + @@ -463,16 +420,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend5.svg b/__tests__/integration/snapshots/LayoutLegend5.svg index 0cbf4fd68..77c7e4ac1 100644 --- a/__tests__/integration/snapshots/LayoutLegend5.svg +++ b/__tests__/integration/snapshots/LayoutLegend5.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,55 +74,40 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + @@ -147,16 +116,13 @@ - + - + - + @@ -226,16 +192,13 @@ - + - + - + - + - + - + - + - + - + @@ -463,16 +420,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend6.svg b/__tests__/integration/snapshots/LayoutLegend6.svg index f81d95edc..21c8f26f4 100644 --- a/__tests__/integration/snapshots/LayoutLegend6.svg +++ b/__tests__/integration/snapshots/LayoutLegend6.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,55 +74,40 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + @@ -147,16 +116,13 @@ - + - + - + @@ -226,16 +192,13 @@ - + - + - + - + - + - + - + - + - + @@ -463,16 +420,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend7.svg b/__tests__/integration/snapshots/LayoutLegend7.svg index 117b1a1bd..886d532dc 100644 --- a/__tests__/integration/snapshots/LayoutLegend7.svg +++ b/__tests__/integration/snapshots/LayoutLegend7.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,55 +74,40 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + @@ -147,16 +116,13 @@ - + - + - + @@ -226,16 +192,13 @@ - + - + - + - + - + - + - + - + - + @@ -463,16 +420,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend8.svg b/__tests__/integration/snapshots/LayoutLegend8.svg index ceb261834..14426aaf8 100644 --- a/__tests__/integration/snapshots/LayoutLegend8.svg +++ b/__tests__/integration/snapshots/LayoutLegend8.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,55 +74,40 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + @@ -147,16 +116,13 @@ - + - + - + @@ -226,16 +192,13 @@ - + - + - + - + - + - + - + - + - + @@ -463,16 +420,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegend9.svg b/__tests__/integration/snapshots/LayoutLegend9.svg index e6143e966..afc2ece57 100644 --- a/__tests__/integration/snapshots/LayoutLegend9.svg +++ b/__tests__/integration/snapshots/LayoutLegend9.svg @@ -10,16 +10,10 @@ - - - - + + + + - + - + - + @@ -90,55 +74,40 @@ fill="none" width="400" height="250" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + @@ -147,16 +116,13 @@ - + - + - + @@ -226,16 +192,13 @@ - + - + - + - + - + - + - + - + - + @@ -463,16 +420,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutLegendMultiple.svg b/__tests__/integration/snapshots/LayoutLegendMultiple.svg index f8aa6726a..02c06fd6d 100644 --- a/__tests__/integration/snapshots/LayoutLegendMultiple.svg +++ b/__tests__/integration/snapshots/LayoutLegendMultiple.svg @@ -16,16 +16,10 @@ - - - - + + + + - + - + - + legend 1 @@ -93,49 +77,34 @@ fill="none" width="400" height="273" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -704,21 +646,15 @@ height="300" transform="matrix(1,0,0,1,150.399994,250)" > - + - + legend 2 @@ -748,55 +686,46 @@ fill="none" width="400" height="273" - transform="matrix(1,0,0,1,0,0)" + x="0" + y="0" class="legend-items" > - - + + - + @@ -805,16 +734,13 @@ - + - + - + @@ -884,16 +810,13 @@ - + - + - + - + - + - + - + - + - + @@ -1121,16 +1038,13 @@ - + - + - + - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/LayoutUpdateAttr.svg b/__tests__/integration/snapshots/LayoutUpdateAttr.svg index 78e33f366..fe3d5c742 100644 --- a/__tests__/integration/snapshots/LayoutUpdateAttr.svg +++ b/__tests__/integration/snapshots/LayoutUpdateAttr.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + @@ -2144,16 +2028,13 @@ - + - + - + @@ -2223,16 +2104,13 @@ - + - + - + @@ -2302,16 +2180,13 @@ - + - + - + @@ -2381,16 +2256,13 @@ - + - + - + @@ -2460,16 +2332,13 @@ - + - + - + @@ -2539,16 +2408,13 @@ - + - + - + - + - + - - + + diff --git a/__tests__/integration/snapshots/Marker1.svg b/__tests__/integration/snapshots/Marker1.svg index 0b0cee194..ad327ef5f 100644 --- a/__tests__/integration/snapshots/Marker1.svg +++ b/__tests__/integration/snapshots/Marker1.svg @@ -6,280 +6,418 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/__tests__/integration/snapshots/NavigatorDemo.svg b/__tests__/integration/snapshots/NavigatorDemo.svg index 99153bca8..41ecf09f5 100644 --- a/__tests__/integration/snapshots/NavigatorDemo.svg +++ b/__tests__/integration/snapshots/NavigatorDemo.svg @@ -28,31 +28,25 @@ - - - - + + + + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -265,7 +269,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -510,7 +524,7 @@ transform="matrix(1,0,0,1,9.080000,0)" class="navigator-page-info-group" > - + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -755,7 +779,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + @@ -1245,7 +1299,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -1970,7 +2069,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + - + - - - + + + - + - + - + diff --git a/__tests__/integration/snapshots/NavigatorNull.svg b/__tests__/integration/snapshots/NavigatorNull.svg index 27dbeab40..eaa8efabe 100644 --- a/__tests__/integration/snapshots/NavigatorNull.svg +++ b/__tests__/integration/snapshots/NavigatorNull.svg @@ -6,29 +6,14 @@ color-interpolation-filters="sRGB" > - - - - - - + + + + + + - + diff --git a/__tests__/integration/snapshots/NavigatorOverPages.svg b/__tests__/integration/snapshots/NavigatorOverPages.svg index ff21a3b68..3d6e5b219 100644 --- a/__tests__/integration/snapshots/NavigatorOverPages.svg +++ b/__tests__/integration/snapshots/NavigatorOverPages.svg @@ -10,21 +10,20 @@ - - - - + + + + - - + + - + - + - + - + - + - + @@ -151,7 +154,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + @@ -10,25 +10,25 @@ - - - - + + + + - - - + + + - + - + - + diff --git a/__tests__/integration/snapshots/NavigatorStyle.svg b/__tests__/integration/snapshots/NavigatorStyle.svg index ec808aec7..0ebe82aa6 100644 --- a/__tests__/integration/snapshots/NavigatorStyle.svg +++ b/__tests__/integration/snapshots/NavigatorStyle.svg @@ -6,35 +6,23 @@ color-interpolation-filters="sRGB" > - - + + - - - - + + + + - - - + + + - + - - + + - + - + - + - + - + - - - - - - + + + + + + - + diff --git a/__tests__/integration/snapshots/NavigatorWithoutShape.svg b/__tests__/integration/snapshots/NavigatorWithoutShape.svg index adee42469..d08d7abb1 100644 --- a/__tests__/integration/snapshots/NavigatorWithoutShape.svg +++ b/__tests__/integration/snapshots/NavigatorWithoutShape.svg @@ -6,7 +6,7 @@ color-interpolation-filters="sRGB" > - + @@ -16,31 +16,25 @@ - - - - + + + + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -253,7 +257,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -498,7 +512,7 @@ transform="matrix(1,0,0,1,11,0)" class="navigator-page-info-group" > - + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + @@ -729,11 +753,11 @@ class="navigator-next-btn-group" transform="matrix(1,0,0,1,40.160000,0)" > - + @@ -745,7 +769,7 @@ class="navigator-page-info-group" transform="matrix(1,0,0,1,11,0)" > - + - - + + - - - - - - + + + + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - + + - + - + @@ -193,26 +193,15 @@ - + - - - + + + - - + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + - - - + + + - - + + - + diff --git a/__tests__/integration/snapshots/Scrollbar1.svg b/__tests__/integration/snapshots/Scrollbar1.svg index ab7262acc..315a0a0b3 100644 --- a/__tests__/integration/snapshots/Scrollbar1.svg +++ b/__tests__/integration/snapshots/Scrollbar1.svg @@ -6,82 +6,77 @@ color-interpolation-filters="sRGB" > - - - - - - + + + + + + - - + + - - + + - + - + diff --git a/__tests__/integration/snapshots/Scrollbar2.svg b/__tests__/integration/snapshots/Scrollbar2.svg index fa5e96d0f..0d26a4fb5 100644 --- a/__tests__/integration/snapshots/Scrollbar2.svg +++ b/__tests__/integration/snapshots/Scrollbar2.svg @@ -6,104 +6,102 @@ color-interpolation-filters="sRGB" > - - - - - - + + + + + + - + - + - - + + - + - - + + - + - + diff --git a/__tests__/integration/snapshots/Scrollbar3.svg b/__tests__/integration/snapshots/Scrollbar3.svg index 7bcf2e209..533530aad 100644 --- a/__tests__/integration/snapshots/Scrollbar3.svg +++ b/__tests__/integration/snapshots/Scrollbar3.svg @@ -6,82 +6,77 @@ color-interpolation-filters="sRGB" > - - - - - - + + + + + + - - + + - - + + - + - + diff --git a/__tests__/integration/snapshots/SelectBasic.svg b/__tests__/integration/snapshots/SelectBasic.svg index 7153fa74a..83b8e491f 100644 --- a/__tests__/integration/snapshots/SelectBasic.svg +++ b/__tests__/integration/snapshots/SelectBasic.svg @@ -1,7 +1,7 @@ @@ -19,43 +19,40 @@ /> - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -19,37 +19,32 @@ /> - - - - - + + + + + - + - + 选项2 - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + 1x - + - + - + - - + + - + - - + + - + - - + + @@ -19,43 +19,40 @@ /> - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -19,43 +19,40 @@ /> - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -19,43 +19,40 @@ /> - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - + + 0 @@ -181,53 +170,47 @@ - - - + + + - + - + - - + + 1 diff --git a/__tests__/integration/snapshots/Slider10.svg b/__tests__/integration/snapshots/Slider10.svg index 05334ba69..71a224dc4 100644 --- a/__tests__/integration/snapshots/Slider10.svg +++ b/__tests__/integration/snapshots/Slider10.svg @@ -6,98 +6,101 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - - + + - + - + diff --git a/__tests__/integration/snapshots/Slider11.svg b/__tests__/integration/snapshots/Slider11.svg index 085511491..bb1856042 100644 --- a/__tests__/integration/snapshots/Slider11.svg +++ b/__tests__/integration/snapshots/Slider11.svg @@ -6,76 +6,76 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - - + + - - + + - + - + diff --git a/__tests__/integration/snapshots/Slider12.svg b/__tests__/integration/snapshots/Slider12.svg index ef8289858..fa1260431 100644 --- a/__tests__/integration/snapshots/Slider12.svg +++ b/__tests__/integration/snapshots/Slider12.svg @@ -6,72 +6,63 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - + + 0 @@ -191,22 +174,14 @@ - - - + + + - + - + - - + + 1 diff --git a/__tests__/integration/snapshots/Slider2.svg b/__tests__/integration/snapshots/Slider2.svg index 992b885d6..839d60cef 100644 --- a/__tests__/integration/snapshots/Slider2.svg +++ b/__tests__/integration/snapshots/Slider2.svg @@ -6,44 +6,38 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - - + + - - + + - + - + - - - + + + - + - + - - + + 0 @@ -159,53 +145,47 @@ - - - + + + - + - + - - + + 1 diff --git a/__tests__/integration/snapshots/Slider3.svg b/__tests__/integration/snapshots/Slider3.svg index 765602a0c..8e0e13eb5 100644 --- a/__tests__/integration/snapshots/Slider3.svg +++ b/__tests__/integration/snapshots/Slider3.svg @@ -6,66 +6,63 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - + + 0.25 @@ -185,53 +175,47 @@ - - - + + + - + - + - - + + 0.75 diff --git a/__tests__/integration/snapshots/Slider4.svg b/__tests__/integration/snapshots/Slider4.svg index aea96e0a2..6f255fe66 100644 --- a/__tests__/integration/snapshots/Slider4.svg +++ b/__tests__/integration/snapshots/Slider4.svg @@ -6,66 +6,63 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - - + + - + - + - - - + + + - + - + - - + + 0 @@ -181,53 +170,47 @@ - - - + + + - + - + - - + + 1 diff --git a/__tests__/integration/snapshots/Slider5.svg b/__tests__/integration/snapshots/Slider5.svg index 0a5cd3654..5f7fcb68c 100644 --- a/__tests__/integration/snapshots/Slider5.svg +++ b/__tests__/integration/snapshots/Slider5.svg @@ -6,66 +6,66 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - - + + 0 @@ -239,53 +228,47 @@ - - - + + + - + - + - - + + 1 diff --git a/__tests__/integration/snapshots/Slider6.svg b/__tests__/integration/snapshots/Slider6.svg index 98b0c68cd..4037a0c74 100644 --- a/__tests__/integration/snapshots/Slider6.svg +++ b/__tests__/integration/snapshots/Slider6.svg @@ -6,66 +6,66 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - - + + 0°C @@ -239,53 +228,47 @@ - - - + + + - + - + - - + + 1°C diff --git a/__tests__/integration/snapshots/Slider7.svg b/__tests__/integration/snapshots/Slider7.svg index 5463c0ac9..7344f1082 100644 --- a/__tests__/integration/snapshots/Slider7.svg +++ b/__tests__/integration/snapshots/Slider7.svg @@ -6,44 +6,38 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - - + + - - + + - + - + - - - + + + - + - + - - + + 0°C @@ -159,53 +145,47 @@ - - - + + + - + - + - - + + 1°C diff --git a/__tests__/integration/snapshots/Slider8.svg b/__tests__/integration/snapshots/Slider8.svg index a1a460744..932ae2a30 100644 --- a/__tests__/integration/snapshots/Slider8.svg +++ b/__tests__/integration/snapshots/Slider8.svg @@ -6,66 +6,66 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - - - - - + + + + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + diff --git a/__tests__/integration/snapshots/SliderInvert.svg b/__tests__/integration/snapshots/SliderInvert.svg index fe7f8b3ab..4ad8d6213 100644 --- a/__tests__/integration/snapshots/SliderInvert.svg +++ b/__tests__/integration/snapshots/SliderInvert.svg @@ -6,52 +6,46 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - + - + - - + + - + - + - - - + + + - + - + - + - - + + 0.25 @@ -219,76 +203,65 @@ - - - + + + - + - + - + - - + + 0.75 diff --git a/__tests__/integration/snapshots/SliderTimebar.svg b/__tests__/integration/snapshots/SliderTimebar.svg index 880445201..5d9b5b60b 100644 --- a/__tests__/integration/snapshots/SliderTimebar.svg +++ b/__tests__/integration/snapshots/SliderTimebar.svg @@ -6,84 +6,75 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + diff --git a/__tests__/integration/snapshots/SliderValueType.svg b/__tests__/integration/snapshots/SliderValueType.svg index 91d8f930a..288a032d3 100644 --- a/__tests__/integration/snapshots/SliderValueType.svg +++ b/__tests__/integration/snapshots/SliderValueType.svg @@ -6,52 +6,46 @@ color-interpolation-filters="sRGB" > - - - - - + + + + + - + - + - - + + - + - + - + - + - - + + - + diff --git a/__tests__/integration/snapshots/Sparkline1.svg b/__tests__/integration/snapshots/Sparkline1.svg index a4d6f8274..60d1c77f4 100644 --- a/__tests__/integration/snapshots/Sparkline1.svg +++ b/__tests__/integration/snapshots/Sparkline1.svg @@ -1,32 +1,28 @@ - - - - - + + + + + - - + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline10.svg b/__tests__/integration/snapshots/Sparkline10.svg index 2ccae48ab..63fb1e264 100644 --- a/__tests__/integration/snapshots/Sparkline10.svg +++ b/__tests__/integration/snapshots/Sparkline10.svg @@ -1,392 +1,444 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline11.svg b/__tests__/integration/snapshots/Sparkline11.svg index 2cd01b4c7..7fb493408 100644 --- a/__tests__/integration/snapshots/Sparkline11.svg +++ b/__tests__/integration/snapshots/Sparkline11.svg @@ -1,392 +1,444 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline12.svg b/__tests__/integration/snapshots/Sparkline12.svg index d5a5267a2..02fc3c6d0 100644 --- a/__tests__/integration/snapshots/Sparkline12.svg +++ b/__tests__/integration/snapshots/Sparkline12.svg @@ -1,392 +1,444 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline2.svg b/__tests__/integration/snapshots/Sparkline2.svg index 623590cf2..5f7b878d8 100644 --- a/__tests__/integration/snapshots/Sparkline2.svg +++ b/__tests__/integration/snapshots/Sparkline2.svg @@ -1,52 +1,49 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline3.svg b/__tests__/integration/snapshots/Sparkline3.svg index 42210f0e7..e95e0d08b 100644 --- a/__tests__/integration/snapshots/Sparkline3.svg +++ b/__tests__/integration/snapshots/Sparkline3.svg @@ -1,52 +1,49 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline4.svg b/__tests__/integration/snapshots/Sparkline4.svg index cfd58447a..6aa449fa5 100644 --- a/__tests__/integration/snapshots/Sparkline4.svg +++ b/__tests__/integration/snapshots/Sparkline4.svg @@ -1,32 +1,29 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline5.svg b/__tests__/integration/snapshots/Sparkline5.svg index cb1dc0add..140143216 100644 --- a/__tests__/integration/snapshots/Sparkline5.svg +++ b/__tests__/integration/snapshots/Sparkline5.svg @@ -1,32 +1,29 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline6.svg b/__tests__/integration/snapshots/Sparkline6.svg index 7d4cedcd1..41b5daa5d 100644 --- a/__tests__/integration/snapshots/Sparkline6.svg +++ b/__tests__/integration/snapshots/Sparkline6.svg @@ -1,52 +1,49 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline7.svg b/__tests__/integration/snapshots/Sparkline7.svg index 69ecff5d3..12a485be6 100644 --- a/__tests__/integration/snapshots/Sparkline7.svg +++ b/__tests__/integration/snapshots/Sparkline7.svg @@ -1,52 +1,49 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline8.svg b/__tests__/integration/snapshots/Sparkline8.svg index e99514d8b..31a56c9b6 100644 --- a/__tests__/integration/snapshots/Sparkline8.svg +++ b/__tests__/integration/snapshots/Sparkline8.svg @@ -1,392 +1,444 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Sparkline9.svg b/__tests__/integration/snapshots/Sparkline9.svg index 9c33b15bc..ccac62519 100644 --- a/__tests__/integration/snapshots/Sparkline9.svg +++ b/__tests__/integration/snapshots/Sparkline9.svg @@ -1,392 +1,444 @@ - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/SparklineScaleColumn.svg b/__tests__/integration/snapshots/SparklineScaleColumn.svg index 4529a5d7e..f7e48a6ac 100644 --- a/__tests__/integration/snapshots/SparklineScaleColumn.svg +++ b/__tests__/integration/snapshots/SparklineScaleColumn.svg @@ -1,403 +1,454 @@ - - - - + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -405,11 +456,13 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/SparklineScaleLine.svg b/__tests__/integration/snapshots/SparklineScaleLine.svg index 6f52967a9..5253e0a91 100644 --- a/__tests__/integration/snapshots/SparklineScaleLine.svg +++ b/__tests__/integration/snapshots/SparklineScaleLine.svg @@ -6,9 +6,9 @@ color-interpolation-filters="sRGB" > - - - + + + - + - - - + + + - + - + - + - + - + - + @@ -115,79 +112,76 @@ - + - - - + + + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Switch1.svg b/__tests__/integration/snapshots/Switch1.svg index 96f865e5f..8ad17f4e0 100644 --- a/__tests__/integration/snapshots/Switch1.svg +++ b/__tests__/integration/snapshots/Switch1.svg @@ -6,126 +6,141 @@ color-interpolation-filters="sRGB" > - - - - - - + + + + + + - + - + - - - + + + - + - + - - - + + + - + - + diff --git a/__tests__/integration/snapshots/Tag1.svg b/__tests__/integration/snapshots/Tag1.svg index 16de2fac2..d9056b540 100644 --- a/__tests__/integration/snapshots/Tag1.svg +++ b/__tests__/integration/snapshots/Tag1.svg @@ -6,16 +6,18 @@ color-interpolation-filters="sRGB" > - - - + + + - + - - + + - + - + - - + + - + G6 @@ -121,12 +117,14 @@ - + - - + + - + - - - + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + @@ -970,103 +898,92 @@ - - - - + + + + - - + + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + diff --git a/__tests__/integration/snapshots/TimebarChart.svg b/__tests__/integration/snapshots/TimebarChart.svg index 47cdb9777..df9ac83a6 100644 --- a/__tests__/integration/snapshots/TimebarChart.svg +++ b/__tests__/integration/snapshots/TimebarChart.svg @@ -1,7 +1,7 @@ @@ -55,36 +55,15 @@ /> - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + @@ -1000,103 +934,92 @@ - - - - + + + + - - + + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + - + @@ -2340,103 +2187,92 @@ - - - - + + + + - - + + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - + - + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + @@ -3507,43 +3267,36 @@ - - - - + + + + - - + + - + @@ -3554,163 +3307,183 @@ - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -3719,23 +3492,20 @@ - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + - + @@ -4886,43 +4582,36 @@ - - - - + + + + - - + + - + @@ -4933,163 +4622,183 @@ - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -5098,62 +4807,51 @@ - + - + - - + + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + diff --git a/__tests__/integration/snapshots/TimebarController.svg b/__tests__/integration/snapshots/TimebarController.svg index d0b900345..631c7ebce 100644 --- a/__tests__/integration/snapshots/TimebarController.svg +++ b/__tests__/integration/snapshots/TimebarController.svg @@ -1,7 +1,7 @@ @@ -43,264 +43,229 @@ /> - - - - - + + + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + @@ -308,103 +273,92 @@ - - - - + + + + - - + + - - + + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + @@ -651,99 +598,92 @@ - - - - + + + + - - + + - - + + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + - + @@ -1030,43 +935,36 @@ - - - - + + + + - - + + - + @@ -1078,9 +976,13 @@ - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 1.5x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 2x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + diff --git a/__tests__/integration/snapshots/TimebarHandle.svg b/__tests__/integration/snapshots/TimebarHandle.svg index a35df2f56..8336af0fd 100644 --- a/__tests__/integration/snapshots/TimebarHandle.svg +++ b/__tests__/integration/snapshots/TimebarHandle.svg @@ -6,16 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + - - + + - + - + - + - - + + - + - + - + - - + + - + - + - + - - - - + + + + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + @@ -690,105 +717,104 @@ - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + 1x - + - + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + @@ -1649,105 +1692,104 @@ - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + 1x - + - + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + @@ -2608,105 +2667,104 @@ - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + 1x - + - + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + @@ -3567,105 +3642,104 @@ - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + 1x - + - + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + @@ -4526,105 +4617,104 @@ - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + 1x - + - + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + @@ -5485,105 +5592,104 @@ - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + 1x - + - + - + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + diff --git a/__tests__/integration/snapshots/TimebarTime.svg b/__tests__/integration/snapshots/TimebarTime.svg index bbe4c11c3..ee3ac458f 100644 --- a/__tests__/integration/snapshots/TimebarTime.svg +++ b/__tests__/integration/snapshots/TimebarTime.svg @@ -1,7 +1,7 @@ @@ -43,56 +43,20 @@ /> - - - - - - - - - + + + + + + + + + - - - + + + - - + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + @@ -370,71 +304,65 @@ - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - - - - - - + + + + + + - - - + + + - - + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + - + @@ -874,89 +716,77 @@ - - + + - + - + - - + + - + - + - - + + - + - - - - - - + + + + + + - - - + + + - - + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - + - + - + - + - + @@ -1311,89 +1070,77 @@ - - + + - + - + - - + + - + - + - - + + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 1x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - + 1.5x - + - - - + + + - - + + - + - - + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + diff --git a/__tests__/integration/snapshots/TitleDemo.svg b/__tests__/integration/snapshots/TitleDemo.svg index 0f5b3db3d..6b5b2e3da 100644 --- a/__tests__/integration/snapshots/TitleDemo.svg +++ b/__tests__/integration/snapshots/TitleDemo.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - + + left top @@ -45,7 +41,7 @@ - + - - + + left @@ -80,7 +72,7 @@ - + - - + + left bottom @@ -116,7 +104,7 @@ - + - - + + - + - - + + right top @@ -187,7 +167,7 @@ - + - - + + - + - - + + - + - - + + top @@ -294,7 +262,7 @@ - + - - + + - + - - + + left top start @@ -366,7 +326,7 @@ - + - + left top start diff --git a/__tests__/integration/snapshots/Tooltip1.svg b/__tests__/integration/snapshots/Tooltip1.svg index 9cc181a8e..8641f5f4f 100644 --- a/__tests__/integration/snapshots/Tooltip1.svg +++ b/__tests__/integration/snapshots/Tooltip1.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip10.svg b/__tests__/integration/snapshots/Tooltip10.svg index d5992196b..d6e14329b 100644 --- a/__tests__/integration/snapshots/Tooltip10.svg +++ b/__tests__/integration/snapshots/Tooltip10.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip2.svg b/__tests__/integration/snapshots/Tooltip2.svg index d5992196b..d6e14329b 100644 --- a/__tests__/integration/snapshots/Tooltip2.svg +++ b/__tests__/integration/snapshots/Tooltip2.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip3.svg b/__tests__/integration/snapshots/Tooltip3.svg index d5992196b..d6e14329b 100644 --- a/__tests__/integration/snapshots/Tooltip3.svg +++ b/__tests__/integration/snapshots/Tooltip3.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip4.svg b/__tests__/integration/snapshots/Tooltip4.svg index d5992196b..d6e14329b 100644 --- a/__tests__/integration/snapshots/Tooltip4.svg +++ b/__tests__/integration/snapshots/Tooltip4.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip5.svg b/__tests__/integration/snapshots/Tooltip5.svg index d5992196b..d6e14329b 100644 --- a/__tests__/integration/snapshots/Tooltip5.svg +++ b/__tests__/integration/snapshots/Tooltip5.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip6.svg b/__tests__/integration/snapshots/Tooltip6.svg index d5992196b..d6e14329b 100644 --- a/__tests__/integration/snapshots/Tooltip6.svg +++ b/__tests__/integration/snapshots/Tooltip6.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + diff --git a/__tests__/integration/snapshots/Tooltip7.svg b/__tests__/integration/snapshots/Tooltip7.svg index f8d3e55f5..d2ed19af2 100644 --- a/__tests__/integration/snapshots/Tooltip7.svg +++ b/__tests__/integration/snapshots/Tooltip7.svg @@ -6,10 +6,10 @@ color-interpolation-filters="sRGB" > - - - - + + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/snapshots/Tooltip9.svg b/__tests__/integration/snapshots/Tooltip9.svg index c970f0485..1a1bc35e2 100644 --- a/__tests__/integration/snapshots/Tooltip9.svg +++ b/__tests__/integration/snapshots/Tooltip9.svg @@ -6,905 +6,1105 @@ color-interpolation-filters="sRGB" > - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/__tests__/integration/utils/offscreen-canvas-context.ts b/__tests__/integration/utils/offscreen-canvas-context.ts index 25cf474af..0edb46b47 100644 --- a/__tests__/integration/utils/offscreen-canvas-context.ts +++ b/__tests__/integration/utils/offscreen-canvas-context.ts @@ -121,6 +121,7 @@ export class OffscreenCanvasContext { } measureText(text: string): TextMetrics { + // @ts-ignore return { width: measureText(text, this.fontSize), actualBoundingBoxAscent: 0, diff --git a/__tests__/performance/scripts/main.ts b/__tests__/performance/scripts/main.ts index 3a76f71dc..12599d798 100644 --- a/__tests__/performance/scripts/main.ts +++ b/__tests__/performance/scripts/main.ts @@ -39,7 +39,7 @@ const Cases = { Path: () => { return new Path({ style: { - path: [ + d: [ ['M', 100 * Math.random(), 100 * Math.random()], ['L', 100 * Math.random(), 100 * Math.random()], ['L', 100 * Math.random(), 100 * Math.random()], diff --git a/__tests__/unit/util/scale-to-pixel.spec.ts b/__tests__/unit/util/scale-to-pixel.spec.ts index ad3cc306c..6f95203ef 100644 --- a/__tests__/unit/util/scale-to-pixel.spec.ts +++ b/__tests__/unit/util/scale-to-pixel.spec.ts @@ -23,7 +23,7 @@ describe('scale to pixel', () => { // height: 10 const path1 = new Path({ style: { - path: 'M0,0 L10,10 L20,0 Z', + d: 'M0,0 L10,10 L20,0 Z', }, }); const path1Bbox = path1.getBBox(); @@ -56,7 +56,7 @@ describe('scale to pixel', () => { // height: 10 const path1 = new Path({ style: { - path: 'M0,0 L10,10 L20,0 Z', + d: 'M0,0 L10,10 L20,0 Z', }, }); const path1Bbox = path1.getBBox(); diff --git a/__tests__/utils/render.ts b/__tests__/utils/render.ts index b7492a72f..c378f2911 100644 --- a/__tests__/utils/render.ts +++ b/__tests__/utils/render.ts @@ -23,7 +23,7 @@ export function createCanvas(size = 300, renderer = 'canvas', grid = false) { path.push(['M', i, 0], ['L', i, size]); path.push(['M', 0, i], ['L', size, i]); } - canvas.appendChild(new Path({ style: { lineWidth: 0.5, stroke: '#ddd', lineDash: [gap / 4, gap / 4], path } })); + canvas.appendChild(new Path({ style: { lineWidth: 0.5, stroke: '#ddd', lineDash: [gap / 4, gap / 4], d: path } })); } return canvas; diff --git a/package.json b/package.json index 5905fba13..0cc624e53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@antv/component", - "version": "1.0.1-beta.0", + "version": "2.0.0", "description": "Visualization components for AntV, based on G.", "license": "MIT", "main": "lib/index.js", @@ -44,16 +44,16 @@ "component" ], "dependencies": { - "@antv/g": "^5.18.6", + "@antv/g": "^6.0.0", "@antv/scale": "^0.4.3", "@antv/util": "^3.3.5", "svg-path-parser": "^1.1.0" }, "devDependencies": { - "@antv/g-canvas": "^1.11.5", - "@antv/g-plugin-control": "^1.9.6", - "@antv/g-svg": "^1.10.20", - "@antv/g-webgl": "^1.9.8", + "@antv/g-canvas": "^2.0.0", + "@antv/g-plugin-control": "^2.0.0", + "@antv/g-svg": "^2.0.0", + "@antv/g-webgl": "^2.0.0", "@babel/plugin-proposal-decorators": "^7.20.5", "@babel/plugin-transform-runtime": "^7.17.0", "@babel/preset-env": "^7.16.11", diff --git a/src/animation/utils.ts b/src/animation/utils.ts index cbbdbc7cf..ad1a04fe4 100644 --- a/src/animation/utils.ts +++ b/src/animation/utils.ts @@ -96,25 +96,26 @@ export function transitionShape( const middle = Math.ceil(+duration / 2); const offset = +duration / 4; - const getPosition = (shape: DisplayObject) => { - if (shape.nodeName === 'circle') { - const [cx, cy] = shape.getLocalPosition(); - const r = shape.attr('r'); - return [cx - r, cy - r]; - } - return shape.getLocalPosition(); - }; - - const [sx, sy] = getPosition(source); - const [ex, ey] = getPosition(target); + const { + center: [sx, sy], + } = source.getGeometryBounds(); + const { + center: [ex, ey], + } = target.getGeometryBounds(); const [mx, my] = [(sx + ex) / 2 - sx, (sy + ey) / 2 - sy]; const { opacity: so = 1 } = source.style; const { opacity: to = 1 } = target.style; + + const st = source.style.transform || ''; + const tt = target.style.transform || ''; + // const st = source.style._transform || ''; + // const tt = target.style._transform || ''; + const sourceAnimation = source.animate( [ - { opacity: so, transform: 'translate(0, 0)' }, - { opacity: 0, transform: `translate(${mx}, ${my})` }, + { opacity: so, transform: `translate(0, 0) ${st}` }, + { opacity: 0, transform: `translate(${mx}, ${my}) ${st}` }, ], { fill: 'both', @@ -124,8 +125,8 @@ export function transitionShape( ); const targetAnimation = target.animate( [ - { opacity: 0, transform: `translate(${-mx}, ${-my})`, offset: 0.01 }, - { opacity: to, transform: 'translate(0, 0)' }, + { opacity: 0, transform: `translate(${-mx}, ${-my}) ${tt}`, offset: 0.01 }, + { opacity: to, transform: `translate(0, 0) ${tt}` }, ], { fill: 'both', diff --git a/src/index.ts b/src/index.ts index 02c8391dc..c7e66d288 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,3 @@ -import { runtime } from '@antv/g'; - -runtime.enableCSSParsing = false; - // ui export * from './ui'; diff --git a/src/ui/axis/constant.ts b/src/ui/axis/constant.ts index e35193c92..c7827e391 100644 --- a/src/ui/axis/constant.ts +++ b/src/ui/axis/constant.ts @@ -37,8 +37,7 @@ export const AXIS_BASE_DEFAULT_ATTR: Partial = { lineArrow: () => new Path({ style: { - path: [['M', 10, 10], ['L', -10, 0], ['L', 10, -10], ['L', 0, 0], ['L', 10, 10], ['Z']], - anchor: '0.5 0.5', + d: [['M', 10, 10], ['L', -10, 0], ['L', 10, -10], ['L', 0, 0], ['L', 10, 10], ['Z']], fill: 'black', transformOrigin: 'center', }, diff --git a/src/ui/axis/guides/labels.ts b/src/ui/axis/guides/labels.ts index de73ea300..8878ffe0e 100644 --- a/src/ui/axis/guides/labels.ts +++ b/src/ui/axis/guides/labels.ts @@ -187,24 +187,30 @@ function overlapHandler(attr: Required) { }); } -function renderLabel(container: DisplayObject, datum: any, data: any[], style: any, attr: Required) { +function renderLabel( + container: DisplayObject, + datum: any, + data: any[], + style: any, + attr: Required +): DisplayObject { const index = data.indexOf(datum); const label = select(container) .append(formatter(datum, index, data, attr)) .attr('className', CLASS_NAMES.labelItem.name) .node(); const [labelStyle, { transform, ...groupStyle }] = splitStyle(getCallbackStyle(style, [datum, index, data])); - percentTransform(container, transform); - const rotate = getLabelRotation(datum, container, attr); - container.setLocalEulerAngles(+rotate); + percentTransform(label, transform); + const rotate = getLabelRotation(datum, label, attr); + if (!label.getLocalEulerAngles()) { + label.setLocalEulerAngles(rotate); + } applyTextStyle(label, { ...getLabelStyle(datum.value, rotate, attr), ...labelStyle, }); - // todo G transform 存在问题,需要二次设置 - percentTransform(container, transform); container.attr(groupStyle); return label; } @@ -227,24 +233,30 @@ export function renderLabels( .attr('className', CLASS_NAMES.label.name) .transition(function (datum) { renderLabel(this, datum, data, style, attr); - this.attr(getLabelPos(datum, data, attr)); - this.__bbox__ = datum.bbox; + const { x, y } = getLabelPos(datum, data, attr); + // .axis-label + this.style.transform = `translate(${x}, ${y})`; return null; }) - .call(() => overlapHandler.call(container, attr)), + .call(() => { + overlapHandler.call(container, attr); + }), (update) => update .transition(function (datum) { const prevLabel = this.querySelector(CLASS_NAMES.labelItem.class); const label = renderLabel(this, datum, data, style, attr); const shapeAnimation = transitionShape(prevLabel, label, animate.update); - const animation = transition(this, getLabelPos(datum, data, attr), animate.update); - this.__bbox__ = datum.bbox; + const { x, y } = getLabelPos(datum, data, attr); + const animation = transition(this, { transform: `translate(${x}, ${y})` }, animate.update); return [...shapeAnimation, animation]; + // return [animation]; }) .call((selection) => { const transitions = get(selection, '_transitions').flat().filter(defined) as IAnimation[]; - onAnimatesFinished(transitions, () => overlapHandler.call(container, attr)); + onAnimatesFinished(transitions, () => { + overlapHandler.call(container, attr); + }); }), (exit) => exit.transition(function () { diff --git a/src/ui/axis/guides/line.ts b/src/ui/axis/guides/line.ts index 5639300f1..2bc587958 100644 --- a/src/ui/axis/guides/line.ts +++ b/src/ui/axis/guides/line.ts @@ -101,14 +101,14 @@ function renderArc( return container .selectAll(CLASS_NAMES.line.class) - .data([{ path: getArcPath(startAngle, endAngle, ...center, radius) }], (d, i) => i) + .data([{ d: getArcPath(startAngle, endAngle, ...center, radius) }], (d, i) => i) .join( (enter) => enter .append('path') .attr('className', CLASS_NAMES.line.name) .styles(attr) - .styles({ path: (d: any) => d.path }), + .styles({ d: (d: any) => d.d }), (update) => update .transition(function () { @@ -121,7 +121,7 @@ function renderArc( if (animation) { const layout = () => { const data = get(this.attributes, '__keyframe_data__') as Parameters; - this.style.path = getArcPath(...data); + this.style.d = getArcPath(...data); }; animation.onframe = layout; animation.onfinish = layout; diff --git a/src/ui/axis/guides/ticks.ts b/src/ui/axis/guides/ticks.ts index 7473d4d8f..a991b2b5c 100644 --- a/src/ui/axis/guides/ticks.ts +++ b/src/ui/axis/guides/ticks.ts @@ -77,7 +77,7 @@ function createTick( const tick = createTickEl(select(this), datum, index, data, attr); applyTickStyle(datum, index, data, tick, this, attr, tickAttr); const [x, y] = getValuePos(datum.value, attr); - return transition(this, { x, y }, animate); + return transition(this, { transform: `translate(${x}, ${y})` }, animate); } export function renderTicks( diff --git a/src/ui/axis/guides/title.ts b/src/ui/axis/guides/title.ts index 8566036ca..82903a43e 100644 --- a/src/ui/axis/guides/title.ts +++ b/src/ui/axis/guides/title.ts @@ -32,7 +32,9 @@ function getTitlePosition( halfExtents: [mainHalfWidth, mainHalfHeight], } = mainGroup.node().getLocalBounds(); - const [titleHalfWidth, titleHalfHeight] = titleGroup.node().getLocalBounds().halfExtents; + const { + halfExtents: [titleHalfWidth, titleHalfHeight], + } = titleGroup.node().getLocalBounds(); let [x, y] = [mainX + mainHalfWidth, mainY + mainHalfHeight]; @@ -49,17 +51,16 @@ function getTitlePosition( if (pos.includes('t')) y -= mainHalfHeight + titleHalfHeight + spacingTop; if (pos.includes('r')) x += mainHalfWidth + titleHalfWidth + spacingRight; - if (pos.includes('l')) x -= mainHalfWidth + titleHalfWidth * 2 + spacingLeft; - if (pos.includes('b')) y += mainHalfHeight + titleHalfHeight * 2 + spacingBottom; + if (pos.includes('l')) x -= mainHalfWidth + titleHalfWidth + spacingLeft; + if (pos.includes('b')) y += mainHalfHeight + titleHalfHeight + spacingBottom; return { x, y }; } function inferTransform(n: DisplayObject, direction: string, position: string): string { - const node = n.cloneNode(true); - node.style.transform = 'scale(1, 1)'; - node.style.transform = 'none'; - const { height } = node.getBBox(); + const { halfExtents } = n.getGeometryBounds(); + const height = halfExtents[1] * 2; + if (direction === 'vertical') { if (position === 'left') return `rotate(-90) translate(0, ${height / 2})`; if (position === 'right') return `rotate(-90) translate(0, -${height / 2})`; @@ -75,12 +76,12 @@ function applyTitleStyle( animate: GenericAnimation ) { const style = subStyleProps(attr, 'title'); - const [titleStyle, { transform: specified, ...groupStyle }] = splitStyle(style); + const [titleStyle, { transform: specified, transformOrigin, ...groupStyle }] = splitStyle(style); - title.styles(titleStyle); group.styles(groupStyle); const transform = specified || inferTransform(title.node(), titleStyle.direction, titleStyle.position); + title.styles({ ...titleStyle, transformOrigin }); percentTransform(title.node(), transform); const { x, y } = getTitlePosition( @@ -90,8 +91,7 @@ function applyTitleStyle( attr ); - const animation = transition(group.node(), { x, y }, animate); - percentTransform(title.node(), transform); + const animation = transition(group.node(), { transform: `translate(${x}, ${y})` }, animate); return animation; } diff --git a/src/ui/axis/overlap/autoEllipsis.ts b/src/ui/axis/overlap/autoEllipsis.ts index cc10eb8fc..2ad3044f1 100644 --- a/src/ui/axis/overlap/autoEllipsis.ts +++ b/src/ui/axis/overlap/autoEllipsis.ts @@ -3,7 +3,6 @@ import type { DisplayObject } from '../../../shapes'; import { Text } from '../../../shapes'; import { getFont, measureTextWidth } from '../../../util'; import { AxisStyleProps, EllipsisOverlapCfg } from '../types'; -import { getBBox } from '../utils/bounds'; import { boundTest } from '../utils/test'; export type Utils = { @@ -40,7 +39,7 @@ export default function ellipseLabels( if (isNil(max) || max === Infinity) { max = Math.max.apply( null, - labels.map((d) => getBBox(d).width) + labels.map((d) => d.getBBox().width) ); } // Generally, 100 ticks cost less than 300ms. If cost time exceed, means ticks count is too large to see. diff --git a/src/ui/axis/overlap/autoHide.ts b/src/ui/axis/overlap/autoHide.ts index e04fc4756..3dbe0c6bc 100644 --- a/src/ui/axis/overlap/autoHide.ts +++ b/src/ui/axis/overlap/autoHide.ts @@ -3,7 +3,6 @@ import { defined, getLocalBBox, hide } from '../../../util'; import { isAxisHorizontal, isAxisVertical } from '../guides/line'; import type { AxisStyleProps, HideOverlapCfg } from '../types'; import { boundTest } from '../utils/test'; -import { getBBox } from '../utils/bounds'; type Hide = (item: DisplayObject) => void; type Show = (item: DisplayObject) => void; @@ -32,7 +31,7 @@ export default function hideLabels( const source = labels.slice(); let target = labels.slice(); - const minLabelWidth = Math.min(1, ...labels.map((d) => getBBox(d).width)); + const minLabelWidth = Math.min(1, ...labels.map((d) => d.getBBox().width)); if (attr.type === 'linear' && (isAxisHorizontal(attr) || isAxisVertical(attr))) { const minX = getLocalBBox(labels[0]).left; diff --git a/src/ui/axis/utils/bounds.ts b/src/ui/axis/utils/bounds.ts index 6b2329760..d25bd7f46 100644 --- a/src/ui/axis/utils/bounds.ts +++ b/src/ui/axis/utils/bounds.ts @@ -78,6 +78,9 @@ export class Bounds { } } +/** + * Can't use getBounds directly since we should not use AABB here. + */ export function getBounds(item: DisplayObject, margin?: SeriesAttr) { const angle = item.getEulerAngles() || 0; item.setEulerAngles(0); @@ -85,8 +88,8 @@ export function getBounds(item: DisplayObject, margin?: SeriesAttr) { const { min: [x, y], max: [right, bottom], - } = item.getLocalBounds(); - const { width: w, height: h } = getBBox(item); + } = item.getBounds(); + const { width: w, height: h } = item.getBBox(); let height = h; let dx = 0; @@ -122,11 +125,6 @@ export function getBounds(item: DisplayObject, margin?: SeriesAttr) { const [t = 0, r = 0, b = t, l = r] = parseSeriesAttr(margin); const bounds = new Bounds((dx += x) - l, (dy += y) - t, dx + w + r, dy + height + b); item.setEulerAngles(angle); - return bounds.rotatedPoints(degToRad(angle), anchorX, anchorY); -} -export function getBBox(shape: DisplayObject): DOMRect { - // @ts-ignore - if (shape.__bbox__) return shape.__bbox__; - return shape.getBBox(); + return bounds.rotatedPoints(degToRad(angle), anchorX, anchorY); } diff --git a/src/ui/axis/utils/test.ts b/src/ui/axis/utils/test.ts index 0ec3e46d6..dddabb1b7 100644 --- a/src/ui/axis/utils/test.ts +++ b/src/ui/axis/utils/test.ts @@ -57,8 +57,10 @@ export function boundTest(items: T[], attr: AxisStylePr }; const testIntersect = (prevItem: T, currItem: T) => { - if (!prevItem) return true; - return !intersect(prevItem, currItem, parseSeriesAttr(margin)); + if (!prevItem || !prevItem.firstChild) return true; + // Get the first child of the item(Text). + // @ts-ignore + return !intersect(prevItem.firstChild, currItem.firstChild, parseSeriesAttr(margin)); }; for (const curr of items) { diff --git a/src/ui/breadcrumb/index.ts b/src/ui/breadcrumb/index.ts index a562cf128..902366f67 100644 --- a/src/ui/breadcrumb/index.ts +++ b/src/ui/breadcrumb/index.ts @@ -69,8 +69,7 @@ export class Breadcrumb extends Component { const shape = new Tag({ className: 'breadcrumb-item', style: { - x: cursorX, - y: cursorY, + transform: `translate(${cursorX}, ${cursorY})`, ...tagStyle, text: isNil(datum.text) ? datum.id : datum.text, ...pick(datum, ['marker']), @@ -88,7 +87,7 @@ export class Breadcrumb extends Component { if (!isNil(width)) { const avaliableWidth = width! - right; if (cursorX > avaliableWidth) { - shape.attr({ x: 0, y: cursorY + shapeH }); + shape.attr({ transform: `translateY(${cursorY + shapeH})` }); // 更新光标 cursorX = shapeW; cursorY += shapeH; diff --git a/src/ui/button/index.ts b/src/ui/button/index.ts index efce63dd9..563a9ce20 100644 --- a/src/ui/button/index.ts +++ b/src/ui/button/index.ts @@ -95,8 +95,10 @@ export class Button extends Component { // @todo 处理 markerAlign='right' 的场景. 方案: left marker & right marker 处理为两个 shape, 互相不干扰 public render(attributes: Required, container: Group) { - const { text = '', padding = 0, markerSymbol, markerSpacing = 0 } = attributes; - container.attr('cursor', this.state === 'disabled' ? 'not-allowed' : 'pointer'); + const { text = '', padding = 0, markerSymbol, markerSpacing = 0, x = 0, y = 0 } = attributes; + container.attr({ + cursor: this.state === 'disabled' ? 'not-allowed' : 'pointer', + }); const [pt, pr, pb, pl] = parseSeriesAttr(padding); const height = this.buttonHeight; @@ -106,8 +108,8 @@ export class Button extends Component { const style = { ...markerStyle, symbol: markerSymbol, - x: pl + markerSize / 2, - y: height / 2, + x: x + pl + markerSize / 2, + y: y + height / 2, size: markerSize, }; const markerShape = maybeAppend(container, '.marker', () => new Marker({ className: 'marker', style })) @@ -120,8 +122,8 @@ export class Button extends Component { this.textShape = maybeAppend(container, '.text', 'text') .attr('className', 'text') .styles({ - x: markerSize ? bounds.max[0] + markerSpacing : pl, - y: height / 2, + x: x + (markerSize ? bounds.max[0] + markerSpacing : pl), + y: y + height / 2, ...textStyle, text, textAlign: 'left', @@ -141,6 +143,8 @@ export class Button extends Component { .styles({ zIndex: -1, ...buttonStyle, + x, + y, height, width: pl + (markerSize ? markerSize + markerSpacing : 0) + textBounds.halfExtents[0] * 2 + pr, }); diff --git a/src/ui/button/types.ts b/src/ui/button/types.ts index 01ec2fe60..c0ec59659 100644 --- a/src/ui/button/types.ts +++ b/src/ui/button/types.ts @@ -13,6 +13,8 @@ export type ButtonStyleProps = GroupStyleProps & Partial> & Partial, 'marker'>> > & { + x?: number; + y?: number; type?: 'primary' | 'dashed' | 'link' | 'text' | 'default'; /** * @title 大小 diff --git a/src/ui/checkbox/constant.ts b/src/ui/checkbox/constant.ts index 57f24511b..4a94aa632 100644 --- a/src/ui/checkbox/constant.ts +++ b/src/ui/checkbox/constant.ts @@ -42,7 +42,7 @@ const CHECKED_SHAPE_PATH = [ ] as any; export const CHECKED_SHAPE_STYLE = { - path: CHECKED_SHAPE_PATH, + d: CHECKED_SHAPE_PATH, lineWidth: 1, cursor: 'pointer', }; diff --git a/src/ui/checkbox/index.ts b/src/ui/checkbox/index.ts index dea11041f..2d0b9d29c 100644 --- a/src/ui/checkbox/index.ts +++ b/src/ui/checkbox/index.ts @@ -30,8 +30,6 @@ export class Checkbox extends Component { constructor(options: CheckboxOptions) { super(options, { - x: 0, - y: 0, labelText: '', spacing: 4, checked: false, diff --git a/src/ui/crosshair/base.ts b/src/ui/crosshair/base.ts index 59573f6f3..fe6360810 100644 --- a/src/ui/crosshair/base.ts +++ b/src/ui/crosshair/base.ts @@ -43,7 +43,7 @@ export abstract class CrosshairBase extends C const style = subStyleProps(this.attributes, 'line'); return { ...style, - path: this.crosshairPath, + d: this.crosshairPath, }; } diff --git a/src/ui/crosshair/circle.ts b/src/ui/crosshair/circle.ts index c7161647f..1751d5761 100644 --- a/src/ui/crosshair/circle.ts +++ b/src/ui/crosshair/circle.ts @@ -34,7 +34,7 @@ export class CircleCrosshair extends CrosshairBase { return { id: item.id || `grid-line-${idx}`, - path: getLinePath(item.points, attr), + d: getLinePath(item.points, attr), }; }); return container @@ -90,7 +90,7 @@ function renderGridLine( enter.append('path').each(function (datum, index) { const lineStyle = getCallbackValue( getPrimitiveAttributes({ - path: datum.path, + d: datum.d, ...style, }), [datum, index, lines] @@ -108,7 +108,7 @@ function renderGridLine( update.transition(function (datum, index) { const lineStyle = getCallbackValue( getPrimitiveAttributes({ - path: datum.path, + d: datum.d, ...style, }), [datum, index, lines] @@ -134,7 +134,7 @@ function renderAlternateRegion(container: Selection, data: GridStyleProps for (let idx = 0; idx < data.length - 1; idx++) { const [prev, curr] = [data[idx].points, data[idx + 1].points]; const path = connectPaths(prev, curr, style); - regions.push({ path, fill: getColor(idx) }); + regions.push({ d: path, fill: getColor(idx) }); } return container diff --git a/src/ui/indicator/indicator.ts b/src/ui/indicator/indicator.ts index a926133cc..edbffb060 100644 --- a/src/ui/indicator/indicator.ts +++ b/src/ui/indicator/indicator.ts @@ -58,7 +58,7 @@ export class Indicator extends Component { this.background = select(this.group) .maybeAppendByClassName(CLASS_NAMES.background, 'path') - .styles({ ...style, path }); + .styles({ ...style, d: path }); this.group.appendChild(this.label.node()); } @@ -78,7 +78,8 @@ export class Indicator extends Component { private adjustLayout() { const [dx, dy] = this.point; - this.group.attr('x', -dx).attr('y', -dy); + const { x, y } = this.attributes; + this.group.attr('transform', `translate(${x - dx}, ${y - dy})`); } private getPath(position: Position, bbox: BBox) { diff --git a/src/ui/indicator/types.ts b/src/ui/indicator/types.ts index 9cca3314a..0f98134e8 100644 --- a/src/ui/indicator/types.ts +++ b/src/ui/indicator/types.ts @@ -8,6 +8,8 @@ export type Position = 'top' | 'right' | 'bottom' | 'left'; export type IndicatorStyleProps = GroupStyleProps & PrefixObject & PrefixObject, 'label'> & { + x: number; + y: number; labelText?: T; /** position of indicator related to pointer */ position?: Position; diff --git a/src/ui/layout/layout.ts b/src/ui/layout/layout.ts index 928bfabc5..e8e81a09d 100644 --- a/src/ui/layout/layout.ts +++ b/src/ui/layout/layout.ts @@ -71,6 +71,9 @@ export class Layout extends Group { if (!this.attributes.display || !this.isConnected) return; if (this.children.some((child) => !child.isConnected)) return; try { + const { x, y } = this.attributes; + this.style.transform = `translate(${x}, ${y})`; + const bboxes = calcLayout( this.getAvailableSpace(), this.children.map((child) => (child as DisplayObject).getBBox()), @@ -79,7 +82,7 @@ export class Layout extends Group { this.children.forEach((child, index) => { const { x, y } = bboxes[index]; - (child as DisplayObject).attr({ x, y }); + child.style.transform = `translate(${x}, ${y})`; }); } catch (e) { // do nothing diff --git a/src/ui/layout/types.ts b/src/ui/layout/types.ts index 1da8bf5e8..a9b7a5d8f 100644 --- a/src/ui/layout/types.ts +++ b/src/ui/layout/types.ts @@ -4,6 +4,8 @@ import type { SeriesAttr } from '../../util/series'; export type LayoutStyleProps = GroupStyleProps & LayoutElementConfig & { + x?: number; + y?: number; width: number; height: number; margin?: SeriesAttr; diff --git a/src/ui/legend/category.ts b/src/ui/legend/category.ts index b33754cf7..ad61c5a0d 100644 --- a/src/ui/legend/category.ts +++ b/src/ui/legend/category.ts @@ -44,7 +44,7 @@ export class Category extends Component { const itemStyle = { ...partialItemStyle, width, height, x: 0, y: 0 } as CategoryStyleProps; this.itemsGroup = container .maybeAppendByClassName(CLASS_NAMES.itemsGroup, 'g') - .styles({ x, y, ...groupStyle }); + .styles({ ...groupStyle, transform: `translate(${x}, ${y})` }); const that = this; this.itemsGroup .selectAll(CLASS_NAMES.items.class) @@ -66,7 +66,7 @@ export class Category extends Component { const { showTitle } = this.attributes; if (showTitle) { const { x, y } = this.title.node().getAvailableSpace(); - this.itemsGroup.node().setLocalPosition(x, y); + this.itemsGroup.node().style.transform = `translate(${x}, ${y})`; } } @@ -84,8 +84,9 @@ export class Category extends Component<CategoryStyleProps> { } render(attributes: Required<CategoryStyleProps>, container: Group) { - const { width, height } = attributes; + const { width, height, x = 0, y = 0 } = this.attributes; const ctn = select(container); + container.style.transform = `translate(${x}, ${y})`; this.renderTitle(ctn, width!, height!); diff --git a/src/ui/legend/category/item.ts b/src/ui/legend/category/item.ts index 424304673..c697efd56 100644 --- a/src/ui/legend/category/item.ts +++ b/src/ui/legend/category/item.ts @@ -42,6 +42,8 @@ export type CategoryItemStyleProps = GroupStyleProps & valueText?: ExtendDisplayObject; // if width and height not specific, set it to actual space occurred width?: number; + x?: number; + y?: number; }; export type CategoryItemOptions = ComponentOptions<CategoryItemStyleProps>; @@ -196,7 +198,8 @@ export class CategoryItem extends Component<CategoryItemStyleProps> { // record the scale of marker this.markerGroup.node().scale(1 / this.markerGroup.node().getScale()[0]); - scaleToPixel(this.markerGroup.node(), this.scaleSize, true); + const scale = scaleToPixel(this.markerGroup.node(), this.scaleSize, true); + this.markerGroup.node().style._transform = `scale(${scale})`; }); } @@ -231,18 +234,25 @@ export class CategoryItem extends Component<CategoryItemStyleProps> { }, } = this; const halfHeight = height / 2; - this.markerGroup.styles({ x: markerX, y: halfHeight }); - this.labelGroup.styles({ x: labelX, y: halfHeight }); + + // console.log(this.markerGroup.node().style._transform); + + this.markerGroup.styles({ + transform: `translate(${markerX}, ${halfHeight})${this.markerGroup.node().style._transform}`, + }); + this.labelGroup.styles({ transform: `translate(${labelX}, ${halfHeight})` }); ellipsisIt(this.labelGroup.select(CLASS_NAMES.label.class).node(), Math.ceil(labelWidth)); if (this.showValue) { - this.valueGroup.styles({ x: valueX, y: halfHeight }); + this.valueGroup.styles({ transform: `translate(${valueX}, ${halfHeight})` }); ellipsisIt(this.valueGroup.select(CLASS_NAMES.value.class).node(), Math.ceil(valueWidth)); } } public render(attributes: CategoryItemStyleProps, container: Group) { const ctn = select(container); + const { x = 0, y = 0 } = attributes; + ctn.styles({ transform: `translate(${x}, ${y})` }); this.renderMarker(ctn); this.renderLabel(ctn); this.renderValue(ctn); diff --git a/src/ui/legend/category/items.ts b/src/ui/legend/category/items.ts index 32b467176..7a09390cc 100644 --- a/src/ui/legend/category/items.ts +++ b/src/ui/legend/category/items.ts @@ -36,6 +36,8 @@ export type CategoryItemsStyleProps = GroupStyleProps & data: CategoryItemsDatum[]; orientation?: 'horizontal' | 'vertical'; layout?: 'flex' | 'grid'; + x?: number; + y?: number; width?: number; height?: number; gridRow?: number; diff --git a/src/ui/legend/continuous.ts b/src/ui/legend/continuous.ts index d391cf31d..eea1a5bbd 100644 --- a/src/ui/legend/continuous.ts +++ b/src/ui/legend/continuous.ts @@ -92,7 +92,9 @@ export class Continuous extends Component<ContinuousStyleProps> { /** label */ /** content */ - const contentGroup = select(container).maybeAppendByClassName(CLASS_NAMES.contentGroup, 'g').styles({ x, y }); + const contentGroup = select(container) + .maybeAppendByClassName(CLASS_NAMES.contentGroup, 'g') + .styles({ transform: `translate(${x}, ${y})` }); const labelGroup = contentGroup.maybeAppendByClassName(CLASS_NAMES.labelGroup, 'g').styles({ zIndex: 1 }); ifShow(!!showLabel, labelGroup, (group) => { @@ -268,8 +270,7 @@ export class Continuous extends Component<ContinuousStyleProps> { const { length, size } = this.ribbonShape; const style: Required<RibbonStyleProps> = deepAssign( { - x, - y, + transform: `translate(${x}, ${y})`, length, size, type, @@ -344,22 +345,6 @@ export class Continuous extends Component<ContinuousStyleProps> { this.setHandlePosition('end', max); } - private adjustTitle() { - const { titlePosition, orientation } = this.attributes; - const [title] = this.getElementsByClassName(CLASS_NAMES.title.name); - const handle: Handle = this.handlesGroup.select(`.${this.getHandleClassName('start')}`).node(); - if (!title || !handle) return; - if (titlePosition !== 'top-left' || orientation !== 'horizontal') return; - const { - min: [handleX], - } = handle.getLocalBounds(); - const { - min: [titleX], - } = title.getLocalBounds(); - const diffX = handleX - titleX; - title.style.x = +(this.style.x || 0) + diffX; - } - private cacheHandleBBox: DOMRect | null = null; private get handleBBox() { @@ -391,7 +376,7 @@ export class Continuous extends Component<ContinuousStyleProps> { [ribbonX + ribbonSize * this.handleOffsetRatio, ribbonY + offset] ); const handle: Handle = this.handlesGroup.select(`.${this.getHandleClassName(type)}`).node(); - handle?.update({ x, y, formatter: handleFormatter }); + handle?.update({ transform: `translate(${x}, ${y})`, formatter: handleFormatter }); } private renderIndicator(container: Selection) { diff --git a/src/ui/legend/continuous/ribbon.ts b/src/ui/legend/continuous/ribbon.ts index ca02373a3..a7bb5c3b7 100644 --- a/src/ui/legend/continuous/ribbon.ts +++ b/src/ui/legend/continuous/ribbon.ts @@ -93,7 +93,7 @@ function getClipPath(attr: RequiredRibbonStyleProps): any[] { function renderTrack(container: Selection, attr: RequiredRibbonStyleProps) { const style = subStyleProps(attr, 'track'); - container.maybeAppendByClassName(CLASS_NAMES.track, 'path').styles({ path: getTrackPath(attr), ...style }); + container.maybeAppendByClassName(CLASS_NAMES.track, 'path').styles({ d: getTrackPath(attr), ...style }); } function renderSelection(container: Selection, attr: RequiredRibbonStyleProps) { @@ -102,12 +102,12 @@ function renderSelection(container: Selection, attr: RequiredRibbonStyleProps) { const ribbon = container .maybeAppendByClassName(CLASS_NAMES.selection, 'path') - .styles({ path: getSelectionPath(attr), fill, ...style }); + .styles({ d: getSelectionPath(attr), fill, ...style }); const clipPath = ribbon .maybeAppendByClassName(CLASS_NAMES.clipPath, 'path') - .styles({ path: getClipPath(attr) }) + .styles({ d: getClipPath(attr) }) .node(); - ribbon.style('clip-path', clipPath); + ribbon.style('clipPath', clipPath); } export class Ribbon extends Component<RibbonStyleProps> { diff --git a/src/ui/marker/index.ts b/src/ui/marker/index.ts index ba3f95be9..f209dc0e0 100644 --- a/src/ui/marker/index.ts +++ b/src/ui/marker/index.ts @@ -44,7 +44,8 @@ function getType(symbol: MarkerStyleProps['symbol']): string | null { export class Marker extends Component<MarkerStyleProps> { public render(attributes: Required<MarkerStyleProps>, container: Group) { - const { symbol, size = 16, ...style } = attributes; + const { symbol, size = 16, x = 0, y = 0, transform, transformOrigin, ...style } = attributes; + const type = getType(symbol); ifShow(!!type, select(container), (group) => { group @@ -58,13 +59,13 @@ export class Marker extends Component<MarkerStyleProps> { img: symbol, width: r, height: r, - x: -size, - y: -size, + x: x - size, + y: y - size, }); } else { const r = (size as number) / 2; const symbolFn = isFunction(symbol) ? symbol : Marker.getSymbol(symbol); - selection.styles({ path: symbolFn?.(0, 0, r), ...style }); + selection.styles({ d: symbolFn?.(x, y, r), ...style }); } }); }); diff --git a/src/ui/marker/types.ts b/src/ui/marker/types.ts index 8fd3e87b9..d3e0ec53e 100644 --- a/src/ui/marker/types.ts +++ b/src/ui/marker/types.ts @@ -4,6 +4,8 @@ import type { BaseCustomElementStyleProps } from '../../shapes'; export type FunctionalSymbol = (x: number, y: number, r: number) => any; export type MarkerStyleProps = BaseCustomElementStyleProps & { + x?: number; + y?: number; size?: number; symbol: string | FunctionalSymbol; }; diff --git a/src/ui/navigator/index.ts b/src/ui/navigator/index.ts index 2f259680c..8bb33f2a3 100644 --- a/src/ui/navigator/index.ts +++ b/src/ui/navigator/index.ts @@ -41,6 +41,8 @@ const CLASS_NAMES = classNames( export class Navigator extends Component<NavigatorStyleProps> { constructor(options: NavigatorOptions) { super(options, { + x: 0, + y: 0, animate: { easing: 'linear', duration: 200, @@ -48,7 +50,7 @@ export class Navigator extends Component<NavigatorStyleProps> { }, buttonCursor: 'pointer', buttonFill: 'black', - buttonPath: button(0, 0, 6), + buttonD: button(0, 0, 6), buttonSize: 12, controllerPadding: 5, controllerSpacing: 5, @@ -305,6 +307,8 @@ export class Navigator extends Component<NavigatorStyleProps> { this.updatePageInfo(); + // group.node().style.transform = `translate(${pageWidth + spacing}, ${pageHeight / 2})`; + // put it on the right side of the container group.node().setLocalPosition(pageWidth + spacing, pageHeight / 2); if (whetherToAddEventListener) { @@ -318,6 +322,9 @@ export class Navigator extends Component<NavigatorStyleProps> { } render(attributes: NavigatorStyleProps, container: Group) { + const { x = 0, y = 0 } = attributes; + this.attr('transform', `translate(${x}, ${y})`); + /** * container * |- contentGroup (with clip path) diff --git a/src/ui/navigator/types.ts b/src/ui/navigator/types.ts index 2f98d17ec..2b18b01e9 100644 --- a/src/ui/navigator/types.ts +++ b/src/ui/navigator/types.ts @@ -6,6 +6,8 @@ import type { PrefixObject } from '../../types'; export type NavigatorStyleProps = Omit<RectStyleProps, 'width' | 'height'> & PrefixObject<PathStyleProps & { size?: number }, 'button'> & PrefixObject<TextStyleProps, 'pageNum'> & { + x?: number; + y?: number; animate?: GenericAnimation; /** padding between buttons and page number */ controllerPadding?: number; diff --git a/src/ui/scrollbar/index.ts b/src/ui/scrollbar/index.ts index 162ae3a4e..799814c56 100644 --- a/src/ui/scrollbar/index.ts +++ b/src/ui/scrollbar/index.ts @@ -23,6 +23,8 @@ export class Scrollbar extends Component<ScrollbarStyleProps> { constructor(options: ScrollbarOptions) { super(options, { + x: 0, + y: 0, isRound: true, orientation: 'vertical', padding: [2, 2, 2, 2], @@ -90,11 +92,13 @@ export class Scrollbar extends Component<ScrollbarStyleProps> { } private renderSlider(container: Group) { - const { orientation, trackSize, padding, slidable } = this.attributes; + const { x, y, orientation, trackSize, padding, slidable } = this.attributes; const trackStyle = subStyleProps<RectStyleProps>(this.attributes, 'track'); const selectionStyle = subStyleProps<RectStyleProps>(this.attributes, 'thumb'); const style: SliderStyleProps = { + x, + y, brushable: false, orientation, padding, diff --git a/src/ui/scrollbar/types.ts b/src/ui/scrollbar/types.ts index 76d04a716..cc5d7d7b3 100644 --- a/src/ui/scrollbar/types.ts +++ b/src/ui/scrollbar/types.ts @@ -8,6 +8,8 @@ import type { SliderStyleProps } from '../slider'; export type ScrollbarStyleProps = GroupStyleProps & PrefixObject<RectStyleProps, 'track'> & PrefixObject<RectStyleProps, 'thumb'> & { + x?: number; + y?: number; /** 滑条朝向 */ orientation?: Required<SliderStyleProps>['orientation']; diff --git a/src/ui/select/option.ts b/src/ui/select/option.ts index a4378783d..010dacee1 100644 --- a/src/ui/select/option.ts +++ b/src/ui/select/option.ts @@ -52,7 +52,7 @@ export class Option extends Component<OptionStyleProps> { fill: selected ? this.selectedColor : '#fff', }); // place label - this.label.attr({ x: left, y: (backgroundHeight - labelHeight) / 2 }); + this.label.attr({ transform: `translate(${left}, ${(backgroundHeight - labelHeight) / 2})` }); } constructor(options: OptionOptions) { diff --git a/src/ui/select/select.ts b/src/ui/select/select.ts index 170bf811f..57316875f 100644 --- a/src/ui/select/select.ts +++ b/src/ui/select/select.ts @@ -9,6 +9,8 @@ import type { SelectOptions, SelectStyleProps } from './types'; export class Select extends Component<SelectStyleProps> { static defaultOptions: SelectOptions = { style: { + x: 0, + y: 0, width: 140, height: 32, options: [], @@ -74,10 +76,10 @@ export class Select extends Component<SelectStyleProps> { ); private renderSelect() { - const { width, height, bordered, showDropdownIcon } = this.style; + const { x, y, width, height, bordered, showDropdownIcon } = this.style; const selectStyle = subStyleProps(this.attributes, 'select'); const placeholderStyle = subStyleProps(this.attributes, 'placeholder'); - this.select.attr({ width, height, ...selectStyle, fill: '#fff', strokeWidth: bordered ? 1 : 0 }); + this.select.attr({ x, y, width, height, ...selectStyle, fill: '#fff', strokeWidth: bordered ? 1 : 0 }); const padding = this.dropdownPadding; // dropdown icon const iconSize = 10; @@ -85,7 +87,7 @@ export class Select extends Component<SelectStyleProps> { select(this.select) .maybeAppend('.dropdown-icon', 'path') .style('d', 'M-5,-3.5 L0,3.5 L5,-3.5') - .style('transform', `translate(${width - iconSize - padding[1] - padding[3]}, ${height / 2})`) + .style('transform', `translate(${x + width - iconSize - padding[1] - padding[3]}, ${y + height / 2})`) .style('lineWidth', 1) .style('stroke', this.select.style.stroke); } @@ -93,7 +95,7 @@ export class Select extends Component<SelectStyleProps> { const currentOption = this.style.options?.find((option) => option.value === this.currentValue); // placeholder const finalPlaceholderStyle = { - x: padding[3], + x: x + padding[3], ...placeholderStyle, }; select(this.select) @@ -107,7 +109,7 @@ export class Select extends Component<SelectStyleProps> { .styles(finalPlaceholderStyle) .style('y', function () { const bbox = this.getBBox(); - return (height - bbox.height) / 2; + return y + (height - bbox.height) / 2; }), (update) => update.styles(finalPlaceholderStyle), (exit) => exit.remove() @@ -116,7 +118,7 @@ export class Select extends Component<SelectStyleProps> { // value const labelStyle = subStyleProps(this.attributes, 'optionLabel'); const finalValueStyle = { - x: padding[3], + x: x + padding[3], ...labelStyle, }; @@ -131,7 +133,7 @@ export class Select extends Component<SelectStyleProps> { .styles(finalValueStyle) .style('y', function () { const bbox = this.getBBox(); - return (height - bbox.height) / 2; + return y + (height - bbox.height) / 2; }), (update) => update.styles(finalValueStyle), (exit) => exit.remove() @@ -139,7 +141,7 @@ export class Select extends Component<SelectStyleProps> { } private renderDropdown() { - const { width, height, options, onSelect, open } = this.style; + const { x, y, width, height, options, onSelect, open } = this.style; const dropdownStyle = subStyleProps(this.attributes, 'dropdown'); const optionStyle = subStyleProps(this.attributes, 'option'); const padding = this.dropdownPadding; @@ -193,7 +195,7 @@ export class Select extends Component<SelectStyleProps> { const { spacing } = dropdownStyle; this.dropdown.attr({ - y: height + spacing, + transform: `translate(${x}, ${y + height + spacing})`, width: bbox.width + padding[1] + padding[3], height: bbox.height + padding[0] + padding[2], ...dropdownStyle, diff --git a/src/ui/select/types.ts b/src/ui/select/types.ts index c26f6cebf..3e5bec7b0 100644 --- a/src/ui/select/types.ts +++ b/src/ui/select/types.ts @@ -28,6 +28,10 @@ export type SelectStyleProps = GroupStyleProps & PrefixObject<Omit<RectStyleProps, 'width' | 'height'>, 'dropdown'> & PrefixObject<TextStyleProps, 'option'> & PrefixObject<Omit<OptionStyleProps, 'value' | 'label' | 'selected' | 'onClick'>, 'option'> & { + /** 左上角 X 坐标 */ + x?: number; + /** 左上角 Y 坐标 */ + y?: number; /** 宽度 */ width?: number; /** 高度 */ diff --git a/src/ui/slider/constant.ts b/src/ui/slider/constant.ts index 1f6811679..29c36d5db 100644 --- a/src/ui/slider/constant.ts +++ b/src/ui/slider/constant.ts @@ -20,6 +20,8 @@ export const HANDLE_LABEL_DEFAULT_CFG = { } as const; export const HANDLE_DEFAULT_CFG = { + x: 0, + y: 0, orientation: 'horizontal', showLabel: true, type: 'start', diff --git a/src/ui/slider/handle.ts b/src/ui/slider/handle.ts index 13cd3f51f..ef1584ddb 100644 --- a/src/ui/slider/handle.ts +++ b/src/ui/slider/handle.ts @@ -8,6 +8,8 @@ import { HANDLE_DEFAULT_CFG, HANDLE_ICON_DEFAULT_CFG, HANDLE_LABEL_DEFAULT_CFG } export type HandleType = 'start' | 'end'; export type IconStyleProps = PathStyleProps & { + x?: number; + y?: number; size?: number; radius?: number; shape?: string | ((type: HandleType) => DisplayObject); @@ -19,6 +21,8 @@ export type LabelStyleProps = Partial<TextStyleProps>; export type HandleStyleProps = GroupStyleProps & PrefixStyleProps<LabelStyleProps, 'label'> & PrefixStyleProps<IconStyleProps, 'icon'> & { + x?: number; + y?: number; orientation?: IconStyleProps['orientation']; showLabel?: boolean; spacing?: number; @@ -41,7 +45,7 @@ const CLASS_NAMES = classNames( class HandleIcon extends Component<IconStyleProps> { render(attributes: Required<IconStyleProps>, container: DisplayObject) { - const { size = 10, radius = size / 4, orientation, ...iconStyle } = attributes; + const { x, y, size = 10, radius = size / 4, orientation, ...iconStyle } = attributes; // 默认手柄 const width = size!; const height = width * 2.4; @@ -53,21 +57,20 @@ class HandleIcon extends Component<IconStyleProps> { width, height, radius, - x: -width / 2, - y: -height / 2, + x: x - width / 2, + y: y - height / 2, + transformOrigin: 'center', }); - const x1 = (1 / 3) * width; - const x2 = (2 / 3) * width; - const y1 = (1 / 4) * height; - const y2 = (3 / 4) * height; + const x1 = x + (1 / 3) * width - width / 2; + const x2 = x + (2 / 3) * width - width / 2; + const y1 = y + (1 / 4) * height - height / 2; + const y2 = y + (3 / 4) * height - height / 2; rect.maybeAppendByClassName(`${CLASS_NAMES.iconLine}-1`, 'line').styles({ x1, x2: x1, y1, y2, ...iconStyle }); rect.maybeAppendByClassName(`${CLASS_NAMES.iconLine}-2`, 'line').styles({ x1: x2, x2, y1, y2, ...iconStyle }); - rect.node().setOrigin(width / 2, height / 2); - if (orientation === 'vertical') container.setLocalEulerAngles(90); - else container.setLocalEulerAngles(0); + if (orientation === 'vertical') rect.node().style.transform = 'rotate(90)'; } } @@ -81,8 +84,14 @@ export class Handle extends Component<HandleStyleProps> { } private renderLabel(container: Group) { - const { showLabel } = this.attributes; - const { transform, ...style } = subStyleProps(this.attributes, 'label'); + const { x, y, showLabel } = this.attributes; + const { + x: labelX = 0, + y: labelY = 0, + transform, + transformOrigin, + ...style + } = subStyleProps(this.attributes, 'label'); const [labelStyle, groupStyle] = splitStyle(style, []); const labelGroup = select(container).maybeAppendByClassName(CLASS_NAMES.labelGroup, 'g').styles(groupStyle); @@ -92,7 +101,10 @@ export class Handle extends Component<HandleStyleProps> { ifShow(!!showLabel, labelGroup, (group) => { this.label = group.maybeAppendByClassName(CLASS_NAMES.label, 'text').styles({ ...rest, + x: x + labelX, + y: y + labelY, transform, + transformOrigin, text: `${text}`, }); @@ -107,8 +119,8 @@ export class Handle extends Component<HandleStyleProps> { } private renderIcon(container: Group) { - const { orientation, type } = this.attributes; - const iconStyle = { orientation, ...HANDLE_ICON_DEFAULT_CFG, ...subStyleProps(this.attributes, 'icon') }; + const { x, y, orientation, type } = this.attributes; + const iconStyle = { x, y, orientation, ...HANDLE_ICON_DEFAULT_CFG, ...subStyleProps(this.attributes, 'icon') }; const { iconShape = () => new HandleIcon({ style: iconStyle }) } = this.attributes; const iconGroup = select(container).maybeAppendByClassName(CLASS_NAMES.iconGroup, 'g'); iconGroup diff --git a/src/ui/slider/index.ts b/src/ui/slider/index.ts index 8607a2a78..439970bcf 100644 --- a/src/ui/slider/index.ts +++ b/src/ui/slider/index.ts @@ -83,7 +83,7 @@ export class Slider extends Component<SliderStyleProps> { } private get availableSpace() { - const { padding } = this.attributes; + const { x, y, padding } = this.attributes; const [top, right, bottom, left] = parseSeriesAttr(padding!); const { width, height } = this.shape; return { @@ -96,6 +96,8 @@ export class Slider extends Component<SliderStyleProps> { constructor(options: SliderOptions) { super(options, { + x: 0, + y: 0, animate: { duration: 100, fill: 'both' }, brushable: true, formatter: (val: any) => val.toString(), @@ -167,18 +169,21 @@ export class Slider extends Component<SliderStyleProps> { } private renderTrack(container: Group) { + const { x, y } = this.attributes; const style = subStyleProps(this.attributes, 'track'); this.trackShape = select(container) .maybeAppendByClassName(CLASS_NAMES.track, 'rect') - .styles({ ...this.shape, ...style }); + .styles({ x, y, ...this.shape, ...style }); } private renderBrushArea(container: Group) { - const { brushable } = this.attributes; + const { x, y, brushable } = this.attributes; this.brushArea = select(container) .maybeAppendByClassName(CLASS_NAMES.brushArea, 'rect') .styles({ + x, + y, fill: 'transparent', cursor: brushable ? 'crosshair' : 'default', ...this.shape, @@ -186,11 +191,11 @@ export class Slider extends Component<SliderStyleProps> { } private renderSparkline(container: Group) { - const { orientation } = this.attributes; + const { x, y, orientation } = this.attributes; const sparklineGroup = select(container).maybeAppendByClassName(CLASS_NAMES.sparklineGroup, 'g'); ifShow(orientation === 'horizontal', sparklineGroup, (group) => { - const style = this.sparklineStyle!; + const style = { ...this.sparklineStyle!, x, y }; group.maybeAppendByClassName(CLASS_NAMES.sparkline, () => new Sparkline({ style })).update(style); }); } @@ -232,7 +237,7 @@ export class Slider extends Component<SliderStyleProps> { } private renderSelection(container: Group) { - const { type, selectionType } = this.attributes; + const { x, y, type, selectionType } = this.attributes; this.foregroundGroup = select(container).maybeAppendByClassName(CLASS_NAMES.foreground, 'g'); // value 类型的 slider 不渲染选区 @@ -245,7 +250,10 @@ export class Slider extends Component<SliderStyleProps> { if (selectionType === 'invert') return 'crosshair'; return 'default'; }) - .styles(selectionStyle); + .styles({ + ...selectionStyle, + transform: `translate(${x}, ${y})`, + }); }; const that = this; @@ -381,8 +389,8 @@ export class Slider extends Component<SliderStyleProps> { private inferTextStyle(handleType: HandleType): Record<string, any> { const { orientation } = this.attributes; if (orientation === 'horizontal') return {}; - if (handleType === 'start') return { transform: 'rotate(90)', textAlign: 'start' }; - if (handleType === 'end') return { transform: 'rotate(90)', textAlign: 'end' }; + if (handleType === 'start') return { transformOrigin: 'left center', transform: 'rotate(90)', textAlign: 'start' }; + if (handleType === 'end') return { transformOrigin: 'right center', transform: 'rotate(90)', textAlign: 'end' }; return {}; } @@ -470,8 +478,8 @@ export class Slider extends Component<SliderStyleProps> { } private getHandleStyle(handleType: HandleType): HandleStyleProps { - const { showLabel, showLabelOnInteraction, orientation } = this.attributes; - const handlePosition = this.calcHandlePosition(handleType); + const { x: ox, y: oy, showLabel, showLabelOnInteraction, orientation } = this.attributes; + const { x, y } = this.calcHandlePosition(handleType); const textStyle = this.calcHandleText(handleType); let internalShowLabel = showLabel; @@ -483,7 +491,7 @@ export class Slider extends Component<SliderStyleProps> { return { ...superStyleProps(this.getHandleIconStyle(), 'icon'), ...superStyleProps({ ...this.getHandleLabelStyle(handleType), ...textStyle }, 'label'), - ...handlePosition, + transform: `translate(${x + ox}, ${y + oy})`, orientation, showLabel: internalShowLabel, type: handleType, diff --git a/src/ui/slider/types.ts b/src/ui/slider/types.ts index c4766c50d..1da4b7b6c 100644 --- a/src/ui/slider/types.ts +++ b/src/ui/slider/types.ts @@ -21,6 +21,8 @@ export type SliderStyleProps = GroupStyleProps & PrefixObject<RectStyleProps, 'selection'> & HandleStyleProps & Partial<PrefixStyleProps<Omit<SparklineStyleProps, 'width' | 'height'>, 'sparkline'>> & { + x?: number; + y?: number; /** 动画配置 */ animate?: GenericAnimation; diff --git a/src/ui/sparkline/columns.ts b/src/ui/sparkline/columns.ts index 42618cdda..608b0c1d0 100644 --- a/src/ui/sparkline/columns.ts +++ b/src/ui/sparkline/columns.ts @@ -5,6 +5,8 @@ import { deepAssign, select } from '../../util'; export type ColumnStyleProps = GroupStyleProps; export interface ColumnsStyleProps extends BaseStyleProps { + x?: number; + y?: number; columns: ColumnStyleProps[][]; } @@ -19,7 +21,8 @@ export class Columns extends DisplayObject<ColumnsStyleProps> { } public render(): void { - const { columns } = this.attributes; + const { columns, x, y } = this.attributes; + this.columnsGroup.style.transform = `translate(${x}, ${y})`; select(this.columnsGroup) .selectAll('.column') diff --git a/src/ui/sparkline/index.ts b/src/ui/sparkline/index.ts index e1ec0f7d7..de44df2f3 100644 --- a/src/ui/sparkline/index.ts +++ b/src/ui/sparkline/index.ts @@ -90,13 +90,13 @@ export class Sparkline extends Component<SparklineStyleProps> { lines: lines.map((line, idx) => { return { stroke: this.getColor(idx), - path: smooth ? lineToCurvePath(line) : lineToLinePath(line), + d: smooth ? lineToCurvePath(line) : lineToLinePath(line), ...lineStyle, }; }) as any, areas: areas.map((path, idx) => { return { - path, + d: path, fill: this.getColor(idx), ...areaStyle, }; @@ -155,6 +155,8 @@ export class Sparkline extends Component<SparklineStyleProps> { constructor(options: SparklineOptions) { super(options, { type: 'line', + x: 0, + y: 0, width: 200, height: 20, isStack: false, @@ -173,9 +175,13 @@ export class Sparkline extends Component<SparklineStyleProps> { public render(attributes: Required<SparklineStyleProps>, container: Group) { maybeAppend(container, '.container', 'rect').attr('className', 'container').node(); - const { type } = attributes; + const { type, x, y } = attributes; const className = `spark${type}`; - const style: any = type === 'line' ? this.linesStyle : this.columnsStyle; + const style: any = { + x, + y, + ...(type === 'line' ? this.linesStyle : this.columnsStyle), + }; select(container) .selectAll('.spark') diff --git a/src/ui/sparkline/lines.ts b/src/ui/sparkline/lines.ts index 02a3b17be..9ee08e2a3 100644 --- a/src/ui/sparkline/lines.ts +++ b/src/ui/sparkline/lines.ts @@ -4,6 +4,8 @@ import { DisplayObject, Group } from '../../shapes'; import { deepAssign, select } from '../../util'; export interface LinesStyleProps extends BaseStyleProps { + x?: number; + y?: number; lines: PathStyleProps[]; areas: PathStyleProps[]; } @@ -19,7 +21,8 @@ export class Lines extends DisplayObject<LinesStyleProps> { } public render(): void { - const { lines, areas } = this.attributes; + const { lines, areas, x, y } = this.attributes; + this.style.transform = `translate(${x}, ${y})`; if (lines) this.renderLines(lines); if (areas) this.renderAreas(areas); } diff --git a/src/ui/sparkline/types.ts b/src/ui/sparkline/types.ts index 6b9f4fc99..7493cbc67 100644 --- a/src/ui/sparkline/types.ts +++ b/src/ui/sparkline/types.ts @@ -31,6 +31,8 @@ type ColumnStyleProps = CallableObject<PrefixObject<RectStyleProps, 'column'>, C export type SparklineStyleProps = GroupStyleProps & LineStyleProps & ColumnStyleProps & { + x?: number; + y?: number; color?: string | string[] | ((idx: number) => string); data?: number[] | number[][]; isStack?: boolean; diff --git a/src/ui/switch/index.ts b/src/ui/switch/index.ts index 08e76ba78..3d0cfb6fc 100644 --- a/src/ui/switch/index.ts +++ b/src/ui/switch/index.ts @@ -92,6 +92,7 @@ export class Switch extends Component<SwitchStyleProps> { }); // 增加 整体宽度 需要对 tag 提前渲染获得 width 然后通过 width 计算 x 的位置 + // @ts-ignore const { max, min } = tagShape?.getLocalBounds() || {}; const width = max[0] - min[0] + sizeStyle.radius; const height = max[1] - min[1]; diff --git a/src/ui/switch/types.ts b/src/ui/switch/types.ts index 46ca1ae15..3dfffbfa3 100644 --- a/src/ui/switch/types.ts +++ b/src/ui/switch/types.ts @@ -3,6 +3,8 @@ import type { ComponentOptions } from '../../core'; import type { TagStyleProps } from '../tag'; export type SwitchStyleProps = GroupStyleProps & { + x?: number; + y?: number; /** * @title 大小 * @description switch 开关组件大小。默认为: default, 高度大小等于 22px,宽度默认等于高度的两倍,会随着内部的子元素大小自动调整。 diff --git a/src/ui/tag/index.ts b/src/ui/tag/index.ts index a37225d28..390731117 100644 --- a/src/ui/tag/index.ts +++ b/src/ui/tag/index.ts @@ -23,6 +23,7 @@ function adjust(container: Group, paddingLeft: number, paddingTop: number, align } function getTextPosition(markerShape: Marker, spacing?: number) { + // @ts-ignore const bounds = markerShape.getLocalBounds(); return { diff --git a/src/ui/tag/types.ts b/src/ui/tag/types.ts index a5cf92de3..9f64bc1f4 100644 --- a/src/ui/tag/types.ts +++ b/src/ui/tag/types.ts @@ -6,6 +6,8 @@ import type { MarkerStyleProps } from '../marker'; export type TagStyleProps = GroupStyleProps & PrefixStyleProps<Omit<TextStyleProps, 'x' | 'y' | 'text'>, 'label'> & PrefixStyleProps<Partial<RectStyleProps>, 'background'> & { + x?: number; + y?: number; text?: string; /** 水平对齐方式 */ align?: 'start' | 'center' | 'end'; diff --git a/src/ui/timebar/controller.ts b/src/ui/timebar/controller.ts index 829bfb74d..b4af47b05 100644 --- a/src/ui/timebar/controller.ts +++ b/src/ui/timebar/controller.ts @@ -19,6 +19,8 @@ const componentsMap: Record<Functions | 'split', { new (...args: any): DisplayOb export class Controller extends Component<ControllerStyleProps> { static defaultOptions: ControllerOptions = { style: { + x: 0, + y: 0, width: 300, height: 40, padding: 0, @@ -50,13 +52,13 @@ export class Controller extends Component<ControllerStyleProps> { } private renderBackground() { - const { width, height } = this.style; + const { x, y, width, height } = this.style; const backgroundStyle = subStyleProps(this.attributes, 'background'); - this.background.attr({ width, height, ...backgroundStyle }); + this.background.attr({ x, y, width, height, ...backgroundStyle }); } private renderFunctions() { - const { functions, iconSize, iconSpacing, width, height, align } = this.attributes; + const { functions, iconSize, iconSpacing, x, y, width, height, align } = this.attributes; const { padding: [, right, , left], @@ -85,8 +87,8 @@ export class Controller extends Component<ControllerStyleProps> { components.forEach((name, index) => { const Ctor = componentsMap[name]; const style: Record<string, any> = { - x: index * (iconSize + iconSpacing) + xOffset, - y: height / 2, + x: x + index * (iconSize + iconSpacing) + xOffset, + y: y + height / 2, size: iconSize, }; @@ -105,11 +107,9 @@ export class Controller extends Component<ControllerStyleProps> { if (Ctor === SpeedSelect) { // SpeedSelect 直接插入到 canvas - const { x: baseX, y: baseY } = this.getBBox(); - const { x, y } = style; const canvas = this.ownerDocument?.defaultView; if (canvas) { - this.speedSelect = new Ctor({ style: { ...style, zIndex: 100, x: baseX + x, y: baseY + y } }) as SpeedSelect; + this.speedSelect = new Ctor({ style: { ...style, zIndex: 100 } }) as SpeedSelect; (canvas as unknown as Canvas).appendChild(this.speedSelect); } } else { diff --git a/src/ui/timebar/handle.ts b/src/ui/timebar/handle.ts index 4018878d3..3d7fd4905 100644 --- a/src/ui/timebar/handle.ts +++ b/src/ui/timebar/handle.ts @@ -40,6 +40,10 @@ type ChartModeHandleStyleProps = GroupStyleProps & PrefixObject<Omit<RectStyleProps, 'x' | 'y' | 'width' | 'height'>, 'background'> & PrefixObject<Omit<LineStyleProps, 'x1' | 'y1' | 'x2' | 'y2'>, 'icon'> & PrefixObject<Omit<LineStyleProps, 'x1' | 'y1' | 'x2' | 'y2'>, 'border'> & { + x?: number; + y?: number; + width?: number; + height?: number; /** 图标尺寸 */ iconSize?: number; type: HandleType; @@ -48,6 +52,8 @@ type ChartModeHandleOptions = ComponentOptions<ChartModeHandleStyleProps>; export class ChartModeHandle extends Component<ChartModeHandleStyleProps> { static defaultOptions: ChartModeHandleOptions = { style: { + x: 0, + y: 0, width: 10, height: 50, iconSize: 10, @@ -62,41 +68,41 @@ export class ChartModeHandle extends Component<ChartModeHandleStyleProps> { }; private renderBackground() { - const { width, height } = this.attributes; + const { x, y, width, height } = this.attributes; const style = subStyleProps(this.attributes, 'background'); select(this) .maybeAppend('background', 'rect') .attr('className', 'background') - .styles({ x: -width / 2, y: -height / 2, width, height, ...style }); + .styles({ x: x - width / 2, y: y - height / 2, width, height, ...style }); } private renderIcon() { - const { iconSize } = this.attributes; + const { x, y, iconSize } = this.attributes; const style = subStyleProps(this.attributes, 'icon'); const diffX = 1; const diffY = iconSize / 2; select(this) .maybeAppend('icon-left-line', 'line') .attr('className', 'icon-left-line') - .styles({ x1: -diffX, y1: -diffY, x2: -diffX, y2: diffY, ...style }); + .styles({ x1: x - diffX, y1: y - diffY, x2: x - diffX, y2: y + diffY, ...style }); select(this) .maybeAppend('icon-right-line', 'line') .attr('className', 'icon-right-line') - .styles({ x1: diffX, y1: -diffY, x2: diffX, y2: diffY, ...style }); + .styles({ x1: x + diffX, y1: y - diffY, x2: x + diffX, y2: y + diffY, ...style }); } private renderBorder() { - const { width, height, type } = this.attributes; + const { x: xx, y, width, height, type } = this.attributes; const style = subStyleProps(this.attributes, 'border'); const x = type === 'start' ? +width / 2 : -width / 2; select(this) .maybeAppend('border', 'line') .attr('className', 'border') .styles({ - x1: x, - y1: -height / 2, - x2: x, - y2: +height / 2, + x1: x + xx, + y1: y - height / 2, + x2: x + xx, + y2: y + height / 2, ...style, }); } diff --git a/src/ui/timebar/icons.ts b/src/ui/timebar/icons.ts index 65f959715..bfd70892c 100644 --- a/src/ui/timebar/icons.ts +++ b/src/ui/timebar/icons.ts @@ -66,10 +66,10 @@ export abstract class IconBase<T extends Record<string, any> = {}> extends Compo } protected renderBackground() { - const { size } = this.attributes; + const { x, y, size } = this.attributes; const halfSize = size / 2; const backgroundStyle = subStyleProps(this.attributes, 'background'); - this.background.attr({ x: -halfSize, y: -halfSize, width: size, height: size, ...backgroundStyle }); + this.background.attr({ x: x - halfSize, y: y - halfSize, width: size, height: size, ...backgroundStyle }); } protected showIndicator() { @@ -161,8 +161,7 @@ const arrow = (size: number, color: string = '#565758') => { return new Path({ style: { fill: color, - anchor: '0.5 0.5', - path: `M ${size},${size} L -${size},0 L ${size},-${size} Z`, + d: `M ${size},${size} L -${size},0 L ${size},-${size} Z`, transformOrigin: 'center', }, }); @@ -183,7 +182,7 @@ export class Reset extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const size = this.iconSize; const { lineWidth } = this; const arrowSize = lineWidth + 0.5; @@ -193,7 +192,7 @@ export class Reset extends IconBase { .styles({ stroke: color, lineWidth, - path: this.arcPath(0, 0, size / 2 - lineWidth), + d: this.arcPath(x, y, size / 2 - lineWidth), markerStart: arrow(arrowSize, color), }); } @@ -206,19 +205,19 @@ export class Backward extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const size = this.iconSize; const deltaX = size / 2; const deltaY = size / 2 / 3 ** 0.5; const points: PolygonStyleProps['points'] = [ - [0, 0], - [0, -deltaY], - [-deltaX, 0], - [0, deltaY], - [0, 0], - [deltaX, -deltaY], - [deltaX, deltaY], - [0, 0], + [x, y], + [x, y - deltaY], + [x - deltaX, y], + [x, y + deltaY], + [x, y], + [x + deltaX, y - deltaY], + [x + deltaX, y + deltaY], + [x, y], ]; select(this.icon).maybeAppend('.backward', 'polygon').styles({ points, @@ -234,19 +233,19 @@ export class Forward extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const size = this.iconSize; const deltaX = size / 2; const deltaY = size / 2 / 3 ** 0.5; const points: PolygonStyleProps['points'] = [ - [0, 0], - [0, -deltaY], - [deltaX, 0], - [0, deltaY], - [0, 0], - [-deltaX, -deltaY], - [-deltaX, deltaY], - [0, 0], + [x, y], + [x, y - deltaY], + [x + deltaX, y], + [x, y + deltaY], + [x, y], + [x - deltaX, y - deltaY], + [x - deltaX, y + deltaY], + [x, y], ]; select(this.icon).maybeAppend('.forward', 'polygon').styles({ points, @@ -261,14 +260,14 @@ export class Play extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const size = this.iconSize; const deltaX = (size / 3) * 3 ** 0.5 * 0.8; const points: PolygonStyleProps['points'] = [ - [deltaX, 0], - [-deltaX / 2, -(size / 2) * 0.8], - [-deltaX / 2, (size / 2) * 0.8], - [deltaX, 0], + [x + deltaX, y], + [x - deltaX / 2, y - (size / 2) * 0.8], + [x - deltaX / 2, y + (size / 2) * 0.8], + [x + deltaX, y], ]; select(this.icon).maybeAppend('.play', 'polygon').styles({ points, @@ -283,19 +282,19 @@ export class Pause extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const size = this.iconSize; const deltaX = size / 3; const points: PolygonStyleProps['points'] = [ - [-deltaX, -size / 2], - [-deltaX, size / 2], - [-deltaX / 2, size / 2], - [-deltaX / 2, -size / 2], - [-deltaX, -size / 2], - [deltaX / 2, -size / 2], - [deltaX / 2, size / 2], - [deltaX, size / 2], - [deltaX, -size / 2], + [x - deltaX, y - size / 2], + [x - deltaX, y + size / 2], + [x - deltaX / 2, y + size / 2], + [x - deltaX / 2, y - size / 2], + [x - deltaX, y - size / 2], + [x + deltaX / 2, y - size / 2], + [x + deltaX / 2, y + size / 2], + [x + deltaX, y + size / 2], + [x + deltaX, y - size / 2], ]; select(this.icon).maybeAppend('.pause', 'polygon').styles({ points, @@ -311,17 +310,17 @@ export class Range extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const { iconSize: size, lineWidth } = this; const gap = lineWidth; select(this.icon) .maybeAppend('.left-line', 'line') .styles({ - x1: -size / 2, - y1: -size / 2, - x2: -size / 2, - y2: size / 2, + x1: x - size / 2, + y1: y - size / 2, + x2: x - size / 2, + y2: y + size / 2, stroke: color, lineWidth, }); @@ -329,10 +328,10 @@ export class Range extends IconBase { select(this.icon) .maybeAppend('.right-line', 'line') .styles({ - x1: size / 2, - y1: -size / 2, - x2: size / 2, - y2: size / 2, + x1: x + size / 2, + y1: y - size / 2, + x2: x + size / 2, + y2: y + size / 2, stroke: color, lineWidth, }); @@ -340,10 +339,10 @@ export class Range extends IconBase { select(this.icon) .maybeAppend('.left-arrow', 'line') .styles({ - x1: 0, - y1: 0, - x2: -size / 2 + gap * 2, - y2: 0, + x1: x, + y1: y, + x2: x - size / 2 + gap * 2, + y2: y, stroke: color, lineWidth, markerEnd: arrow(lineWidth * 2, color), @@ -352,10 +351,10 @@ export class Range extends IconBase { select(this.icon) .maybeAppend('.right-arrow', 'line') .styles({ - x1: 0, - y1: 0, - x2: size / 2 - gap * 2, - y2: 0, + x1: x, + y1: y, + x2: x + size / 2 - gap * 2, + y2: y, stroke: color, lineWidth, markerEnd: arrow(lineWidth * 2, color), @@ -370,16 +369,16 @@ export class Value extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const { iconSize: size, lineWidth } = this; select(this.icon) .maybeAppend('.line', 'line') .styles({ - x1: 0, - y1: -size / 2, - x2: 0, - y2: size / 2, + x1: x, + y1: y - size / 2, + x2: x, + y2: y + size / 2, stroke: color, lineWidth, }); @@ -389,10 +388,10 @@ export class Value extends IconBase { select(this.icon) .maybeAppend('.left-arrow', 'line') .styles({ - x1: -size / 2 - gap * 2, - y1: 0, - x2: -gap * 2, - y2: 0, + x1: x - size / 2 - gap * 2, + y1: y, + x2: x - gap * 2, + y2: y, stroke: color, lineWidth, markerEnd: arrow(lineWidth * 2, color), @@ -401,10 +400,10 @@ export class Value extends IconBase { select(this.icon) .maybeAppend('.right-arrow', 'line') .styles({ - x1: size / 2 + gap * 2, - y1: 0, - x2: gap * 2, - y2: 0, + x1: x + size / 2 + gap * 2, + y1: y, + x2: x + gap * 2, + y2: y, stroke: color, lineWidth, markerEnd: arrow(lineWidth * 2, color), @@ -426,18 +425,18 @@ export class LineChart extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const { iconSize: size, lineWidth } = this; const gap = lineWidth; const deltaX = (size - gap * 2 - lineWidth) / 4; const deltaY = (size - gap * 2 - lineWidth) / 2; - const [ox, oy] = [-size / 2 + gap, size / 2 - gap * 2]; + const [ox, oy] = [x - size / 2 + gap, y + size / 2 - gap * 2]; select(this.icon) .maybeAppend('.coordinate', 'polyline') .styles({ - points: getCoordinatePoints(size), + points: getCoordinatePoints(size).map(([px, py]) => [px + x, py + y]), stroke: color, lineWidth, }); @@ -468,18 +467,18 @@ export class BarChart extends IconBase { renderIcon() { const { data } = this; - const { color } = this.attributes; + const { x, y, color } = this.attributes; const { iconSize: size, lineWidth } = this; const gap = lineWidth; const deltaX = (size - gap) / data.length; const deltaY = (size - gap * 2) / 4; - const [ox, oy] = [-size / 2 + gap * 2, size / 2 - gap]; + const [ox, oy] = [x - size / 2 + gap * 2, y + size / 2 - gap]; select(this.icon) .maybeAppend('.coordinate', 'polyline') .styles({ - points: getCoordinatePoints(size), + points: getCoordinatePoints(size).map(([px, py]) => [px + x, py + y]), stroke: color, lineWidth, }); @@ -514,15 +513,15 @@ export class Split extends IconBase { } renderIcon() { - const { color } = this.attributes; + const { x, y, color } = this.attributes; const { iconSize: size, lineWidth } = this; select(this.icon) .maybeAppend('.split', 'line') .styles({ - x1: 0, - y1: -size / 2, - x2: 0, - y2: size / 2, + x1: x, + y1: y - size / 2, + x2: x, + y2: y + size / 2, stroke: color, lineWidth, }); @@ -540,16 +539,24 @@ export class SpeedSelect extends IconBase<{ speed?: number; onSelect: SelectStyl renderIcon() { const { iconSize } = this; - const { speed = 1 } = this.attributes; - const inheritStyle = omit(this.attributes as any, ['x', 'y', 'width', 'height', 'size', 'color', 'speed']); + const { x, y, speed = 1 } = this.attributes; + const inheritStyle = omit(this.attributes as any, [ + 'x', + 'y', + 'transform', + 'transformOrigin', + 'width', + 'height', + 'size', + 'color', + 'speed', + ]); const width = clamp(iconSize, 20, Infinity); const height = 20; - const x = -width / 2; - const y = -height / 2; const style: SelectStyleProps = { ...inheritStyle, - x, - y, + x: x - width / 2, + y: y - height / 2, width, height, defaultValue: speed, @@ -605,7 +612,7 @@ export abstract class ToggleIcon<T extends string> extends Component<ToggleIconS } render() { - const { x, y, onChange, ...restStyles } = this.attributes; + const { onChange, ...restStyles } = this.attributes; select(this.icon) .selectAll('.icon') .data([this.currentType]) diff --git a/src/ui/timebar/timebar.ts b/src/ui/timebar/timebar.ts index 2d8b138d0..d5c4144fd 100644 --- a/src/ui/timebar/timebar.ts +++ b/src/ui/timebar/timebar.ts @@ -18,6 +18,8 @@ type States = Pick<TimebarStyleProps, 'speed' | 'selectionType' | 'chartType' | export class Timebar extends Component<TimebarStyleProps> { static defaultOptions: TimebarOptions = { style: { + x: 0, + y: 0, axisLabelFill: '#6e6e6e', axisLabelTextAlign: 'left', axisLabelTextBaseline: 'top', @@ -75,10 +77,10 @@ export class Timebar extends Component<TimebarStyleProps> { /** 计算空间分配 */ private get space() { - const { width, height, type, controllerHeight } = this.attributes; + const { x, y, width, height, type, controllerHeight } = this.attributes; const availableTimelineHeight = clamp(+height - controllerHeight, 0, +height); - const controllerBBox = new BBox(0, +height - controllerHeight, +width, controllerHeight); + const controllerBBox = new BBox(x, y + +height - controllerHeight, +width, controllerHeight); // chart 模式下可用 let axisBBox: BBox; @@ -86,13 +88,13 @@ export class Timebar extends Component<TimebarStyleProps> { if (type === 'chart') { // axis 默认分配高度为 35 axisHeight = 35; - axisBBox = new BBox(0, availableTimelineHeight - axisHeight, +width, axisHeight); + axisBBox = new BBox(x, y + availableTimelineHeight - axisHeight, +width, axisHeight); } else axisBBox = new BBox(); const timelineHeight = type === 'time' ? 10 : availableTimelineHeight; const timelineBBox = new BBox( - 0, - type === 'time' ? availableTimelineHeight : availableTimelineHeight - timelineHeight, + x, + y + (type === 'time' ? availableTimelineHeight : availableTimelineHeight - timelineHeight), +width, timelineHeight - axisHeight ); @@ -210,8 +212,9 @@ export class Timebar extends Component<TimebarStyleProps> { if (typeof time === 'number') return parseBySeries(time); return formatTime(time, 'YYYY-MM-DD HH:mm:ss'); }, - x, - y, + transform: `translate(${x}, ${y})`, + // x, + // y, zIndex: 1, ...userDefinedChartStyle, }; @@ -237,8 +240,9 @@ export class Timebar extends Component<TimebarStyleProps> { trackSize: height, type: selectionType, values: this.sliderValues, - x, - y, + // x, + // y, + transform: `translate(${x}, ${y})`, zIndex: 1, ...userDefinedChartStyle, }; diff --git a/src/ui/timebar/types.ts b/src/ui/timebar/types.ts index 23fb51c8e..afc41f0b1 100644 --- a/src/ui/timebar/types.ts +++ b/src/ui/timebar/types.ts @@ -8,6 +8,8 @@ import type { LinearAxisStyleProps } from '../axis/types'; export type Functions = 'reset' | 'speed' | 'backward' | 'playPause' | 'forward' | 'selectionType' | 'chartType'; export type ControllerStyleProps = GroupStyleProps & PrefixObject<BaseStyleProps, 'background'> & { + x?: number; + y?: number; width: number; height: number; padding?: SeriesAttr; @@ -72,6 +74,8 @@ export type TimebarStyleProps = GroupStyleProps & PrefixObject<Omit<LinearAxisStyleProps, 'type' | 'startPos' | 'endPos' | 'data'>, 'axis'> & Pick<ControllerStyleProps, UnvarnishedControllerProps> & PrefixObject<Omit<ControllerStyleProps, 'width' | 'onChange' | UnvarnishedControllerProps>, 'controller'> & { + x?: number; + y?: number; /** * 类型 * @description time 时间轴 diff --git a/src/ui/tooltip/types.ts b/src/ui/tooltip/types.ts index 5a8249686..294f1d859 100644 --- a/src/ui/tooltip/types.ts +++ b/src/ui/tooltip/types.ts @@ -20,6 +20,8 @@ export type TooltipItem = { }; export type TooltipStyleProps = GroupStyleProps & { + x?: number; + y?: number; /* 项目 */ data?: TooltipItem[]; /** 标题 */ diff --git a/src/util/offscreen.ts b/src/util/offscreen.ts index 945b7b1b4..7f4a97ec4 100644 --- a/src/util/offscreen.ts +++ b/src/util/offscreen.ts @@ -6,6 +6,7 @@ import { hide } from './visibility'; class OffscreenGroup extends Group { constructor(...args: any[]) { super(...args); + this.isMutationObserved = true; this.addEventListener(ElementEvent.INSERTED, () => { hide(this); }); diff --git a/src/util/primitive.ts b/src/util/primitive.ts index c66d504dc..920f340f9 100644 --- a/src/util/primitive.ts +++ b/src/util/primitive.ts @@ -1,11 +1,8 @@ export const PRIMILTIVE_ATTRIBUTES = [ '$el', - 'anchor', 'cx', 'cy', 'd', - 'defX', - 'defY', 'dx', 'dy', 'fill', diff --git a/src/util/scale-to-pixel.ts b/src/util/scale-to-pixel.ts index 94a7d3656..ec5e157cf 100644 --- a/src/util/scale-to-pixel.ts +++ b/src/util/scale-to-pixel.ts @@ -6,6 +6,8 @@ import type { DisplayObject } from '../shapes'; export function scaleToPixel(el: DisplayObject, size: number, applyScale = false) { const { width, height } = el.getBBox(); const scale = size / Math.max(width, height); - if (applyScale) el.scale(scale); + if (applyScale) { + el.style.transform = `scale(${scale})`; + } return scale; }