Version 4.10.20

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.10.20] - 2021-06-17
+
+### Fixed
+- In-line formatting of labels was triggering errors on pages with strict CSP rules.
+
+
 ## [4.10.19] - 2021-06-08
 
 ### Fixed

dist/ember/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amcharts/amcharts4-ember",
-  "version": "4.10.19",
+  "version": "4.10.20",
   "description": "Ember add-on for amCharts 4",
   "keywords": [
     "ember-addon",

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.10.20] - 2021-06-17
+
+### Fixed
+- In-line formatting of labels was triggering errors on pages with strict CSP rules.
+
+
 ## [4.10.19] - 2021-06-08
 
 ### Fixed

dist/es2015/.internal/charts/axes/Axis.d.ts

@@ -109,27 +109,20 @@ export declare class AxisDataItem extends DataItem {
      *
      * ```TypeScript
      * // Hide all ticks and labels closer than 20% to axis beginning.
-     * axis.renderer.ticks.template.minPosition = 0.2;
-     * axis.renderer.labels.template.minPosition = 0.2;
+     * axis.dataItems.template.minPosition = 0.2;
      * ```
      * ```JavaScript
      * // Hide all ticks and labels closer than 20% to axis beginning.
-     * axis.renderer.ticks.template.minPosition = 0.2;
-     * axis.renderer.labels.template.minPosition = 0.2;
+     * axis.dataItems.template.minPosition = 0.2;
      * ```
      * ```JSON
      * {
      *   // ...
      *   "xAxes": [{
      *     // ...
      *     // Hide all ticks and labels closer than 20% to axis beginning.
-     *     "renderer": {
-     *       "ticks": {
-     *         "minPosition": 0.2
-     *       },
-     *       "labels": {
-     *         "minPosition": 0.2
-     *       }
+     *     "dataItems": {
+     *       "minPosition": 0.2
      *     }
      *   }]
      * }
@@ -146,27 +139,20 @@ export declare class AxisDataItem extends DataItem {
      *
      * ```TypeScript
      * // Hide all ticks and labels closer than 20% to axis end.
-     * axis.renderer.ticks.template.maxPosition = 0.8;
-     * axis.renderer.labels.template.maxPosition = 0.8;
+     * axis.dataItems.template.maxPosition = 0.8;
      * ```
      * ```JavaScript
      * // Hide all ticks and labels closer than 20% to axis end.
-     * axis.renderer.ticks.template.maxPosition = 0.8;
-     * axis.renderer.labels.template.maxPosition = 0.8;
+     * axis.dataItems.template.maxPosition = 0.8;
      * ```
      * ```JSON
      * {
      *   // ...
      *   "xAxes": [{
      *     // ...
      *     // Hide all ticks and labels closer than 20% to axis end.
-     *     "renderer": {
-     *       "ticks": {
-     *         "maxPosition": 0.8
-     *       },
-     *       "labels": {
-     *         "maxPosition": 0.8
-     *       }
+     *     "dataItems": {
+     *       "maxPosition": 0.8
      *     }
      *   }]
      * }

dist/es2015/.internal/core/elements/Label.d.ts

@@ -571,7 +571,7 @@ export declare class Label extends Container {
      * @return Available height (px)
      */
     readonly availableHeight: number;
-    getSvgElement(text: string, style?: string): AMElement;
+    getSvgElement(text: string, style?: string, parent?: Group): AMElement;
     /**
      * Invalidates the whole element, including layout AND all its child
      * elements.

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.10.20] - 2021-06-17
+
+### Fixed
+- In-line formatting of labels was triggering errors on pages with strict CSP rules.
+
+
 ## [4.10.19] - 2021-06-08
 
 ### Fixed

dist/es2015/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amcharts/amcharts4",
-  "version": "4.10.19",
+  "version": "4.10.20",
   "author": "amCharts <contact@amcharts.com> (https://www.amcharts.com/)",
   "description": "amCharts 4",
   "homepage": "https://www.amcharts.com/",

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.10.20] - 2021-06-17
+
+### Fixed
+- In-line formatting of labels was triggering errors on pages with strict CSP rules.
+
+
 ## [4.10.19] - 2021-06-08
 
 ### Fixed

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@amcharts/amcharts4",
-  "version": "4.10.19",
+  "version": "4.10.20",
   "repository": {
     "type": "git",
     "url": "https://github.com/amcharts/amcharts4.git"

src/.internal/charts/axes/Axis.ts

@@ -147,27 +147,20 @@ export class AxisDataItem extends DataItem {
 	 *
 	 * ```TypeScript
 	 * // Hide all ticks and labels closer than 20% to axis beginning.
-	 * axis.renderer.ticks.template.minPosition = 0.2;
-	 * axis.renderer.labels.template.minPosition = 0.2;
+	 * axis.dataItems.template.minPosition = 0.2;
 	 * ```
 	 * ```JavaScript
 	 * // Hide all ticks and labels closer than 20% to axis beginning.
-	 * axis.renderer.ticks.template.minPosition = 0.2;
-	 * axis.renderer.labels.template.minPosition = 0.2;
+	 * axis.dataItems.template.minPosition = 0.2;
 	 * ```
 	 * ```JSON
 	 * {
 	 *   // ...
 	 *   "xAxes": [{
 	 *     // ...
 	 *     // Hide all ticks and labels closer than 20% to axis beginning.
-	 *     "renderer": {
-	 *       "ticks": {
-	 *         "minPosition": 0.2
-	 *       },
-	 *       "labels": {
-	 *         "minPosition": 0.2
-	 *       }
+	 *     "dataItems": {
+	 *       "minPosition": 0.2
 	 *     }
 	 *   }]
 	 * }
@@ -185,27 +178,20 @@ export class AxisDataItem extends DataItem {
 	 *
 	 * ```TypeScript
 	 * // Hide all ticks and labels closer than 20% to axis end.
-	 * axis.renderer.ticks.template.maxPosition = 0.8;
-	 * axis.renderer.labels.template.maxPosition = 0.8;
+	 * axis.dataItems.template.maxPosition = 0.8;
 	 * ```
 	 * ```JavaScript
 	 * // Hide all ticks and labels closer than 20% to axis end.
-	 * axis.renderer.ticks.template.maxPosition = 0.8;
-	 * axis.renderer.labels.template.maxPosition = 0.8;
+	 * axis.dataItems.template.maxPosition = 0.8;
 	 * ```
 	 * ```JSON
 	 * {
 	 *   // ...
 	 *   "xAxes": [{
 	 *     // ...
 	 *     // Hide all ticks and labels closer than 20% to axis end.
-	 *     "renderer": {
-	 *       "ticks": {
-	 *         "maxPosition": 0.8
-	 *       },
-	 *       "labels": {
-	 *         "maxPosition": 0.8
-	 *       }
+	 *     "dataItems": {
+	 *       "maxPosition": 0.8
 	 *     }
 	 *   }]
 	 * }

src/.internal/core/System.ts

@@ -54,7 +54,7 @@ export class System {
 	 *
 	 * @see {@link https://docs.npmjs.com/misc/semver}
 	 */
-	static VERSION: string = "4.10.19";
+	static VERSION: string = "4.10.20";
 
 	/**
 	 * @todo Description

src/.internal/core/elements/Label.ts

@@ -25,6 +25,7 @@ import * as $type from "../utils/Type";
 import { Paper } from "../rendering/Paper";
 import * as $dom from "../utils/DOM";
 import { defaultRules, ResponsiveBreakpoints } from "../utils/Responsive";
+import { options } from "../Options";
 
 
 /**
@@ -675,13 +676,11 @@ export class Label extends Container {
 						lineInfo.style = getTextFormatter().translateStyleShortcuts(currentFormat);
 
 
-						let tspan = this.getSvgElement(lineInfo.text, lineInfo.style);
-
 						if (this.textPathElement) {
-							this.textPathElement.add(tspan);
+							this.getSvgElement(lineInfo.text, lineInfo.style, this.textPathElement);
 						}
 						else {
-							lineInfo.element.add(tspan);
+							this.getSvgElement(lineInfo.text, lineInfo.style, lineInfo.element);
 						}
 
 						this.getLineBBox(lineInfo);
@@ -1747,12 +1746,35 @@ export class Label extends Container {
 	}
 
 	// temp, replacing textFormatter method
-	public getSvgElement(text: string, style?: string): AMElement {
+	public getSvgElement(text: string, style?: string, parent?: Group): AMElement {
 		let element = this.paper.add("tspan");
 		element.textContent = text;
 		if (style) {
-			element.node.setAttribute("style", style);
+
+			if (options.nonce && parent) {
+				//element.node.setAttribute("nonce", "test123");
+				const classid = "amcharts_element_style_" + btoa(style).replace(/[^\w]*/g, "");
+				element.node.setAttribute("class", classid);
+
+				const defs = <SVGDefsElement>document.createElementNS($dom.SVGNS, "defs");
+				parent.node.appendChild(defs);
+
+				const e = document.createElement("style");
+				e.type = "text/css";
+				e.innerHTML = "." + classid + " { " + style + "}";
+				e.setAttribute("nonce", options.nonce)
+				defs.appendChild(e);
+			}
+			else {
+				element.node.setAttribute("style", style);
+			}
+
 		}
+
+		if (parent) {
+			parent.add(element);
+		}
+
 		return element;
 	}