@wcardinal/wcardinal-ui 0.414.0 → 0.415.0

package/dist/types/wcardinal/ui/d-table-category-cell.d.ts

@@ -1,7 +1,8 @@
-import { InteractionEvent, InteractionManager, Point } from "pixi.js";
+import { InteractionEvent } from "pixi.js";
 import { DImage, DImageOptions, DThemeImage } from "./d-image";
 import { DTableCategoryColumn } from "./d-table-category-column";
 import { DBaseStateSet } from "./d-base-state-set";
+import { DTableCellEdge } from "./d-table-cell-edge";
 export interface DTableCategoryCellCategory {
     readonly children: DTableCategoryCell[];
     readonly state: DBaseStateSet;
@@ -11,35 +12,17 @@ export interface DTableCategoryCellOptions<THEME extends DThemeTableCategoryCell
 export interface DThemeTableCategoryCell extends DThemeImage<string | null> {
     getEdgeWidth(): number;
 }
-export declare const DTableCategoryCellEdge: {
-    readonly NONE: 0;
-    readonly LEFT: 1;
-    readonly RIGHT: 2;
-    readonly BOTH: 3;
-};
-export type DTableCategoryCellEdge = (typeof DTableCategoryCellEdge)[keyof typeof DTableCategoryCellEdge];
 export declare class DTableCategoryCell<THEME extends DThemeTableCategoryCell = DThemeTableCategoryCell, OPTIONS extends DTableCategoryCellOptions<THEME> = DTableCategoryCellOptions<THEME>> extends DImage<string | null, THEME, OPTIONS> {
     protected _category: DTableCategoryCellCategory;
     protected _column: DTableCategoryColumn;
     protected _columnIndex: number;
-    protected _checkWork?: Point;
-    protected _onHoveredBound?: (e: InteractionEvent) => void;
-    protected _resizableEdges?: DTableCategoryCellEdge;
-    protected _edgeSize: number;
-    protected _wasResizing: boolean;
+    protected _edge: DTableCellEdge<DTableCategoryCell>;
     constructor(category: DTableCategoryCellCategory, columnIndex: number, column: DTableCategoryColumn, options?: OPTIONS);
     get column(): DTableCategoryColumn;
     get columnIndex(): number;
     get category(): DTableCategoryCellCategory;
     protected onDown(e: InteractionEvent): void;
-    protected findLeftResizableCell(columnIndex: number): DTableCategoryCell | null;
-    protected findRightResizableCellOfWeight(columnIndex: number): DTableCategoryCell | null;
-    protected checkIfEdgeResizable(columnIndex: number): boolean;
-    protected getResizableEdges(): DTableCategoryCellEdge;
     protected onOver(e: InteractionEvent): void;
     protected onOut(e: InteractionEvent): void;
-    protected onHovered(e: InteractionEvent): void;
-    protected toClickPosition(e: InteractionEvent): number;
-    protected onDownEdge(onDownPoint: number, columnIndex: number, interactionManager: InteractionManager): void;
     protected getType(): string;
 }

package/dist/types/wcardinal/ui/d-table-category-column-impl.d.ts

@@ -9,11 +9,10 @@ export declare class DTableCategoryColumnImpl<ROW_VALUE, CELL_VALUE, DIALOG_VALU
     protected _isLocked: boolean;
     offset: number;
     protected _columns: DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG>[];
-    protected _nresizable: number;
+    readonly resizable: boolean;
     protected _onResizeBound: (column: DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG>) => void;
     constructor(index: number, column: DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG>);
     protected onResize(): void;
-    get resizable(): boolean;
     get weight(): number | undefined;
     set weight(weight: number);
     get minWeight(): number;

package/dist/types/wcardinal/ui/d-table-category-container-impl.d.ts

@@ -7,6 +7,6 @@ export declare class DTableCategoryContainerImpl<ROW_VALUE, CELL_VALUE, DIALOG_V
     readonly items: DTableCategory[];
     constructor(columns: DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG>[], frozen: number, options?: DTableCategoryOptions);
     protected toCount(columns: DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG>[]): number;
-    protected isCategory(index: number, a: string | string[] | undefined, b: string | string[] | undefined): boolean;
+    protected isEqual(index: number, a: string | string[] | undefined, b: string | string[] | undefined): boolean;
     protected toColumns(index: number, columns: DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG>[], frozen: number): DTableCategoryColumn[];
 }

package/dist/types/wcardinal/ui/d-table-cell-edge.d.ts

