-
-
+
+
+
-
{version}
-
{environment}
-
-
-
-
+
{version}
+
{environment}
+
+
+
+
-
+
);
}
diff --git a/ts/components/App.tsx b/ts/components/App.tsx
index 5343f060e2..29251de2c4 100644
--- a/ts/components/App.tsx
+++ b/ts/components/App.tsx
@@ -5,8 +5,6 @@ import React, { useEffect } from 'react';
import { Globals } from '@react-spring/web';
import classNames from 'classnames';
-import type { ExecuteMenuRoleType } from './TitleBarContainer';
-import type { MenuOptionsType, MenuActionType } from '../types/menu';
import type { AnyToast } from '../types/Toast';
import type { ViewStoryActionCreatorType } from '../state/ducks/stories';
import type { LocalizerType } from '../types/Util';
@@ -15,7 +13,6 @@ import { ThemeType } from '../types/Util';
import { AppViewType } from '../state/ducks/app';
import { SmartInstallScreen } from '../state/smart/InstallScreen';
import { StandaloneRegistration } from './StandaloneRegistration';
-import { TitleBarContainer } from './TitleBarContainer';
import { ToastManager } from './ToastManager';
import { usePageVisibility } from '../hooks/usePageVisibility';
import { useReducedMotion } from '../hooks/useReducedMotion';
@@ -42,18 +39,12 @@ type PropsType = {
theme: ThemeType;
isMaximized: boolean;
isFullScreen: boolean;
- menuOptions: MenuOptionsType;
onUndoArchive: (conversationId: string) => unknown;
openFileInFolder: (target: string) => unknown;
- hasCustomTitleBar: boolean;
OS: string;
osClassName: string;
- hideMenuBar: boolean;
- executeMenuRole: ExecuteMenuRoleType;
- executeMenuAction: (action: MenuActionType) => void;
hideToast: () => unknown;
- titleBarDoubleClick: () => void;
toast?: AnyToast;
scrollToMessage: (conversationId: string, messageId: string) => unknown;
viewStory: ViewStoryActionCreatorType;
@@ -62,16 +53,11 @@ type PropsType = {
export function App({
appView,
- executeMenuAction,
- executeMenuRole,
- hasCustomTitleBar,
hasSelectedStoryData,
- hideMenuBar,
hideToast,
i18n,
isFullScreen,
isMaximized,
- menuOptions,
onUndoArchive,
openFileInFolder,
openInbox,
@@ -85,7 +71,6 @@ export function App({
renderStoryViewer,
requestVerification,
theme,
- titleBarDoubleClick,
toast,
viewStory,
}: PropsType): JSX.Element {
@@ -127,10 +112,6 @@ export function App({
document.body.classList.add(osClassName);
}, [osClassName]);
- useEffect(() => {
- document.body.classList.toggle('os-has-custom-titlebar', hasCustomTitleBar);
- }, [hasCustomTitleBar]);
-
useEffect(() => {
document.body.classList.toggle('full-screen', isFullScreen);
document.body.classList.toggle('maximized', isMaximized);
@@ -150,41 +131,27 @@ export function App({
}, [prefersReducedMotion]);
return (
-
-
- {contents}
-
- {renderGlobalModalContainer()}
- {renderCallManager()}
- {renderLightbox()}
- {hasSelectedStoryData &&
- renderStoryViewer(() => viewStory({ closeViewer: true }))}
-
-
+ {contents}
+
+ {renderGlobalModalContainer()}
+ {renderCallManager()}
+ {renderLightbox()}
+ {hasSelectedStoryData &&
+ renderStoryViewer(() => viewStory({ closeViewer: true }))}
+
);
}
diff --git a/ts/components/CallingPip.tsx b/ts/components/CallingPip.tsx
index 0fcb3ca711..d4af9f5f94 100644
--- a/ts/components/CallingPip.tsx
+++ b/ts/components/CallingPip.tsx
@@ -294,7 +294,7 @@ export function CallingPip({
positionState.mode === PositionMode.BeingDragged
? '-webkit-grabbing'
: '-webkit-grab',
- transform: `translate3d(${localizedTranslateX}px,calc(${translateY}px - var(--titlebar-height)), 0)`,
+ transform: `translate3d(${localizedTranslateX}px,calc(${translateY}px), 0)`,
transition:
positionState.mode === PositionMode.BeingDragged
? 'none'
diff --git a/ts/components/DebugLogWindow.stories.tsx b/ts/components/DebugLogWindow.stories.tsx
index 2e226a0db0..dcb638f889 100644
--- a/ts/components/DebugLogWindow.stories.tsx
+++ b/ts/components/DebugLogWindow.stories.tsx
@@ -26,8 +26,6 @@ const createProps = (): PropsType => ({
await sleep(5000);
return 'https://picsum.photos/1800/900';
},
- executeMenuRole: action('executeMenuRole'),
- hasCustomTitleBar: true,
});
export default {
diff --git a/ts/components/DebugLogWindow.tsx b/ts/components/DebugLogWindow.tsx
index 7a70c880ee..0476109d28 100644
--- a/ts/components/DebugLogWindow.tsx
+++ b/ts/components/DebugLogWindow.tsx
@@ -4,20 +4,17 @@
import type { MouseEvent } from 'react';
import React, { useEffect, useState } from 'react';
import copyText from 'copy-text-to-clipboard';
-import type { ExecuteMenuRoleType } from './TitleBarContainer';
import type { LocalizerType } from '../types/Util';
import * as Errors from '../types/errors';
import * as log from '../logging/log';
import { Button, ButtonVariant } from './Button';
import { Spinner } from './Spinner';
-import { TitleBarContainer } from './TitleBarContainer';
import { ToastDebugLogError } from './ToastDebugLogError';
import { ToastLinkCopied } from './ToastLinkCopied';
import { ToastLoadingFullLogs } from './ToastLoadingFullLogs';
import { createSupportUrl } from '../util/createSupportUrl';
import { openLinkInWebBrowser } from '../util/openLinkInWebBrowser';
import { useEscapeHandling } from '../hooks/useEscapeHandling';
-import { useTheme } from '../hooks/useTheme';
enum LoadState {
NotStarted,
@@ -32,8 +29,6 @@ export type PropsType = {
i18n: LocalizerType;
fetchLogs: () => Promise
;
uploadLogs: (logs: string) => Promise;
- hasCustomTitleBar: boolean;
- executeMenuRole: ExecuteMenuRoleType;
};
enum ToastType {
@@ -48,8 +43,6 @@ export function DebugLogWindow({
i18n,
fetchLogs,
uploadLogs,
- hasCustomTitleBar,
- executeMenuRole,
}: PropsType): JSX.Element {
const [loadState, setLoadState] = useState(LoadState.NotStarted);
const [logText, setLogText] = useState();
@@ -59,8 +52,6 @@ export function DebugLogWindow({
);
const [toastType, setToastType] = useState();
- const theme = useTheme();
-
useEscapeHandling(closeWindow);
useEffect(() => {
@@ -144,41 +135,35 @@ export function DebugLogWindow({
});
return (
-
-
-
-
- {i18n('icu:debugLogSuccess')}
-
-
- {i18n('icu:debugLogSuccessNextSteps')}
-
+
+
+
+ {i18n('icu:debugLogSuccess')}
-
-
-
-
-
-
-
- {toastElement}
+
+ {i18n('icu:debugLogSuccessNextSteps')}
+
-
+
+
+
+
+
+
+
+ {toastElement}
+
);
}
@@ -188,49 +173,43 @@ export function DebugLogWindow({
loadState === LoadState.Started || loadState === LoadState.Submitting;
return (
-
-
-
-
- {i18n('icu:submitDebugLog')}
-
-
- {i18n('icu:debugLogExplanation')}
-
+
+
+
+ {i18n('icu:submitDebugLog')}
- {isLoading ? (
-
-
-
- ) : (
-
- )}
-
-
-
-
- {toastElement}
+
+ {i18n('icu:debugLogExplanation')}
+
-
+ {isLoading ? (
+
+
+
+ ) : (
+
+ )}
+
+
+
+
+ {toastElement}
+
);
}
diff --git a/ts/components/ModalHost.tsx b/ts/components/ModalHost.tsx
index 33cacbf7d0..fb8aa708d5 100644
--- a/ts/components/ModalHost.tsx
+++ b/ts/components/ModalHost.tsx
@@ -127,12 +127,10 @@ export const ModalHost = React.memo(function ModalHostInner({
}
// Exemptions:
- // - TitleBar should always receive clicks.
// - Quill suggestions since they are placed in the document.body
// - Calling module (and pip) are always above everything else
const exemptParent = target.closest(
- '.TitleBarContainer__title, ' +
- '.module-composition-input__suggestions, ' +
+ '.module-composition-input__suggestions, ' +
'.module-composition-input__format-menu, ' +
'.module-calling__modal-container'
);
diff --git a/ts/components/Preferences.stories.tsx b/ts/components/Preferences.stories.tsx
index 404e728cad..9c80209c4f 100644
--- a/ts/components/Preferences.stories.tsx
+++ b/ts/components/Preferences.stories.tsx
@@ -82,7 +82,6 @@ export default {
hasCallNotifications: true,
hasCallRingtoneNotification: false,
hasCountMutedConversations: false,
- hasCustomTitleBar: true,
hasHideMenuBar: false,
hasIncomingCallNotifications: true,
hasLinkPreviews: true,
@@ -131,7 +130,6 @@ export default {
doDeleteAllData: action('doDeleteAllData'),
doneRendering: action('doneRendering'),
editCustomColor: action('editCustomColor'),
- executeMenuRole: action('executeMenuRole'),
makeSyncRequest: action('makeSyncRequest'),
onAudioNotificationsChange: action('onAudioNotificationsChange'),
onAutoConvertEmojiChange: action('onAutoConvertEmojiChange'),
diff --git a/ts/components/Preferences.tsx b/ts/components/Preferences.tsx
index e1e8602383..5d20285ef4 100644
--- a/ts/components/Preferences.tsx
+++ b/ts/components/Preferences.tsx
@@ -33,7 +33,6 @@ import type {
SentMediaQualityType,
ThemeType,
} from '../types/Util';
-import type { ExecuteMenuRoleType } from './TitleBarContainer';
import { Button, ButtonVariant } from './Button';
import { ChatColorPicker } from './ChatColorPicker';
@@ -48,7 +47,6 @@ import { PhoneNumberDiscoverability } from '../util/phoneNumberDiscoverability';
import { PhoneNumberSharingMode } from '../util/phoneNumberSharingMode';
import { Select } from './Select';
import { Spinner } from './Spinner';
-import { TitleBarContainer } from './TitleBarContainer';
import { getCustomColorStyle } from '../util/getCustomColorStyle';
import {
DEFAULT_DURATIONS_IN_SECONDS,
@@ -58,7 +56,6 @@ import {
import { DurationInSeconds } from '../util/durations';
import { useEscapeHandling } from '../hooks/useEscapeHandling';
import { useUniqueId } from '../hooks/useUniqueId';
-import { useTheme } from '../hooks/useTheme';
import { focusableSelectors } from '../util/focusableSelectors';
import { Modal } from './Modal';
import { SearchInput } from './SearchInput';
@@ -116,7 +113,6 @@ export type PropsDataType = {
resolvedLocale: string;
// Other props
- hasCustomTitleBar: boolean;
initialSpellCheckSetting: boolean;
// Limited support features
@@ -141,7 +137,6 @@ type PropsFunctionType = {
doDeleteAllData: () => unknown;
doneRendering: () => unknown;
editCustomColor: (colorId: string, color: CustomColorType) => unknown;
- executeMenuRole: ExecuteMenuRoleType;
getConversationsWithCustomColor: (
colorId: string
) => Promise
>;
@@ -256,7 +251,6 @@ export function Preferences({
doDeleteAllData,
doneRendering,
editCustomColor,
- executeMenuRole,
getConversationsWithCustomColor,
hasAudioNotifications,
hasAutoConvertEmoji,
@@ -291,7 +285,6 @@ export function Preferences({
isSyncSupported,
isSystemTraySupported,
isMinimizeToAndStartInSystemTraySupported,
- hasCustomTitleBar,
lastSyncTime,
makeSyncRequest,
notificationContent,
@@ -364,7 +357,6 @@ export function Preferences({
string | null
>(localeOverride);
const [languageSearchInput, setLanguageSearchInput] = useState('');
- const theme = useTheme();
function closeLanguageDialog() {
setLanguageDialog(null);
@@ -1502,11 +1494,7 @@ export function Preferences({
}
return (
-
+ <>
@@ -1584,7 +1572,7 @@ export function Preferences({
{settings}
-
+
);
}
diff --git a/ts/components/TitleBarContainer.tsx b/ts/components/TitleBarContainer.tsx
deleted file mode 100644
index 8697114687..0000000000
--- a/ts/components/TitleBarContainer.tsx
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright 2021 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-import React, { useMemo } from 'react';
-import type { ReactNode } from 'react';
-import TitleBar from '@indutny/frameless-titlebar';
-import type { MenuItem } from '@indutny/frameless-titlebar';
-import type { MenuItemConstructorOptions } from 'electron';
-import classNames from 'classnames';
-
-import { createTemplate } from '../../app/menu';
-import { ThemeType } from '../types/Util';
-import type { LocalizerType } from '../types/I18N';
-import type { MenuOptionsType, MenuActionType } from '../types/menu';
-import { useIsWindowActive } from '../hooks/useIsWindowActive';
-
-export type MenuPropsType = Readonly<{
- hasMenu: true;
- i18n: LocalizerType;
- menuOptions: MenuOptionsType;
- executeMenuAction: (action: MenuActionType) => void;
-}>;
-
-export type ExecuteMenuRoleType = (
- role: MenuItemConstructorOptions['role']
-) => void;
-
-export type PropsType = Readonly<{
- theme: ThemeType;
- isMaximized?: boolean;
- isFullScreen?: boolean;
- hasCustomTitleBar: boolean;
- hideMenuBar?: boolean;
- executeMenuRole: ExecuteMenuRoleType;
- titleBarDoubleClick?: () => void;
- children: ReactNode;
-}> &
- (MenuPropsType | { hasMenu?: false });
-
-const TITLEBAR_HEIGHT = 28;
-
-// Windows only
-const ROLE_TO_ACCELERATOR = new Map<
- MenuItemConstructorOptions['role'],
- string
->();
-ROLE_TO_ACCELERATOR.set('undo', 'CmdOrCtrl+Z');
-ROLE_TO_ACCELERATOR.set('redo', 'CmdOrCtrl+Y');
-ROLE_TO_ACCELERATOR.set('cut', 'CmdOrCtrl+X');
-ROLE_TO_ACCELERATOR.set('copy', 'CmdOrCtrl+C');
-ROLE_TO_ACCELERATOR.set('paste', 'CmdOrCtrl+V');
-ROLE_TO_ACCELERATOR.set('pasteAndMatchStyle', 'CmdOrCtrl+Shift+V');
-ROLE_TO_ACCELERATOR.set('selectAll', 'CmdOrCtrl+A');
-ROLE_TO_ACCELERATOR.set('resetZoom', 'CmdOrCtrl+0');
-ROLE_TO_ACCELERATOR.set('zoomIn', 'CmdOrCtrl+=');
-ROLE_TO_ACCELERATOR.set('zoomOut', 'CmdOrCtrl+-');
-ROLE_TO_ACCELERATOR.set('togglefullscreen', 'F11');
-ROLE_TO_ACCELERATOR.set('toggleDevTools', 'CmdOrCtrl+Shift+I');
-ROLE_TO_ACCELERATOR.set('minimize', 'CmdOrCtrl+M');
-
-function convertMenu(
- menuList: ReadonlyArray,
- executeMenuRole: (role: MenuItemConstructorOptions['role']) => void,
- i18n: LocalizerType
-): Array