Skip to content

D3 update #387

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
chgennar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

D3 update #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daab355
test
chgennar Oct 12, 2022
bedf510
Current progress updating D3
chgennar Oct 21, 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
638 changes: 345 additions & 293 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "tsiclient",
"main": "tsiclient.js",
"description": "",
"version": "1.4.24",
"version": "1.4.21",
"types": "tsiclient.d.ts",
"repository": {
"type": "git",
Expand Down Expand Up @@ -31,7 +31,7 @@
"css-loader": "^3.4.2",
"file-loader": "^1.1.11",
"mini-css-extract-plugin": "^0.4.5",
"node-sass": "^4.14.1",
"node-sass": "^4.13.1",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"postcss-url": "^8.0.0",
"rollup": "^2.26.11",
Expand All @@ -57,10 +57,10 @@
},
"dependencies": {
"@types/awesomplete": "^1.1.8",
"@types/d3": "^4.13.0",
"@types/d3": "^7.4.0",
"awesomplete": "^1.1.2",
"azure-maps-control": "^2.0.26",
"d3": "^4.13.0",
"d3": "^7.6.1",
"d3-interpolate-path": "^1.1.1",
"moment": "^2.27.0",
"moment-timezone": "^0.5.31",
Expand Down
20 changes: 10 additions & 10 deletions src/UXClient/Components/AvailabilityChart/AvailabilityChart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class AvailabilityChart extends ChartComponent{
return totalTimeRange / maxZoomFactor;
}

private zoom (direction: string, xPos: number) {
private zoom (event: any, direction: string, xPos: number) {
if (this.chartOptions.isCompact)
return;
var range = Math.max(this.getMinZoomedRange(), (this.zoomedToMillis - this.zoomedFromMillis));
Expand Down Expand Up @@ -82,7 +82,7 @@ class AvailabilityChart extends ChartComponent{
this.sparkLineChart.setBrushStartTime(new Date(this.zoomedFromMillis));
this.sparkLineChart.setBrush();
this.timePickerLineChart.drawBrushRange();
d3.event.preventDefault && d3.event.preventDefault();
event.preventDefault && event.preventDefault();
}
private setChartOptions (chartOptions) {
this.chartOptions.setOptions({ ...chartOptions, ...{
Expand Down Expand Up @@ -285,10 +285,10 @@ class AvailabilityChart extends ChartComponent{
this.sparkLineChart.setBrush();

var self = this;
this.timePickerChart.select(".brushElem").on("wheel.zoom", function (d) {
let direction = d3.event.deltaY > 0 ? 'out' : 'in';
let xPos = (d3.mouse(<any>this)[0]);
self.zoom(direction, xPos);
this.timePickerChart.select(".brushElem").on("wheel.zoom", function (event , d) {
let direction = event.deltaY > 0 ? 'out' : 'in';
let xPos = (d3.pointer(event)[0]);
self.zoom(event, direction, xPos);
});
if (!this.chartOptions.isCompact) {
this.buildZoomButtons();
Expand All @@ -311,15 +311,15 @@ class AvailabilityChart extends ChartComponent{
.attr("class", "tsi-zoomButton tsi-zoomButtonIn")
.attr('aria-label', this.getString('A line chart zoom in'))
.attr('title', this.getString('zoom in'))
.on("click", () => {
this.zoom("in", midpoint);
.on("click", (event) => {
this.zoom(event, "in", midpoint);
});
buttonsDiv.append("button")
.attr("class", "tsi-zoomButton tsi-zoomButtonOut")
.attr('aria-label', this.getString('A line chart zoom out'))
.attr('title', this.getString('zoom out'))
.on("click", () => {
this.zoom("out", midpoint);
.on("click", (event) => {
this.zoom(event, "out", midpoint);
});
}

Expand Down
36 changes: 18 additions & 18 deletions src/UXClient/Components/ColorPicker/ColorPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class ColorPicker extends Component{
.attr("title", this.getString('Select color'))
.attr("aria-label", (this.selectedColor ? this.selectedColor : this.getString('No color')) + ' ' + this.getString('Select color'))
.attr("aria-controls", `tsi-colorGrid_${this.componentId}`)
.on('click', () => {
.on('click', (event) => {
if (this.isColorGridVisible) {
this.hideColorGrid(true);
} else {
this.chartOptions.onClick(d3.event); this.showColorGrid();
this.chartOptions.onClick(event); this.showColorGrid();
}
});
if (this.selectedColor) {
Expand All @@ -68,33 +68,33 @@ class ColorPicker extends Component{
.attr("aria-label", c)
.attr("aria-selected", c === this.selectedColor)
.style("background-color", c)
.on('click', () => {
d3.event.preventDefault();
d3.event.stopPropagation();
.on('click', (event) => {
event.preventDefault();
event.stopPropagation();
this.chartOptions.onSelect(c); this.hideColorGrid(true); this.setSelectedColor(c, gridItem);
})
.on('keydown', () => {
if (d3.event.keyCode === KeyCodes.Tab && !d3.event.shiftKey && idx === this.chartOptions.colors.length - 1) { // tab
d3.event.preventDefault();
.on('keydown', (event) => {
if (event.keyCode === KeyCodes.Tab && !event.shiftKey && idx === this.chartOptions.colors.length - 1) { // tab
event.preventDefault();
this.colorPickerElem.selectAll(".tsi-colorItem").nodes()[0].focus();
} else if (d3.event.keyCode === KeyCodes.Enter) {
d3.event.preventDefault();
d3.event.stopPropagation();
} else if (event.keyCode === KeyCodes.Enter) {
event.preventDefault();
event.stopPropagation();
this.chartOptions.onSelect(c);
this.hideColorGrid(true);
this.setSelectedColor(c, gridItem);
} else if (d3.event.keyCode === KeyCodes.Esc) {
d3.event.preventDefault();
d3.event.stopPropagation();
} else if (event.keyCode === KeyCodes.Esc) {
event.preventDefault();
event.stopPropagation();
this.hideColorGrid(true);
}
});
});

d3.select("html").on("click." + this.componentId, () => {
if (this.colorPickerElem.select(".tsi-colorPickerButton").filter(Utils.equalToEventTarget).empty() &&
this.colorPickerElem.select(".tsi-colorPickerButton").selectAll("*").filter(Utils.equalToEventTarget).empty() &&
this.colorPickerElem.selectAll(".tsi-colorGrid").filter(Utils.equalToEventTarget).empty()) {
d3.select("html").on("click." + this.componentId, (event) => {
if (this.colorPickerElem.select(".tsi-colorPickerButton").filter(el => el == event.target).empty() &&
this.colorPickerElem.select(".tsi-colorPickerButton").selectAll("*").filter(el => el == event.target).empty() &&
this.colorPickerElem.selectAll(".tsi-colorGrid").filter(el => el == event.target).empty()) {
this.hideColorGrid();
}
});
Expand Down
10 changes: 5 additions & 5 deletions src/UXClient/Components/DateTimeButtonRange/DateTimeButtonRange.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ class DateTimeButtonRange extends DateTimeButton {

let targetElement = <any>d3.select(this.renderTarget)
var dateTimeTextChildren = (targetElement.select(".tsi-dateTimeContainer")).selectAll("*");
d3.select("html").on("click." + Utils.guid(), () => {
d3.select("html").on("click." + Utils.guid(), (event) => {
let pickerContainerChildren = this.dateTimePickerContainer.selectAll("*");
var outside = dateTimeTextChildren.filter(Utils.equalToEventTarget).empty()
&& targetElement.selectAll(".tsi-dateTimeContainer").filter(Utils.equalToEventTarget).empty()
&& targetElement.selectAll(".tsi-dateTimeButton").filter(Utils.equalToEventTarget).empty();
var inClickTarget = pickerContainerChildren.filter(Utils.equalToEventTarget).empty();
var outside = dateTimeTextChildren.filter(el => el == event.target).empty()
&& targetElement.selectAll(".tsi-dateTimeContainer").filter(el => el == event.target).empty()
&& targetElement.selectAll(".tsi-dateTimeButton").filter(el => el == event.target).empty();
var inClickTarget = pickerContainerChildren.filter(el => el == event.target).empty();
if (outside && inClickTarget && (this.dateTimePickerContainer.style('display') !== 'none')) {
this.onClose();
}
Expand Down
12 changes: 6 additions & 6 deletions src/UXClient/Components/DateTimeButtonSingle/DateTimeButtonSingle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ class DateTimeButtonSingle extends DateTimeButton {

let targetElement = <any>d3.select(this.renderTarget);
var dateTimeTextChildren = (targetElement.select(".tsi-dateTimePickerContainer")).selectAll("*");
d3.select("html").on("click." + Utils.guid(), () => {
d3.select("html").on("click." + Utils.guid(), (event) => {
let pickerContainerChildren = this.dateTimePickerContainer.selectAll("*");
var outside = dateTimeTextChildren.filter(Utils.equalToEventTarget).empty()
&& targetElement.selectAll(".tsi-dateTimePickerContainer").filter(Utils.equalToEventTarget).empty()
&& targetElement.selectAll(".tsi-dateTimeButton").filter(Utils.equalToEventTarget).empty()
&& targetElement.selectAll(".tsi-saveButton").filter(Utils.equalToEventTarget).empty();
var inClickTarget = pickerContainerChildren.filter(Utils.equalToEventTarget).empty();
var outside = dateTimeTextChildren.filter(el => el == event.target).empty()
&& targetElement.selectAll(".tsi-dateTimePickerContainer").filter(el => el == event.target).empty()
&& targetElement.selectAll(".tsi-dateTimeButton").filter(el => el == event.target).empty()
&& targetElement.selectAll(".tsi-saveButton").filter(el => el == event.target).empty();
var inClickTarget = pickerContainerChildren.filter(el => el == event.target).empty();
if (outside && inClickTarget && (this.dateTimePickerContainer.style('display') !== 'none')) {
this.closeSDTP();
}
Expand Down
Loading