@gjsify/adwaita-web 0.51.1 → 0.53.0

package/src/source-view/theme.ts

@@ -14,6 +14,12 @@
 import { EditorView } from '@codemirror/view';
 import { HighlightStyle } from '@codemirror/language';
 import { tags } from '@lezer/highlight';
+import {
+    ADW_SOURCE_PALETTE_DARK,
+    ADW_SOURCE_PALETTE_LIGHT,
+    ADW_SOURCE_SYNTAX_ROLES,
+    type AdwSourcePalette,
+} from '@gjsify/adwaita-core';
 
 /**
  * Monospace stack — the `--monospace-font-family` token, with its own value
@@ -28,8 +34,14 @@ import { tags } from '@lezer/highlight';
  * and a `.monospace` label on the SAME page rendered in DIFFERENT typefaces.
  * `_variables.scss` is where that stack is argued about (it explains why
  * 'Cantarell' is dropped from it), so it is where it lives.
+ *
+ * The `var()` FALLBACK is a second copy by construction — it has to be, or a page
+ * that loads the stylesheet without the theme tokens gets no stack at all — so it
+ * is kept to the token's own value and nothing longer, and a tail entry landing in
+ * `_variables.scss` (#1817 added 'Consolas') has to land here too.
  */
-const MONO_FONT = "var(--monospace-font-family, 'Adwaita Mono', ui-monospace, 'SF Mono', 'Menlo', monospace)";
+const MONO_FONT =
+    "var(--monospace-font-family, 'Adwaita Mono', ui-monospace, 'SF Mono', 'Menlo', 'Consolas', monospace)";
 
 /** The CodeMirror EditorView theme mapping `.cm-*` chrome to Adwaita tokens. */
 export const adwaitaEditorTheme = EditorView.theme({
@@ -95,18 +107,19 @@ export const adwaitaHighlightStyle = HighlightStyle.define([
     { tag: tags.variableName, color: 'var(--view-fg-color, rgba(0,0,6,0.8))' },
 ]);
 
+/**
+ * Emit one `--adw-src-<role>: <colour>;` declaration per syntax role, in the
+ * core's role order. The two schemes therefore cannot drift into listing
+ * different roles, which is the failure a hand-written pair of blocks invites.
+ */
+const paletteDeclarations = (palette: AdwSourcePalette): string =>
+    ADW_SOURCE_SYNTAX_ROLES.map((role) => `    --adw-src-${role}: ${palette[role]};`).join('\n');
+
 // The light-theme syntax palette + shared chrome. Dark values are supplied by
 // the overrides block (same mechanism as adwaita-web's _theme.scss: auto via
 // prefers-color-scheme, manual via .theme-dark / opt-out via .theme-light).
 const DARK_TOKENS = `
-    --adw-src-comment: #9a9996;
-    --adw-src-keyword: #78aeed;
-    --adw-src-number: #ffa348;
-    --adw-src-string: #8ff0a4;
-    --adw-src-label: #dc8add;
-    --adw-src-register: #33d1c9;
-    --adw-src-directive: #f66151;
-    --adw-src-operator: rgba(255, 255, 255, 0.55);
+${paletteDeclarations(ADW_SOURCE_PALETTE_DARK)}
     --adw-src-gutter-fg: rgba(255, 255, 255, 0.35);
     --adw-src-active-line: color-mix(in srgb, #ffffff 6%, transparent);`;
 
@@ -116,14 +129,7 @@ export const SOURCE_VIEW_STYLE_ID = 'adw-source-view-style';
 /** The chrome stylesheet: container, copy button, LTR pin, syntax palette. */
 export const SOURCE_VIEW_CSS = `
 .adw-source-view {
-    --adw-src-comment: #5e5c64;
-    --adw-src-keyword: #1c71d8;
-    --adw-src-number: #c64600;
-    --adw-src-string: #26a269;
-    --adw-src-label: #813d9c;
-    --adw-src-register: #007e8a;
-    --adw-src-directive: #a51d2d;
-    --adw-src-operator: rgba(0, 0, 6, 0.55);
+${paletteDeclarations(ADW_SOURCE_PALETTE_LIGHT)}
     --adw-src-selection: color-mix(in srgb, var(--accent-bg-color, #3584e4) 26%, transparent);
     --adw-src-gutter-bg: var(--view-bg-color, #ffffff);
     --adw-src-gutter-fg: rgba(0, 0, 6, 0.35);

package/src/split-button.spec.ts

@@ -338,6 +338,13 @@ export const AdwSplitButtonTest = async () => {
             expect(el.classList.contains('checked')).toBe(false);
             host.remove();
         });
+
+        // Measured beside a GTK render of the gallery's split-button `.blp`: 5px wider there.
+        await it('draws the arrow half 24px wide, as `splitbutton > menubutton > button` is', () => {
+            const { el, host } = mount({ label: 'Save' });
+            expect(Math.round(dropdownHalf(el).getBoundingClientRect().width)).toBe(24);
+            host.remove();
+        });
     });
 
     // The two behaviours a hand-rolled popover with only an outside-click handler cannot

package/src/string-list-slot.ts

@@ -0,0 +1,21 @@
+// The `model` slot `<adw-combo-row>` and `<gtk-drop-down>` share — ADR 0072.
+//
+// A `.blp` writes a list model as an OBJECT at the property it sets,
+// `model: Gtk.StringList { strings [ "Blue", "Teal" ] }`, and the shared-tree builder hands
+// that over as a `<gtk-string-list slot="model" strings='["Blue","Teal"]'>` child. The slot
+// CONSUMES it: the child is data, read for its strings and then gone, as GtkBuilder leaves no
+// list model in the widget tree. The strings are JSON because `model` itself is a JSON
+// attribute on both elements, so the one parser reads both spellings.
+
+import { parseListModel } from '@gjsify/adwaita-core';
+import type { AdwComboOption } from '@gjsify/adwaita-core';
+
+import type { AdwSlotConsume } from './slotted-children.js';
+
+/** The `model` slot, handing the authored list to `adopt`. */
+export function stringListSlot(adopt: (model: AdwComboOption[]) => void): AdwSlotConsume {
+    return {
+        name: 'model',
+        consume: (node) => adopt(parseListModel(node instanceof Element ? node.getAttribute('strings') : null)),
+    };
+}