Load chats even on small screen sizes

revert-fa4bd20d
Alex Gleason 2022-12-06 22:22:25 -06:00
rodzic 2ffce5b68f
commit ef4e738625
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
1 zmienionych plików z 7 dodań i 15 usunięć

Wyświetl plik

@ -1,7 +1,6 @@
'use strict'; 'use strict';
import debounce from 'lodash/debounce'; import React, { useState, useEffect, useRef } from 'react';
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { HotKeys } from 'react-hotkeys'; import { HotKeys } from 'react-hotkeys';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import { Switch, useHistory, useLocation, Redirect } from 'react-router-dom'; import { Switch, useHistory, useLocation, Redirect } from 'react-router-dom';
@ -121,8 +120,6 @@ import 'soapbox/components/status';
const EmptyPage = HomePage; const EmptyPage = HomePage;
const isMobile = (width: number): boolean => width <= 1190;
const messages = defineMessages({ const messages = defineMessages({
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave.' }, beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave.' },
publish: { id: 'compose_form.publish', defaultMessage: 'Publish' }, publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
@ -328,7 +325,6 @@ const UI: React.FC = ({ children }) => {
const instance = useInstance(); const instance = useInstance();
const [draggingOver, setDraggingOver] = useState<boolean>(false); const [draggingOver, setDraggingOver] = useState<boolean>(false);
const [mobile, setMobile] = useState<boolean>(isMobile(window.innerWidth));
const dragTargets = useRef<EventTarget[]>([]); const dragTargets = useRef<EventTarget[]>([]);
const disconnect = useRef<any>(null); const disconnect = useRef<any>(null);
@ -435,12 +431,6 @@ const UI: React.FC = ({ children }) => {
} }
}; };
const handleResize = useCallback(debounce(() => {
setMobile(isMobile(window.innerWidth));
}, 500, {
trailing: true,
}), [setMobile]);
/** Load initial data when a user is logged in */ /** Load initial data when a user is logged in */
const loadAccountData = () => { const loadAccountData = () => {
if (!account) return; if (!account) return;
@ -475,7 +465,6 @@ const UI: React.FC = ({ children }) => {
}; };
useEffect(() => { useEffect(() => {
window.addEventListener('resize', handleResize, { passive: true });
document.addEventListener('dragenter', handleDragEnter, false); document.addEventListener('dragenter', handleDragEnter, false);
document.addEventListener('dragover', handleDragOver, false); document.addEventListener('dragover', handleDragOver, false);
document.addEventListener('drop', handleDrop, false); document.addEventListener('drop', handleDrop, false);
@ -490,7 +479,6 @@ const UI: React.FC = ({ children }) => {
} }
return () => { return () => {
window.removeEventListener('resize', handleResize);
document.removeEventListener('dragenter', handleDragEnter); document.removeEventListener('dragenter', handleDragEnter);
document.removeEventListener('dragover', handleDragOver); document.removeEventListener('dragover', handleDragOver);
document.removeEventListener('drop', handleDrop); document.removeEventListener('drop', handleDrop);
@ -684,9 +672,13 @@ const UI: React.FC = ({ children }) => {
</BundleContainer> </BundleContainer>
)} )}
{me && features.chats && !mobile && ( {me && features.chats && (
<BundleContainer fetchComponent={ChatWidget}> <BundleContainer fetchComponent={ChatWidget}>
{Component => <Component />} {Component => (
<div className='hidden xl:block'>
<Component />
</div>
)}
</BundleContainer> </BundleContainer>
)} )}
<ThumbNavigation /> <ThumbNavigation />