@gjsify/adwaita-nativescript 0.64.13 → 0.64.15-next.287

package/lib/types/widgets/stack-page.d.ts

@@ -16,6 +16,8 @@ declare const GtkStackPage_base: ((abstract new (...args: any[]) => {
     emit(eventName: string, ...args: unknown[]): void;
     get_property(name: string): unknown;
     set_property(name: string, value: unknown): void;
+    get cssType(): string | undefined;
+    set cssType(value: string | undefined);
     get halign(): string;
     set halign(value: string | number);
     get valign(): string;

package/lib/types/widgets/styled-layout-base.d.ts

@@ -8,6 +8,8 @@ declare const AdwStyledLayoutBase_base: ((abstract new (...args: any[]) => {
     emit(eventName: string, ...args: unknown[]): void;
     get_property(name: string): unknown;
     set_property(name: string, value: unknown): void;
+    get cssType(): string | undefined;
+    set cssType(value: string | undefined);
     get halign(): string;
     set halign(value: string | number);
     get valign(): string;

package/lib/types/widgets/view-stack-page.d.ts

@@ -16,6 +16,8 @@ declare const AdwViewStackPage_base: ((abstract new (...args: any[]) => {
     emit(eventName: string, ...args: unknown[]): void;
     get_property(name: string): unknown;
     set_property(name: string, value: unknown): void;
+    get cssType(): string | undefined;
+    set cssType(value: string | undefined);
     get halign(): string;
     set halign(value: string | number);
     get valign(): string;

package/lib/types/widgets/view-switcher-base.d.ts

@@ -20,6 +20,8 @@ declare const AdwViewSwitcherBase_base: ((abstract new (...args: any[]) => {
     emit(eventName: string, ...args: unknown[]): void;
     get_property(name: string): unknown;
     set_property(name: string, value: unknown): void;
+    get cssType(): string | undefined;
+    set cssType(value: string | undefined);
     get halign(): string;
     set halign(value: string | number);
     get valign(): string;

package/lib/types/widgets/widget-layout.d.ts

@@ -47,6 +47,8 @@ export interface GtkWidgetLayout {
  * The accessors keep their wider setter types (TS 5.1 unrelated accessor types).
  */
 export declare abstract class GtkWidgetLayoutMembers {
+    get cssType(): string | undefined;
+    set cssType(value: string | undefined);
     get halign(): string;
     set halign(value: string | number);
     get valign(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/adwaita-nativescript",
-    "version": "0.64.13",
+    "version": "0.64.15-next.287",
     "description": "Native Adwaita widgets for the NativeScript runtime — real NativeScript components (StackLayout/GridLayout/Switch/Label) styled like Libadwaita, not a webview",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -49,7 +49,7 @@
         "src/testing/ns-core.mts"
     ],
     "scripts": {
-        "clear": "gjsify clear lib tsconfig.tsbuildinfo tsconfig.types.tsbuildinfo test.gjs.mjs test.node.mjs test.trees.gjs.mjs test.trees.node.mjs",
+        "clear": "gjsify clear lib tsconfig.tsbuildinfo tsconfig.types.tsbuildinfo test.gjs.mjs test.node.mjs test.trees.gjs.mjs test.trees.node.mjs test.node-gi.mjs",
         "check": "gjsify tsc --noEmit",
         "build": "gjsify run build:gjsify && gjsify run build:types",
         "build:gjsify": "gjsify build --library 'src/**/*.{ts,js}' --exclude 'src/**/*.spec.{mts,ts}' 'src/test.{mts,ts}'",
@@ -59,9 +59,11 @@
         "build:test:node": "gjsify build src/test.mts --app node --outfile test.node.mjs",
         "build:test:trees:gjs": "gjsify build src/test.trees.mts --app gjs --no-minify --alias @nativescript/core=@gjsify/adwaita-nativescript/testing/ns-core --outfile test.trees.gjs.mjs",
         "build:test:trees:node": "gjsify build src/test.trees.mts --app node --no-minify --alias @nativescript/core=@gjsify/adwaita-nativescript/testing/ns-core --outfile test.trees.node.mjs",
+        "build:test:node-gi": "gjsify build src/test.node-gi.mts --app node --no-minify --alias @nativescript/core=@gjsify/adwaita-nativescript/testing/ns-core --outfile test.node-gi.mjs",
         "test": "gjsify run build:gjsify && gjsify run build:test && gjsify run test:node && gjsify run test:gjs",
         "test:gjs": "gjsify run test.gjs.mjs && gjsify run test.trees.gjs.mjs",
-        "test:node": "node test.node.mjs && node test.trees.node.mjs"
+        "test:node": "node test.node.mjs && node test.trees.node.mjs",
+        "test:gjs-on-node": "gjsify run build:test:node-gi && node --conditions=gjsify-foreign-parents test.node-gi.mjs"
     },
     "keywords": [
         "gjs",
@@ -73,15 +75,15 @@
         "design-system"
     ],
     "dependencies": {
-        "@gjsify/adwaita-core": "^0.64.13",
-        "@gjsify/adwaita-fonts": "^0.64.13",
-        "@gjsify/adwaita-icons": "^0.64.13",
-        "@gjsify/canvas2d-core": "^0.64.13",
-        "@gjsify/native-platform": "^0.64.13"
+        "@gjsify/adwaita-core": "0.64.15-next.287",
+        "@gjsify/adwaita-fonts": "0.64.15-next.287",
+        "@gjsify/adwaita-icons": "0.64.15-next.287",
+        "@gjsify/canvas2d-core": "0.64.15-next.287",
+        "@gjsify/native-platform": "0.64.15-next.287"
     },
     "peerDependencies": {
         "@nativescript/core": "*",
-        "@gjsify/app-settings": "^0.64.13"
+        "@gjsify/app-settings": "0.64.15-next.287"
     },
     "peerDependenciesMeta": {
         "@nativescript/core": {
@@ -92,11 +94,13 @@
         }
     },
     "devDependencies": {
-        "@gjsify/app-settings": "^0.64.13",
-        "@gjsify/blueprint": "^0.64.13",
-        "@gjsify/cli": "^0.64.13",
-        "@gjsify/unit": "^0.64.13",
-        "@gjsify/vite-plugin-blueprint": "^0.64.13",
+        "@gjsify/adwaita-gobject-native": "0.64.15-next.287",
+        "@gjsify/app-settings": "0.64.15-next.287",
+        "@gjsify/blueprint": "0.64.15-next.287",
+        "@gjsify/cli": "0.64.15-next.287",
+        "@gjsify/node-gi": "file:../../node-gi/node-gi",
+        "@gjsify/unit": "0.64.15-next.287",
+        "@gjsify/vite-plugin-blueprint": "0.64.15-next.287",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },
@@ -125,5 +129,6 @@
     "bugs": {
         "url": "https://github.com/gjsify/gjsify/issues"
     },
-    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/nativescript-bridge/adwaita#readme"
+    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/nativescript-bridge/adwaita#readme",
+    "gitHead": "5742b282a8a2bc8633dd8384ef436768447f6a83"
 }

package/src/testing/ns-core.mts

@@ -263,6 +263,16 @@ export class View extends Observable {
      * missing so the first `className` write died inside a constructor.
      */
     readonly cssClasses: Set<string> = new Set();
+    /**
+     * The real `View.cssType` derives `typeName.toLowerCase()` on first read and keeps it in
+     * `_cssType`; a subclass accessor wins over both, which is what a port widget relies on.
+     */
+    get cssType(): string | undefined {
+        return this.constructor.name.toLowerCase();
+    }
+
+    set cssType(_value: string | undefined) {}
+
     /**
      * `'auto'` until written, and HELD ON THE {@link Style} as `widthProperty` /
      * `heightProperty` are (`ui/styling/style-properties.ts` registers both on `Style`;
@@ -624,6 +634,17 @@ export class StackLayout extends LayoutBase {
     orientation: 'horizontal' | 'vertical' = 'vertical';
 }
 
+/**
+ * Upstream's `DockLayout`, of which only `stretchLastChild` is state a spec can read — the
+ * docking itself is `onLayout`'s arithmetic on a real allocation and happens nowhere off a
+ * device. `true` is the platform default (`ui/layouts/dock-layout/dock-layout-common`), and a
+ * double that started at `false` would let `widgets/bin-layout.ts` rely on a default it does
+ * not have.
+ */
+export class DockLayout extends LayoutBase {
+    stretchLastChild: boolean = true;
+}
+
 export type GridUnitType = 'auto' | 'star' | 'pixel';
 
 export class ItemSpec {
@@ -667,11 +688,22 @@ export class GridLayout extends LayoutBase {
         if (at !== -1) this._rows.splice(at, 1);
     }
 
+    /** `GridLayoutBase.removeColumn` — BY SPEC, like `removeRow`, not by index. */
+    removeColumn(itemSpec: ItemSpec): void {
+        const at = this._cols.indexOf(itemSpec);
+        if (at !== -1) this._cols.splice(at, 1);
+    }
+
     /** `GridLayoutBase.getColumns` — a copy, as on a device. */
     getColumns(): ItemSpec[] {
         return [...this._cols];
     }
 
+    /** `GridLayoutBase.getRows` — the same read on the other axis. */
+    getRows(): ItemSpec[] {
+        return [...this._rows];
+    }
+
     removeColumns(): void {
         this._cols.length = 0;
     }
@@ -893,6 +925,14 @@ export class Label extends View {
         this._text = value?.toString() ?? '';
     }
 
+    /**
+     * `TextBase._setNativeText` — the framework's sink for every text write, and the seam
+     * the native markup path draws at (`widgets/label-markup-native.ts`). There is no
+     * native text view off a device, so this records nothing: it exists because the port
+     * overrides it and `super._setNativeText()` has to be callable.
+     */
+    _setNativeText(_reset = false): void {}
+
     textWrap = false;
     textAlignment = 'initial';
     textOverflow = 'initial';
@@ -1261,3 +1301,21 @@ export const ApplicationSettings = {
         SETTINGS.set(key, value);
     },
 };
+
+/** `CSSHelper.createSelector('#x')` answers an `IdSelector`; the double is the stock one's shape. */
+class MockIdSelector {
+    id: string | undefined;
+    constructor(id: string) {
+        this.id = id;
+    }
+    match(node: { id?: string }): boolean {
+        return node.id === this.id;
+    }
+    lookupSort(sorter: { sortAsUniversal(selector: unknown): void }, base?: unknown): void {
+        sorter.sortAsUniversal(base ?? this);
+    }
+}
+
+export const CSSHelper = {
+    createSelector: (selector: string): object => new MockIdSelector(selector.slice(1)),
+};

package/src/theme/adwaita.css

@@ -506,13 +506,22 @@ Page.adw-window {
 
 /* ===== Button (variants) ===== */
 
+/* A FLOOR AND NOT A BOX. 38 is libadwaita's `min-height: 24px` plus its 5px of vertical
+ * padding twice (_buttons.scss, pin 42f647ff) — a MINIMUM there, and GTK has no CSS
+ * `height` at all. Writing it as NativeScript's `height`, which is exact, made every
+ * button in the port exactly 38 tall and silently swallowed `height-request`, which the
+ * bridge maps to `minHeight` and which GTK treats as a second floor: Learn6502's d-pad
+ * asks each of its five cells for 50×50 and got 50×38, so the cross came out as a row of
+ * flattened buttons. `min-height` is the property that means what the SCSS means, it
+ * composes with `height-request` the way GTK composes its two floors — the larger wins —
+ * and a caller that really wants an exact box can still write `height` itself. */
 .adw-button {
     background-color: rgba(0, 0, 0, 0.08);
     color: rgba(0, 0, 0, 0.8);
     border-radius: 9;
     font-weight: 700;
     padding: 5 16 5 16;
-    height: 38;
+    min-height: 38;
 }
 
 .adw-button.suggested-action {
@@ -534,10 +543,10 @@ Page.adw-window {
  * pin 42f647ff). The padding is the whole variant, and it is why this rule HAS to
  * restate the height.
  *
- * `.adw-button` above pins `height: 38`, and a NativeScript `height` is an EXACT box
- * where GTK's `min-height` is a floor — the same non-equivalence ADR 0034 measured for
- * `adw-spinner.size`. So a variant that doubles the vertical padding cannot grow the
- * box it sits in: the base budgets 38 − (5 + 5) = 28 for the label, and this one left
+ * `.adw-button` above pins a 38 floor, and this variant doubles the vertical padding
+ * inside it. While that floor was written as an EXACT NativeScript `height` — the
+ * non-equivalence ADR 0034 measured for `adw-spinner.size` — the variant could not grow
+ * the box it sat in: the base budgets 38 − (5 + 5) = 28 for the label, and this one left
  * 38 − (10 + 10) = 18 for a `.adw-button-label` at `font-size: 15`, whose line box does
  * not fit in 18. The pill was clipped, and every consumer that wanted one had to
  * override the height itself — which is how the defect surfaced, in Learn6502.
@@ -547,13 +556,17 @@ Page.adw-window {
  * 34, + 10px twice is 44 — so the pill is taller than the plain button there too.
  *
  * THE RULE THIS VARIANT BROKE, stated because the next variant will meet it: in this
- * stylesheet a class that changes vertical padding on a widget whose base pins an exact
- * `height` must restate that height. `.adw-button.circular` does (34), and both split
- * button halves do (38) beside their own padding. This one did not, and nothing said so. */
+ * stylesheet a class that changes vertical padding on a widget whose base states a
+ * `min-height` must restate that floor at its own padding. `.adw-button.circular` does
+ * (34), and both split button halves do (38) beside their own padding. This one did not,
+ * and nothing said so. The floors are `min-*` rather than `height` / `width` since the
+ * d-pad incident above, so a `height-request` larger than the floor now wins as it does
+ * in GTK — but a floor that is too SMALL for its own padding still clips, which is the
+ * half this comment is about and the reason the number is restated here. */
 .adw-button.pill {
     border-radius: 9999;
     padding: 10 32 10 32;
-    height: 48;
+    min-height: 48;
 }
 
 /* `%circular_button` — the explicit exception to the 9px rounded square: a full
@@ -563,8 +576,8 @@ Page.adw-window {
  * at all", and a class with no rule would have drawn a rounded rectangle instead. The
  * 34 is the same number `.adw-image-button` above carries, from the same line. */
 .adw-button.circular {
-    width: 34;
-    height: 34;
+    min-width: 34;
+    min-height: 34;
     border-radius: 9999;
     padding: 0;
 }