@wcardinal/wcardinal-ui 0.200.1 → 0.201.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.200.1
+ Winter Cardinal UI v0.201.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -7833,15 +7833,17 @@
             var data = shape.data;
             var isEffectTimeUp = this.effect <= time;
             if (data.isChanged || this.isStateChanged || isEffectTimeUp) {
+                this.isStateChanged = false;
+                data.isChanged = false;
                 if (isEffectTimeUp) {
                     this.effect = NaN;
                 }
                 shape.disallowUploadedUpdate();
                 this.onUpdate(shape, time);
                 shape.allowUploadedUpdate();
+                var wasStateChanged = this.isStateChanged;
                 shape.state.removeAll(EShapeState.CLICKED, EShapeState.DOWN, EShapeState.UP, EShapeState.ACTIVATED, EShapeState.DEACTIVATED);
-                this.isStateChanged = false;
-                data.isChanged = false;
+                this.isStateChanged = wasStateChanged;
             }
         };
         EShapeRuntime.prototype.onRender = function (shape, time, renderer) {
@@ -13521,9 +13523,9 @@
             if (target === this) {
                 return true;
             }
-            else if (target != null && !(target instanceof DBase)) {
+            else if (target != null && !(target instanceof DBase && target.interactive)) {
                 var parent_5 = target.parent;
-                while (parent_5 != null && !(parent_5 instanceof DBase)) {
+                while (parent_5 != null && !(parent_5 instanceof DBase && parent_5.interactive)) {
                     parent_5 = parent_5.parent;
                 }
                 return parent_5 === this;
@@ -46295,9 +46297,9 @@
     var isCommandClean = function (command) {
         return !!(command.getFlag() & DCommandFlag.CLEAN);
     };
-    var DControllerDefaultCommand = /** @class */ (function (_super) {
-        __extends(DControllerDefaultCommand, _super);
-        function DControllerDefaultCommand() {
+    var DControllerCommandImpl = /** @class */ (function (_super) {
+        __extends(DControllerCommandImpl, _super);
+        function DControllerCommandImpl() {
             var _this = _super.call(this) || this;
             _this._position = 0;
             _this._done = [];
@@ -46305,7 +46307,7 @@
             _this._executing = null;
             return _this;
         }
-        DControllerDefaultCommand.prototype.last = function () {
+        DControllerCommandImpl.prototype.last = function () {
             var done = this._done;
             var waiting = this._waiting;
             if (waiting.length <= 0) {
@@ -46320,11 +46322,11 @@
                 return waiting[waiting.length - 1];
             }
         };
-        DControllerDefaultCommand.prototype.push = function (command) {
+        DControllerCommandImpl.prototype.push = function (command) {
             this._waiting.push(command);
             this.next();
         };
-        DControllerDefaultCommand.prototype.next = function () {
+        DControllerCommandImpl.prototype.next = function () {
             if (this._executing != null) {
                 // Still executing a command.
                 // So do nothing.
@@ -46352,7 +46354,7 @@
                 this.execute(command);
             }
         };
-        DControllerDefaultCommand.prototype.executeUndo = function (command) {
+        DControllerCommandImpl.prototype.executeUndo = function (command) {
             var _this = this;
             var done = this._done;
             if (this._position < done.length) {
@@ -46375,7 +46377,7 @@
                 }
             }
         };
-        DControllerDefaultCommand.prototype.executeRedo = function (command) {
+        DControllerCommandImpl.prototype.executeRedo = function (command) {
             var _this = this;
             var done = this._done;
             if (0 < this._position) {
@@ -46398,7 +46400,7 @@
                 }
             }
         };
-        DControllerDefaultCommand.prototype.execute = function (command) {
+        DControllerCommandImpl.prototype.execute = function (command) {
             var _this = this;
             var isClear = isCommandClear(command);
             var isStorable = isCommandStorable(command);
@@ -46426,7 +46428,7 @@
                 });
             }
         };
-        DControllerDefaultCommand.prototype.cleanup = function () {
+        DControllerCommandImpl.prototype.cleanup = function () {
             var done = this._done;
             var size = done.length - 100;
             if (0 < size) {
@@ -46436,7 +46438,7 @@
                 }
             }
         };
-        DControllerDefaultCommand.prototype.remove = function (size) {
+        DControllerCommandImpl.prototype.remove = function (size) {
             var done = this._done;
             if (0 < size) {
                 var ifrom = Math.max(0, done.length - size);
@@ -46451,7 +46453,7 @@
             }
             return false;
         };
-        DControllerDefaultCommand.prototype.onSuccess = function (command) {
+        DControllerCommandImpl.prototype.onSuccess = function (command) {
             this._executing = null;
             if (isCommandStorable(command)) {
                 this._done.push(command);
@@ -46462,7 +46464,7 @@
             this.emit("change", this);
             this.next();
         };
-        DControllerDefaultCommand.prototype.onSuccessUndo = function (undoed) {
+        DControllerCommandImpl.prototype.onSuccessUndo = function (undoed) {
             this._executing = null;
             if (!isCommandClean(undoed)) {
                 this.emit("dirty", this);
@@ -46470,7 +46472,7 @@
             this.emit("change", this);
             this.next();
         };
-        DControllerDefaultCommand.prototype.onSuccessRedo = function (redoed) {
+        DControllerCommandImpl.prototype.onSuccessRedo = function (redoed) {
             this._executing = null;
             if (!isCommandClean(redoed)) {
                 this.emit("dirty", this);
@@ -46478,7 +46480,7 @@
             this.emit("change", this);
             this.next();
         };
-        DControllerDefaultCommand.prototype.onFail = function (command) {
+        DControllerCommandImpl.prototype.onFail = function (command) {
             this._executing = null;
             var waiting = this._waiting;
             command.destroy();
@@ -46488,31 +46490,31 @@
             waiting.length = 0;
             this.emit("change", this);
         };
-        DControllerDefaultCommand.prototype.size = function () {
+        DControllerCommandImpl.prototype.size = function () {
             return this._done.length;
         };
-        DControllerDefaultCommand.prototype.clear = function () {
+        DControllerCommandImpl.prototype.clear = function () {
             this.push(new DCommandClear());
         };
-        DControllerDefaultCommand.prototype.redo = function () {
+        DControllerCommandImpl.prototype.redo = function () {
             if (this.isRedoable()) {
                 this._waiting.push(new DCommandRedo());
                 this.next();
             }
         };
-        DControllerDefaultCommand.prototype.undo = function () {
+        DControllerCommandImpl.prototype.undo = function () {
             if (this.isUndoable()) {
                 this._waiting.push(new DCommandUndo());
                 this.next();
             }
         };
-        DControllerDefaultCommand.prototype.isRedoable = function () {
+        DControllerCommandImpl.prototype.isRedoable = function () {
             return 0 < this._position && this._executing == null;
         };
-        DControllerDefaultCommand.prototype.isUndoable = function () {
+        DControllerCommandImpl.prototype.isUndoable = function () {
             return this._position < this._done.length && this._executing == null;
         };
-        return DControllerDefaultCommand;
+        return DControllerCommandImpl;
     }(pixi_js.utils.EventEmitter));
 
     /*
@@ -46599,7 +46601,7 @@
         // Command
         DControllers.getCommandController = function () {
             if (this.COMMAND == null) {
-                this.COMMAND = new DControllerDefaultCommand();
+                this.COMMAND = new DControllerCommandImpl();
             }
             return this.COMMAND;
         };
@@ -46913,25 +46915,27 @@
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
      */
-    var DControllerDefaultFocus = /** @class */ (function () {
-        function DControllerDefaultFocus() {
+    var DControllerFocusImpl = /** @class */ (function () {
+        function DControllerFocusImpl() {
             this._focused = null;
         }
-        DControllerDefaultFocus.prototype.focus = function (focusable) {
+        DControllerFocusImpl.prototype.focus = function (focusable) {
             var previous = this._focused;
             if (previous !== focusable) {
                 if (previous != null) {
+                    console.log("previous", previous.constructor.name);
                     previous.state.isFocused = false;
                 }
                 this._focused = focusable;
                 if (this.isFocusable(focusable)) {
+                    console.log("previous", focusable.constructor.name);
                     focusable.state.isFocused = true;
                 }
                 return previous;
             }
             return null;
         };
-        DControllerDefaultFocus.prototype.blur = function (focusable) {
+        DControllerFocusImpl.prototype.blur = function (focusable) {
             if (focusable != null && this._focused === focusable) {
                 this._focused = null;
                 focusable.state.isFocused = false;
@@ -46939,10 +46943,10 @@
             }
             return null;
         };
-        DControllerDefaultFocus.prototype.clear = function () {
+        DControllerFocusImpl.prototype.clear = function () {
             return this.focus(null);
         };
-        DControllerDefaultFocus.prototype.set = function (focusable, isFocused) {
+        DControllerFocusImpl.prototype.set = function (focusable, isFocused) {
             if (isFocused) {
                 return this.focus(focusable);
             }
@@ -46950,10 +46954,10 @@
                 return this.blur(focusable);
             }
         };
-        DControllerDefaultFocus.prototype.get = function () {
+        DControllerFocusImpl.prototype.get = function () {
             return this._focused;
         };
-        DControllerDefaultFocus.prototype.findParent = function (mightBeFocusable) {
+        DControllerFocusImpl.prototype.findParent = function (mightBeFocusable) {
             var current = mightBeFocusable;
             while (current != null) {
                 if (this.isFocusable(current)) {
@@ -46965,7 +46969,7 @@
             }
             return null;
         };
-        DControllerDefaultFocus.prototype.find = function (target, includesTarget, includesTargetChildren, direction, root) {
+        DControllerFocusImpl.prototype.find = function (target, includesTarget, includesTargetChildren, direction, root) {
             if (direction) {
                 var result = this.findNext(target, includesTarget, includesTargetChildren);
                 if (result != null) {
@@ -47079,7 +47083,7 @@
             }
             return null;
         };
-        DControllerDefaultFocus.prototype.findNext = function (target, includesTarget, includesTargetChildren) {
+        DControllerFocusImpl.prototype.findNext = function (target, includesTarget, includesTargetChildren) {
             // Target itself
             if (includesTarget) {
                 if (this.isFocusable(target)) {
@@ -47110,7 +47114,7 @@
             // Found nothing
             return null;
         };
-        DControllerDefaultFocus.prototype.findPrevious = function (target, includesTarget, includesTargetChildren) {
+        DControllerFocusImpl.prototype.findPrevious = function (target, includesTarget, includesTargetChildren) {
             // Target children
             if (includesTargetChildren && this.isFocusableContainer(target) && target.visible) {
                 var children = target.children;
@@ -47141,26 +47145,26 @@
             // Found nothing
             return null;
         };
-        DControllerDefaultFocus.prototype.isFocusable = function (target) {
+        DControllerFocusImpl.prototype.isFocusable = function (target) {
             return (target != null &&
                 "state" in target &&
                 target.state.inEnabled &&
                 target.state.isFocusable &&
                 target.visible);
         };
-        DControllerDefaultFocus.prototype.isFocusableContainer = function (target) {
+        DControllerFocusImpl.prototype.isFocusableContainer = function (target) {
             return target != null && "children" in target;
         };
-        DControllerDefaultFocus.prototype.isFocusRoot = function (target, root) {
+        DControllerFocusImpl.prototype.isFocusRoot = function (target, root) {
             if (target === root) {
                 return true;
             }
             return target != null && "state" in target && target.state.isFocusRoot && target.visible;
         };
-        DControllerDefaultFocus.prototype.isFocusReverse = function (target) {
+        DControllerFocusImpl.prototype.isFocusReverse = function (target) {
             return target != null && "state" in target && target.state.isFocusReverse;
         };
-        return DControllerDefaultFocus;
+        return DControllerFocusImpl;
     }());
 
     /*
@@ -47242,7 +47246,7 @@
         };
         DApplication.prototype.getFocusController = function () {
             if (this._focus == null) {
-                this._focus = new DControllerDefaultFocus();
+                this._focus = new DControllerFocusImpl();
             }
             return this._focus;
         };
@@ -59139,7 +59143,7 @@
         DDiagramCanvas.prototype.initialize = function (shapes, mapper) {
             var time = Date.now();
             var actionables = this._actionables;
-            this.initialize_(shapes, null, mapper, new Map(), new Map(), new Map(), this._ticker, this._shape, this._data, actionables);
+            this.initialize_(shapes, null, null, mapper, new Map(), new Map(), new Map(), this._ticker, this._shape, this._data, actionables);
             var layers = this._layer.children;
             for (var i = 0, imax = layers.length; i < imax; ++i) {
                 layers[i].initialize(actionables);
@@ -59154,7 +59158,7 @@
             EShapeActionEnvironment.isInitializing = false;
             this._ticker.start();
         };
-        DDiagramCanvas.prototype.initialize_ = function (shapes, dataShape, mapper, formatToFormatter, initialToInitialValue, actionValueToRuntime, canvasTicker, canvasShape, canvasData, actionables) {
+        DDiagramCanvas.prototype.initialize_ = function (shapes, dataShape, containerShape, mapper, formatToFormatter, initialToInitialValue, actionValueToRuntime, canvasTicker, canvasShape, canvasData, actionables) {
             var _loop_1 = function (i, imax) {
                 var shape = shapes[i];
                 // ID
@@ -59163,7 +59167,7 @@
                     canvasShape.add(id, shape);
                 }
                 // Data
-                this_1.initData(shape, dataShape, mapper, formatToFormatter, initialToInitialValue, canvasTicker, canvasData);
+                this_1.initData(shape, dataShape, containerShape, mapper, formatToFormatter, initialToInitialValue, canvasTicker, canvasData);
                 // Runtime
                 var runtime = new (EShapeRuntimes[shape.type] || EShapeRuntime)(shape);
                 shape.runtime = runtime;
@@ -59185,7 +59189,13 @@
                 // Children
                 var children = shape.children;
                 if (0 < children.length) {
-                    this_1.initialize_(children, this_1.toDataShape(dataShape, shape), mapper, formatToFormatter, initialToInitialValue, actionValueToRuntime, canvasTicker, canvasShape, canvasData, actionables);
+                    if (shape instanceof EShapeEmbedded) {
+                        if (dataShape == null) {
+                            dataShape = shape;
+                        }
+                        containerShape = shape;
+                    }
+                    this_1.initialize_(children, dataShape, containerShape, mapper, formatToFormatter, initialToInitialValue, actionValueToRuntime, canvasTicker, canvasShape, canvasData, actionables);
                 }
             };
             var this_1 = this;
@@ -59193,105 +59203,107 @@
                 _loop_1(i);
             }
         };
-        DDiagramCanvas.prototype.initData = function (shape, dataShape, mapper, formatToFormatter, initialToInitialValue, canvasTicker, canvasData) {
+        DDiagramCanvas.prototype.initData = function (shape, dataShape, containerShape, 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 (containerShape) {
+                                    containerShape.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;
                 }
             }
         };
@@ -59363,15 +59375,6 @@
                     return "0";
             }
         };
-        DDiagramCanvas.prototype.toDataShape = function (dataShape, shape) {
-            if (dataShape != null) {
-                return dataShape;
-            }
-            if (shape instanceof EShapeEmbedded) {
-                return shape;
-            }
-            return null;
-        };
         DDiagramCanvas.prototype.onDestroy = function () {
             this._ticker.stop();
             _super.prototype.onDestroy.call(this);
@@ -71732,8 +71735,8 @@
         DCommandSave: DCommandSave,
         DCommandUndo: DCommandUndo,
         DContent: DContent,
-        DControllerDefaultCommand: DControllerDefaultCommand,
-        DControllerDefaultFocus: DControllerDefaultFocus,
+        DControllerCommandImpl: DControllerCommandImpl,
+        DControllerFocusImpl: DControllerFocusImpl,
         DControllerKeyboard: DControllerKeyboard,
         DControllers: DControllers,
         DCornerMask: DCornerMask,