verstak 0.24.264 → 0.24.266

package/build/dist/source/html/El.d.ts

@@ -10,12 +10,12 @@ export type El<T = any, M = any> = {
     area: ElArea;
     width: Range;
     widthJustMin: string;
-    widthJustGrowth: number;
     height: Range;
     heightJustMin: string;
-    heightJustGrowth: number;
-    contentAlignment: Align;
-    boundsAlignment: Align;
+    alignment: Align;
+    extraAlignment: Align;
+    stretchFactorX: number | undefined;
+    stretchFactorY: number | undefined;
     contentWrapping: boolean;
     overlayVisible: boolean | undefined;
     readonly style: CSSStyleDeclaration;
@@ -37,20 +37,21 @@ export type ElCoords = {
     y2: number;
 };
 export declare enum Align {
-    default = 16,
-    stretch = 0,
     left = 1,
     centerX = 2,
     right = 3,
-    top = 4,
-    centerY = 8,
-    bottom = 12,
-    center = 10
+    stretchX = 4,
+    top = 8,
+    centerY = 16,
+    bottom = 24,
+    stretchY = 32,
+    center = 18,
+    stretch = 36,
+    default = 0
 }
 export type Range = {
     readonly min?: string;
     readonly max?: string;
-    readonly growth?: number;
 };
 export type MarkedRange = Range & {
     readonly marker?: string;
@@ -71,8 +72,10 @@ export declare class ElImpl<T extends Element = any, M = any> implements El<T, M
     private _coords;
     private _width;
     private _height;
-    private _contentAlignment;
-    private _boundsAlignment;
+    private _alignment;
+    private _extraAlignment;
+    private _stretchFactorX;
+    private _stretchFactorY;
     private _contentWrapping;
     private _overlayVisible;
     private _hasStylingPresets;
@@ -89,18 +92,18 @@ export declare class ElImpl<T extends Element = any, M = any> implements El<T, M
     set width(value: Range);
     get widthJustMin(): string;
     set widthJustMin(value: string);
-    get widthJustGrowth(): number;
-    set widthJustGrowth(value: number);
     get height(): Range;
     set height(value: Range);
     get heightJustMin(): string;
     set heightJustMin(value: string);
-    get heightJustGrowth(): number;
-    set heightJustGrowth(value: number);
-    get contentAlignment(): Align;
-    set contentAlignment(value: Align);
-    get boundsAlignment(): Align;
-    set boundsAlignment(value: Align);
+    get alignment(): Align;
+    set alignment(value: Align);
+    get extraAlignment(): Align;
+    set extraAlignment(value: Align);
+    get stretchFactorX(): number | undefined;
+    set stretchFactorX(value: number | undefined);
+    get stretchFactorY(): number | undefined;
+    set stretchFactorY(value: number | undefined);
     get contentWrapping(): boolean;
     set contentWrapping(value: boolean);
     get overlayVisible(): boolean | undefined;
@@ -134,14 +137,14 @@ export declare class CursorCommandDriver extends ElDriver<Element, unknown> {
 export declare class Apply {
     static kind<T extends Element>(element: El<T, any>, value: ElKind): void;
     static coords<T extends Element>(element: El<T, any>, value: ElCoords | undefined): void;
-    static widthGrowth<T extends Element>(element: El<T, any>, value: number): void;
     static minWidth<T extends Element>(element: El<T, any>, value: string): void;
     static maxWidth<T extends Element>(element: El<T, any>, value: string): void;
-    static heightGrowth<T extends Element>(element: El<T, any>, value: number): void;
     static minHeight<T extends Element>(element: El<T, any>, value: string): void;
     static maxHeight<T extends Element>(element: El<T, any>, value: string): void;
-    static contentAlignment<T extends Element>(element: El<T, any>, value: Align): void;
-    static boundsAlignment<T extends Element>(element: El<T, any>, value: Align): void;
+    static alignment<T extends Element>(element: El<T, any>, value: Align): void;
+    static extraAlignment<T extends Element>(element: El<T, any>, value: Align): void;
+    static stretchFactorX<T extends Element>(element: El<T, any>, value: number): void;
+    static stretchFactorY<T extends Element>(element: El<T, any>, value: number): void;
     static contentWrapping<T extends Element>(element: El<T, any>, value: boolean): void;
     static overlayVisible<T extends Element>(element: El<T, any>, value: boolean | undefined): void;
     static stylingPreset<T extends Element>(element: El<T, any>, secondary: boolean, styleName: string, enabled?: boolean): void;

package/build/dist/source/html/El.js

@@ -17,15 +17,17 @@ export var ElKind;
 })(ElKind || (ElKind = {}));
 export var Align;
 (function (Align) {
-    Align[Align["default"] = 16] = "default";
-    Align[Align["stretch"] = 0] = "stretch";
     Align[Align["left"] = 1] = "left";
     Align[Align["centerX"] = 2] = "centerX";
     Align[Align["right"] = 3] = "right";
-    Align[Align["top"] = 4] = "top";
-    Align[Align["centerY"] = 8] = "centerY";
-    Align[Align["bottom"] = 12] = "bottom";
-    Align[Align["center"] = 10] = "center";
+    Align[Align["stretchX"] = 4] = "stretchX";
+    Align[Align["top"] = 8] = "top";
+    Align[Align["centerY"] = 16] = "centerY";
+    Align[Align["bottom"] = 24] = "bottom";
+    Align[Align["stretchY"] = 32] = "stretchY";
+    Align[Align["center"] = 18] = "center";
+    Align[Align["stretch"] = 36] = "stretch";
+    Align[Align["default"] = 0] = "default";
 })(Align || (Align = {}));
 export class ElImpl {
     constructor(node) {
@@ -38,10 +40,12 @@ export class ElImpl {
         this._kind = ElKind.part;
         this._area = undefined;
         this._coords = UndefinedElCoords;
-        this._width = { min: "", max: "", growth: 0 };
-        this._height = { min: "", max: "", growth: 0 };
-        this._contentAlignment = Align.default;
-        this._boundsAlignment = Align.default;
+        this._width = { min: "", max: "" };
+        this._height = { min: "", max: "" };
+        this._alignment = Align.default;
+        this._extraAlignment = Align.default;
+        this._stretchFactorX = undefined;
+        this._stretchFactorY = undefined;
         this._contentWrapping = true;
         this._overlayVisible = undefined;
         this._hasStylingPresets = false;
@@ -86,7 +90,7 @@ export class ElImpl {
     }
     get width() { return this._width; }
     set width(value) {
-        var _a, _b, _c;
+        var _a, _b;
         const w = this._width;
         let updated = false;
         if (value.min !== w.min) {
@@ -97,20 +101,14 @@ export class ElImpl {
             Apply.maxWidth(this, (_b = value.max) !== null && _b !== void 0 ? _b : "");
             updated = true;
         }
-        if (value.growth !== w.growth) {
-            Apply.widthGrowth(this, (_c = value.growth) !== null && _c !== void 0 ? _c : 0);
-            updated = true;
-        }
         if (updated)
             this._width = value;
     }
     get widthJustMin() { var _a; return (_a = this._width.min) !== null && _a !== void 0 ? _a : ""; }
     set widthJustMin(value) { this.width = { min: value }; }
-    get widthJustGrowth() { var _a; return (_a = this._width.growth) !== null && _a !== void 0 ? _a : 0; }
-    set widthJustGrowth(value) { this.width = { growth: value }; }
     get height() { return this._height; }
     set height(value) {
-        var _a, _b, _c;
+        var _a, _b;
         const w = this._height;
         let updated = false;
         if (value.min !== w.min) {
@@ -121,29 +119,37 @@ export class ElImpl {
             Apply.maxHeight(this, (_b = value.max) !== null && _b !== void 0 ? _b : "");
             updated = true;
         }
-        if (value.growth !== w.growth) {
-            Apply.heightGrowth(this, (_c = value.growth) !== null && _c !== void 0 ? _c : 0);
-            updated = true;
-        }
         if (updated)
             this._height = value;
     }
     get heightJustMin() { var _a; return (_a = this._height.min) !== null && _a !== void 0 ? _a : ""; }
     set heightJustMin(value) { this.height = { min: value }; }
-    get heightJustGrowth() { var _a; return (_a = this._height.growth) !== null && _a !== void 0 ? _a : 0; }
-    set heightJustGrowth(value) { this.height = { growth: value }; }
-    get contentAlignment() { return this._contentAlignment; }
-    set contentAlignment(value) {
-        if (value !== this._contentAlignment) {
-            Apply.contentAlignment(this, value);
-            this._contentAlignment = value;
+    get alignment() { return this._alignment; }
+    set alignment(value) {
+        if (value !== this._alignment) {
+            Apply.alignment(this, value);
+            this._alignment = value;
+        }
+    }
+    get extraAlignment() { return this._extraAlignment; }
+    set extraAlignment(value) {
+        if (value !== this._extraAlignment) {
+            Apply.extraAlignment(this, value);
+            this._extraAlignment = value;
+        }
+    }
+    get stretchFactorX() { return this._stretchFactorX; }
+    set stretchFactorX(value) {
+        if (value !== this._stretchFactorX) {
+            Apply.stretchFactorX(this, value !== null && value !== void 0 ? value : 0);
+            this._stretchFactorX = value;
         }
     }
-    get boundsAlignment() { return this._boundsAlignment; }
-    set boundsAlignment(value) {
-        if (value !== this._boundsAlignment) {
-            Apply.boundsAlignment(this, value);
-            this._boundsAlignment = value;
+    get stretchFactorY() { return this._stretchFactorY; }
+    set stretchFactorY(value) {
+        if (value !== this._stretchFactorY) {
+            Apply.stretchFactorY(this, value !== null && value !== void 0 ? value : 0);
+            this._stretchFactorY = value;
         }
     }
     get contentWrapping() { return this._contentWrapping; }
@@ -321,19 +327,6 @@ export class Apply {
                 s.gridArea = "";
         }
     }
-    static widthGrowth(element, value) {
-        if (element.native instanceof HTMLElement) {
-            const s = element.native.style;
-            if (value > 0) {
-                s.flexGrow = `${value}`;
-                s.flexBasis = "0";
-            }
-            else {
-                s.flexGrow = "";
-                s.flexBasis = "";
-            }
-        }
-    }
     static minWidth(element, value) {
         if (element.native instanceof HTMLElement)
             element.native.style.minWidth = `${value}`;
@@ -342,27 +335,6 @@ export class Apply {
         if (element.native instanceof HTMLElement)
             element.native.style.maxWidth = `${value}`;
     }
-    static heightGrowth(element, value) {
-        const bNode = element.node;
-        const driver = bNode.driver;
-        if (driver.isPartition) {
-            if (element.native instanceof HTMLElement) {
-                const s = element.native.style;
-                if (value > 0)
-                    s.flexGrow = `${value}`;
-                else
-                    s.flexGrow = "";
-            }
-        }
-        else {
-            const hostDriver = bNode.host.driver;
-            if (hostDriver.isPartition) {
-                const host = bNode.host.seat.instance;
-                Apply.boundsAlignment(element, Align.stretch);
-                Apply.heightGrowth(host.element, value);
-            }
-        }
-    }
     static minHeight(element, value) {
         if (element.native instanceof HTMLElement)
             element.native.style.minHeight = `${value}`;
@@ -371,11 +343,24 @@ export class Apply {
         if (element.native instanceof HTMLElement)
             element.native.style.maxHeight = `${value}`;
     }
-    static contentAlignment(element, value) {
+    static alignment(element, value) {
         if (element.native instanceof HTMLElement) {
             const s = element.native.style;
-            if ((value & Align.default) === 0) {
-                const v = AlignToCss[(value >> 2) & 0b11];
+            if (value !== Align.default) {
+                const v = AlignToCss[(value >> 3) & 0b11];
+                const h = AlignToCss[value & 0b11];
+                s.alignSelf = v;
+                s.justifySelf = h;
+            }
+            else
+                s.alignSelf = s.justifySelf = "";
+        }
+    }
+    static extraAlignment(element, value) {
+        if (element.native instanceof HTMLElement) {
+            const s = element.native.style;
+            if (value !== Align.default) {
+                const v = AlignToCss[(value >> 3) & 0b11];
                 const h = AlignToCss[value & 0b11];
                 const t = TextAlignCss[value & 0b11];
                 s.justifyContent = v;
@@ -386,17 +371,38 @@ export class Apply {
                 s.justifyContent = s.alignContent = s.textAlign = "";
         }
     }
-    static boundsAlignment(element, value) {
+    static stretchFactorX(element, value) {
         if (element.native instanceof HTMLElement) {
             const s = element.native.style;
-            if ((value & Align.default) === 0) {
-                const v = AlignToCss[(value >> 2) & 0b11];
-                const h = AlignToCss[value & 0b11];
-                s.alignSelf = v;
-                s.justifySelf = h;
+            if (value > 0) {
+                s.flexGrow = `${value}`;
+                s.flexBasis = "0";
+            }
+            else {
+                s.flexGrow = "";
+                s.flexBasis = "";
+            }
+        }
+    }
+    static stretchFactorY(element, value) {
+        const bNode = element.node;
+        const driver = bNode.driver;
+        if (driver.isPartition) {
+            if (element.native instanceof HTMLElement) {
+                const s = element.native.style;
+                if (value > 0)
+                    s.flexGrow = `${value}`;
+                else
+                    s.flexGrow = "";
+            }
+        }
+        else {
+            const hostDriver = bNode.host.driver;
+            if (hostDriver.isPartition) {
+                const host = bNode.host.seat.instance;
+                Apply.alignment(element, Align.stretch);
+                Apply.stretchFactorY(host.element, value);
             }
-            else
-                s.alignSelf = s.justifySelf = "";
         }
     }
     static contentWrapping(element, value) {

package/build/dist/source/html/Elements.d.ts

@@ -4,7 +4,7 @@ import { HtmlElementDriver } from "./HtmlDriver.js";
 export declare function Section<M = unknown>(declaration?: RxNodeDecl<El<HTMLElement, M>>, preset?: RxNodeDecl<El<HTMLElement, M>>): RxNode<El<HTMLElement, M>>;
 export declare function Table<M = unknown, R = void>(declaration?: RxNodeDecl<El<HTMLElement, M>>, preset?: RxNodeDecl<El<HTMLElement, M>>): RxNode<El<HTMLElement, M>>;
 export declare function row<T = void>(builder?: (element: void) => T, shiftCursorDown?: number): void;
-export declare function startNewRow(shiftCursorDown?: number): void;
+export declare function rowBreak(shiftCursorDown?: number): void;
 export declare function cursor(areaParams: ElArea): void;
 export declare function Note(content: string, formatted?: boolean, declaration?: RxNodeDecl<El<HTMLElement, void>>): RxNode<El<HTMLElement, void>>;
 export declare function Group<M = unknown, R = void>(declaration?: RxNodeDecl<El<HTMLElement, M>>, preset?: RxNodeDecl<El<HTMLElement, M>>): RxNode<El<HTMLElement, M>>;

package/build/dist/source/html/Elements.js

@@ -8,10 +8,10 @@ export function Table(declaration, preset) {
     return RxNode.declare(Drivers.table, declaration, preset);
 }
 export function row(builder, shiftCursorDown) {
-    startNewRow(shiftCursorDown);
+    rowBreak(shiftCursorDown);
     builder === null || builder === void 0 ? void 0 : builder();
 }
-export function startNewRow(shiftCursorDown) {
+export function rowBreak(shiftCursorDown) {
     RxNode.declare(Drivers.partition);
 }
 export function cursor(areaParams) {
@@ -44,7 +44,7 @@ export class VerstakElementDriver extends HtmlElementDriver {
     update(node) {
         const element = node.element;
         if (element.kind === ElKind.section)
-            startNewRow();
+            rowBreak();
         return super.update(node);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verstak",
-  "version": "0.24.264",
+  "version": "0.24.266",
   "description": "Verstak - Front-End Library",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/nezaboodka/verstak/blob/master/README.md#readme",
   "dependencies": {
-    "reactronic": "^0.24.264"
+    "reactronic": "^0.24.265"
   },
   "devDependencies": {
     "@types/node": "20.11.17",