Skip to content

continue update ui #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kitenite merged 1 commit into from
Nov 8, 2025
Merged

continue update ui #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/desktop/src/renderer/screens/main/components/MainContent/TabGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,18 @@ export default function TabGroup({
}
.mosaic-theme-dark .mosaic-split {
background: #333;
opacity: 0;
border-radius: 25px;
transition: opacity 0.2s ease, background-color 0.2s ease;
}
.mosaic-theme-dark .mosaic-split:hover {
background: #444;
opacity: 1;
}
.mosaic-theme-dark .mosaic-split:active,
.mosaic-theme-dark .mosaic-split.mosaic-split-dragging {
background: #555;
opacity: 1;
}
.active-mosaic-window .mosaic-window-toolbar {
background: #3a3a3a !important;
Expand Down
23 changes: 0 additions & 23 deletions apps/desktop/src/renderer/screens/main/components/MainContent/Terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ export default function TerminalComponent({
const fitFunctionRef = useRef<(() => void) | null>(null);
const hasBeenVisibleRef = useRef(false);

// Log visibility changes for debugging
console.log(`[Terminal] Render: ${terminalId?.slice(0, 8)} hidden=${hidden} terminal=${!!terminal}`);

// Update the ref when onFocus changes
useEffect(() => {
onFocusRef.current = onFocus;
Expand All @@ -101,8 +98,6 @@ export default function TerminalComponent({

// Handle visibility changes - fit terminal when it becomes visible
useEffect(() => {
console.log(`[Terminal] Visibility effect fired: ${terminalIdRef.current?.slice(0, 8)} hidden=${hidden} terminal=${!!terminal} hasBeenVisible=${hasBeenVisibleRef.current}`);

if (!hidden && terminal && fitFunctionRef.current && terminalRef.current) {
const isFirstTimeVisible = !hasBeenVisibleRef.current;
hasBeenVisibleRef.current = true;
Expand All @@ -116,14 +111,10 @@ export default function TerminalComponent({
const tryFit = () => {
const rect = terminalRef.current?.getBoundingClientRect();
if (rect && rect.width > 0 && rect.height > 0) {
console.log(`[Terminal] Fitting terminal ${terminalIdRef.current?.slice(0, 8)} after becoming visible (attempt ${attempts + 1}, firstTime=${isFirstTimeVisible})`);
fitFunctionRef.current?.();
} else if (attempts < maxAttempts) {
attempts++;
console.log(`[Terminal] Container not ready for ${terminalIdRef.current?.slice(0, 8)}, retrying... (${rect?.width}x${rect?.height})`);
setTimeout(tryFit, retryDelay);
} else {
console.warn(`[Terminal] Failed to fit ${terminalIdRef.current} after ${maxAttempts} attempts`);
}
};

Expand All @@ -145,16 +136,12 @@ export default function TerminalComponent({
return;
}

console.log(`[Terminal] Initializing terminal: ${terminalId.slice(0, 8)}`);

// Set terminalIdRef immediately to prevent race conditions
terminalIdRef.current = terminalId;

const { term } = initTerminal(terminalRef.current, theme, onFocusRef);
setTerminal(term);

console.log(`[Terminal] Initialized terminal: ${terminalId.slice(0, 8)}`);

return () => {
// Don't dispose XTerm or cleanup on unmount
// XTerm instances should persist through reordering
Expand Down Expand Up @@ -232,15 +219,13 @@ export default function TerminalComponent({
const height = rect.height;

if (width <= 0 || height <= 0) {
console.log(`[Terminal] Skipping fit for ${terminalIdRef.current} - container has no dimensions (${width}x${height})`);
return; // Skip if container has no dimensions yet
}

// Use proposeDimensions to calculate optimal size without applying it
// Then manually resize to ensure PTY gets the correct dimensions
const dimensions = fitAddon.proposeDimensions();
if (dimensions) {
console.log(`[Terminal] Fitting ${terminalIdRef.current} to ${dimensions.cols}x${dimensions.rows}`);
term.resize(dimensions.cols, dimensions.rows);
}
} catch (e) {
Expand Down Expand Up @@ -276,7 +261,6 @@ export default function TerminalComponent({
const cols = dimensions?.cols || 80;
const rows = dimensions?.rows || 30;

console.log(`[Terminal] Creating terminal ${terminalId.slice(0, 8)} with dimensions ${cols}x${rows}`);
window.ipcRenderer.invoke("terminal-create", {
id: terminalId,
cwd,
Expand Down Expand Up @@ -373,12 +357,9 @@ export default function TerminalComponent({
data === '\x1b[O'; // Focus out event

if (isTerminalResponse) {
console.log(`[Terminal] Filtered terminal response for ${terminalIdRef.current}:`, JSON.stringify(data));
return;
}

// Debug: log user input
console.log(`[Terminal] User input for ${terminalIdRef.current}:`, JSON.stringify(data), `(length: ${data.length})`);
window.ipcRenderer.send("terminal-input", {
id: terminalIdRef.current,
data,
Expand Down Expand Up @@ -421,10 +402,6 @@ export default function TerminalComponent({

const terminalDataListener = (message: TerminalMessage) => {
if (message?.id === terminalIdRef.current) {
// Debug: log data being written to xterm
if (message.data.includes("1;2c") || message.data.includes("0;276")) {
console.log(`[Terminal] Received data for ${terminalIdRef.current}:`, JSON.stringify(message.data), `(length: ${message.data.length})`);
}
// If we're in the middle of a resize, queue the write
if (isResizing) {
writeQueue.push(message.data);
Expand Down
Loading
Loading