Skip to content

Commit

Permalink
Version 4.10.22
Browse files Browse the repository at this point in the history
  • Loading branch information
martynasma committed Aug 20, 2021
1 parent d542633 commit 1b4530c
Show file tree
Hide file tree
Showing 34 changed files with 118 additions and 33 deletions.
11 changes: 11 additions & 0 deletions dist/ember/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
Please note, that this project, while following numbering syntax, it DOES NOT
adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) rules.

## [4.10.22] - 2021-08-20

### Changed
- `package.json` for ES2015 package was properly updated with new version dependencies.

### Fixed
- Another issue with label text with a lot of in-line formatting not wrapping properly fixed.
- ForceDirectedTree was not updating label `maxWidth` on zoom.
- Legend's `position = "absolute"` was not working.


## [4.10.21] - 2021-08-08

### Added
Expand Down
2 changes: 1 addition & 1 deletion dist/ember/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@amcharts/amcharts4-ember",
"version": "4.10.21",
"version": "4.10.22",
"description": "Ember add-on for amCharts 4",
"keywords": [
"ember-addon",
Expand Down
11 changes: 11 additions & 0 deletions dist/ember/vendor/script/amcharts4/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
Please note, that this project, while following numbering syntax, it DOES NOT
adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) rules.

## [4.10.22] - 2021-08-20

### Changed
- `package.json` for ES2015 package was properly updated with new version dependencies.

### Fixed
- Another issue with label text with a lot of in-line formatting not wrapping properly fixed.
- ForceDirectedTree was not updating label `maxWidth` on zoom.
- Legend's `position = "absolute"` was not working.


## [4.10.21] - 2021-08-08

### Added
Expand Down
2 changes: 1 addition & 1 deletion dist/ember/vendor/script/amcharts4/core.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ember/vendor/script/amcharts4/core.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions dist/es2015/.internal/charts/Chart.js

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

2 changes: 1 addition & 1 deletion dist/es2015/.internal/charts/Chart.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/es2015/.internal/charts/series/XYSeries.js

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

2 changes: 1 addition & 1 deletion dist/es2015/.internal/charts/series/XYSeries.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/es2015/.internal/core/System.js

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

2 changes: 1 addition & 1 deletion dist/es2015/.internal/core/System.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/es2015/.internal/core/utils/Utils.js

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

