@wcardinal/wcardinal-ui 0.199.1 → 0.200.2

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.199.1
+ Winter Cardinal UI v0.200.2
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -22004,25 +22004,31 @@ var DDiagrams = /** @class */ (function () {
         }
     };
     DDiagrams.toPieceData = function (controller, pieces, isEditMode) {
-        var result = new Map();
+        var pieceToDatum = new Map();
+        var pieceToPromise = new Map();
         var onFulfilled = function () {
-            return result;
+            return pieceToDatum;
         };
-        return this.toPieceData_(controller, pieces, result, isEditMode).then(onFulfilled, onFulfilled);
+        return this.toPieceData_(controller, pieces, pieceToDatum, pieceToPromise, isEditMode).then(onFulfilled, onFulfilled);
     };
-    DDiagrams.toPieceData_ = function (controller, pieces, pieceData, isEditMode) {
+    DDiagrams.toPieceData_ = function (controller, pieces, pieceToDatum, pieceToPromise, isEditMode) {
         var _this = this;
         var promises = [];
         if (pieces && 0 < pieces.length && controller) {
             var _loop_1 = function (i, imax) {
                 var piece = pieces[i];
-                if (!pieceData.has(piece)) {
-                    pieceData.set(piece, null);
-                    promises.push(controller.piece.getByName(piece).then(function (found) {
-                        return _this.toPieceData__(controller, piece, found, isEditMode, pieceData);
+                var promise = pieceToPromise.get(piece);
+                if (promise != null) {
+                    promises.push(promise);
+                }
+                else {
+                    var newPromise = controller.piece.getByName(piece).then(function (found) {
+                        return _this.toPieceData__(controller, piece, found, isEditMode, pieceToDatum, pieceToPromise);
                     }, function () {
                         return null;
-                    }));
+                    });
+                    pieceToPromise.set(piece, newPromise);
+                    promises.push(newPromise);
                 }
             };
             for (var i = 0, imax = pieces.length; i < imax; ++i) {
@@ -22031,16 +22037,16 @@ var DDiagrams = /** @class */ (function () {
         }
         return Promise.all(promises);
     };
-    DDiagrams.toPieceData__ = function (controller, name, serializedOrSimple, isEditMode, pieceData) {
+    DDiagrams.toPieceData__ = function (controller, name, serializedOrSimple, isEditMode, pieceToDatum, pieceToPromise) {
         var _this = this;
         var serialized = this.toSerialized(serializedOrSimple);
         var width = serialized.width;
         var height = serialized.height;
         var container = new EShapeEmbeddedLayerContainer(width, height, isEditMode);
-        pieceData.set(name, new EShapeEmbeddedDatum(name, width, height, container));
+        pieceToDatum.set(name, new EShapeEmbeddedDatum(name, width, height, container));
         var pieces = serialized.pieces;
-        return this.toPieceData_(controller, pieces, pieceData, isEditMode).then(function () {
-            return _this.newLayer(serialized, container, new EShapeResourceManagerDeserialization(serialized, pieces, pieceData, isEditMode));
+        return this.toPieceData_(controller, pieces, pieceToDatum, pieceToPromise, isEditMode).then(function () {
+            return _this.newLayer(serialized, container, new EShapeResourceManagerDeserialization(serialized, pieces, pieceToDatum, isEditMode));
         });
     };
     return DDiagrams;
@@ -75626,45 +75632,59 @@ var DDiagramBase = /** @class */ (function (_super) {
         configurable: true
     });
     DDiagramBase.prototype.set = function (serialized) {
+        var _this = this;
         var oldSerialized = this._serialized;
         if (oldSerialized !== serialized) {
             if (oldSerialized) {
                 this._serialized = null;
+                var canvas = this.canvas;
+                if (canvas) {
+                    this.canvas = null;
+                }
                 this.onUnset();
             }
             this._serialized = serialized;
             if (serialized) {
-                this.onSet(serialized);
+                var canvas_1 = this.newCanvas(serialized);
+                var pieces_1 = serialized.pieces;
+                var isEditMode_1 = this.isEditMode();
+                var result = DDiagrams.toPieceData(this._controller, pieces_1, isEditMode_1).then(function (pieceData) {
+                    return _this.newLayer(serialized, canvas_1, isEditMode_1, pieces_1, pieceData);
+                });
+                this.onSet(serialized, canvas_1);
+                this.canvas = canvas_1;
+                return result;
             }
+            else {
+                return Promise.resolve(null);
+            }
+        }
+        else {
+            return Promise.resolve(this.canvas);
         }
     };
-    DDiagramBase.prototype.onSet = function (serialized) {
-        var _this = this;
-        var canvas = this.newCanvas(serialized);
-        var pieces = serialized.pieces;
-        var isEditMode = this.isEditMode();
-        DDiagrams.toPieceData(this._controller, pieces, isEditMode).then(function (pieceData) {
-            _this.newLayer(serialized, canvas, isEditMode, pieces, pieceData);
-        });
-        this.canvas = canvas;
+    DDiagramBase.prototype.onSet = function (serialized, canvas) {
+        // DO NOTHING
     };
     DDiagramBase.prototype.newLayer = function (serialized, canvas, isEditMode, pieces, pieceData) {
         var _this = this;
         var manager = new EShapeResourceManagerDeserialization(serialized, pieces, pieceData, isEditMode);
-        DDiagrams.newLayer(serialized, canvas.layer, manager).then(function (shapes) {
-            _this.initLayer(canvas, shapes);
+        var result = DDiagrams.newLayer(serialized, canvas.layer, manager).then(function (shapes) {
+            return _this.initLayer(canvas, shapes);
         });
         if (this._isAmbient) {
             var background = this.toCanvasBaseBackgroundOptions(serialized, this.theme, false);
             this.background.color = background.color;
             this.background.alpha = background.alpha;
         }
+        return result;
     };
     DDiagramBase.prototype.initLayer = function (canvas, shapes, mapper) {
         canvas.layer.init();
         canvas.initialize(shapes, mapper);
         DApplications.update(this);
         this.emit("ready", this);
+        return canvas;
     };
     DDiagramBase.prototype.toCanvasBaseOptions = function (serialized) {
         var _a;
@@ -75699,10 +75719,7 @@ var DDiagramBase = /** @class */ (function (_super) {
         };
     };
     DDiagramBase.prototype.onUnset = function () {
-        var canvas = this.canvas;
-        if (canvas) {
-            this.canvas = null;
-        }
+        // DO NOTHING
     };
     DDiagramBase.prototype.get = function () {
         return this._serialized;
@@ -76956,103 +76973,105 @@ var DDiagramCanvas = /** @class */ (function (_super) {
     };
     DDiagramCanvas.prototype.initData = function (shape, dataShape, mapper, formatToFormatter, initialToInitialValue, canvasTicker, canvasData) {
         var data = shape.data;
+        var format = "";
+        var initial = "";
         for (var i = 0, imax = data.size(); i < imax; ++i) {
             var value = data.get(i);
-            if (value) {
-                var type = value.type;
-                var format = value.format;
-                var initial = value.initial;
-                switch (type) {
-                    case EShapeDataValueType.NUMBER:
-                    case EShapeDataValueType.NUMBER_ARRAY:
-                    case EShapeDataValueType.STRING:
-                    case EShapeDataValueType.STRING_ARRAY:
-                    case EShapeDataValueType.OBJECT:
-                    case EShapeDataValueType.OBJECT_ARRAY:
-                        // Mapping
-                        if (value.scope === EShapeDataValueScope.PRIVATE) {
-                            var id = value.id;
-                            if (0 < id.length) {
-                                if (dataShape) {
-                                    dataShape.data.private.add(id, value);
-                                }
-                                else {
-                                    canvasData.private.add(id, value);
-                                }
+            if (value == null)
+                continue;
+            switch (value.type) {
+                case EShapeDataValueType.NUMBER:
+                case EShapeDataValueType.NUMBER_ARRAY:
+                case EShapeDataValueType.STRING:
+                case EShapeDataValueType.STRING_ARRAY:
+                case EShapeDataValueType.OBJECT:
+                case EShapeDataValueType.OBJECT_ARRAY:
+                    // Mapping
+                    if (value.scope === EShapeDataValueScope.PRIVATE) {
+                        var id = value.id;
+                        if (0 < id.length) {
+                            if (dataShape) {
+                                dataShape.data.private.add(id, value);
                             }
-                        }
-                        else if (value.scope === EShapeDataValueScope.PROTECTED) {
-                            var id = value.id;
-                            if (0 < id.length) {
-                                canvasData.protected.add(id, value);
+                            else {
+                                canvasData.private.add(id, value);
                             }
                         }
-                        else {
-                            if (mapper) {
-                                mapper(value, dataShape || shape);
-                            }
-                            var id = value.id;
-                            if (0 < id.length) {
-                                canvasData.add(id, value);
-                            }
+                    }
+                    else if (value.scope === EShapeDataValueScope.PROTECTED) {
+                        var id = value.id;
+                        if (0 < id.length) {
+                            canvasData.protected.add(id, value);
                         }
-                        // Format
-                        if (formatToFormatter.has(format)) {
-                            value.formatter = formatToFormatter.get(format);
+                    }
+                    else {
+                        if (mapper) {
+                            mapper(value, dataShape || shape);
                         }
-                        else if (0 < format.length) {
-                            try {
-                                var formatter = this.calcFormatter(value, format, initial);
-                                formatToFormatter.set(format, formatter);
-                                value.formatter = formatter;
-                            }
-                            catch (e) {
-                                // DO NOTHING
-                            }
+                        var id = value.id;
+                        if (0 < id.length) {
+                            canvasData.add(id, value);
                         }
-                        // Initial
-                        if (initialToInitialValue.has(initial)) {
-                            value.value = initialToInitialValue.get(initial);
+                    }
+                    // Format
+                    format = value.format;
+                    initial = value.initial;
+                    if (formatToFormatter.has(format)) {
+                        value.formatter = formatToFormatter.get(format);
+                    }
+                    else if (0 < format.length) {
+                        try {
+                            var formatter = this.calcFormatter(value, format, initial);
+                            formatToFormatter.set(format, formatter);
+                            value.formatter = formatter;
                         }
-                        else if (0 < initial.length) {
-                            try {
-                                var initialValue = this.calcInitial(value, initial);
-                                initialToInitialValue.set(initial, initialValue);
-                                value.value = initialValue;
-                            }
-                            catch (e) {
-                                // DO NOTHING
-                            }
+                        catch (e) {
+                            // DO NOTHING
                         }
-                        break;
-                    case EShapeDataValueType.TICKER:
-                        // Initial
-                        if (initialToInitialValue.has(initial)) {
-                            value.value = 0;
-                            canvasTicker.add(initialToInitialValue.get(initial)).add(value);
+                    }
+                    // Initial
+                    if (initialToInitialValue.has(initial)) {
+                        value.value = initialToInitialValue.get(initial);
+                    }
+                    else if (0 < initial.length) {
+                        try {
+                            var initialValue = this.calcInitial(value, initial);
+                            initialToInitialValue.set(initial, initialValue);
+                            value.value = initialValue;
                         }
-                        else if (0 < initial.length) {
-                            try {
-                                var initialValue = this.calcInitial(value, initial);
-                                initialToInitialValue.set(initial, initialValue);
-                                value.value = 0;
-                                canvasTicker.add(initialValue).add(value);
-                            }
-                            catch (e) {
-                                // DO NOTHING
-                            }
+                        catch (e) {
+                            // DO NOTHING
                         }
-                        break;
-                    default:
-                        var extension = EShapeDataValueExtensions.get(type);
-                        if (extension) {
-                            // Mapping
-                            canvasData.extended.add(extension.id, value);
-                            // Initial
-                            value.value = extension.initial;
+                    }
+                    break;
+                case EShapeDataValueType.TICKER:
+                    // Initial
+                    initial = value.initial;
+                    if (initialToInitialValue.has(initial)) {
+                        value.value = 0;
+                        canvasTicker.add(initialToInitialValue.get(initial)).add(value);
+                    }
+                    else if (0 < initial.length) {
+                        try {
+                            var initialValue = this.calcInitial(value, initial);
+                            initialToInitialValue.set(initial, initialValue);
+                            value.value = 0;
+                            canvasTicker.add(initialValue).add(value);
                         }
-                        break;
-                }
+                        catch (e) {
+                            // DO NOTHING
+                        }
+                    }
+                    break;
+                default:
+                    var extension = EShapeDataValueExtensions.get(value.type);
+                    if (extension) {
+                        // Mapping
+                        canvasData.extended.add(extension.id, value);
+                        // Initial
+                        value.value = extension.initial;
+                    }
+                    break;
             }
         }
     };
@@ -77913,8 +77932,8 @@ var DDiagramEditor = /** @class */ (function (_super) {
             snap: undefined
         });
     };
-    DDiagramEditor.prototype.onSet = function (serialized) {
-        _super.prototype.onSet.call(this, serialized);
+    DDiagramEditor.prototype.onSet = function (serialized, canvas) {
+        _super.prototype.onSet.call(this, serialized, canvas);
         // Snap settings
         var snap = serialized.snap;
         var snapper = this._snapper;
@@ -78103,7 +78122,7 @@ var DDiagram = /** @class */ (function (_super) {
         return _this;
     }
     DDiagram.prototype.initLayer = function (canvas, shapes, mapper) {
-        _super.prototype.initLayer.call(this, canvas, shapes, mapper || this.data.mapper);
+        return _super.prototype.initLayer.call(this, canvas, shapes, mapper || this.data.mapper);
     };
     DDiagram.prototype.isEditMode = function () {
         return false;