Version 4.9.37

amcharts · Aug 21, 2020 · c08fdcd · c08fdcd
1 parent f0e5ab3
commit c08fdcd
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 15 deletions.
diff --git a/dist/ember/CHANGELOG.md b/dist/ember/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.9.37] - 2020-08-21
+
+### Fixed
+- Colors for markers in Legend with `useDefaultMarkers = true` were broken since last release.
+
+
 ## [4.9.36] - 2020-08-20
 
 ### Added

diff --git a/dist/ember/package.json b/dist/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amcharts/amcharts4-ember",
-  "version": "4.9.36",
+  "version": "4.9.37",
   "description": "Ember add-on for amCharts 4",
   "keywords": [
     "ember-addon",

diff --git a/dist/ember/vendor/script/amcharts4/CHANGELOG.md b/dist/ember/vendor/script/amcharts4/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.9.37] - 2020-08-21
+
+### Fixed
+- Colors for markers in Legend with `useDefaultMarkers = true` were broken since last release.
+
+
 ## [4.9.36] - 2020-08-20
 
 ### Added

diff --git a/dist/ember/vendor/script/amcharts4/core.js b/dist/ember/vendor/script/amcharts4/core.js
diff --git a/dist/ember/vendor/script/amcharts4/core.js.map b/dist/ember/vendor/script/amcharts4/core.js.map
diff --git a/dist/es2015/.internal/charts/Legend.js b/dist/es2015/.internal/charts/Legend.js
diff --git a/dist/es2015/.internal/charts/Legend.js.map b/dist/es2015/.internal/charts/Legend.js.map
diff --git a/dist/es2015/.internal/core/System.js b/dist/es2015/.internal/core/System.js
diff --git a/dist/es2015/.internal/core/System.js.map b/dist/es2015/.internal/core/System.js.map
diff --git a/dist/es2015/CHANGELOG.md b/dist/es2015/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.9.37] - 2020-08-21
+
+### Fixed
+- Colors for markers in Legend with `useDefaultMarkers = true` were broken since last release.
+
+
 ## [4.9.36] - 2020-08-20
 
 ### Added

diff --git a/dist/es2015/package.json b/dist/es2015/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amcharts/amcharts4",
-  "version": "4.9.36",
+  "version": "4.9.37",
   "author": "amCharts <[email protected]> (https://www.amcharts.com/)",
   "description": "amCharts 4",
   "homepage": "https://www.amcharts.com/",

diff --git a/dist/script/CHANGELOG.md b/dist/script/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.9.37] - 2020-08-21
+
+### Fixed
+- Colors for markers in Legend with `useDefaultMarkers = true` were broken since last release.
+
+
 ## [4.9.36] - 2020-08-20
 
 ### Added

diff --git a/dist/script/core.js b/dist/script/core.js
diff --git a/dist/script/core.js.map b/dist/script/core.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@amcharts/amcharts4",
-  "version": "4.9.36",
+  "version": "4.9.37",
   "repository": {
     "type": "git",
     "url": "https://github.com/amcharts/amcharts4.git"

diff --git a/src/.internal/charts/Legend.ts b/src/.internal/charts/Legend.ts
@@ -585,7 +585,7 @@ export class Legend extends Component {
 		rectangle.width = percent(100);
 		rectangle.height = percent(100);
 		rectangle.applyOnClones = true;
-		//rectangle.propertyFields.fill = "fill"; //othrwise old edge doesn't like as the same pattern is set both on parent and child https://codepen.io/team/amcharts/pen/72d7a98f3fb811d3118795220ff63182
+		rectangle.propertyFields.fill = "fill"; //othrwise old edge doesn't like as the same pattern is set both on parent and child https://codepen.io/team/amcharts/pen/72d7a98f3fb811d3118795220ff63182
 		rectangle.strokeOpacity = 0;
 
 		// Create a template container and list for item labels
@@ -663,7 +663,6 @@ export class Legend extends Component {
 	 */
 	public validateDataElement(dataItem: this["_dataItem"]): void {
 		super.validateDataElement(dataItem);
-
 		// Get data item (legend item's) container
 		let container = dataItem.itemContainer;
 
@@ -680,7 +679,7 @@ export class Legend extends Component {
 
 		let tempMaxWidth = dataItem.label.maxWidth;
 		dataItem.label.width = undefined;
-		if(tempMaxWidth > 0){
+		if (tempMaxWidth > 0) {
 			dataItem.label.maxWidth = tempMaxWidth;
 		}
 		if (valueLabel.align == "right") {
@@ -699,6 +698,9 @@ export class Legend extends Component {
 				dataItem.childrenCreated = true;
 			}
 		}
+		else {
+			this.markers.template.propertyFields.fill = undefined;
+		}
 
 		if (dataContext.updateLegendValue) {
 			dataContext.updateLegendValue(); // this solves issue with external legend, as legend is created after chart updates legend values

diff --git a/src/.internal/core/System.ts b/src/.internal/core/System.ts
@@ -54,7 +54,7 @@ export class System {
 	 *
 	 * @see {@link https://docs.npmjs.com/misc/semver}
 	 */
-	static VERSION: string = "4.9.36";
+	static VERSION: string = "4.9.37";
 
 	/**
 	 * @todo Description