Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(v6): use d3 v6 build with webpack 5 #1025

Open
wants to merge 1 commit into
base: release/3.0.0-rc6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ node_modules
demos/build

# Builds
sandbox/build
sandbox/build/
dist
docs
*.tgz
Expand Down
16 changes: 8 additions & 8 deletions demos/css/britecharts.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.vertical-grid-line,
.horizontal-grid-line {
fill: none;
shape-rendering: crispEdges;
shape-rendering: crispedges;
stroke: #eff2f5;
stroke-dasharray: 4, 4;
stroke-width: 1; }
Expand All @@ -36,13 +36,13 @@
.extended-y-line,
.extended-x-line {
fill: none;
shape-rendering: crispEdges;
shape-rendering: crispedges;
stroke: #adb0b6;
stroke-width: 1; }

.tick line {
fill: none;
shape-rendering: crispEdges;
shape-rendering: crispedges;
stroke: #adb0b6;
stroke-width: 1; }

Expand Down Expand Up @@ -96,7 +96,7 @@
transition: opacity 0.2s ease-out; }

.bar-chart .bar {
shape-rendering: crispEdges; }
shape-rendering: crispedges; }

.bar-chart .y-axis-group text {
font-size: 14px; }
Expand Down Expand Up @@ -127,7 +127,7 @@
display: none; }

.line-chart .custom-line {
shape-rendering: crispEdges;
shape-rendering: crispedges;
stroke-width: 1; }

