Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

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: 2 additions & 7 deletions src/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import {
__experimentalVStack as VStack,
__experimentalHStack as HStack,
} from '@wordpress/components';
import { useState } from 'react';
import { useLocalizationSupport } from '../hooks/use-localization-support';
import { useOnboarding } from '../hooks/use-onboarding';
import { useSidebarVisibility } from '../hooks/use-sidebar-visibility';
import { isWindows } from '../lib/app-globals';
import { cx } from '../lib/cx';
import { getIpcApi } from '../lib/get-ipc-api';
import MainSidebar from './main-sidebar';
import Onboarding from './onboarding';
import { SiteContentTabs } from './site-content-tabs';
Expand All @@ -18,11 +17,7 @@ import WindowsTitlebar from './windows-titlebar';
export default function App() {
useLocalizationSupport();
const { needsOnboarding } = useOnboarding();
const [ isSidebarVisible, setIsSidebarVisible ] = useState( true );
const toggleSidebar = () => {
getIpcApi().toggleMinWindowWidth( isSidebarVisible );
setIsSidebarVisible( ! isSidebarVisible );
};
const { isSidebarVisible, toggleSidebar } = useSidebarVisibility();

return (
<>
Expand Down
3 changes: 2 additions & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export const MAIN_MIN_WIDTH = 900;
export const DEFAULT_WIDTH = 900;
export const MAIN_MIN_HEIGHT = 600;
export const SIDEBAR_WIDTH = 268;
export const MAIN_MIN_WIDTH = DEFAULT_WIDTH - SIDEBAR_WIDTH + 20;
export const SCREENSHOT_WIDTH = 1040;
export const SCREENSHOT_HEIGHT = 1248;
export const LIMIT_OF_ZIP_SITES_PER_USER = 5;
Expand Down
35 changes: 35 additions & 0 deletions src/hooks/use-sidebar-visibility.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { useState, useEffect, useCallback } from 'react';
import { DEFAULT_WIDTH } from '../constants';
import { getIpcApi } from '../lib/get-ipc-api';

const SIDEBAR_BREAKPOINT = DEFAULT_WIDTH;

export function useSidebarVisibility() {
const [ isSidebarVisible, setIsSidebarVisible ] = useState( true );
const [ isLowerThanBreakpoint, setIsLowerThanBreakpoint ] = useState( false );

useEffect( () => {
const handleResize = () => {
setIsLowerThanBreakpoint( window.innerWidth < SIDEBAR_BREAKPOINT );
};
window.addEventListener( 'resize', handleResize );
return () => {
window.removeEventListener( 'resize', handleResize );
};
}, [] );

useEffect( () => {
if ( isLowerThanBreakpoint ) {
setIsSidebarVisible( false );
} else {
setIsSidebarVisible( true );
}
}, [ isLowerThanBreakpoint ] );

const toggleSidebar = useCallback( () => {
getIpcApi().toggleMinWindowWidth( isSidebarVisible );
setIsSidebarVisible( ! isSidebarVisible );
}, [ isSidebarVisible ] );

return { isSidebarVisible, toggleSidebar };
}
19 changes: 5 additions & 14 deletions src/ipc-handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import * as Sentry from '@sentry/electron/main';
import { LocaleData, defaultI18n } from '@wordpress/i18n';
import archiver from 'archiver';
import { DEFAULT_PHP_VERSION } from '../vendor/wp-now/src/constants';
import { MAIN_MIN_HEIGHT, MAIN_MIN_WIDTH, SIDEBAR_WIDTH, SIZE_LIMIT_BYTES } from './constants';
import { MAIN_MIN_WIDTH, SIDEBAR_WIDTH, SIZE_LIMIT_BYTES } from './constants';
import { isEmptyDir, pathExists, isWordPressDirectory, sanitizeFolderName } from './lib/fs-utils';
import { getImageData } from './lib/get-image-data';
import { exportBackup } from './lib/import-export/export/export-manager';
Expand Down Expand Up @@ -727,24 +727,15 @@ export function resetDefaultLocaleData( _event: IpcMainInvokeEvent ) {
defaultI18n.resetLocaleData();
}

const previousWidths = {
sidebar: MAIN_MIN_WIDTH,
noSidebar: MAIN_MIN_WIDTH - SIDEBAR_WIDTH,
};
export function toggleMinWindowWidth( event: IpcMainInvokeEvent, isSidebarVisible: boolean ) {
const parentWindow = BrowserWindow.fromWebContents( event.sender );
if ( ! parentWindow || parentWindow.isDestroyed() || event.sender.isDestroyed() ) {
return;
}
const [ currentWidth, currentHeight ] = parentWindow.getSize();
if ( isSidebarVisible ) {
previousWidths.sidebar = currentWidth;
} else {
previousWidths.noSidebar = currentWidth;
}
const padding = 20;
const newMinWidth = isSidebarVisible ? MAIN_MIN_WIDTH - SIDEBAR_WIDTH + padding : MAIN_MIN_WIDTH;
const newWidth = isSidebarVisible ? previousWidths.noSidebar : previousWidths.sidebar;
parentWindow.setMinimumSize( newMinWidth, MAIN_MIN_HEIGHT );
const newWidth = Math.max(
MAIN_MIN_WIDTH,
isSidebarVisible ? currentWidth - SIDEBAR_WIDTH : currentWidth + SIDEBAR_WIDTH
);
parentWindow.setSize( newWidth, currentHeight, true );
}
9 changes: 7 additions & 2 deletions src/main-window.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { BrowserWindow, type BrowserWindowConstructorOptions } from 'electron';
import { moveDatabasesInSitu } from '../vendor/wp-now/src';
import { MAIN_MIN_HEIGHT, MAIN_MIN_WIDTH, WINDOWS_TITLEBAR_HEIGHT } from './constants';
import {
DEFAULT_WIDTH,
MAIN_MIN_HEIGHT,
MAIN_MIN_WIDTH,
WINDOWS_TITLEBAR_HEIGHT,
} from './constants';
import { isEmptyDir } from './lib/fs-utils';
import { portFinder } from './lib/port-finder';
import { keepSqliteIntegrationUpdated } from './lib/sqlite-versions';
Expand Down Expand Up @@ -52,7 +57,7 @@ export function createMainWindow(): BrowserWindow {

mainWindow = new BrowserWindow( {
height: MAIN_MIN_HEIGHT,
width: MAIN_MIN_WIDTH,
width: DEFAULT_WIDTH,
backgroundColor: 'rgba(30, 30, 30, 1)',
minHeight: MAIN_MIN_HEIGHT,
minWidth: MAIN_MIN_WIDTH,
Expand Down