@amcharts/amcharts5 5.0.0-beta.3 → 5.0.0-beta.30

package/.internal/core/util/Entity.js

@@ -3,9 +3,11 @@ import { Disposer } from "./Disposer";
 import { EventDispatcher } from "./EventDispatcher";
 import { getInterpolate } from "./Animation";
 import { States } from "./States";
+import { registry } from "../Registry";
 import * as $object from "./Object";
 import * as $ease from "./Ease";
 import * as $array from "./Array";
+import * as $order from "./Order";
 /**
  * Allows to dynamically modify setting value of its target element.
  *
@@ -529,8 +531,9 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, fallback) {
-            if (key in this._settings) {
-                return this._settings[key];
+            var value = this._settings[key];
+            if (value !== undefined) {
+                return value;
             }
             else {
                 return fallback;
@@ -573,6 +576,18 @@ var Settings = /** @class */ (function () {
             }
         }
     });
+    /**
+     * @ignore
+     */
+    Object.defineProperty(Settings.prototype, "_setRaw", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (key, old, value) {
+            this._prevSettings[key] = old;
+            this._sendKeyEvent(key, value);
+        }
+    });
     /**
      * @ignore
      */
@@ -581,10 +596,11 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, value) {
-            this._prevSettings[key] = this._settings[key];
+            var old = this._settings[key];
             this._settings[key] = value;
-            this._sendKeyEvent(key, value);
-            return value;
+            if (old !== value) {
+                this._setRaw(key, old, value);
+            }
         }
     });
     /**
@@ -595,8 +611,10 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, value) {
-            if (this._settings[key] !== value) {
-                this.setRaw(key, value);
+            var old = this._settings[key];
+            this._settings[key] = value;
+            if (old !== value) {
+                this._setRaw(key, old, value);
                 this._markDirtyKey(key);
             }
         }
@@ -608,9 +626,9 @@ var Settings = /** @class */ (function () {
         value: function (key) {
             var animation = this._animatingSettings[key];
             if (animation) {
-                animation.stop();
                 delete this._animatingSettings[key];
                 --this._animatingCount;
+                animation.stop();
             }
         }
     });
@@ -627,8 +645,8 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, value) {
-            this._stopAnimation(key);
             this._set(key, value);
+            this._stopAnimation(key);
             return value;
         }
     });
@@ -643,13 +661,13 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key) {
-            this._stopAnimation(key);
             if (key in this._settings) {
                 this._prevSettings[key] = this._settings[key];
                 delete this._settings[key];
                 this._sendKeyEvent(key, undefined);
                 this._markDirtyKey(key);
             }
+            this._stopAnimation(key);
         }
     });
     /**
@@ -678,14 +696,27 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, fallback) {
-            if (key in this._privateSettings) {
-                return this._privateSettings[key];
+            var value = this._privateSettings[key];
+            if (value !== undefined) {
+                return value;
             }
             else {
                 return fallback;
             }
         }
     });
+    /**
+     * @ignore
+     */
+    Object.defineProperty(Settings.prototype, "_setPrivateRaw", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (key, old, value) {
+            this._prevPrivateSettings[key] = old;
+            this._sendPrivateKeyEvent(key, value);
+        }
+    });
     /**
      * @ignore
      */
