mirror of
https://github.com/cinnyapp/cinny.git
synced 2025-11-06 23:30:28 +03:00
clean up call references
This commit is contained in:
parent
d602631986
commit
fd0fa3c921
1 changed files with 2 additions and 23 deletions
|
|
@ -23,7 +23,6 @@ import { settingsAtom } from '../../state/settings';
|
||||||
import { useSetting } from '../../state/hooks/settings';
|
import { useSetting } from '../../state/hooks/settings';
|
||||||
import { useAccessibleTagColors, usePowerLevelTags } from '../../hooks/usePowerLevelTags';
|
import { useAccessibleTagColors, usePowerLevelTags } from '../../hooks/usePowerLevelTags';
|
||||||
import { useTheme } from '../../hooks/useTheme';
|
import { useTheme } from '../../hooks/useTheme';
|
||||||
import { CallActivationEffect } from '../../pages/call/CallActivation';
|
|
||||||
|
|
||||||
const FN_KEYS_REGEX = /^F\d+$/;
|
const FN_KEYS_REGEX = /^F\d+$/;
|
||||||
|
|
||||||
|
|
@ -78,7 +77,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||||
const [powerLevelTags, getPowerLevelTag] = usePowerLevelTags(room, powerLevels);
|
const [powerLevelTags, getPowerLevelTag] = usePowerLevelTags(room, powerLevels);
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const accessibleTagColors = useAccessibleTagColors(theme.kind, powerLevelTags);
|
const accessibleTagColors = useAccessibleTagColors(theme.kind, powerLevelTags);
|
||||||
const isCall = room.isCallRoom();
|
|
||||||
useKeyDown(
|
useKeyDown(
|
||||||
window,
|
window,
|
||||||
useCallback(
|
useCallback(
|
||||||
|
|
@ -87,7 +86,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||||
if (document.querySelector('.ReactModalPortal > *') || navigation.isRawModalVisible) {
|
if (document.querySelector('.ReactModalPortal > *') || navigation.isRawModalVisible) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (isCall) return;
|
|
||||||
|
|
||||||
if (shouldFocusMessageField(evt) || isKeyHotkey('mod+v', evt)) {
|
if (shouldFocusMessageField(evt) || isKeyHotkey('mod+v', evt)) {
|
||||||
if (editor) {
|
if (editor) {
|
||||||
|
|
@ -95,32 +93,13 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[editor, isCall]
|
[editor]
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isCall) {
|
|
||||||
return (
|
|
||||||
<Page
|
|
||||||
ref={roomViewRef}
|
|
||||||
style={{
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
height: '100%',
|
|
||||||
width: '0%',
|
|
||||||
overflow: 'hidden',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<RoomViewHeader />
|
|
||||||
<CallActivationEffect />
|
|
||||||
</Page>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Page ref={roomViewRef}>
|
<Page ref={roomViewRef}>
|
||||||
<RoomViewHeader />
|
<RoomViewHeader />
|
||||||
{/* Main timeline area */}
|
|
||||||
<Box grow="Yes" direction="Column" style={{ flex: 1, overflow: 'hidden', minHeight: 0 }}>
|
<Box grow="Yes" direction="Column" style={{ flex: 1, overflow: 'hidden', minHeight: 0 }}>
|
||||||
<RoomTimeline
|
<RoomTimeline
|
||||||
key={roomId}
|
key={roomId}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue