@@ -29,7 +29,14 @@ interface Props { isLoader?: boolean } -export const Layout: React.FC = ({ children, device, isAuthPage = false, titlePage, title = titlePage, isLoader }) => { +export const Layout: React.FC = ({ + children, + device, + isAuthPage = false, + titlePage, + title = titlePage, + isLoader, +}) => { const { data: sessionData } = useSession() const appState = useAppSelector((state) => state) const dispatch = useAppDispatch() @@ -56,7 +63,10 @@ export const Layout: React.FC = ({ children, device, isAuthPage = false, }, [status]) React.useEffect(() => { - if ((sessionData && !sessionStorage.getItem('firstRender')) || (sessionData && !localStorage.getItem('global_settings'))) { + if ( + (sessionData && !sessionStorage.getItem('firstRender')) || + (sessionData && !localStorage.getItem('global_settings')) + ) { dispatch(getUserAccountSettings(sessionData.access)) sessionStorage.setItem('firstRender', 'true') } @@ -81,7 +91,10 @@ export const Layout: React.FC = ({ children, device, isAuthPage = false, targetDevice: device, targetType: 'sidemenu', }) - if (setting) setting?.value?.sidemenu_state === 'opened' ? setSidemenuDefaultOpen(true) : setSidemenuDefaultOpen(false) + if (setting) + setting?.value?.sidemenu_state === 'opened' + ? setSidemenuDefaultOpen(true) + : setSidemenuDefaultOpen(false) } }, [appState.settings.state]) @@ -113,8 +126,9 @@ export const Layout: React.FC = ({ children, device, isAuthPage = false, id={'layout'} sx={{ width: '100%', - height: desktop ? '100%' : '100vh', + height: desktop ? '100%' : '100dvh', padding: isAuthPage ? '0px' : desktop ? '0px' : '10px', + overflowY: 'hidden', }} > = ({ children, device, isAuthPage = false, {!isAuthPage ? ( desktop ? ( - - - + + + {children} @@ -55,7 +55,8 @@ const Images: React.FC = ({ deviceType, deviceOs }) => { const includeParams = useAppSelector((state) => state.params.params) const dispatch = useDispatch() - const { messages, loading, createImage, isComplete, getMessagesPagination } = useModelImages(showError, modelType, deviceType) + const { messages, loading, createImage, isComplete, getMessagesPagination } = + useModelImages(showError, modelType, deviceType) const [chatScrollHeight, setChatScrollHeight] = React.useState(0) const [scrollBottom, setScrollBottom] = React.useState(0) @@ -219,7 +220,11 @@ const Images: React.FC = ({ deviceType, deviceOs }) => { }, [isComplete]) const handleMobileScroll = () => { - setScrollBottom(refScrollMobile.current?.scrollHeight - refScrollMobile.current?.scrollTop - refScrollMobile.current?.clientHeight) + setScrollBottom( + refScrollMobile.current?.scrollHeight - + refScrollMobile.current?.scrollTop - + refScrollMobile.current?.clientHeight + ) if (refScrollMobile.current && messages?.length !== 0) { const { scrollTop, scrollHeight, clientHeight } = refScrollMobile.current @@ -281,6 +286,7 @@ const Images: React.FC = ({ deviceType, deviceOs }) => { marginBottom: desktop ? 0 : 3, width: desktop ? '97%' : '100%', marginTop: desktop ? 3 : '15px', + overflowY: 'hidden', }} > = ({ deviceType, deviceOs }) => { ref={refScrollMobile} sx={{ padding: '30px', - height: ios - ? 'calc(200px + (400 - 180) * ((100vh - 400px) / (600 - 400)) - 100px)' - // iosver - calc(200px + (400 - 165) * ((95vh - 350px) / (600 - 395)) - 95px) - : 'calc(200px + (400 - 200) * ((100vh - 400px) / (600 - 400)))', + height: 'calc(100dvh - 116px - 61px)', overflowY: 'scroll', overflowX: 'hidden', }}