@@ -694,10 +725,11 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, value) {
-            this._prevPrivateSettings[key] = this._privateSettings[key];
-            this._sendPrivateKeyEvent(key, value);
+            var old = this._privateSettings[key];
             this._privateSettings[key] = value;
-            return value;
+            if (old !== value) {
+                this._setPrivateRaw(key, old, value);
+            }
         }
     });
     /**
@@ -708,8 +740,10 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, value) {
-            if (this._privateSettings[key] !== value) {
-                this.setPrivateRaw(key, value);
+            var old = this._privateSettings[key];
+            this._privateSettings[key] = value;
+            if (old !== value) {
+                this._setPrivateRaw(key, old, value);
                 this._markDirtyPrivateKey(key);
             }
         }
@@ -735,8 +769,8 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key, value) {
-            this._stopAnimationPrivate(key);
             this._setPrivate(key, value);
+            this._stopAnimationPrivate(key);
             return value;
         }
     });
@@ -748,12 +782,12 @@ var Settings = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (key) {
-            this._stopAnimationPrivate(key);
             if (key in this._privateSettings) {
                 this._prevPrivateSettings[key] = this._privateSettings[key];
                 delete this._privateSettings[key];
                 this._markDirtyPrivateKey(key);
             }
+            this._stopAnimationPrivate(key);
         }
     });
     /**
@@ -898,7 +932,8 @@ var Entity = /** @class */ (function (_super) {
      * @see {@link https://www.amcharts.com/docs/v5/getting-started/#New_element_syntax} for more info
      * @ignore
      */
-    function Entity(root, settings, isReal, template) {
+    function Entity(root, settings, isReal, templates) {
+        if (templates === void 0) { templates = []; }
         var _this = _super.call(this, settings) || this;
         Object.defineProperty(_this, "_root", {
             enumerable: true,
@@ -961,6 +996,13 @@ var Entity = /** @class */ (function (_super) {
             writable: true,
             value: []
         });
+        // Internal templates which can be overridden by the user's templates
+        Object.defineProperty(_this, "_internalTemplates", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         // Disposers for all of the templates
         Object.defineProperty(_this, "_templateDisposers", {
             enumerable: true,
@@ -991,22 +1033,61 @@ var Entity = /** @class */ (function (_super) {
             throw new Error("You cannot use `new Class()`, instead use `Class.new()`");
         }
         _this._root = root;
-        _this._template = template;
+        _this._internalTemplates = templates;
         return _this;
     }
+    /**
+     * Use this method to create an instance of this class.
+     *
+     * @see {@link https://www.amcharts.com/docs/v5/getting-started/#New_element_syntax} for more info
+     * @param   root      Root element
+     * @param   settings  Settings
+     * @param   template  Template
+     * @return            Instantiated object
+     */
+    Object.defineProperty(Entity, "new", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (root, settings, template) {
+            var x = (new this(root, settings, true));
+            x._template = template;
+            x._afterNew();
+            return x;
+        }
+    });
+    Object.defineProperty(Entity, "_new", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (root, settings, templates) {
+            if (templates === void 0) { templates = []; }
+            var x = (new this(root, settings, true, templates));
+            x._afterNew();
+            return x;
+        }
+    });
     Object.defineProperty(Entity.prototype, "_afterNew", {
         enumerable: false,
         configurable: true,
         writable: true,
         value: function () {
+            var _this = this;
             this._checkDirty();
+            var shouldApply = false;
             var template = this._template;
             if (template) {
+                shouldApply = true;
                 template._setObjectTemplate(this);
-                this._applyTemplate(template, {}, {});
+            }
+            $array.each(this._internalTemplates, function (template) {
+                shouldApply = true;
+                template._setObjectTemplate(_this);
+            });
+            if (shouldApply) {
+                this._applyTemplates(false);
             }
             this.states.create("default", {});
-            this._setRawDefault("autoDispose", true);
             this._setDefaults();
         }
     });
@@ -1228,8 +1309,8 @@ var Entity = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function (key, fallback) {
-            if (key in this._settings) {
-                var value = this._settings[key];
+            var value = this._settings[key];
+            if (value !== undefined) {
                 return this.adapters.fold(key, value);
             }
             else {
@@ -1254,6 +1335,18 @@ var Entity = /** @class */ (function (_super) {
             return _super.prototype.set.call(this, key, value);
         }
     });
+    /**
+     * @ignore
+     */
+    Object.defineProperty(Entity.prototype, "setRaw", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (key, value) {
+            this._userProperties[key] = true;
+            _super.prototype.setRaw.call(this, key, value);
+        }
+    });
     /**
      * Sets a setting `value` for the specified `key` only if the value for this key was not set previously using set method, and returns the same `value`.
      *
@@ -1288,6 +1381,18 @@ var Entity = /** @class */ (function (_super) {
             this._removeTemplateProperty(key);
         }
     });
+    /**
+     * @ignore
+     */
+    Object.defineProperty(Entity.prototype, "setPrivate", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (key, value) {
+            this._userPrivateProperties[key] = true;
+            return _super.prototype.setPrivate.call(this, key, value);
+        }
+    });
     /**
      * @ignore
      */
@@ -1297,7 +1402,7 @@ var Entity = /** @class */ (function (_super) {
         writable: true,
         value: function (key, value) {
             this._userPrivateProperties[key] = true;
-            return _super.prototype.setPrivateRaw.call(this, key, value);
+            _super.prototype.setPrivateRaw.call(this, key, value);
         }
     });
     /**
@@ -1381,23 +1486,43 @@ var Entity = /** @class */ (function (_super) {
             f(this);
         }
     });
+    // TODO faster version of this method which is specialized to just 1 key
+    Object.defineProperty(Entity.prototype, "_applyStateByKey", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (name) {
+            var other = this.states.create(name, {});
+            var seen = {};
+            this._eachTemplate(function (template) {
+                var state = template.states.lookup(name);
+                if (state) {
+                    state._apply(other, seen);
+                }
+            });
+            $object.each(other._settings, function (key) {
+                if (!seen[key] && !other._userSettings[key]) {
+                    other.remove(key);
+                }
+            });
+        }
+    });
     Object.defineProperty(Entity.prototype, "_applyTemplate", {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (template, settings, privateProperties) {
+        value: function (template, state) {
             var _this = this;
-            this._templateDisposers.push(template._apply(this));
-            template.states._apply(this);
+            this._templateDisposers.push(template._apply(this, state));
             $object.each(template._settings, function (key, value) {
-                if (!_this._userProperties[key] && !settings[key]) {
-                    settings[key] = true;
+                if (!state.settings[key] && !_this._userProperties[key]) {
+                    state.settings[key] = true;
                     _super.prototype.set.call(_this, key, value);
                 }
             });
             $object.each(template._privateSettings, function (key, value) {
-                if (!_this._userPrivateProperties[key] && !privateProperties[key]) {
-                    privateProperties[key] = true;
+                if (!state.privateSettings[key] && !_this._userPrivateProperties[key]) {
+                    state.privateSettings[key] = true;
                     _super.prototype.setPrivate.call(_this, key, value);
                 }
             });
@@ -1431,6 +1556,7 @@ var Entity = /** @class */ (function (_super) {
                 f(template);
                 return false;
             });
+            $array.each(this._internalTemplates, f);
             $array.each(this._templates, f);
         }
     });
@@ -1438,46 +1564,32 @@ var Entity = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function () {
+        value: function (remove) {
             var _this = this;
-            this._disposeTemplates();
-            var settings = {};
-            var privateProperties = {};
+            if (remove === void 0) { remove = true; }
+            if (remove) {
+                this._disposeTemplates();
+            }
+            var state = {
+                settings: {},
+                privateSettings: {},
+                states: {},
+            };
             this._eachTemplate(function (template) {
-                _this._applyTemplate(template, settings, privateProperties);
-            });
-            $object.each(this._settings, function (key) {
-                if (!_this._userProperties[key] && !settings[key]) {
-                    _super.prototype.remove.call(_this, key);
-                }
-            });
-            $object.each(this._privateSettings, function (key) {
-                if (!_this._userPrivateProperties[key] && !privateProperties[key]) {
-                    _super.prototype.removePrivate.call(_this, key);
-                }
-            });
-        }
-    });
-    Object.defineProperty(Entity.prototype, "_addTheme", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (theme, themeTags) {
-            var _this = this;
-            $array.eachReverse(this.classNames, function (name) {
-                var rules = theme._lookupRules(name);
-                if (rules) {
-                    $array.eachReverse(rules, function (rule) {
-                        var matches = rule.tags.every(function (tag) {
-                            return themeTags.has(tag);
-                        });
-                        if (matches) {
-                            rule.template._setObjectTemplate(_this);
-                            _this._templates.push(rule.template);
-                        }
-                    });
-                }
+                _this._applyTemplate(template, state);
             });
+            if (remove) {
+                $object.each(this._settings, function (key) {
+                    if (!_this._userProperties[key] && !state.settings[key]) {
+                        _super.prototype.remove.call(_this, key);
+                    }
+                });
+                $object.each(this._privateSettings, function (key) {
+                    if (!_this._userPrivateProperties[key] && !state.privateSettings[key]) {
+                        _super.prototype.removePrivate.call(_this, key);
+                    }
+                });
+            }
         }
     });
     Object.defineProperty(Entity.prototype, "_findTemplate", {
@@ -1487,7 +1599,13 @@ var Entity = /** @class */ (function (_super) {
         value: function (f) {
             var value = this._findStaticTemplate(f);
             if (value === undefined) {
-                return $array.find(this._templates, f);
+                var value_1 = $array.find(this._internalTemplates, f);
+                if (value_1 === undefined) {
+                    return $array.find(this._templates, f);
+                }
+                else {
+                    return value_1;
+                }
             }
             else {
                 return value;
@@ -1546,6 +1664,12 @@ var Entity = /** @class */ (function (_super) {
             var isConnected = false;
             var themes = [];
             var themeTags = new Set();
+            var tags = this.get("themeTagsSelf");
+            if (tags) {
+                $array.each(tags, function (tag) {
+                    themeTags.add(tag);
+                });
+            }
             this._walkParents(function (entity) {
                 if (entity === _this._root._rootContainer) {
                     isConnected = true;
@@ -1563,9 +1687,35 @@ var Entity = /** @class */ (function (_super) {
             });
             this._removeTemplates();
             if (isConnected) {
-                $array.eachReverse(themes, function (themes) {
-                    $array.eachReverse(themes, function (theme) {
-                        _this._addTheme(theme, themeTags);
+                $array.eachReverse(this.classNames, function (name) {
+                    var allRules = [];
+                    $array.each(themes, function (themes) {
+                        $array.each(themes, function (theme) {
+                            var rules = theme._lookupRules(name);
+                            if (rules) {
+                                $array.eachReverse(rules, function (rule) {
+                                    var matches = rule.tags.every(function (tag) {
+                                        return themeTags.has(tag);
+                                    });
+                                    if (matches) {
+                                        var result = $array.getFirstSortedIndex(allRules, function (x) {
+                                            var order = $order.compare(rule.tags.length, x.tags.length);
+                                            if (order === 0) {
+                                                return $order.compareArray(rule.tags, x.tags, $order.compare);
+                                            }
+                                            else {
+                                                return order;
+                                            }
+                                        });
+                                        allRules.splice(result.index, 0, rule);
+                                    }
+                                });
+                            }
+                        });
+                    });
+                    $array.each(allRules, function (rule) {
+                        _this._templates.push(rule.template);
+                        rule.template._setObjectTemplate(_this);
                     });
                 });
             }
@@ -1587,7 +1737,21 @@ var Entity = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function () { }
+        value: function () {
+            if (this.isDirty("id")) {
+                var id = this.get("id");
+                if (id) {
+                    if (registry.entitiesById[id]) {
+                        throw new Error("An entity with id \"" + id + "\" already exists.");
+                    }
+                    registry.entitiesById[id] = this;
+                }
+                var prevId = this._prevSettings.id;
+                if (prevId) {
+                    delete registry.entitiesById[prevId];
+                }
+            }
+        }
     });
     Object.defineProperty(Entity.prototype, "_afterChanged", {
         enumerable: false,
@@ -1612,11 +1776,15 @@ var Entity = /** @class */ (function (_super) {
         configurable: true,
         writable: true,
         value: function () {
+            var _this = this;
             _super.prototype._dispose.call(this);
             var template = this._template;
             if (template) {
                 template._removeObjectTemplate(this);
             }
+            $array.each(this._internalTemplates, function (template) {
+                template._removeObjectTemplate(_this);
+            });
             this._removeTemplates();
             this._disposeTemplates();
             this.events.dispose();
@@ -1628,6 +1796,10 @@ var Entity = /** @class */ (function (_super) {
                     disposer.dispose();
                 });
             });
+            var id = this.get("id");
+            if (id) {
+                delete registry.entitiesById[id];
+            }
         }
     });
     /**