Merge pull request #82 from ulu-telegram/master

deploy
ulu-telegram · Nov 16, 2023 · 8cd5c90 · 8cd5c90
2 parents 2ad1c65 + 98e4947
commit 8cd5c90
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/src/components/left/main/UluHeaderProfile.module.scss b/src/components/left/main/UluHeaderProfile.module.scss
@@ -40,4 +40,7 @@
   text-overflow: ellipsis;
   overflow: hidden;
   max-width: 250px;
+  width: 50%;
+  white-space: nowrap;
+  min-width: 125px;
 }
diff --git a/src/components/main/CommandMenu.tsx b/src/components/main/CommandMenu.tsx
@@ -20,6 +20,7 @@ import { getMainUsername, getUserFullName } from '../../global/helpers';
 import captureKeyboardListeners from '../../util/captureKeyboardListeners';
 import { convertLayout } from '../../util/convertLayout';
 import { throttle } from '../../util/schedulers';
+import { IS_ARC_BROWSER } from '../../util/windowEnvironment';
 import renderText from '../common/helpers/renderText';
 
 import useArchiver from '../../hooks/useArchiver';
@@ -360,6 +361,23 @@ const CommandMenu: FC<CommandMenuProps> = ({ topUserIds, usersById }) => {
     }
   }, [close, archiveMessages, track]);
 
+  useEffect(() => {
+    const listener = (e: KeyboardEvent) => {
+      if (IS_ARC_BROWSER && e.metaKey && e.ctrlKey && e.code === 'KeyC') {
+        handleSelectNewGroup();
+        e.preventDefault();
+        e.stopPropagation();
+      } else if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === 'KeyC') {
+        handleSelectNewGroup();
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    };
+
+    document.addEventListener('keydown', listener);
+    return () => document.removeEventListener('keydown', listener);
+  }, [handleSelectNewGroup]);
+
   const CommandMenuInner = (
     <Command.Dialog
       label="Command Menu"

diff --git a/src/util/windowEnvironment.ts b/src/util/windowEnvironment.ts
@@ -37,6 +37,12 @@ export const IS_FIREFOX = navigator.userAgent.toLowerCase().includes('firefox')
   || navigator.userAgent.toLowerCase().includes('iceweasel')
   || navigator.userAgent.toLowerCase().includes('icecat');
 export const IS_ELECTRON = Boolean(window.electron);
+export const IS_ARC_BROWSER = navigator.userAgent.includes('Chrome')
+  && navigator.userAgent.includes('Safari')
+  && !navigator.userAgent.includes('Edg')
+  && !IS_FIREFOX
+  && !IS_YA_BROWSER
+  && !IS_SAFARI;
 
 export enum MouseButton {
   Main = 0,