@@ -0,0 +1,69 @@
+import { DisplayObject, IPointData, InteractionEvent, InteractionManager, Point, utils } from "pixi.js";
+import { DBaseStateSet } from "./d-base-state-set";
+import { DApplicationTarget } from "./d-application-like";
+export declare const DTableCellEdgeHovered: {
+    readonly NONE: 0;
+    readonly LEFT: 1;
+    readonly RIGHT: 2;
+    readonly BOTH: 3;
+};
+export type DTableCellEdgeHovered = (typeof DTableCellEdgeHovered)[keyof typeof DTableCellEdgeHovered];
+export type DTableCellEdgeData0<CELL> = [0, CELL];
+export type DTableCellEdgeData1<CELL> = [1, CELL, CELL];
+export type DTableCellEdgeData2<CELL> = [2, CELL, CELL, CELL[]];
+export type DTableCellEdgeData3<CELL> = [3, CELL, CELL, CELL[]];
+export type DTableCellEdgeData<CELL> = DTableCellEdgeData0<CELL> | DTableCellEdgeData1<CELL> | DTableCellEdgeData2<CELL> | DTableCellEdgeData3<CELL>;
+export interface DTableCellEdgeRow<CELL> {
+    readonly state: DBaseStateSet;
+    readonly children: CELL[];
+}
+export interface DTableCellEdgeColumn {
+    weight?: number;
+    readonly minWeight: number;
+    width?: number;
+    readonly minWidth: number;
+    readonly resizable: boolean;
+}
+export interface DTableCellEdgeCell extends DApplicationTarget, utils.EventEmitter {
+    readonly state: DBaseStateSet;
+    readonly column: DTableCellEdgeColumn;
+    readonly columnIndex: number;
+    readonly cursor: string;
+    readonly width: number;
+    readonly weight: number;
+    toLocal(position: IPointData, from?: DisplayObject, point?: Point, skipUpdate?: boolean): Point;
+}
+export declare class DTableCellEdge<CELL extends DTableCellEdgeCell> {
+    protected _row: DTableCellEdgeRow<CELL>;
+    protected _cell: CELL;
+    protected _columnIndex: number;
+    protected _checkWork?: Point;
+    protected _onHoveredBound?: (e: InteractionEvent) => void;
+    protected _left?: DTableCellEdgeData<CELL> | null;
+    protected _right?: DTableCellEdgeData<CELL> | null;
+    protected _size: number;
+    protected _dragged: boolean;
+    protected _minWidth: number;
+    constructor(row: DTableCellEdgeRow<CELL>, cell: CELL, columnIndex: number, size: number);
+    protected findResizableCell(columnIndex: number, direction: boolean, weight: boolean | null): CELL | null;
+    protected findCells(columnIndex: number, direction: boolean, weight: boolean): CELL[];
+    protected calcData(columnIndex: number): DTableCellEdgeData<CELL> | null;
+    get left(): DTableCellEdgeData<CELL> | null;
+    get right(): DTableCellEdgeData<CELL> | null;
+    onDown(e: InteractionEvent): boolean;
+    protected onDown_(onDownPoint: number, data: DTableCellEdgeData<CELL>, interactionManager: InteractionManager): void;
+    onOver(e: InteractionEvent): void;
+    onOut(e: InteractionEvent): void;
+    protected onHovered(e: InteractionEvent): void;
+    protected toX(e: InteractionEvent): number;
+    protected onDown0(onDownPoint: number, data: DTableCellEdgeData0<CELL>, interactionManager: InteractionManager): void;
+    protected onDown1(onDownPoint: number, data: DTableCellEdgeData1<CELL>, interactionManager: InteractionManager): void;
+    protected onDown2(onDownPoint: number, data: DTableCellEdgeData2<CELL>, interactionManager: InteractionManager): void;
+    protected onDown2a(onDownPoint: number, data: DTableCellEdgeData2<CELL>, interactionManager: InteractionManager): void;
+    protected onDown2b(onDownPoint: number, data: DTableCellEdgeData2<CELL>, interactionManager: InteractionManager): void;
+    protected onDown3(onDownPoint: number, data: DTableCellEdgeData3<CELL>, interactionManager: InteractionManager): void;
+    protected onDown3a(onDownPoint: number, data: DTableCellEdgeData3<CELL>, interactionManager: InteractionManager): void;
+    protected onDown3b(onDownPoint: number, data: DTableCellEdgeData3<CELL>, interactionManager: InteractionManager): void;
+    protected newOnUp(onMove: (e: InteractionEvent) => void, interactionManager: InteractionManager): () => void;
+    isClicked(e?: InteractionEvent | KeyboardEvent | MouseEvent | TouchEvent): boolean;
+}

package/dist/types/wcardinal/ui/d-table-column-impl.d.ts