2 changes: 1 addition & 1 deletion dist/es2015/.internal/core/utils/Utils.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export declare class ForceDirectedNode extends Container {
/**
* @ignore
*/
protected updateLabelSize(): void;
updateLabelSize(): void;
/**
* Copies all parameters from another [[ForceDirectedNode]].
*
Expand Down

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions dist/es2015/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
Please note, that this project, while following numbering syntax, it DOES NOT
adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) rules.

## [4.10.22] - 2021-08-20

### Changed
- `package.json` for ES2015 package was properly updated with new version dependencies.

### Fixed
- Another issue with label text with a lot of in-line formatting not wrapping properly fixed.
- ForceDirectedTree was not updating label `maxWidth` on zoom.
- Legend's `position = "absolute"` was not working.


## [4.10.21] - 2021-08-08

### Added
Expand Down
6 changes: 3 additions & 3 deletions dist/es2015/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@amcharts/amcharts4",
"version": "4.10.21",
"version": "4.10.22",
"author": "amCharts <[email protected]> (https://www.amcharts.com/)",
"description": "amCharts 4",
"homepage": "https://www.amcharts.com/",
Expand Down Expand Up @@ -36,14 +36,14 @@
"d3-force": "^2.0.1",
"d3-geo": "^2.0.1",
"d3-geo-projection": "^3.0.0",
"pdfmake": "^0.1.36",
"pdfmake": "^0.2.2",
"polylabel": "^1.0.2",
"raf": "^3.4.1",
"regression": "^2.0.1",
"rgbcolor": "^1.0.1",
"stackblur-canvas": "^2.0.0",
"tslib": "^2.0.1",
"venn.js": "^0.2.20",
"xlsx": "^0.16.4"
"xlsx": "^0.17.0"
}
}
11 changes: 11 additions & 0 deletions dist/script/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
Please note, that this project, while following numbering syntax, it DOES NOT
adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) rules.

## [4.10.22] - 2021-08-20

### Changed
- `package.json` for ES2015 package was properly updated with new version dependencies.

### Fixed
- Another issue with label text with a lot of in-line formatting not wrapping properly fixed.
- ForceDirectedTree was not updating label `maxWidth` on zoom.
- Legend's `position = "absolute"` was not working.


## [4.10.21] - 2021-08-08

### Added
Expand Down
2 changes: 1 addition & 1 deletion dist/script/core.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/script/core.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/script/plugins/forceDirected.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/script/plugins/forceDirected.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@amcharts/amcharts4",
"version": "4.10.21",
"version": "4.10.22",
"repository": {
"type": "git",
"url": "https://github.com/amcharts/amcharts4.git"
Expand Down
11 changes: 9 additions & 2 deletions src/.internal/charts/Chart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,11 @@ export class Chart extends Component {
let chartContainer = this.chartContainer;
chartContainer.x = undefined;
chartContainer.y = undefined;
legend.x = undefined;
legend.y = undefined;
if (legend.position != "absolute") {
legend.x = undefined;
legend.y = undefined;
}

switch (legend.position) {
case "left":
chartAndLegendContainer.layout = "horizontal";
Expand All @@ -262,6 +265,10 @@ export class Chart extends Component {
case "bottom":
chartAndLegendContainer.layout = "vertical";
legend.toFront();
break;
case "absolute":
legend.isMeasured = false;
break;
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/.internal/charts/series/XYSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,9 @@ export class XYSeries extends Series {
const scrollbarSeries = this.scrollbarSeries;
if (scrollbarSeries) {
this.scrollbarSeries.addData(rawDataItem, removeCount, true);
this.scrollbarSeries._parseDataFrom = this._parseDataFrom;
}

}

protected setData(value: any[]) {
Expand Down
2 changes: 1 addition & 1 deletion src/.internal/core/System.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class System {
*
* @see {@link https://docs.npmjs.com/misc/semver}
*/
static VERSION: string = "4.10.21";
static VERSION: string = "4.10.22";

/**
* @todo Description
Expand Down
2 changes: 1 addition & 1 deletion src/.internal/core/utils/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ export function splitTextByCharCount(text: string, maxChars: number, fullWords?:
// Do we have only one word that does not fit?
// Since fullWords is set and we can't split the word, we end up with empty
// set.
if (res.length == 1 && fullWords && (res[0].length > maxChars)) {
if (res.length == 1 && fullWords && fullWordFallback && (res[0].length > maxChars)) {
res = [];
}

Expand Down
12 changes: 9 additions & 3 deletions src/.internal/plugins/forceDirected/ForceDirectedNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export class ForceDirectedNode extends Container {
/**
* @ignore
*/
protected updateLabelSize() {
public updateLabelSize() {
if (this.label.text) {
let circle = this.circle;
let radius = circle.pixelRadius;
Expand All @@ -218,8 +218,14 @@ export class ForceDirectedNode extends Container {
radius = dsRadius;
}

this.label.width = 2 * radius;
this.label.height = 2 * radius;
let scale = 1;

if (this.parent && this.parent.parent) {
scale = this.parent.parent.scale;
}

this.label.width = 2 * radius * scale;
this.label.height = 2 * radius * scale;
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/.internal/plugins/forceDirected/ForceDirectedTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,14 @@ export class ForceDirectedTree extends SerialChart {
this.zoomOut();
}, this, false);
this._disposers.push(this._backgroundZoomoutDisposer);

this._disposers.push(this.seriesContainer.events.on("sizechanged", () => {
this.series.each((series) => {
series.nodes.each((node) => {
node.updateLabelSize();
})
})
}))
}
else {
this.seriesContainer.resizable = false;
Expand Down

0 comments on commit 1b4530c

Please sign in to comment.