@floegence/floeterm-terminal-web 0.5.21 → 0.5.23

package/dist/core/TerminalCore.js

@@ -4,7 +4,7 @@ import { cursorToFabricCursor, mapGhosttyRowToFabricCells, renderReasonFromForce
 import { terminalFabricCoordinator } from '../fabric/TerminalFabricCoordinator.js';
 import { TerminalState, } from '../types.js';
 import { terminalInitializationScheduler, } from '../internal/TerminalInitializationScheduler.js';
-import { loadBeamtermModule } from '../fabric/BeamtermFabricRenderer.js';
+import { getGhosttyFitAddonConstructor, getGhosttyTerminalConstructor, loadGhosttyModules, waitWithAbort, } from '../internal/TerminalResourceLoader.js';
 import { resolveTerminalInputElement, TerminalInputBridge } from './TerminalInputBridge.js';
 import { terminalRenderScheduler } from './TerminalRenderScheduler.js';
 import { scheduleUiTurn } from '../internal/scheduleUiTurn.js';
@@ -113,64 +113,7 @@ const getPerfProbe = () => {
     }
     return window.__floetermPerfProbe;
 };
-// Dynamic imports avoid SSR issues and keep the bundle flexible.
-let TerminalCtor = null;
-let FitAddonCtor = null;
-let ghosttyResourcesPromise = null;
-const abortError = () => {
-    if (typeof DOMException !== 'undefined')
-        return new DOMException('Operation aborted', 'AbortError');
-    const error = new Error('Operation aborted');
-    error.name = 'AbortError';
-    return error;
-};
-const waitWithAbort = (promise, signal) => {
-    if (!signal)
-        return promise;
-    if (signal.aborted)
-        return Promise.reject(abortError());
-    return new Promise((resolve, reject) => {
-        const onAbort = () => reject(abortError());
-        signal.addEventListener('abort', onAbort, { once: true });
-        promise.then(value => {
-            signal.removeEventListener('abort', onAbort);
-            resolve(value);
-        }, error => {
-            signal.removeEventListener('abort', onAbort);
-            reject(error);
-        });
-    });
-};
-const loadGhosttyModules = async (logger, signal) => {
-    if (typeof window === 'undefined') {
-        throw new Error('ghostty-web 只能在浏览器环境中加载');
-    }
-    if (TerminalCtor && FitAddonCtor) {
-        return;
-    }
-    if (!ghosttyResourcesPromise) {
-        logger.debug('[TerminalCore] Initializing ghostty-web WASM');
-        ghosttyResourcesPromise = (async () => {
-            const { Terminal, FitAddon, init } = await import('ghostty-web');
-            await init();
-            TerminalCtor = Terminal;
-            FitAddonCtor = FitAddon;
-        })().catch((error) => {
-            TerminalCtor = null;
-            FitAddonCtor = null;
-            ghosttyResourcesPromise = null;
-            throw error;
-        });
-    }
-    await waitWithAbort(ghosttyResourcesPromise, signal);
-};
-export const preloadTerminalResources = async (options = {}) => {
-    const resources = Promise.all([
-        loadGhosttyModules(options.logger ?? noopLogger),
-        loadBeamtermModule(),
-    ]).then(() => undefined);
-    await waitWithAbort(resources, options.signal);
-};
+export { preloadTerminalResources } from '../internal/TerminalResourceLoader.js';
 const mapThemeToGhostty = (theme) => {
     if (!theme) {
         return {};
@@ -404,6 +347,7 @@ export class TerminalCore {
         this.fabricAttachSeq = 0;
         this.cancelFabricAttachSchedule = null;
         this.cancelInputRefocusSchedule = null;
+        this.inputElement = null;
         this.viewportHost = null;
         this.renderHost = null;
         this.resizeObserver = null;
@@ -588,12 +532,15 @@ export class TerminalCore {
         this.fabricView = null;
         this.terminal?.dispose();
         this.terminal = null;
+        this.inputElement?.remove();
+        this.inputElement = null;
         this.fitAddon = null;
         this.viewportHost?.remove();
         this.viewportHost = null;
         this.renderHost = null;
     }
     async createTerminalInstance(signal) {
+        const TerminalCtor = getGhosttyTerminalConstructor();
         if (!TerminalCtor) {
             throw new Error('ghostty-web module not loaded');
         }
@@ -644,6 +591,7 @@ export class TerminalCore {
         if (!this.terminal) {
             throw new Error('Terminal instance not created');
         }
+        const FitAddonCtor = getGhosttyFitAddonConstructor();
         if (!FitAddonCtor) {
             throw new Error('Required ghostty-web addons not loaded');
         }
@@ -661,6 +609,7 @@ export class TerminalCore {
         this.applyPresentationScaleStyles();
         this.installDemandRenderPatchBeforeOpen();
         this.terminal.open(this.renderHost ?? this.container);
+        this.mountInputElement();
         this.stopGhosttyRenderLoop();
         this.patchDemandRenderTriggersAfterOpen();
         this.patchSelectionManagerClipboardBehavior();
@@ -669,6 +618,18 @@ export class TerminalCore {
         this.applyRegisteredLinkProviders();
         void this.refreshFontMetricsAfterLoad('open');
     }
+    mountInputElement() {
+        const input = resolveTerminalInputElement(this.renderHost ?? this.container);
+        if (!input) {
+            throw new Error('ghostty-web terminal input element was not created');
+        }
+        const body = this.container.ownerDocument.body;
+        if (!body) {
+            throw new Error('Terminal input requires a document body');
+        }
+        body.appendChild(input);
+        this.inputElement = input;
+    }
     installFitAddonGeometryPatch() {
         const fitAddon = this.fitAddon;
         if (!fitAddon || fitAddon.__floetermGeometryPatchApplied) {
@@ -791,7 +752,7 @@ export class TerminalCore {
         this.syncImeInputAnchor();
     }
     syncImeInputAnchor() {
-        const input = resolveTerminalInputElement(this.container);
+        const input = this.inputElement;
         if (!input || this.shouldPreserveTransientInputPlacement(input)) {
             return;
         }
@@ -801,17 +762,34 @@ export class TerminalCore {
             return;
         }
         const canvasRect = geometry.canvas.getBoundingClientRect();
-        const left = Number(canvasRect.left) + cursor.x * geometry.cellWidth;
-        const top = Number(canvasRect.top) + cursor.y * geometry.cellHeight;
-        if (!Number.isFinite(left) || !Number.isFinite(top)) {
+        const canvasClientWidth = Number(geometry.canvas.clientWidth);
+        const canvasClientHeight = Number(geometry.canvas.clientHeight);
+        if (!Number.isFinite(canvasClientWidth)
+            || !Number.isFinite(canvasClientHeight)
+            || canvasClientWidth <= 0
+            || canvasClientHeight <= 0) {
+            return;
+        }
+        const visibleScaleX = Number(canvasRect.width) / canvasClientWidth;
+        const visibleScaleY = Number(canvasRect.height) / canvasClientHeight;
+        const cellWidth = geometry.cellWidth * visibleScaleX;
+        const cellHeight = geometry.cellHeight * visibleScaleY;
+        const left = Number(canvasRect.left) + cursor.x * cellWidth;
+        const top = Number(canvasRect.top) + cursor.y * cellHeight;
+        if (!Number.isFinite(left)
+            || !Number.isFinite(top)
+            || !Number.isFinite(cellWidth)
+            || !Number.isFinite(cellHeight)
+            || cellWidth <= 0
+            || cellHeight <= 0) {
             return;
         }
         input.style.position = 'fixed';
         input.style.left = formatCssPixelValue(left);
         input.style.top = formatCssPixelValue(top);
-        input.style.width = formatCssPixelValue(geometry.cellWidth);
-        input.style.height = formatCssPixelValue(geometry.cellHeight);
-        input.style.lineHeight = formatCssPixelValue(geometry.cellHeight);
+        input.style.width = formatCssPixelValue(cellWidth);
+        input.style.height = formatCssPixelValue(cellHeight);
+        input.style.lineHeight = formatCssPixelValue(cellHeight);
         input.style.padding = '0';
         input.style.border = 'none';
         input.style.margin = '0';
@@ -822,35 +800,10 @@ export class TerminalCore {
         input.style.clipPath = 'none';
         input.style.pointerEvents = 'none';
         input.style.zIndex = '0';
-        this.calibrateImeInputAnchorRect(input, left, top);
     }
     shouldPreserveTransientInputPlacement(input) {
         return input.style.pointerEvents === 'auto' || input.style.zIndex === '1000';
     }
-    calibrateImeInputAnchorRect(input, targetLeft, targetTop) {
-        const rect = input.getBoundingClientRect();
-        if (rect.width <= 0
-            || rect.height <= 0
-            || !Number.isFinite(rect.left)
-            || !Number.isFinite(rect.top)) {
-            return;
-        }
-        const deltaLeft = targetLeft - Number(rect.left);
-        const deltaTop = targetTop - Number(rect.top);
-        if (Math.abs(deltaLeft) < 0.5 && Math.abs(deltaTop) < 0.5) {
-            return;
-        }
-        const currentLeft = Number.parseFloat(input.style.left);
-        const currentTop = Number.parseFloat(input.style.top);
-        const nextLeft = (Number.isFinite(currentLeft) ? currentLeft : targetLeft) + deltaLeft;
-        const nextTop = (Number.isFinite(currentTop) ? currentTop : targetTop) + deltaTop;
-        if (Number.isFinite(nextLeft)) {
-            input.style.left = formatCssPixelValue(nextLeft);
-        }
-        if (Number.isFinite(nextTop)) {
-            input.style.top = formatCssPixelValue(nextTop);
-        }
-    }
     resolveImeInputAnchorGeometry() {
         const terminalAny = this.terminal;
         const renderer = terminalAny?.renderer ?? null;
@@ -873,9 +826,8 @@ export class TerminalCore {
         const metrics = renderer?.getMetrics?.() ?? renderer?.metrics ?? {};
         const cols = Math.floor(Number(terminalAny?.cols));
         const rows = Math.floor(Number(terminalAny?.rows));
-        const canvasRect = canvas.getBoundingClientRect();
-        const fallbackCellWidth = cols > 0 ? Number(canvasRect.width) / cols : Number.NaN;
-        const fallbackCellHeight = rows > 0 ? Number(canvasRect.height) / rows : Number.NaN;
+        const fallbackCellWidth = cols > 0 ? Number(canvas.clientWidth) / cols : Number.NaN;
+        const fallbackCellHeight = rows > 0 ? Number(canvas.clientHeight) / rows : Number.NaN;
         const cellWidth = Number(metrics.width ?? renderer?.charWidth ?? fallbackCellWidth);
         const cellHeight = Number(metrics.height ?? renderer?.charHeight ?? fallbackCellHeight);
         if (!this.isUsableAnchorGeometry(cellWidth, cellHeight, cols, rows)) {
@@ -1309,7 +1261,7 @@ export class TerminalCore {
     }
     setupInputBridge() {
         this.disposeInputBridge();
-        const input = resolveTerminalInputElement(this.container);
+        const input = this.inputElement;
         if (!input) {
             this.logger.debug('[TerminalCore] No terminal input host found for input bridge');
             return;
@@ -2727,6 +2679,8 @@ export class TerminalCore {
         this.fabricView = null;
         this.terminal?.dispose();
         this.terminal = null;
+        this.inputElement?.remove();
+        this.inputElement = null;
         this.viewportHost = null;
         this.renderHost = null;
         this.registeredLinkProviders.clear();