@mp-lb/termkit 0.2.3 → 0.2.4

package/README.md

@@ -26,4 +26,6 @@ export const Shell = () => (
 
 `api` represents your host application's control-plane adapter. Keep the provider configuration stable. Unmounting a terminal detaches the view; the shell keeps running in the daemon. Remounting the same session ID reattaches to its current screen.
 
+TermKit includes IBM Plex Mono and Noto Sans Symbols 2 for its default terminal font stack. Applications can provide their own font family through the terminal options.
+
 See the [guide](../../docs/public/index.mdx) and [generated reference](../../docs/public/api/index.mdx). The Node daemon and optional tRPC adapter live in sibling packages and are kept out of the browser entrypoint.

package/dist/Terminal.d.ts

@@ -1,6 +1,9 @@
 import { type CSSProperties } from "react";
 import { type ITheme } from "@xterm/xterm";
 import "@xterm/xterm/css/xterm.css";
+import "@fontsource/ibm-plex-mono/400.css";
+import "@fontsource/ibm-plex-mono/700.css";
+import "@fontsource/noto-sans-symbols-2/400.css";
 import { type TerminalColors } from "./terminalColors.js";
 export interface TerminalProps {
     session: string;

package/dist/Terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Terminal.d.ts","sourceRoot":"","sources":["../src/Terminal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAqB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,4BAA4B,CAAC;AAUpC,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,aAAa;IAK5B,OAAO,EAAE,MAAM,CAAC;IAIhB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhC,SAAS,CAAC,EAAE,OAAO,CAAC;IAKpB,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,cAAc,CAAC,EAAE,MAAM,CAAC;IAIxB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAGzB,cAAc,CAAC,EAAE,YAAY,GAAG,kBAAkB,CAAC;IAInD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,MAAM,CAAC,EAAE,cAAc,CAAC;IAIxB,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,OAAO,CAAC,EAAE,OAAO,CAAC;IAGlB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,wBAAgB,QAAQ,CAAC,EACvB,OAAO,EACP,MAAM,EACN,SAAiB,EACjB,aAAoB,EACpB,cAAc,EACd,WAAW,EACX,cAAmC,EACnC,UAAU,EACV,MAAM,EACN,KAAK,EACL,OAAc,EACd,SAAS,EACT,KAAK,GACN,EAAE,aAAa,+BAscf"}
+{"version":3,"file":"Terminal.d.ts","sourceRoot":"","sources":["../src/Terminal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAqB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,mCAAmC,CAAC;AAC3C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,yCAAyC,CAAC;AAUjD,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,aAAa;IAK5B,OAAO,EAAE,MAAM,CAAC;IAIhB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhC,SAAS,CAAC,EAAE,OAAO,CAAC;IAKpB,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,cAAc,CAAC,EAAE,MAAM,CAAC;IAIxB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAGzB,cAAc,CAAC,EAAE,YAAY,GAAG,kBAAkB,CAAC;IAInD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,MAAM,CAAC,EAAE,cAAc,CAAC;IAIxB,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,OAAO,CAAC,EAAE,OAAO,CAAC;IAGlB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,wBAAgB,QAAQ,CAAC,EACvB,OAAO,EACP,MAAM,EACN,SAAiB,EACjB,aAAoB,EACpB,cAAc,EACd,WAAW,EACX,cAAmC,EACnC,UAAU,EACV,MAAM,EACN,KAAK,EACL,OAAc,EACd,SAAS,EACT,KAAK,GACN,EAAE,aAAa,+BA+cf"}

package/dist/Terminal.js

@@ -3,6 +3,9 @@ import { useEffect, useRef } from "react";
 import { Terminal as XTerm } from "@xterm/xterm";
 import { FitAddon } from "@xterm/addon-fit";
 import "@xterm/xterm/css/xterm.css";
+import "@fontsource/ibm-plex-mono/400.css";
+import "@fontsource/ibm-plex-mono/700.css";
+import "@fontsource/noto-sans-symbols-2/400.css";
 import { CLOSE_SESSION_GONE, HEARTBEAT_INTERVAL_MS, HEARTBEAT_PONG_GRACE_MS, } from "@mp-lb/termkit-core";
 import { useTermkitContext } from "./useTermkitContext.js";
 import { createTerminalWriteQueue } from "./createTerminalWriteQueue.js";
@@ -49,7 +52,7 @@ export function Terminal({ session, params, autoFocus = false, dismissOnView = t
                 opts.background,
         };
         const term = new XTerm({
-            fontFamily: opts.fontFamily ?? '"IBM Plex Mono", monospace',
+            fontFamily: opts.fontFamily ?? '"IBM Plex Mono", "Noto Sans Symbols 2", monospace',
             fontSize: opts.fontSize ?? 13,
             cursorBlink: opts.cursorBlink ?? true,
             theme: terminalTheme,
@@ -361,7 +364,16 @@ export function Terminal({ session, params, autoFocus = false, dismissOnView = t
         window.addEventListener("focus", refreshAfterLayout);
         window.addEventListener("pageshow", refreshAfterLayout);
         document.addEventListener("visibilitychange", refreshWhenVisible);
-        document.fonts?.ready.then(refreshLayoutBurst).catch(() => { });
+        document.fonts?.ready
+            .then(() => {
+            if (disposed)
+                return;
+            // xterm measures cells when opened; loading a web font does not remeasure
+            // them. A harmless font-family change asks xterm to measure again.
+            term.options.fontFamily = `${term.options.fontFamily} `;
+            refreshLayoutBurst();
+        })
+            .catch(() => { });
         return () => {
             disposed = true;
             if (reconnectTimer !== null)

package/dist/fitTerminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fitTerminal.d.ts","sourceRoot":"","sources":["../src/fitTerminal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,IAAI,KAAK,EAAE,MAAM,cAAc,CAAC;AAEtD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAiDD,eAAO,MAAM,WAAW,GACtB,WAAW,WAAW,EACtB,MAAM,KAAK,EACX,UAAU,QAAQ,EAClB,UAAU,YAAY,GAAG,IAAI,KAC5B,YAAY,GAAG,IAiBjB,CAAC"}
+{"version":3,"file":"fitTerminal.d.ts","sourceRoot":"","sources":["../src/fitTerminal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,IAAI,KAAK,EAAE,MAAM,cAAc,CAAC;AAEtD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,WAAW,GACtB,WAAW,WAAW,EACtB,MAAM,KAAK,EACX,UAAU,QAAQ,EAClB,UAAU,YAAY,GAAG,IAAI,KAC5B,YAAY,GAAG,IAejB,CAAC"}

package/dist/fitTerminal.js

@@ -1,36 +1,7 @@
-function parsePixels(value) {
-    const parsed = Number.parseFloat(value);
-    return Number.isFinite(parsed) ? parsed : 0;
-}
-function fallbackDimensions(container) {
-    if (typeof container.querySelector !== "function")
-        return null;
-    const terminal = container.querySelector(".xterm");
-    const measure = container.querySelector(".xterm-helper-textarea");
-    if (!terminal || !measure)
-        return null;
-    const terminalStyle = window.getComputedStyle(terminal);
-    const cell = measure.getBoundingClientRect();
-    if (cell.width <= 0 || cell.height <= 0)
-        return null;
-    const paddingX = parsePixels(terminalStyle.paddingLeft) +
-        parsePixels(terminalStyle.paddingRight);
-    const paddingY = parsePixels(terminalStyle.paddingTop) +
-        parsePixels(terminalStyle.paddingBottom);
-    const scrollbarWidth = 14;
-    const availableWidth = Math.max(0, container.clientWidth - paddingX - scrollbarWidth);
-    const availableHeight = Math.max(0, container.clientHeight - paddingY);
-    return {
-        cols: Math.max(2, Math.floor(availableWidth / cell.width)),
-        rows: Math.max(1, Math.floor(availableHeight / cell.height)),
-    };
-}
 export const fitTerminal = (container, term, fitAddon, lastSize) => {
     if (container.clientWidth === 0 || container.clientHeight === 0)
         return lastSize;
-    const fallback = fallbackDimensions(container);
-    const proposed = fitAddon.proposeDimensions();
-    const nextSize = fallback ?? proposed;
+    const nextSize = fitAddon.proposeDimensions();
     if (!nextSize)
         return lastSize;
     if (term.cols !== nextSize.cols || term.rows !== nextSize.rows) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mp-lb/termkit",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -18,6 +18,8 @@
   ],
   "description": "Build terminal experiences.",
   "dependencies": {
+    "@fontsource/ibm-plex-mono": "5.3.0",
+    "@fontsource/noto-sans-symbols-2": "5.3.0",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",
     "zustand": "^5.0.14",