From 16df89188ae8ce8ebcc603baeaa426918003ce9f Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Fri, 29 Apr 2022 19:53:39 +0800 Subject: [PATCH] fix: cannot select code language automatically / code editor height auto-fit into view height --- src/component/FileManager/Pagination.js | 7 ++++++- src/component/Viewer/Code.js | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/component/FileManager/Pagination.js b/src/component/FileManager/Pagination.js index c1d2742..b1ba688 100644 --- a/src/component/FileManager/Pagination.js +++ b/src/component/FileManager/Pagination.js @@ -6,6 +6,7 @@ import CustomPaginationItem from "./PaginationItem"; import { setPagination } from "../../redux/viewUpdate/action"; import AutoHidden from "../Dial/AutoHidden"; import statusHelper from "../../utils/page"; +import { useLocation } from "react-router-dom"; const useStyles = makeStyles((theme) => ({ root: { @@ -31,6 +32,7 @@ export default function PaginationFooter() { const folders = useSelector((state) => state.explorer.dirList); const pagination = useSelector((state) => state.viewUpdate.pagination); const loading = useSelector((state) => state.viewUpdate.navigatorLoading); + const location = useLocation(); const SetPagination = useCallback((p) => dispatch(setPagination(p)), [ dispatch, @@ -46,11 +48,14 @@ export default function PaginationFooter() { ); const isMobile = statusHelper.isMobile(); + const isSharePage = statusHelper.isSharePage(location.pathname); if (count > 1 && !loading) { return ( <> - {!isMobile &&
} + {!isMobile && !isSharePage && ( + + )}