.line-chart .custom-line-annotation {
Expand Down Expand Up @@ -173,7 +173,7 @@

.stacked-area .area-outline {
fill: none;
shape-rendering: geometricPrecision;
shape-rendering: geometricprecision;
stroke-width: 1.2; }

.stacked-area .data-point-highlighter {
Expand Down Expand Up @@ -205,7 +205,7 @@

.step-chart .step {
fill: #8fdad8;
shape-rendering: crispEdges;
shape-rendering: crispedges;
stroke-width: 0; }
.step-chart .step:hover {
fill: #39c2c9; }
Expand Down Expand Up @@ -235,7 +235,7 @@
display: none; }

.bullet-chart .marker-line {
shape-rendering: crispEdges; }
shape-rendering: crispedges; }

.bullet-chart .axis-group path {
display: none; }
Expand Down
2 changes: 1 addition & 1 deletion demos/src/demo-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function createHorizontalBarChart() {
barContainer.datum(dataset).call(barChart);

tooltipContainer = select(
'.js-horizontal-bar-chart-container .bar-chart .metadata-group'
'.js-horizontal-bar-chart-container .bar-chart .metadata-group',
);
tooltipContainer.datum([]).call(tooltip);
}
Expand Down
8 changes: 4 additions & 4 deletions demos/src/demo-brush.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { select, event } from 'd3-selection';
import { select } from 'd3-selection';
import { timeFormat } from 'd3-time-format';
// import PubSub from 'pubsub-js';

Expand Down Expand Up @@ -133,7 +133,7 @@ if (select('.js-brush-chart-container').node()) {
? brushContainer.node().getBoundingClientRect().width
: false;
const missingDataBrushContainer = select(
'.js-other-brush-chart-container'
'.js-other-brush-chart-container',
);
const missingDataContainerWidth = missingDataBrushContainer.node()
? missingDataBrushContainer.node().getBoundingClientRect().width
Expand All @@ -152,11 +152,11 @@ if (select('.js-brush-chart-container').node()) {
// Redraw charts on window resize
// PubSub.subscribe('resize', redrawCharts);

select('#clear-selection').on('click', function (e) {
select('#clear-selection').on('click', function (event) {
brushChart.dateRange([null, null]);
event.preventDefault();
});
select('#other-clear-selection').on('click', function (e) {
select('#other-clear-selection').on('click', function (event) {
missingDataBrushChart.dateRange([null, null]);
event.preventDefault();
});
Expand Down
2 changes: 1 addition & 1 deletion demos/src/demo-bullet.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ if (select('.js-bullet-chart-container').node()) {
'.bullet-chart',
function (newSchema) {
createBulletChart(newSchema);
}
},
);
}
11 changes: 5 additions & 6 deletions demos/src/demo-color.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function createColors() {

Object.keys(colorSchemas).forEach((colorPalette) => {
const paletteDiv = document.getElementById(
`js-palette-${colorPalette}`
`js-palette-${colorPalette}`,
);

paletteDiv.style.display = 'flex';
Expand All @@ -28,14 +28,13 @@ function createGradients() {

Object.keys(colorGradients).forEach((colorGradient) => {
const gradientDiv = document.getElementById(
`js-gradient-${colorGradient}`
`js-gradient-${colorGradient}`,
);

gradientDiv.style.display = 'flex';

let [gradientStartColor, gradientEndColor] = colorGradients[
colorGradient
];
let [gradientStartColor, gradientEndColor] =
colorGradients[colorGradient];
const div = document.createElement('div');

div.style.width = '900px';
Expand All @@ -49,7 +48,7 @@ function createGradients() {
function createSingleColors() {
const { singleColors } = colors;
const colorsDiv = document.getElementsByClassName(
'js-single-color-container'
'js-single-color-container',
)[0];

colorsDiv.style.display = 'flex';
Expand Down
6 changes: 3 additions & 3 deletions demos/src/demo-donut.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function getVerticalLegendChart(dataset, optionalColorSchema) {

if (containerWidth) {
select(
'.js-vertical-legend-no-quantity-container .britechart-legend'
'.js-vertical-legend-no-quantity-container .britechart-legend',
).remove();

legendChart.width(containerWidth).height(100);
Expand Down Expand Up @@ -159,7 +159,7 @@ function createDonutWithHighlightSliceChart() {
delete item.quantity;

return item;
}
},
),
legendChart = getVerticalLegendChart(dataNoQuantity),
donutChart = donut(),
Expand Down Expand Up @@ -232,6 +232,6 @@ if (select('.js-donut-chart-container').node()) {
colorSelectorHelper.createColorSelector(
'.js-color-selector-container',
'.donut-chart',
createDonutChart
createDonutChart,
);
}
8 changes: 4 additions & 4 deletions demos/src/demo-grouped-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ function creategroupedBarChartWithTooltip(optionalColorSchema) {
// Note that if the viewport width is less than the tooltipThreshold value,
// this container won't exist, and the tooltip won't show up
tooltipContainer = select(
'.js-grouped-bar-chart-tooltip-container .metadata-group'
'.js-grouped-bar-chart-tooltip-container .metadata-group',
);
tooltipContainer.datum([]).call(chartTooltip);

select('#button').on('click', function () {
groupedBar.exportChart(
'grouped-bar.png',
'Britecharts Grouped Bar'
'Britecharts Grouped Bar',
);
});
}
Expand Down Expand Up @@ -157,7 +157,7 @@ function createHorizontalgroupedBarChart(optionalColorSchema) {
// Note that if the viewport width is less than the tooltipThreshold value,
// this container won't exist, and the tooltip won't show up
tooltipContainer = select(
'.js-grouped-bar-chart-fixed-container .metadata-group'
'.js-grouped-bar-chart-fixed-container .metadata-group',
);
tooltipContainer.datum([]).call(chartTooltip);
}
Expand Down Expand Up @@ -207,6 +207,6 @@ if (select('.js-grouped-bar-chart-tooltip-container').node()) {
colorSelectorHelper.createColorSelector(
'.js-color-selector-container',
'.grouped-bar',
creategroupedBarChartWithTooltip
creategroupedBarChartWithTooltip,
);
}
4 changes: 2 additions & 2 deletions demos/src/demo-heatmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function createWeeklyHeatmapChart(optionalColorSchema) {
heatmapContainer.datum(dataset).call(heatmapChart);

tooltipContainer = select(
'.js-heatmap-chart-container .heatmap .metadata-group'
'.js-heatmap-chart-container .heatmap .metadata-group',
);
tooltipContainer.datum([]).call(tooltip);
}
Expand All @@ -66,6 +66,6 @@ if (select('.js-heatmap-chart-container').node()) {
'.heatmap',
function (newSchema) {
createWeeklyHeatmapChart(newSchema);
}
},
);
}
2 changes: 1 addition & 1 deletion demos/src/demo-legend.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,6 @@ if (select('.js-legend-chart-container').node()) {
colorSelectorHelper.createColorSelector(
'.js-color-selector-container',
'.donut-chart',
createDonutChart
createDonutChart,
);
}
52 changes: 25 additions & 27 deletions demos/src/demo-line.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function createBrushChart(optionalColorSchema) {
if (brushRangeStart && brushRangeEnd) {
const filteredDataByBrushRange = filterData(
brushRangeStart,
brushRangeEnd
brushRangeEnd,
);
createLineChart(colorSchema, filteredDataByBrushRange);
} else {
Expand Down Expand Up @@ -109,7 +109,7 @@ function createLineChart(optionalColorSchema, optionalData) {
// Note that if the viewport width is less than the tooltipThreshold value,
// this container won't exist, and the tooltip won't show up
tooltipContainer = select(
'.js-line-chart-container .metadata-group .hover-marker'
'.js-line-chart-container .metadata-group .hover-marker',
);
tooltipContainer.datum([]).call(chartTooltip);
}
Expand All @@ -136,17 +136,16 @@ function createLineChartWithSingleLine() {
.grid('vertical')
.width(containerWidth)
.on('customMouseOver', chartTooltip.show)
.on('customMouseMove', function (
dataPoint,
topicColorMap,
dataPointXPosition
) {
chartTooltip.update(
dataPoint,
topicColorMap,
dataPointXPosition
);
})
.on(
'customMouseMove',
function (dataPoint, topicColorMap, dataPointXPosition) {
chartTooltip.update(
dataPoint,
topicColorMap,
dataPointXPosition,
);
},
)
.on('customMouseOut', chartTooltip.hide);

container.datum(dataset).call(lineChart2);
Expand All @@ -157,7 +156,7 @@ function createLineChartWithSingleLine() {
// Note that if the viewport width is less than the tooltipThreshold value,
// this container won't exist, and the tooltip won't show up
tooltipContainer = select(
'.js-single-line-chart-container .metadata-group .vertical-marker-container'
'.js-single-line-chart-container .metadata-group .vertical-marker-container',
);
tooltipContainer.datum([]).call(chartTooltip);

Expand Down Expand Up @@ -188,17 +187,16 @@ function createLineChartWithFixedHeight() {
.on('customMouseOver', function () {
chartTooltip.show();
})
.on('customMouseMove', function (
dataPoint,
topicColorMap,
dataPointXPosition
) {
chartTooltip.update(
dataPoint,
topicColorMap,
dataPointXPosition
);
})
.on(
'customMouseMove',
function (dataPoint, topicColorMap, dataPointXPosition) {
chartTooltip.update(
dataPoint,
topicColorMap,
dataPointXPosition,
);
},
)
.on('customMouseOut', function () {
chartTooltip.hide();
});
Expand All @@ -211,7 +209,7 @@ function createLineChartWithFixedHeight() {
// Note that if the viewport width is less than the tooltipThreshold value,
// this container won't exist, and the tooltip won't show up
tooltipContainer = select(
'.js-fixed-line-chart-container .metadata-group .hover-marker'
'.js-fixed-line-chart-container .metadata-group .hover-marker',
);
tooltipContainer.datum([]).call(chartTooltip);
}
Expand Down Expand Up @@ -305,6 +303,6 @@ if (select('.js-line-chart-container').node()) {
createLineChart(newSchema);
selectAll('.brush-chart').remove();
createBrushChart(newSchema);
}
},
);
}
10 changes: 5 additions & 5 deletions demos/src/demo-scatter-plot.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function createScatterPlotWithSingleSource(optionalColorSchema) {
let scatterChart = scatterPlot();
let tooltip = miniTooltip().title('Temperature (C)');
let scatterPlotContainer = select(
'.js-scatter-plot-chart-tooltip-container'
'.js-scatter-plot-chart-tooltip-container',
);
let containerWidth = scatterPlotContainer.node()
? scatterPlotContainer.node().getBoundingClientRect().width
Expand Down Expand Up @@ -56,7 +56,7 @@ function createScatterPlotWithSingleSource(optionalColorSchema) {
tooltip.valueLabel('y').nameLabel('x').numberFormat('$');

tooltipContainer = select(
'.js-scatter-plot-chart-tooltip-container .scatter-plot .metadata-group'
'.js-scatter-plot-chart-tooltip-container .scatter-plot .metadata-group',
);
tooltipContainer.datum([]).call(tooltip);
}
Expand All @@ -66,7 +66,7 @@ function createScatterPlotWithIncreasedAreaAndHollowCircles() {
let scatterChart = scatterPlot();
let tooltip = miniTooltip();
let scatterPlotContainer = select(
'.js-scatter-plot-container-with-hollow-circles'
'.js-scatter-plot-container-with-hollow-circles',
);
let containerWidth = scatterPlotContainer.node()
? scatterPlotContainer.node().getBoundingClientRect().width
Expand Down Expand Up @@ -99,7 +99,7 @@ function createScatterPlotWithIncreasedAreaAndHollowCircles() {
scatterPlotContainer.datum(dataset).call(scatterChart);

tooltipContainer = select(
'.js-scatter-plot-container-with-hollow-circles .scatter-plot .metadata-group'
'.js-scatter-plot-container-with-hollow-circles .scatter-plot .metadata-group',
);
tooltipContainer.datum([]).call(tooltip);
}
Expand All @@ -125,6 +125,6 @@ if (select('.js-scatter-plot-chart-tooltip-container').node()) {
'.scatter-plot',
function (newSchema) {
createScatterPlotWithSingleSource(newSchema);
}
},
);
}