mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 20:11:08 +00:00
Replace immersive instant-switch with animated active chrome theme sync so top tabs match terminal sessions immediately on tab click, and clamp autocomplete popups to the active pane so they stay anchored to the cursor in split workspaces. Co-authored-by: Cursor <cursoragent@cursor.com>
146 lines
4.9 KiB
TypeScript
146 lines
4.9 KiB
TypeScript
import React, { Suspense, lazy, useEffect, useMemo, useState } from 'react';
|
|
import { useActiveTabId, useIsSftpActive, useIsVaultActive } from '../state/activeTabStore';
|
|
import { useTerminalHostTreeLayoutWidth } from '../state/terminalHostTreeStore';
|
|
import { isTerminalContentTabSurface } from './workTabSurface';
|
|
import { cn } from '../../lib/utils';
|
|
import { ConnectionLog, TerminalTheme } from '../../types';
|
|
import type { LogView as LogViewType } from '../state/logViewState';
|
|
import type { SftpView as SftpViewComponent } from '../../components/SftpView';
|
|
import type { TerminalLayer as TerminalLayerComponent } from '../../components/TerminalLayer';
|
|
|
|
// Visibility container for VaultView - isolates isActive subscription
|
|
export const VaultViewContainer: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
|
const isActive = useIsVaultActive();
|
|
const containerStyle: React.CSSProperties = isActive
|
|
? {}
|
|
: { visibility: 'hidden', pointerEvents: 'none', position: 'absolute', zIndex: -1 };
|
|
|
|
return (
|
|
<div className={cn("absolute inset-0", isActive ? "z-20" : "")} style={containerStyle}>
|
|
{children}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
// LogView wrapper - manages visibility based on active tab
|
|
interface LogViewWrapperProps {
|
|
logView: LogViewType;
|
|
defaultTerminalTheme: TerminalTheme;
|
|
defaultFontSize: number;
|
|
onClose: () => void;
|
|
onUpdateLog: (logId: string, updates: Partial<ConnectionLog>) => void;
|
|
}
|
|
|
|
export function getLogViewWrapperStyle(
|
|
isVisible: boolean,
|
|
hostTreeLayoutWidth: number,
|
|
): React.CSSProperties {
|
|
const baseStyle = {
|
|
left: hostTreeLayoutWidth,
|
|
};
|
|
return isVisible
|
|
? baseStyle
|
|
: { visibility: 'hidden', pointerEvents: 'none', position: 'absolute', zIndex: -1, ...baseStyle };
|
|
}
|
|
|
|
export const LogViewWrapper: React.FC<LogViewWrapperProps> = ({ logView, defaultTerminalTheme, defaultFontSize, onClose, onUpdateLog }) => {
|
|
const activeTabId = useActiveTabId();
|
|
const isVisible = activeTabId === logView.id;
|
|
const hostTreeLayoutWidth = useTerminalHostTreeLayoutWidth();
|
|
|
|
const containerStyle = getLogViewWrapperStyle(isVisible, hostTreeLayoutWidth);
|
|
|
|
return (
|
|
<div className={cn("absolute inset-0", isVisible ? "z-20" : "")} style={containerStyle}>
|
|
<Suspense fallback={null}>
|
|
<LazyLogView
|
|
log={logView.log}
|
|
defaultTerminalTheme={defaultTerminalTheme}
|
|
defaultFontSize={defaultFontSize}
|
|
isVisible={isVisible}
|
|
onClose={onClose}
|
|
onUpdateLog={onUpdateLog}
|
|
/>
|
|
</Suspense>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
const LazyLogView = lazy(() => import('../../components/LogView'));
|
|
|
|
const LazySftpView = lazy(() =>
|
|
import('../../components/SftpView').then((m) => ({ default: m.SftpView })),
|
|
);
|
|
|
|
const LazyTerminalLayer = lazy(() =>
|
|
import('../../components/TerminalLayer').then((m) => ({ default: m.TerminalLayer })),
|
|
);
|
|
|
|
type SftpViewProps = React.ComponentProps<typeof SftpViewComponent>;
|
|
type TerminalLayerProps = React.ComponentProps<typeof TerminalLayerComponent>;
|
|
|
|
export function shouldRenderTerminalLayerMount(
|
|
isVisible: boolean,
|
|
shouldMount: boolean,
|
|
): boolean {
|
|
return isVisible || shouldMount;
|
|
}
|
|
|
|
export const SftpViewMount: React.FC<SftpViewProps> = (props) => {
|
|
const isActive = useIsSftpActive();
|
|
const [shouldMount, setShouldMount] = useState(isActive);
|
|
|
|
useEffect(() => {
|
|
if (isActive) setShouldMount(true);
|
|
}, [isActive]);
|
|
|
|
if (!shouldMount) return null;
|
|
|
|
return (
|
|
<Suspense fallback={null}>
|
|
<LazySftpView {...props} />
|
|
</Suspense>
|
|
);
|
|
};
|
|
|
|
export const TerminalLayerMount: React.FC<TerminalLayerProps> = (props) => {
|
|
const activeTabId = useActiveTabId();
|
|
const sessionIds = useMemo(() => new Set(props.sessions.map((session) => session.id)), [props.sessions]);
|
|
const workspaceIds = useMemo(() => new Set(props.workspaces.map((workspace) => workspace.id)), [props.workspaces]);
|
|
const isVisible = isTerminalContentTabSurface({
|
|
activeTabId,
|
|
sessionIds,
|
|
workspaceIds,
|
|
}) || !!props.draggingSessionId;
|
|
const [shouldMount, setShouldMount] = useState(isVisible);
|
|
|
|
useEffect(() => {
|
|
if (isVisible) setShouldMount(true);
|
|
}, [isVisible]);
|
|
|
|
useEffect(() => {
|
|
if (shouldMount) return;
|
|
type IdleWindow = Window & {
|
|
requestIdleCallback?: (callback: () => void, options?: { timeout: number }) => number;
|
|
cancelIdleCallback?: (id: number) => void;
|
|
};
|
|
const idleWindow = window as IdleWindow;
|
|
if (typeof idleWindow.requestIdleCallback === "function") {
|
|
const id = idleWindow.requestIdleCallback(() => setShouldMount(true), { timeout: 5000 });
|
|
return () => idleWindow.cancelIdleCallback?.(id);
|
|
}
|
|
const id = window.setTimeout(() => setShouldMount(true), 5000);
|
|
return () => window.clearTimeout(id);
|
|
}, [shouldMount]);
|
|
|
|
const shouldRender = shouldRenderTerminalLayerMount(isVisible, shouldMount);
|
|
|
|
if (!shouldRender) return null;
|
|
|
|
return (
|
|
<Suspense fallback={null}>
|
|
<LazyTerminalLayer {...props} />
|
|
</Suspense>
|
|
);
|
|
};
|