Skip to content

upgrade d3 deps to v3+ #501

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

upgrade d3 deps to v3+ #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57c9bbf
upgrade d3 deps to v3+
jkafader-esnet Sep 19, 2022
e51755d
Update package json
sartaj10 Sep 20, 2022
e1af8c5
Update d3 to 3.x, react scripts to 4.x to fix fsevents warnings
sartaj10 Sep 21, 2022
e1d42cb
Fix errors with styling the Yaxis and TimeAxis
sartaj10 Sep 29, 2022
522099b
Remove unused code, rename variable
sartaj10 Sep 29, 2022
f2c9c1f
Use .style instead of .attr
sartaj10 Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 43 additions & 10 deletions lib/components/TimeAxis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

var _underscore = require("underscore");
Expand Down Expand Up @@ -34,8 +36,6 @@ var _d3Axis = require("d3-axis");

var _d3Selection = require("d3-selection");

require("d3-selection-multi");

var _d3Time = require("d3-time");

var _d3TimeFormat = require("d3-time-format");
Expand Down Expand Up @@ -196,20 +196,53 @@ var TimeAxis = function (_React$Component) {
//
// Draw the new axis
//
(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.append("g").attr("class", "x axis").style("stroke", "none").styles(valueStyle).call(axis.tickSize(tickSize));
var element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.append("g").attr("class", "x axis").style("stroke", "none").call(axis.tickSize(tickSize));

Object.entries(valueStyle).forEach(function (_ref) {
var _ref2 = _slicedToArray(_ref, 2),
prop = _ref2[0],
val = _ref2[1];

return element.style(prop, val);
});

if (this.props.angled) {
(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.select("g").selectAll(".tick").select("text").styles(valueStyle).style("text-anchor", "end").attr("dx", "-1.2em").attr("dy", "0em").attr("transform", function (d) {
element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.select("g").selectAll(".tick").select("text").attr("dx", "-1.2em").attr("dy", "0em").attr("transform", function (d) {
return "rotate(-65)";
}).style("text-anchor", "end");

Object.entries(valueStyle).forEach(function (_ref3) {
var _ref4 = _slicedToArray(_ref3, 2),
prop = _ref4[0],
val = _ref4[1];

return element.style(prop, val);
});
} else {
(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.select("g").selectAll(".tick").select("text").styles(valueStyle);
element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.select("g").selectAll(".tick").select("text");

Object.entries(valueStyle).forEach(function (_ref5) {
var _ref6 = _slicedToArray(_ref5, 2),
prop = _ref6[0],
val = _ref6[1];

return element.style(prop, val);
});
}
(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.select("g").selectAll(".tick").select("line").styles(tickStyle);

element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)) // eslint-disable-line
.select("g").selectAll(".tick").select("line");

Object.entries(tickStyle).forEach(function (_ref7) {
var _ref8 = _slicedToArray(_ref7, 2),
prop = _ref8[0],
val = _ref8[1];

return element.style(prop, val);
});

(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").select("path").remove();
}
Expand Down
53 changes: 47 additions & 6 deletions lib/components/YAxis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

require("d3-transition");
Expand Down Expand Up @@ -38,8 +40,6 @@ var _d3Format = require("d3-format");

var _d3Selection = require("d3-selection");

require("d3-selection-multi");

var _util = require("../js/util");

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
Expand Down Expand Up @@ -213,14 +213,38 @@ var YAxis = function (_React$Component) {
tickStyle = style.tickStyle,
axisStyle = style.axisStyle;

(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").selectAll(".tick").select("text").styles(valueStyle);
var element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").selectAll(".tick").select("text");

Object.entries(valueStyle).forEach(function (_ref) {
var _ref2 = _slicedToArray(_ref, 2),
prop = _ref2[0],
val = _ref2[1];

return element.style(prop, val);
});

element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").selectAll(".tick").select("line");

(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").selectAll(".tick").select("line").styles(tickStyle);
Object.entries(tickStyle).forEach(function (_ref3) {
var _ref4 = _slicedToArray(_ref3, 2),
prop = _ref4[0],
val = _ref4[1];

return element.style(prop, val);
});

(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").selectAll(".domain").remove();

if (!hideAxisLine) {
(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").append("line").styles(axisStyle).attr("x1", 0).attr("y1", 0).attr("x2", 0).attr("y2", height);
element = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).select("g").append("line").attr("x1", 0).attr("y1", 0).attr("x2", 0).attr("y2", height);

Object.entries(axisStyle).forEach(function (_ref5) {
var _ref6 = _slicedToArray(_ref5, 2),
prop = _ref6[0],
val = _ref6[1];

return element.style(prop, val);
});
}
}
}, {
Expand Down Expand Up @@ -264,6 +288,8 @@ var YAxis = function (_React$Component) {
}, {
key: "renderAxis",
value: function renderAxis(align, scale, width, height, showGrid, chartExtent, hideAxisLine, absolute, type, fmt, label, tickCount, min, max) {
var _this2 = this;

var yformat = this.yformat(fmt);
var axis = align === "left" ? _d3Axis.axisLeft : _d3Axis.axisRight;
var style = this.mergeStyles(this.props.style);
Expand All @@ -281,7 +307,22 @@ var YAxis = function (_React$Component) {
(0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).selectAll("*").remove();

// Add the new axis
this.axis = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).append("g").attr("transform", "translate(" + x + ",0)").attr("class", "yaxis").styles(valueStyle).call(axisGenerator.tickSize(tickSize)).append("text").text(label || this.props.label).styles(labelStyle).attr("transform", "rotate(-90)").attr("class", "yaxislabel").attr("y", labelOffset).attr("dy", ".71em").attr("text-anchor", "end");
this.axis = (0, _d3Selection.select)(_reactDom2.default.findDOMNode(this)).append("g").attr("transform", "translate(" + x + ",0)").attr("class", "yaxis").call(axisGenerator.tickSize(tickSize)).append("text").text(label || this.props.label).attr("transform", "rotate(-90)").attr("class", "yaxislabel").attr("y", labelOffset).attr("dy", ".71em").attr("text-anchor", "end");

Object.entries(valueStyle).forEach(function (_ref7) {
var _ref8 = _slicedToArray(_ref7, 2),
prop = _ref8[0],
val = _ref8[1];

return _this2.axis.style(prop, val);
});
Object.entries(labelStyle).forEach(function (_ref9) {
var _ref10 = _slicedToArray(_ref9, 2),
prop = _ref10[0],
val = _ref10[1];

return _this2.axis.style(prop, val);
});

this.postSelect(style, hideAxisLine, height);
}
Expand Down
Loading