@@ -16,7 +16,9 @@ import { DTableColumnUpdate } from "./d-table-column-update";
 import { DTableHeaderCellOptions, DThemeTableHeaderCell } from "./d-table-header-cell";
 export declare class DTableColumnImpl<ROW_VALUE, CELL_VALUE, DIALOG_VALUE = CELL_VALUE, DIALOG extends DTableColumnSelectingDialog<DIALOG_VALUE> = DTableColumnSelectingDialog<DIALOG_VALUE>> extends utils.EventEmitter implements DTableColumn<ROW_VALUE, CELL_VALUE, DIALOG_VALUE, DIALOG> {
     protected _weight?: number;
+    readonly minWeight: number;
     protected _width?: number;
+    readonly minWidth: number;
     readonly resizable: boolean;
     readonly type: DTableColumnType;
     readonly label: string;

package/dist/types/wcardinal/ui/d-table-column.d.ts

@@ -73,7 +73,9 @@ export interface DTableColumnOptions<ROW_VALUE, CELL_VALUE = any, DIALOG_VALUE =
 }
 export interface DTableColumn<ROW_VALUE, CELL_VALUE = unknown, DIALOG_VALUE = CELL_VALUE, DIALOG extends DTableColumnSelectingDialog<DIALOG_VALUE> = DTableColumnSelectingDialog<DIALOG_VALUE>> extends utils.EventEmitter {
     weight?: number;
+    minWeight: number;
     width?: number;
+    minWidth: number;
     readonly resizable: boolean;
     readonly type: DTableColumnType;
     label: string;

package/dist/types/wcardinal/ui/d-table-header-cell.d.ts

@@ -1,10 +1,11 @@
-import { InteractionEvent, InteractionManager, Point } from "pixi.js";
+import { InteractionEvent, Point } from "pixi.js";
 import { DImage, DImageOptions, DThemeImage } from "./d-image";
 import { DTableColumn } from "./d-table-column";
 import { DTableDataComparator, DTableDataSorter } from "./d-table-data-sorter";
 import { DTableHeaderTable } from "./d-table-header";
 import { DTableHeaderCellCheck, DTableHeaderCellCheckOptions } from "./d-table-header-cell-check";
 import { DBaseStateSet } from "./d-base-state-set";
+import { DTableCellEdge } from "./d-table-cell-edge";
 export interface DTableHeaderCellHeader<ROW> {
     readonly table: DTableHeaderTable<ROW> | null;
     readonly children: DTableHeaderCell<ROW>[];
@@ -16,13 +17,6 @@ export interface DTableHeaderCellOptions<ROW, THEME extends DThemeTableHeaderCel
 export interface DThemeTableHeaderCell extends DThemeImage<string | null> {
     getEdgeWidth(): number;
 }
-export declare const DTableHeaderCellEdge: {
-    readonly NONE: 0;
-    readonly LEFT: 1;
-    readonly RIGHT: 2;
-    readonly BOTH: 3;
-};
-export type DTableHeaderCellEdge = (typeof DTableHeaderCellEdge)[keyof typeof DTableHeaderCellEdge];
 export declare class DTableHeaderCell<ROW, THEME extends DThemeTableHeaderCell = DThemeTableHeaderCell, OPTIONS extends DTableHeaderCellOptions<ROW, THEME> = DTableHeaderCellOptions<ROW, THEME>> extends DImage<string | null, THEME, OPTIONS> {
     protected _sorter?: DTableDataSorter<ROW>;
     protected _onSorterChangeBound?: () => void;
@@ -31,30 +25,20 @@ export declare class DTableHeaderCell<ROW, THEME extends DThemeTableHeaderCell =
     protected _columnIndex: number;
     protected _check: DTableHeaderCellCheck<ROW>;
     protected _checkWork?: Point;
-    protected _onHoveredBound?: (e: InteractionEvent) => void;
-    protected _resizableEdges?: DTableHeaderCellEdge;
-    protected _edgeSize: number;
-    protected _wasResizing: boolean;
+    protected _edge: DTableCellEdge<DTableHeaderCell<ROW>>;
     constructor(header: DTableHeaderCellHeader<ROW>, columnIndex: number, column: DTableColumn<ROW>, options?: OPTIONS);
     get column(): DTableColumn<ROW>;
     get columnIndex(): number;
     get header(): DTableHeaderCellHeader<ROW>;
     get check(): DTableHeaderCellCheck<ROW>;
     protected onDown(e: InteractionEvent): void;
-    protected findLeftResizableCell(columnIndex: number): DTableHeaderCell<ROW> | null;
-    protected findRightResizableCellOfWeight(columnIndex: number): DTableHeaderCell<ROW> | null;
-    protected checkIfEdgeResizable(columnIndex: number): boolean;
-    protected getResizableEdges(): DTableHeaderCellEdge;
     protected onOver(e: InteractionEvent): void;
     protected onOut(e: InteractionEvent): void;
-    protected onHovered(e: InteractionEvent): void;
-    protected onDownEdge(onDownPoint: number, columnIndex: number, interactionManager: InteractionManager): void;
     get sorter(): DTableDataSorter<ROW> | null;
     get comparator(): DTableDataComparator<ROW> | null;
     protected onSorterChange(): void;
     protected toClickPosition(e: InteractionEvent): number;
     protected isCheckClicked(e?: InteractionEvent | KeyboardEvent | MouseEvent | TouchEvent): boolean;
-    protected isEdgeClicked(e?: InteractionEvent | KeyboardEvent | MouseEvent | TouchEvent): boolean;
     protected onClick(e: InteractionEvent): void;
     activate(e?: InteractionEvent | KeyboardEvent | MouseEvent | TouchEvent): void;
     protected onActivate(e?: InteractionEvent | KeyboardEvent | MouseEvent | TouchEvent): void;

package/dist/wcardinal/ui/d-table-category-cell.js

@@ -3,17 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { __extends } from "tslib";
-import { Point } from "pixi.js";
 import { DImage } from "./d-image";
-import { DTableState } from "./d-table-state";
-import { DApplications } from "./d-applications";
-import { UtilPointerEvent } from "./util/util-pointer-event";
-export var DTableCategoryCellEdge = {
-    NONE: 0,
-    LEFT: 1,
-    RIGHT: 2,
-    BOTH: 3
-};
+import { DTableCellEdge } from "./d-table-cell-edge";
 var DTableCategoryCell = /** @class */ (function (_super) {
     __extends(DTableCategoryCell, _super);
     function DTableCategoryCell(category, columnIndex, column, options) {
@@ -21,8 +12,7 @@ var DTableCategoryCell = /** @class */ (function (_super) {
         _this._category = category;
         _this._columnIndex = columnIndex;
         _this._column = column;
-        _this._edgeSize = _this.theme.getEdgeWidth();
-        _this._wasResizing = false;
+        _this._edge = new DTableCellEdge(_this._category, _this, columnIndex, _this.theme.getEdgeWidth());
         return _this;
     }
     Object.defineProperty(DTableCategoryCell.prototype, "column", {
@@ -47,209 +37,17 @@ var DTableCategoryCell = /** @class */ (function (_super) {
         configurable: true
     });
     DTableCategoryCell.prototype.onDown = function (e) {
-        var edges = this.state.valueOf(DTableState.HOVERED_ON_EDGE);
-        if (edges != null) {
-            this._wasResizing = true;
-            var layer = DApplications.getLayer(this);
-            if (layer != null) {
-                var interactionManager = layer.renderer.plugins.interaction;
-                var columnIndex = this._columnIndex;
-                if (edges === DTableCategoryCellEdge.LEFT) {
-                    this.onDownEdge(e.data.global.x, columnIndex - 1, interactionManager);
-                }
-                else {
-                    this.onDownEdge(e.data.global.x, columnIndex, interactionManager);
-                }
-            }
-        }
-        else {
-            this._wasResizing = false;
+        if (!this._edge.onDown(e)) {
             _super.prototype.onDown.call(this, e);
         }
     };
-    DTableCategoryCell.prototype.findLeftResizableCell = function (columnIndex) {
-        var children = this._category.children;
-        var childrenLength = children.length;
-        for (var i = columnIndex; 0 <= i; --i) {
-            var child = children[childrenLength - i - 1];
-            if (child.column.resizable) {
-                return child;
-            }
-        }
-        return null;
-    };
-    DTableCategoryCell.prototype.findRightResizableCellOfWeight = function (columnIndex) {
-        var children = this._category.children;
-        var childrenLength = children.length;
-        for (var i = columnIndex + 1; i < childrenLength; ++i) {
-            var child = children[childrenLength - i - 1];
-            var childColumn = child.column;
-            if (childColumn.resizable) {
-                var childColumnWeight = childColumn.weight;
-                if (childColumnWeight != null) {
-                    return child;
-                }
-            }
-        }
-        return null;
-    };
-    DTableCategoryCell.prototype.checkIfEdgeResizable = function (columnIndex) {
-        var target = this.findLeftResizableCell(columnIndex);
-        if (target != null) {
-            if (target.column.weight != null) {
-                return this.findRightResizableCellOfWeight(target.columnIndex) != null;
-            }
-            else {
-                return true;
-            }
-        }
-        return false;
-    };
-    DTableCategoryCell.prototype.getResizableEdges = function () {
-        var result = this._resizableEdges;
-        if (result == null) {
-            var columnIndex = this._columnIndex;
-            if (this.checkIfEdgeResizable(columnIndex - 1)) {
-                if (this.checkIfEdgeResizable(columnIndex)) {
-                    result = DTableCategoryCellEdge.BOTH;
-                }
-                else {
-                    result = DTableCategoryCellEdge.LEFT;
-                }
-            }
-            else {
-                if (this.checkIfEdgeResizable(columnIndex)) {
-                    result = DTableCategoryCellEdge.RIGHT;
-                }
-                else {
-                    result = DTableCategoryCellEdge.NONE;
-                }
-            }
-            this._resizableEdges = result;
-        }
-        return result;
-    };
     DTableCategoryCell.prototype.onOver = function (e) {
-        var _this = this;
-        var _a;
         _super.prototype.onOver.call(this, e);
-        if (this.getResizableEdges() !== DTableCategoryCellEdge.NONE) {
-            var onHoveredBound = ((_a = this._onHoveredBound) !== null && _a !== void 0 ? _a : (this._onHoveredBound = function (event) {
-                _this.onHovered(event);
-            }));
-            this.on(UtilPointerEvent.move, onHoveredBound);
-            // Since the cursor is set by InteractionManager before this method is called,
-            // the cursor need to be overriden.
-            this.onHovered(e);
-            var layer = DApplications.getLayer(this);
-            if (layer != null) {
-                layer.renderer.plugins.interaction.cursor = this.cursor;
-            }
-        }
+        this._edge.onOver(e);
     };
     DTableCategoryCell.prototype.onOut = function (e) {
         _super.prototype.onOut.call(this, e);
-        var onHoveredBound = this._onHoveredBound;
-        if (onHoveredBound != null) {
-            this.state.remove(DTableState.HOVERED_ON_EDGE);
-            this.off(UtilPointerEvent.move, onHoveredBound);
-        }
-    };
-    DTableCategoryCell.prototype.onHovered = function (e) {
-        var width = this.width;
-        var x = this.toClickPosition(e);
-        var edgeSize = this._edgeSize;
-        if (0 <= x && x <= edgeSize) {
-            if (this.getResizableEdges() & DTableCategoryCellEdge.LEFT) {
-                this.state.add(DTableState.HOVERED_ON_EDGE, DTableCategoryCellEdge.LEFT);
-            }
-            else {
-                this.state.remove(DTableState.HOVERED_ON_EDGE);
-            }
-        }
-        else if (width - edgeSize <= x && x <= width) {
-            if (this.getResizableEdges() & DTableCategoryCellEdge.RIGHT) {
-                this.state.add(DTableState.HOVERED_ON_EDGE, DTableCategoryCellEdge.RIGHT);
-            }
-            else {
-                this.state.remove(DTableState.HOVERED_ON_EDGE);
-            }
-        }
-        else {
-            this.state.remove(DTableState.HOVERED_ON_EDGE);
-        }
-    };
-    DTableCategoryCell.prototype.toClickPosition = function (e) {
-        var _a;
-        var checkWork = ((_a = this._checkWork) !== null && _a !== void 0 ? _a : (this._checkWork = new Point()));
-        return e.data.getLocalPosition(this, checkWork).x;
-    };
-    DTableCategoryCell.prototype.onDownEdge = function (onDownPoint, columnIndex, interactionManager) {
-        // Find the resizable cell
-        var left = this.findLeftResizableCell(columnIndex);
-        if (left == null) {
-            // No resizable cell
-            return;
-        }
-        var category = this._category;
-        var leftColumn = left.column;
-        var leftOldWidth = left.width;
-        var leftOldWeight = left.weight;
-        if (leftColumn.weight == null) {
-            category.state.add(DTableState.RESIZING);
-            var leftMinWidth_1 = leftColumn.minWidth;
-            var onMove_1 = function (e) {
-                leftColumn.width = Math.max(leftMinWidth_1, leftOldWidth + e.data.global.x - onDownPoint);
-            };
-            var onUp_1 = function (e) {
-                category.state.remove(DTableState.RESIZING);
-                interactionManager.off(UtilPointerEvent.move, onMove_1);
-                interactionManager.off(UtilPointerEvent.up, onUp_1);
-                interactionManager.off(UtilPointerEvent.upoutside, onUp_1);
-                interactionManager.off(UtilPointerEvent.cancel, onUp_1);
-            };
-            interactionManager.on(UtilPointerEvent.move, onMove_1);
-            interactionManager.on(UtilPointerEvent.up, onUp_1);
-            interactionManager.on(UtilPointerEvent.upoutside, onUp_1);
-            interactionManager.on(UtilPointerEvent.cancel, onUp_1);
-        }
-        else {
-            var right = this.findRightResizableCellOfWeight(left.columnIndex);
-            if (right == null) {
-                // No right resizable cell found
-                return;
-            }
-            var rightColumn_1 = right.column;
-            var rightOldWeight = right.weight;
-            var rightOldWidth = right.width;
-            var totalWidth_1 = leftOldWidth + rightOldWidth;
-            var totalWeight_1 = leftOldWeight + rightOldWeight;
-            var leftMinWeight_1 = leftColumn.minWeight;
-            var rightMinWeight = rightColumn_1.minWeight;
-            var leftMaxWeight_1 = totalWeight_1 - rightMinWeight;
-            if (totalWidth_1 <= 0 || leftMaxWeight_1 <= leftMinWeight_1) {
-                // The left and right resizable cells doesn't non-zero width
-                return;
-            }
-            category.state.add(DTableState.RESIZING);
-            var onMove_2 = function (e) {
-                var leftNewWidth = Math.max(0, Math.min(totalWidth_1, leftOldWidth + e.data.global.x - onDownPoint));
-                var leftNewWeight = Math.max(leftMinWeight_1, Math.min(leftMaxWeight_1, totalWeight_1 * (leftNewWidth / totalWidth_1)));
-                leftColumn.weight = leftNewWeight;
-                rightColumn_1.weight = totalWeight_1 - leftNewWeight;
-            };
-            var onUp_2 = function (e) {
-                category.state.remove(DTableState.RESIZING);
-                interactionManager.off(UtilPointerEvent.move, onMove_2);
-                interactionManager.off(UtilPointerEvent.up, onUp_2);
-                interactionManager.off(UtilPointerEvent.upoutside, onUp_2);
-                interactionManager.off(UtilPointerEvent.cancel, onUp_2);
-            };
-            interactionManager.on(UtilPointerEvent.move, onMove_2);
-            interactionManager.on(UtilPointerEvent.up, onUp_2);
-            interactionManager.on(UtilPointerEvent.upoutside, onUp_2);
-            interactionManager.on(UtilPointerEvent.cancel, onUp_2);
-        }
+        this._edge.onOut(e);
     };
     DTableCategoryCell.prototype.getType = function () {
         return "DTableCategoryCell";

package/dist/wcardinal/ui/d-table-category-cell.js.map

@@ -1 +1 @@
-{"version":3,"file":"d-table-category-cell.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-table-category-cell.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { InteractionEvent, InteractionManager, Point } from \"pixi.js\";\nimport { DImage, DImageOptions, DThemeImage } from \"./d-image\";\nimport { DTableCategoryColumn } from \"./d-table-category-column\";\nimport { DTableState } from \"./d-table-state\";\nimport { DApplications } from \"./d-applications\";\nimport { DBaseStateSet } from \"./d-base-state-set\";\nimport { UtilPointerEvent } from \"./util/util-pointer-event\";\n\nexport interface DTableCategoryCellCategory {\n\treadonly children: DTableCategoryCell[];\n\treadonly state: DBaseStateSet;\n}\n\nexport interface DTableCategoryCellOptions<\n\tTHEME extends DThemeTableCategoryCell = DThemeTableCategoryCell\n> extends DImageOptions<string | null, THEME> {}\n\nexport interface DThemeTableCategoryCell extends DThemeImage<string | null> {\n\tgetEdgeWidth(): number;\n}\n\nexport const DTableCategoryCellEdge = {\n\tNONE: 0,\n\tLEFT: 1,\n\tRIGHT: 2,\n\tBOTH: 3\n} as const;\n\nexport type DTableCategoryCellEdge =\n\t(typeof DTableCategoryCellEdge)[keyof typeof DTableCategoryCellEdge];\n\nexport class DTableCategoryCell<\n\tTHEME extends DThemeTableCategoryCell = DThemeTableCategoryCell,\n\tOPTIONS extends DTableCategoryCellOptions<THEME> = DTableCategoryCellOptions<THEME>\n> extends DImage<string | null, THEME, OPTIONS> {\n\tprotected _category: DTableCategoryCellCategory;\n\tprotected _column: DTableCategoryColumn;\n\tprotected _columnIndex: number;\n\n\tprotected _checkWork?: Point;\n\tprotected _onHoveredBound?: (e: InteractionEvent) => void;\n\tprotected _resizableEdges?: DTableCategoryCellEdge;\n\tprotected _edgeSize: number;\n\tprotected _wasResizing: boolean;\n\n\tconstructor(\n\t\tcategory: DTableCategoryCellCategory,\n\t\tcolumnIndex: number,\n\t\tcolumn: DTableCategoryColumn,\n\t\toptions?: OPTIONS\n\t) {\n\t\tsuper(options);\n\n\t\tthis._category = category;\n\t\tthis._columnIndex = columnIndex;\n\t\tthis._column = column;\n\t\tthis._edgeSize = this.theme.getEdgeWidth();\n\t\tthis._wasResizing = false;\n\t}\n\n\tget column(): DTableCategoryColumn {\n\t\treturn this._column;\n\t}\n\n\tget columnIndex(): number {\n\t\treturn this._columnIndex;\n\t}\n\n\tget category(): DTableCategoryCellCategory {\n\t\treturn this._category;\n\t}\n\n\tprotected override onDown(e: InteractionEvent): void {\n\t\tconst edges = this.state.valueOf(DTableState.HOVERED_ON_EDGE);\n\t\tif (edges != null) {\n\t\t\tthis._wasResizing = true;\n\t\t\tconst layer = DApplications.getLayer(this);\n\t\t\tif (layer != null) {\n\t\t\t\tconst interactionManager = layer.renderer.plugins.interaction;\n\t\t\t\tconst columnIndex = this._columnIndex;\n\t\t\t\tif (edges === DTableCategoryCellEdge.LEFT) {\n\t\t\t\t\tthis.onDownEdge(e.data.global.x, columnIndex - 1, interactionManager);\n\t\t\t\t} else {\n\t\t\t\t\tthis.onDownEdge(e.data.global.x, columnIndex, interactionManager);\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\tthis._wasResizing = false;\n\t\t\tsuper.onDown(e);\n\t\t}\n\t}\n\n\tprotected findLeftResizableCell(columnIndex: number): DTableCategoryCell | null {\n\t\tconst children = this._category.children;\n\t\tconst childrenLength = children.length;\n\t\tfor (let i = columnIndex; 0 <= i; --i) {\n\t\t\tconst child = children[childrenLength - i - 1];\n\t\t\tif (child.column.resizable) {\n\t\t\t\treturn child;\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\tprotected findRightResizableCellOfWeight(columnIndex: number): DTableCategoryCell | null {\n\t\tconst children = this._category.children;\n\t\tconst childrenLength = children.length;\n\t\tfor (let i = columnIndex + 1; i < childrenLength; ++i) {\n\t\t\tconst child = children[childrenLength - i - 1];\n\t\t\tconst childColumn = child.column;\n\t\t\tif (childColumn.resizable) {\n\t\t\t\tconst childColumnWeight = childColumn.weight;\n\t\t\t\tif (childColumnWeight != null) {\n\t\t\t\t\treturn child;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\tprotected checkIfEdgeResizable(columnIndex: number): boolean {\n\t\tconst target = this.findLeftResizableCell(columnIndex);\n\t\tif (target != null) {\n\t\t\tif (target.column.weight != null) {\n\t\t\t\treturn this.findRightResizableCellOfWeight(target.columnIndex) != null;\n\t\t\t} else {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\n\tprotected getResizableEdges(): DTableCategoryCellEdge {\n\t\tlet result = this._resizableEdges;\n\t\tif (result == null) {\n\t\t\tconst columnIndex = this._columnIndex;\n\t\t\tif (this.checkIfEdgeResizable(columnIndex - 1)) {\n\t\t\t\tif (this.checkIfEdgeResizable(columnIndex)) {\n\t\t\t\t\tresult = DTableCategoryCellEdge.BOTH;\n\t\t\t\t} else {\n\t\t\t\t\tresult = DTableCategoryCellEdge.LEFT;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tif (this.checkIfEdgeResizable(columnIndex)) {\n\t\t\t\t\tresult = DTableCategoryCellEdge.RIGHT;\n\t\t\t\t} else {\n\t\t\t\t\tresult = DTableCategoryCellEdge.NONE;\n\t\t\t\t}\n\t\t\t}\n\t\t\tthis._resizableEdges = result;\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected override onOver(e: InteractionEvent): void {\n\t\tsuper.onOver(e);\n\n\t\tif (this.getResizableEdges() !== DTableCategoryCellEdge.NONE) {\n\t\t\tconst onHoveredBound = (this._onHoveredBound ??= (event: InteractionEvent): void => {\n\t\t\t\tthis.onHovered(event);\n\t\t\t});\n\t\t\tthis.on(UtilPointerEvent.move, onHoveredBound);\n\n\t\t\t// Since the cursor is set by InteractionManager before this method is called,\n\t\t\t// the cursor need to be overriden.\n\t\t\tthis.onHovered(e);\n\t\t\tconst layer = DApplications.getLayer(this);\n\t\t\tif (layer != null) {\n\t\t\t\tlayer.renderer.plugins.interaction.cursor = this.cursor;\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected override onOut(e: InteractionEvent): void {\n\t\tsuper.onOut(e);\n\n\t\tconst onHoveredBound = this._onHoveredBound;\n\t\tif (onHoveredBound != null) {\n\t\t\tthis.state.remove(DTableState.HOVERED_ON_EDGE);\n\t\t\tthis.off(UtilPointerEvent.move, onHoveredBound);\n\t\t}\n\t}\n\n\tprotected onHovered(e: InteractionEvent): void {\n\t\tconst width = this.width;\n\t\tconst x = this.toClickPosition(e);\n\t\tconst edgeSize = this._edgeSize;\n\t\tif (0 <= x && x <= edgeSize) {\n\t\t\tif (this.getResizableEdges() & DTableCategoryCellEdge.LEFT) {\n\t\t\t\tthis.state.add(DTableState.HOVERED_ON_EDGE, DTableCategoryCellEdge.LEFT);\n\t\t\t} else {\n\t\t\t\tthis.state.remove(DTableState.HOVERED_ON_EDGE);\n\t\t\t}\n\t\t} else if (width - edgeSize <= x && x <= width) {\n\t\t\tif (this.getResizableEdges() & DTableCategoryCellEdge.RIGHT) {\n\t\t\t\tthis.state.add(DTableState.HOVERED_ON_EDGE, DTableCategoryCellEdge.RIGHT);\n\t\t\t} else {\n\t\t\t\tthis.state.remove(DTableState.HOVERED_ON_EDGE);\n\t\t\t}\n\t\t} else {\n\t\t\tthis.state.remove(DTableState.HOVERED_ON_EDGE);\n\t\t}\n\t}\n\n\tprotected toClickPosition(e: InteractionEvent): number {\n\t\tconst checkWork = (this._checkWork ??= new Point());\n\t\treturn e.data.getLocalPosition(this, checkWork).x;\n\t}\n\n\tprotected onDownEdge(\n\t\tonDownPoint: number,\n\t\tcolumnIndex: number,\n\t\tinteractionManager: InteractionManager\n\t): void {\n\t\t// Find the resizable cell\n\t\tconst left = this.findLeftResizableCell(columnIndex);\n\t\tif (left == null) {\n\t\t\t// No resizable cell\n\t\t\treturn;\n\t\t}\n\n\t\tconst category = this._category;\n\t\tconst leftColumn = left.column;\n\t\tconst leftOldWidth = left.width;\n\t\tconst leftOldWeight = left.weight;\n\t\tif (leftColumn.weight == null) {\n\t\t\tcategory.state.add(DTableState.RESIZING);\n\t\t\tconst leftMinWidth = leftColumn.minWidth;\n\t\t\tconst onMove = (e: InteractionEvent): void => {\n\t\t\t\tleftColumn.width = Math.max(\n\t\t\t\t\tleftMinWidth,\n\t\t\t\t\tleftOldWidth + e.data.global.x - onDownPoint\n\t\t\t\t);\n\t\t\t};\n\t\t\tconst onUp = (e: InteractionEvent) => {\n\t\t\t\tcategory.state.remove(DTableState.RESIZING);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.move, onMove);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.up, onUp);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.upoutside, onUp);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.cancel, onUp);\n\t\t\t};\n\t\t\tinteractionManager.on(UtilPointerEvent.move, onMove);\n\t\t\tinteractionManager.on(UtilPointerEvent.up, onUp);\n\t\t\tinteractionManager.on(UtilPointerEvent.upoutside, onUp);\n\t\t\tinteractionManager.on(UtilPointerEvent.cancel, onUp);\n\t\t} else {\n\t\t\tconst right = this.findRightResizableCellOfWeight(left.columnIndex);\n\t\t\tif (right == null) {\n\t\t\t\t// No right resizable cell found\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tconst rightColumn = right.column;\n\t\t\tconst rightOldWeight = right.weight;\n\t\t\tconst rightOldWidth = right.width;\n\t\t\tconst totalWidth = leftOldWidth + rightOldWidth;\n\t\t\tconst totalWeight = leftOldWeight + rightOldWeight;\n\t\t\tconst leftMinWeight = leftColumn.minWeight;\n\t\t\tconst rightMinWeight = rightColumn.minWeight;\n\t\t\tconst leftMaxWeight = totalWeight - rightMinWeight;\n\t\t\tif (totalWidth <= 0 || leftMaxWeight <= leftMinWeight) {\n\t\t\t\t// The left and right resizable cells doesn't non-zero width\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcategory.state.add(DTableState.RESIZING);\n\t\t\tconst onMove = (e: InteractionEvent): void => {\n\t\t\t\tconst leftNewWidth = Math.max(\n\t\t\t\t\t0,\n\t\t\t\t\tMath.min(totalWidth, leftOldWidth + e.data.global.x - onDownPoint)\n\t\t\t\t);\n\t\t\t\tconst leftNewWeight = Math.max(\n\t\t\t\t\tleftMinWeight,\n\t\t\t\t\tMath.min(leftMaxWeight, totalWeight * (leftNewWidth / totalWidth))\n\t\t\t\t);\n\t\t\t\tleftColumn.weight = leftNewWeight;\n\t\t\t\trightColumn.weight = totalWeight - leftNewWeight;\n\t\t\t};\n\t\t\tconst onUp = (e: InteractionEvent) => {\n\t\t\t\tcategory.state.remove(DTableState.RESIZING);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.move, onMove);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.up, onUp);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.upoutside, onUp);\n\t\t\t\tinteractionManager.off(UtilPointerEvent.cancel, onUp);\n\t\t\t};\n\t\t\tinteractionManager.on(UtilPointerEvent.move, onMove);\n\t\t\tinteractionManager.on(UtilPointerEvent.up, onUp);\n\t\t\tinteractionManager.on(UtilPointerEvent.upoutside, onUp);\n\t\t\tinteractionManager.on(UtilPointerEvent.cancel, onUp);\n\t\t}\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DTableCategoryCell\";\n\t}\n}\n"]}
+{"version":3,"file":"d-table-category-cell.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-table-category-cell.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EAAE,MAAM,EAA8B,MAAM,WAAW,CAAC;AAG/D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAerD;IAGU,sCAAqC;IAM9C,4BACC,QAAoC,EACpC,WAAmB,EACnB,MAA4B,EAC5B,OAAiB;QAJlB,YAMC,kBAAM,OAAO,CAAC,SAWd;QATA,KAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,KAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,KAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,KAAI,CAAC,KAAK,GAAG,IAAI,cAAc,CAC9B,KAAI,CAAC,SAAS,EACd,KAAI,EACJ,WAAW,EACX,KAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CACzB,CAAC;;IACH,CAAC;IAED,sBAAI,sCAAM;aAAV;YACC,OAAO,IAAI,CAAC,OAAO,CAAC;QACrB,CAAC;;;OAAA;IAED,sBAAI,2CAAW;aAAf;YACC,OAAO,IAAI,CAAC,YAAY,CAAC;QAC1B,CAAC;;;OAAA;IAED,sBAAI,wCAAQ;aAAZ;YACC,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;;;OAAA;IAEkB,mCAAM,GAAzB,UAA0B,CAAmB;QAC5C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAC1B,iBAAM,MAAM,YAAC,CAAC,CAAC,CAAC;SAChB;IACF,CAAC;IAEkB,mCAAM,GAAzB,UAA0B,CAAmB;QAC5C,iBAAM,MAAM,YAAC,CAAC,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IAEkB,kCAAK,GAAxB,UAAyB,CAAmB;QAC3C,iBAAM,KAAK,YAAC,CAAC,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAES,oCAAO,GAAjB;QACC,OAAO,oBAAoB,CAAC;IAC7B,CAAC;IACF,yBAAC;AAAD,CAAC,AA3DD,CAGU,MAAM,GAwDf","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { InteractionEvent } from \"pixi.js\";\nimport { DImage, DImageOptions, DThemeImage } from \"./d-image\";\nimport { DTableCategoryColumn } from \"./d-table-category-column\";\nimport { DBaseStateSet } from \"./d-base-state-set\";\nimport { DTableCellEdge } from \"./d-table-cell-edge\";\n\nexport interface DTableCategoryCellCategory {\n\treadonly children: DTableCategoryCell[];\n\treadonly state: DBaseStateSet;\n}\n\nexport interface DTableCategoryCellOptions<\n\tTHEME extends DThemeTableCategoryCell = DThemeTableCategoryCell\n> extends DImageOptions<string | null, THEME> {}\n\nexport interface DThemeTableCategoryCell extends DThemeImage<string | null> {\n\tgetEdgeWidth(): number;\n}\n\nexport class DTableCategoryCell<\n\tTHEME extends DThemeTableCategoryCell = DThemeTableCategoryCell,\n\tOPTIONS extends DTableCategoryCellOptions<THEME> = DTableCategoryCellOptions<THEME>\n> extends DImage<string | null, THEME, OPTIONS> {\n\tprotected _category: DTableCategoryCellCategory;\n\tprotected _column: DTableCategoryColumn;\n\tprotected _columnIndex: number;\n\tprotected _edge: DTableCellEdge<DTableCategoryCell>;\n\n\tconstructor(\n\t\tcategory: DTableCategoryCellCategory,\n\t\tcolumnIndex: number,\n\t\tcolumn: DTableCategoryColumn,\n\t\toptions?: OPTIONS\n\t) {\n\t\tsuper(options);\n\n\t\tthis._category = category;\n\t\tthis._columnIndex = columnIndex;\n\t\tthis._column = column;\n\t\tthis._edge = new DTableCellEdge<DTableCategoryCell>(\n\t\t\tthis._category,\n\t\t\tthis,\n\t\t\tcolumnIndex,\n\t\t\tthis.theme.getEdgeWidth()\n\t\t);\n\t}\n\n\tget column(): DTableCategoryColumn {\n\t\treturn this._column;\n\t}\n\n\tget columnIndex(): number {\n\t\treturn this._columnIndex;\n\t}\n\n\tget category(): DTableCategoryCellCategory {\n\t\treturn this._category;\n\t}\n\n\tprotected override onDown(e: InteractionEvent): void {\n\t\tif (!this._edge.onDown(e)) {\n\t\t\tsuper.onDown(e);\n\t\t}\n\t}\n\n\tprotected override onOver(e: InteractionEvent): void {\n\t\tsuper.onOver(e);\n\t\tthis._edge.onOver(e);\n\t}\n\n\tprotected override onOut(e: InteractionEvent): void {\n\t\tsuper.onOut(e);\n\t\tthis._edge.onOut(e);\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DTableCategoryCell\";\n\t}\n}\n"]}

package/dist/wcardinal/ui/d-table-category-column-impl.js

@@ -28,7 +28,7 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
         _this._isLocked = false;
         _this.offset = 0.0;
         _this._columns = [column];
-        _this._nresizable = column.resizable ? 1 : 0;
+        _this.resizable = column.resizable;
         var onResizeBound = function () {
             _this.onResize();
         };
@@ -68,21 +68,13 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
             }
         }
     };
-    Object.defineProperty(DTableCategoryColumnImpl.prototype, "resizable", {
-        get: function () {
-            return 0 < this._nresizable;
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(DTableCategoryColumnImpl.prototype, "weight", {
         get: function () {
             return this._weight;
         },
         set: function (weight) {
             var oldWeight = this._weight;
-            var nresizable = this._nresizable;
-            if (0 < nresizable && oldWeight != null && oldWeight !== weight) {
+            if (oldWeight != null && oldWeight !== weight) {
                 var columns = this._columns;
                 var columnsLength = columns.length;
                 var minWeight = this.minWeight;
@@ -90,22 +82,22 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
                 if (this._weight !== newWeight) {
                     this._isLocked = true;
                     if (minWeight < oldWeight) {
-                        var columnWeightRatio = (newWeight - minWeight) / (oldWeight - minWeight);
+                        // TODO: IMPROVE THIS
+                        var columnWeightRatio = newWeight / oldWeight;
                         for (var i = 0; i < columnsLength; ++i) {
                             var column = columns[i];
                             var columnWeight = column.weight;
-                            if (column.resizable && columnWeight != null) {
-                                column.weight = columnWeight * columnWeightRatio;
+                            if (columnWeight != null) {
+                                column.weight = Math.max(column.minWeight, columnWeight * columnWeightRatio);
                             }
                         }
                     }
                     else {
-                        var newColumnWeight = (newWeight - minWeight) / this._nresizable;
                         for (var i = 0; i < columnsLength; ++i) {
                             var column = columns[i];
                             var columnWeight = column.weight;
-                            if (column.resizable && columnWeight != null) {
-                                column.weight = newColumnWeight;
+                            if (columnWeight != null) {
+                                column.weight = column.minWeight;
                             }
                         }
                     }
@@ -125,8 +117,8 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
             for (var i = 0; i < columnsLength; ++i) {
                 var column = columns[i];
                 var columnWeight = column.weight;
-                if (!column.resizable && columnWeight != null) {
-                    result += columnWeight;
+                if (columnWeight != null) {
+                    result += column.minWeight;
                 }
             }
             return result;
@@ -140,8 +132,7 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
         },
         set: function (width) {
             var oldWidth = this._width;
-            var nresizable = this._nresizable;
-            if (0 < nresizable && oldWidth != null && oldWidth !== width) {
+            if (oldWidth != null && oldWidth !== width) {
                 var columns = this._columns;
                 var columnsLength = columns.length;
                 var minWidth = this.minWidth;
@@ -149,22 +140,22 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
                 if (oldWidth !== newWidth) {
                     this._isLocked = true;
                     if (minWidth < oldWidth) {
-                        var columnWidthRatio = (newWidth - minWidth) / (oldWidth - minWidth);
+                        // TODO: IMPROVE THIS
+                        var columnWidthRatio = newWidth / oldWidth;
                         for (var i = 0; i < columnsLength; ++i) {
                             var column = columns[i];
                             var columnWidth = column.width;
-                            if (column.resizable && columnWidth != null) {
-                                column.width = columnWidth * columnWidthRatio;
+                            if (columnWidth != null) {
+                                column.width = Math.max(column.minWidth, columnWidth * columnWidthRatio);
                             }
                         }
                     }
                     else {
-                        var newColumnWidth = (newWidth - minWidth) / this._nresizable;
                         for (var i = 0; i < columnsLength; ++i) {
                             var column = columns[i];
                             var columnWidth = column.width;
-                            if (column.resizable && columnWidth != null) {
-                                column.width = newColumnWidth;
+                            if (columnWidth != null) {
+                                column.width = column.minWidth;
                             }
                         }
                     }
@@ -184,8 +175,8 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
             for (var i = 0; i < columnsLength; ++i) {
                 var column = columns[i];
                 var columnWidth = column.width;
-                if (!column.resizable && columnWidth != null) {
-                    result += columnWidth;
+                if (columnWidth != null) {
+                    result += column.minWidth;
                 }
             }
             return result;
@@ -199,9 +190,6 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
             var weight = column.weight;
             if (weight != null) {
                 this._weight += weight;
-                if (column.resizable) {
-                    this._nresizable += 1;
-                }
                 column.on("resize", this._onResizeBound);
             }
         }
@@ -209,9 +197,6 @@ var DTableCategoryColumnImpl = /** @class */ (function (_super) {
             var width = column.width;
             if (width != null) {
                 this._width += width;
-                if (column.resizable) {
-                    this._nresizable += 1;
-                }
                 column.on("resize", this._onResizeBound);
             }
         }