yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow use of useCurrentUser/useCurrentTeam hooks in unauthenticated components

Browse Source
This commit is contained in:
Tom Moor
2023-10-28 11:31:42 -04:00
parent 56f9755cd9
commit 964d2b6bb3
17 changed files with 109 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/Sidebar/Shared.tsx
View File

@@ -5,6 +5,7 @@ import styled from "styled-components";
import { NavigationNode } from "@shared/types";
import Scrollable from "~/components/Scrollable";
import SearchPopover from "~/components/SearchPopover";
import useCurrentUser from "~/hooks/useCurrentUser";
import useStores from "~/hooks/useStores";
import history from "~/utils/history";
import { homePath, sharedDocumentPath } from "~/utils/routeHelpers";
@@ -22,7 +23,8 @@ type Props = {
function SharedSidebar({ rootNode, shareId }: Props) {
const team = useTeamContext();
const { ui, documents, auth } = useStores();
const user = useCurrentUser({ rejectOnEmpty: false });
const { ui, documents } = useStores();
const { t } = useTranslation();
return (
@@ -33,7 +35,7 @@ function SharedSidebar({ rootNode, shareId }: Props) {
image={<TeamLogo model={team} size={32} alt={t("Logo")} />}
onClick={() =>
history.push(
auth.user ? homePath() : sharedDocumentPath(shareId, rootNode.url)
user ? homePath() : sharedDocumentPath(shareId, rootNode.url)
)
}
/>

5
app/components/Sidebar/Sidebar.tsx
View File

@@ -6,6 +6,7 @@ import styled, { css, useTheme } from "styled-components";
import breakpoint from "styled-components-breakpoint";
import { depths, s } from "@shared/styles";
import Flex from "~/components/Flex";
import useCurrentUser from "~/hooks/useCurrentUser";
import useMenuContext from "~/hooks/useMenuContext";
import usePrevious from "~/hooks/usePrevious";
import useStores from "~/hooks/useStores";
@@ -33,11 +34,11 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
) {
const [isCollapsing, setCollapsing] = React.useState(false);
const theme = useTheme();
const { ui, auth } = useStores();
const { ui } = useStores();
const location = useLocation();
const previousLocation = usePrevious(location);
const { isMenuOpen } = useMenuContext();
const { user } = auth;
const user = useCurrentUser({ rejectOnEmpty: false });
const width = ui.sidebarWidth;
const collapsed = ui.sidebarIsClosed && !isMenuOpen;
const maxWidth = theme.sidebarMaxWidth;