verstak 0.24.266 → 0.24.268

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

@@ -9,13 +9,11 @@ export type El<T = any, M = any> = {
     kind: ElKind;
     area: ElArea;
     width: Range;
-    widthJustMin: string;
     height: Range;
-    heightJustMin: string;
     alignment: Align;
     extraAlignment: Align;
-    stretchFactorX: number | undefined;
-    stretchFactorY: number | undefined;
+    stretchingStrengthX: number | undefined;
+    stretchingStrengthY: number | undefined;
     contentWrapping: boolean;
     overlayVisible: boolean | undefined;
     readonly style: CSSStyleDeclaration;
@@ -37,17 +35,17 @@ export type ElCoords = {
     y2: number;
 };
 export declare enum Align {
-    left = 1,
-    centerX = 2,
-    right = 3,
-    stretchX = 4,
-    top = 8,
-    centerY = 16,
-    bottom = 24,
-    stretchY = 32,
-    center = 18,
-    stretch = 36,
-    default = 0
+    default = 0,
+    left = 4,
+    centerWidth = 5,
+    right = 6,
+    stretchWidth = 7,
+    top = 32,
+    centerHeight = 40,
+    bottom = 48,
+    stretchHeight = 56,
+    center = 45,
+    stretch = 63
 }
 export type Range = {
     readonly min?: string;
@@ -74,8 +72,8 @@ export declare class ElImpl<T extends Element = any, M = any> implements El<T, M
     private _height;
     private _alignment;
     private _extraAlignment;
-    private _stretchFactorX;
-    private _stretchFactorY;
+    private _stretchingStrengthX;
+    private _stretchingStrengthY;
     private _contentWrapping;
     private _overlayVisible;
     private _hasStylingPresets;
@@ -90,20 +88,16 @@ export declare class ElImpl<T extends Element = any, M = any> implements El<T, M
     set area(value: ElArea);
     get width(): Range;
     set width(value: Range);
-    get widthJustMin(): string;
-    set widthJustMin(value: string);
     get height(): Range;
     set height(value: Range);
-    get heightJustMin(): string;
-    set heightJustMin(value: string);
     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 stretchingStrengthX(): number | undefined;
+    set stretchingStrengthX(value: number | undefined);
+    get stretchingStrengthY(): number | undefined;
+    set stretchingStrengthY(value: number | undefined);
     get contentWrapping(): boolean;
     set contentWrapping(value: boolean);
     get overlayVisible(): boolean | undefined;
@@ -135,19 +129,18 @@ export declare class CursorCommandDriver extends ElDriver<Element, unknown> {
     constructor();
 }
 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 minWidth<T extends Element>(element: El<T, any>, value: string): void;
-    static maxWidth<T extends Element>(element: El<T, any>, value: string): 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 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;
+    static kind<T extends Element>(element: ElImpl<T, any>, value: ElKind): void;
+    static coords<T extends Element>(element: ElImpl<T, any>, value: ElCoords | undefined): void;
+    static minWidth<T extends Element>(element: ElImpl<T, any>, value: string): void;
+    static maxWidth<T extends Element>(element: ElImpl<T, any>, value: string): void;
+    static minHeight<T extends Element>(element: ElImpl<T, any>, value: string): void;
+    static maxHeight<T extends Element>(element: ElImpl<T, any>, value: string): void;
+    static alignment<T extends Element>(element: ElImpl<T, any>, primary: Align, extra: Align, strengthX: number | undefined, strengthY: number | undefined): void;
+    static stretchingStrengthX<T extends Element>(element: ElImpl<T, any>, value: number): void;
+    static stretchingStrengthY<T extends Element>(element: ElImpl<T, any>, value: number): void;
+    static contentWrapping<T extends Element>(element: ElImpl<T, any>, value: boolean): void;
+    static overlayVisible<T extends Element>(element: ElImpl<T, any>, value: boolean | undefined): void;
+    static stylingPreset<T extends Element>(element: ElImpl<T, any>, secondary: boolean, styleName: string, enabled?: boolean): void;
 }
 export declare const Constants: {
     element: string;

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

@@ -17,17 +17,17 @@ export var ElKind;
 })(ElKind || (ElKind = {}));
 export var Align;
 (function (Align) {
-    Align[Align["left"] = 1] = "left";
-    Align[Align["centerX"] = 2] = "centerX";
-    Align[Align["right"] = 3] = "right";
-    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["left"] = 4] = "left";
+    Align[Align["centerWidth"] = 5] = "centerWidth";
+    Align[Align["right"] = 6] = "right";
+    Align[Align["stretchWidth"] = 7] = "stretchWidth";
+    Align[Align["top"] = 32] = "top";
+    Align[Align["centerHeight"] = 40] = "centerHeight";
+    Align[Align["bottom"] = 48] = "bottom";
+    Align[Align["stretchHeight"] = 56] = "stretchHeight";
+    Align[Align["center"] = 45] = "center";
+    Align[Align["stretch"] = 63] = "stretch";
 })(Align || (Align = {}));
 export class ElImpl {
     constructor(node) {
@@ -44,8 +44,8 @@ export class ElImpl {
         this._height = { min: "", max: "" };
         this._alignment = Align.default;
         this._extraAlignment = Align.default;
-        this._stretchFactorX = undefined;
-        this._stretchFactorY = undefined;
+        this._stretchingStrengthX = undefined;
+        this._stretchingStrengthY = undefined;
         this._contentWrapping = true;
         this._overlayVisible = undefined;
         this._hasStylingPresets = false;
@@ -104,8 +104,6 @@ export class ElImpl {
         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 height() { return this._height; }
     set height(value) {
         var _a, _b;
@@ -122,34 +120,32 @@ export class ElImpl {
         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 alignment() { return this._alignment; }
     set alignment(value) {
         if (value !== this._alignment) {
-            Apply.alignment(this, value);
+            Apply.alignment(this, value, this._extraAlignment, this._stretchingStrengthX, this._stretchingStrengthY);
             this._alignment = value;
         }
     }
     get extraAlignment() { return this._extraAlignment; }
     set extraAlignment(value) {
         if (value !== this._extraAlignment) {
-            Apply.extraAlignment(this, value);
+            Apply.alignment(this, this._alignment, value, this._stretchingStrengthX, this._stretchingStrengthY);
             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 stretchingStrengthX() { return this._stretchingStrengthX; }
+    set stretchingStrengthX(value) {
+        if (value !== this._stretchingStrengthX) {
+            Apply.stretchingStrengthX(this, value !== null && value !== void 0 ? value : 0);
+            this._stretchingStrengthX = 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 stretchingStrengthY() { return this._stretchingStrengthY; }
+    set stretchingStrengthY(value) {
+        if (value !== this._stretchingStrengthY) {
+            Apply.stretchingStrengthY(this, value !== null && value !== void 0 ? value : 0);
+            this._stretchingStrengthY = value;
         }
     }
     get contentWrapping() { return this._contentWrapping; }
@@ -343,35 +339,42 @@ export class Apply {
         if (element.native instanceof HTMLElement)
             element.native.style.maxHeight = `${value}`;
     }
-    static alignment(element, value) {
+    static alignment(element, primary, extra, strengthX, strengthY) {
         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];
-                s.alignSelf = v;
-                s.justifySelf = h;
+            let v1 = "";
+            let h1 = "";
+            let t1 = "";
+            if (primary !== Align.default) {
+                v1 = AlignToCss[(primary >> 3) & 0b11];
+                h1 = AlignToCss[primary & 0b11];
+                t1 = TextAlignCss[primary & 0b11];
             }
-            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;
-                s.alignItems = h;
-                s.textAlign = t;
+            s.alignSelf = v1;
+            s.justifySelf = h1;
+            if ((primary & Align.left) !== 0 && strengthX === undefined)
+                Apply.stretchingStrengthX(element, 1);
+            if ((primary & Align.top) !== 0 && strengthY === undefined)
+                Apply.stretchingStrengthY(element, 1);
+            let v2 = "";
+            let h2 = "";
+            let t2 = "";
+            if (extra !== Align.default) {
+                v2 = AlignToCss[(extra >> 3) & 0b11];
+                h2 = AlignToCss[extra & 0b11];
+                t2 = TextAlignCss[extra & 0b11];
             }
-            else
-                s.justifyContent = s.alignContent = s.textAlign = "";
+            else {
+                v2 = v1;
+                h2 = h1;
+                t2 = t1;
+            }
+            s.justifyContent = v2;
+            s.alignItems = h2;
+            s.textAlign = t2;
         }
     }
-    static stretchFactorX(element, value) {
+    static stretchingStrengthX(element, value) {
         if (element.native instanceof HTMLElement) {
             const s = element.native.style;
             if (value > 0) {
@@ -384,7 +387,7 @@ export class Apply {
             }
         }
     }
-    static stretchFactorY(element, value) {
+    static stretchingStrengthY(element, value) {
         const bNode = element.node;
         const driver = bNode.driver;
         if (driver.isPartition) {
@@ -400,8 +403,8 @@ export class Apply {
             const hostDriver = bNode.host.driver;
             if (hostDriver.isPartition) {
                 const host = bNode.host.seat.instance;
-                Apply.alignment(element, Align.stretch);
-                Apply.stretchFactorY(host.element, value);
+                Apply.alignment(host.element, Align.stretchHeight, Align.default, undefined, undefined);
+                Apply.stretchingStrengthY(host.element, value);
             }
         }
     }
@@ -514,5 +517,5 @@ const VerstakDriversByLayout = [
     el => {
     },
 ];
-const AlignToCss = ["stretch", "start", "center", "end"];
-const TextAlignCss = ["justify", "left", "center", "right"];
+const AlignToCss = ["start", "center", "end", "stretch"];
+const TextAlignCss = ["left", "center", "right", "justify"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verstak",
-  "version": "0.24.266",
+  "version": "0.24.268",
   "description": "Verstak - Front-End Library",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",