@wcardinal/wcardinal-ui 0.157.0 → 0.158.0

package/dist/wcardinal/ui/d-base.js

@@ -80,7 +80,7 @@ var DBase = /** @class */ (function (_super) {
         _this._auto = new DBaseAutoSet();
         _this._isDirty = true;
         _this._hasDirty = false;
-        _this._isChildrenDirty = false;
+        _this._isHierarchyDirty = false;
         _this._shadow = null;
         _this.name = (_a = options === null || options === void 0 ? void 0 : options.name) !== null && _a !== void 0 ? _a : "";
         var theme = toTheme(options) || _this.getThemeDefault();
@@ -90,7 +90,7 @@ var DBase = /** @class */ (function (_super) {
         _this._clearType = toEnum((_b = options === null || options === void 0 ? void 0 : options.clear) !== null && _b !== void 0 ? _b : theme.getClearType(), DLayoutClearType);
         _this._padding = new DBasePadding(theme, options, function () {
             _this.toParentResized();
-            _this.toChildrenDirty();
+            _this.toHierarchyDirty();
             DApplications.update(_this);
         });
         var toDirtyAndUpdate = function () {
@@ -219,8 +219,8 @@ var DBase = /** @class */ (function (_super) {
             if (_this.isDirty() || _this.hasDirty()) {
                 _this.toParentHasDirty();
             }
-            if (_this._isChildrenDirty) {
-                _this.toParentChildrenDirty();
+            if (_this._isHierarchyDirty) {
+                _this.toParentHierarchyDirty();
             }
             var newParent = _this.parent;
             if (newParent instanceof DBase) {
@@ -312,7 +312,7 @@ var DBase = /** @class */ (function (_super) {
         new DBaseReflowableImpl(this);
     };
     DBase.prototype.onChildrenChange = function () {
-        this.toChildrenDirty();
+        this.toHierarchyDirty();
         _super.prototype.onChildrenChange.call(this);
     };
     DBase.prototype.onShortcut = function (e) {
@@ -342,46 +342,48 @@ var DBase = /** @class */ (function (_super) {
     DBase.prototype.resize = function (width, height) {
         var oldWidth = this._width;
         var oldHeight = this._height;
-        var widthResized = oldWidth !== width;
-        var heightResized = oldHeight !== height;
-        if (widthResized) {
-            this._width = width;
+        var newWidth = width != null ? width : oldWidth;
+        var newHeight = height != null ? height : oldHeight;
+        var isWidthChanged = oldWidth !== newWidth;
+        var isHeightChanged = oldHeight !== newHeight;
+        if (isWidthChanged) {
+            this._width = newWidth;
         }
-        if (heightResized) {
-            this._height = height;
+        if (isHeightChanged) {
+            this._height = newHeight;
         }
-        var resized = widthResized || heightResized;
-        if (resized) {
-            this.onResize(width, height, oldWidth, oldHeight);
+        var isChanged = isWidthChanged || isHeightChanged;
+        if (isChanged) {
+            this.onResize(newWidth, newHeight, oldWidth, oldHeight);
         }
-        if (widthResized) {
+        if (isWidthChanged) {
             var scalarSet = this._scalarSet;
             if (scalarSet.x != null) {
-                var position = this.transform.position;
+                var position = this._position;
                 var parent_1 = this.getParentOfSize();
                 if (parent_1) {
-                    this.x = scalarSet.x(parent_1.width, width, parent_1.padding.getLeft(), position.x);
+                    this._position.x = scalarSet.x(parent_1.width, newWidth, parent_1.padding.getLeft(), position.x);
                 }
             }
         }
-        if (heightResized) {
+        if (isHeightChanged) {
             var scalarSet = this._scalarSet;
             if (scalarSet.y != null) {
-                var position = this.transform.position;
+                var position = this._position;
                 var parent_2 = this.getParentOfSize();
                 if (parent_2) {
-                    this.y = scalarSet.y(parent_2.height, height, parent_2.padding.getTop(), position.y);
+                    this._position.y = scalarSet.y(parent_2.height, newHeight, parent_2.padding.getTop(), position.y);
                 }
             }
         }
-        return resized;
+        return isChanged;
     };
     DBase.prototype.getClearType = function () {
         return this._clearType;
     };
     DBase.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
         this.toDirty();
-        this.toChildrenDirty();
+        this.toHierarchyDirty();
         var padding = this._padding;
         var children = this.children;
         for (var i = 0, imax = children.length; i < imax; ++i) {
@@ -414,7 +416,7 @@ var DBase = /** @class */ (function (_super) {
             return this._position.x;
         },
         set: function (x) {
-            this._position.x = x;
+            this.setX(x);
         },
         enumerable: false,
         configurable: true
@@ -425,15 +427,25 @@ var DBase = /** @class */ (function (_super) {
             return scalarSet.x;
         }
         else {
-            return this.x;
+            return this._position.x;
         }
     };
     DBase.prototype.setX = function (x) {
+        var scalarSet = this._scalarSet;
         if (isNumber(x)) {
-            this.x = x;
+            var position = this._position;
+            if (position.x !== x) {
+                scalarSet.x = undefined;
+                position.x = x;
+            }
+            else {
+                if (scalarSet.x !== undefined) {
+                    scalarSet.x = undefined;
+                    this.toParentResized();
+                }
+            }
         }
         else {
-            var scalarSet = this._scalarSet;
             var scalar = DScalarFunctions.position(x);
             if (scalarSet.x !== scalar) {
                 scalarSet.x = scalar;
@@ -447,7 +459,7 @@ var DBase = /** @class */ (function (_super) {
             return this._position.y;
         },
         set: function (y) {
-            this._position.y = y;
+            this.setY(y);
         },
         enumerable: false,
         configurable: true
@@ -458,15 +470,25 @@ var DBase = /** @class */ (function (_super) {
             return scalarSet.y;
         }
         else {
-            return this.y;
+            return this._position.y;
         }
     };
     DBase.prototype.setY = function (y) {
+        var scalarSet = this._scalarSet;
         if (isNumber(y)) {
-            this.y = y;
+            var position = this._position;
+            if (position.y !== y) {
+                scalarSet.y = undefined;
+                position.y = y;
+            }
+            else {
+                if (scalarSet.y !== undefined) {
+                    scalarSet.y = undefined;
+                    this.toParentResized();
+                }
+            }
         }
         else {
-            var scalarSet = this._scalarSet;
             var scalar = DScalarFunctions.position(y);
             if (scalarSet.y !== scalar) {
                 scalarSet.y = scalar;
@@ -480,21 +502,7 @@ var DBase = /** @class */ (function (_super) {
             return this._width;
         },
         set: function (width) {
-            var oldWidth = this._width;
-            if (oldWidth !== width) {
-                this._width = width;
-                var height = this._height;
-                this.onResize(width, height, oldWidth, height);
-                // Layout
-                var scalarSet = this._scalarSet;
-                if (scalarSet.x != null) {
-                    var position = this.transform.position;
-                    var parent_3 = this.getParentOfSize();
-                    if (parent_3) {
-                        this.x = scalarSet.x(parent_3.width, width, parent_3.padding.getLeft(), position.x);
-                    }
-                }
-            }
+            this.setWidth(width);
         },
         enumerable: false,
         configurable: true
@@ -507,15 +515,34 @@ var DBase = /** @class */ (function (_super) {
         var isOn = auto.isOn;
         var isAuto = auto.from(width);
         if (auto.isOn !== isOn) {
-            this.toChildrenDirty();
+            this.toHierarchyDirty();
             DApplications.update(this);
         }
         if (!isAuto) {
+            var scalarSet = this._scalarSet;
             if (isNumber(width)) {
-                this.width = width;
+                var oldWidth = this._width;
+                if (oldWidth !== width) {
+                    scalarSet.width = undefined;
+                    this._width = width;
+                    var height = this._height;
+                    this.onResize(width, height, oldWidth, height);
+                    if (scalarSet.x != null) {
+                        var position = this._position;
+                        var parent_3 = this.getParentOfSize();
+                        if (parent_3) {
+                            position.x = scalarSet.x(parent_3.width, width, parent_3.padding.getLeft(), position.x);
+                        }
+                    }
+                }
+                else {
+                    if (scalarSet.width !== undefined) {
+                        scalarSet.width = undefined;
+                        this.toParentResized();
+                    }
+                }
             }
             else {
-                var scalarSet = this._scalarSet;
                 var scalar = DScalarFunctions.size(width);
                 if (scalarSet.width !== scalar) {
                     scalarSet.width = scalar;
@@ -530,21 +557,7 @@ var DBase = /** @class */ (function (_super) {
             return this._height;
         },
         set: function (height) {
-            var oldHeight = this._height;
-            if (oldHeight !== height) {
-                this._height = height;
-                var width = this._width;
-                this.onResize(width, height, width, oldHeight);
-                // Layout
-                var scalarSet = this._scalarSet;
-                if (scalarSet.y != null) {
-                    var position = this.transform.position;
-                    var parent_4 = this.getParentOfSize();
-                    if (parent_4) {
-                        this.y = scalarSet.y(parent_4.height, height, parent_4.padding.getTop(), position.y);
-                    }
-                }
-            }
+            this.setHeight(height);
         },
         enumerable: false,
         configurable: true
@@ -557,15 +570,34 @@ var DBase = /** @class */ (function (_super) {
         var isOn = auto.isOn;
         var isAuto = auto.from(height);
         if (auto.isOn !== isOn) {
-            this.toChildrenDirty();
+            this.toHierarchyDirty();
             DApplications.update(this);
         }
         if (!isAuto) {
+            var scalarSet = this._scalarSet;
             if (isNumber(height)) {
-                this.height = height;
+                var oldHeight = this._height;
+                if (oldHeight !== height) {
+                    scalarSet.height = undefined;
+                    this._height = height;
+                    var width = this._width;
+                    this.onResize(width, height, width, oldHeight);
+                    if (scalarSet.y != null) {
+                        var position = this._position;
+                        var parent_4 = this.getParentOfSize();
+                        if (parent_4) {
+                            position.y = scalarSet.y(parent_4.height, height, parent_4.padding.getTop(), position.y);
+                        }
+                    }
+                }
+                else {
+                    if (scalarSet.height !== undefined) {
+                        scalarSet.height = undefined;
+                        this.toParentResized();
+                    }
+                }
             }
             else {
-                var scalarSet = this._scalarSet;
                 var scalar = DScalarFunctions.size(height);
                 if (scalarSet.height !== scalar) {
                     scalarSet.height = scalar;
@@ -664,7 +696,7 @@ var DBase = /** @class */ (function (_super) {
     DBase.prototype.show = function () {
         if (!this.visible) {
             this.visible = true;
-            this.toParentChildrenDirty();
+            this.toParentHierarchyDirty();
             DApplications.update(this);
         }
         return this;
@@ -675,7 +707,7 @@ var DBase = /** @class */ (function (_super) {
     DBase.prototype.hide = function () {
         if (this.visible) {
             this.visible = false;
-            this.toParentChildrenDirty();
+            this.toParentHierarchyDirty();
             this.blur(true);
             DApplications.update(this);
         }
@@ -706,25 +738,25 @@ var DBase = /** @class */ (function (_super) {
             parent.toHasDirty();
         }
     };
-    DBase.prototype.toChildrenDirty = function () {
-        if (!this._isChildrenDirty) {
-            this._isChildrenDirty = true;
-            this.onChildrenDirty();
-            this.toParentChildrenDirty();
+    DBase.prototype.toHierarchyDirty = function () {
+        if (!this._isHierarchyDirty) {
+            this._isHierarchyDirty = true;
+            this.onHierarchyDirty();
+            this.toParentHierarchyDirty();
             return true;
         }
         return false;
     };
-    DBase.prototype.toParentChildrenDirty = function () {
+    DBase.prototype.toParentHierarchyDirty = function () {
         var parent = this.parent;
         if (parent instanceof DBase) {
-            parent.toChildrenDirty();
+            parent.toHierarchyDirty();
         }
     };
-    DBase.prototype.isChildrenDirty = function () {
-        return this._isChildrenDirty;
+    DBase.prototype.isHierarchyDirty = function () {
+        return this._isHierarchyDirty;
     };
-    DBase.prototype.onChildrenDirty = function () {
+    DBase.prototype.onHierarchyDirty = function () {
         // DO NOTHING
     };
     DBase.prototype.isDirty = function () {
@@ -840,16 +872,26 @@ var DBase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    DBase.prototype.refit = function () {
-        if (this._isChildrenDirty) {
-            this._isChildrenDirty = false;
+    DBase.prototype.reflow = function () {
+        var isDirty = this._isDirty;
+        if (isDirty) {
+            this.onReflow();
+            this._isDirty = false;
+        }
+        var hasDirty = this._hasDirty;
+        var isHierarchyDirty = this._isHierarchyDirty;
+        if (hasDirty || isHierarchyDirty) {
+            this._hasDirty = false;
+            this._isHierarchyDirty = false;
             var children = this.children;
             for (var i = 0, imax = children.length; i < imax; ++i) {
                 var child = children[i];
                 if (child instanceof DBase) {
-                    child.refit();
+                    child.reflow();
                 }
             }
+        }
+        if (isDirty || hasDirty || isHierarchyDirty) {
             this.onRefit();
         }
     };
@@ -884,7 +926,7 @@ var DBase = /** @class */ (function (_super) {
                     width = Math.max(width, child.x + child.width);
                 }
             }
-            this.width = width + this.padding.getRight();
+            this.resize(width + this.padding.getRight(), undefined);
         }
         else if (isHeightAuto) {
             var height = 0;
@@ -895,7 +937,7 @@ var DBase = /** @class */ (function (_super) {
                     height = Math.max(height, child.y + child.height);
                 }
             }
-            this.height = height + this.padding.getBottom();
+            this.resize(undefined, height + this.padding.getBottom());
         }
     };
     DBase.prototype.isRefitable = function (target) {
@@ -907,22 +949,6 @@ var DBase = /** @class */ (function (_super) {
     DBase.prototype.hasRefitableWidth = function (target) {
         return (this.isRefitable(target) && !(target instanceof DBase && isFunction(target.getWidth())));
     };
-    DBase.prototype.reflow = function () {
-        if (this._isDirty) {
-            this.onReflow();
-            this._isDirty = false;
-        }
-        if (this._hasDirty) {
-            var children = this.children;
-            for (var i = 0, imax = children.length; i < imax; ++i) {
-                var child = children[i];
-                if (child instanceof DBase) {
-                    child.reflow();
-                }
-            }
-            this._hasDirty = false;
-        }
-    };
     DBase.prototype.onReflow = function () {
         this._reflowable.onReflow(this, this._width, this._height);
     };