* fix: add disclosure and transition * fix: keep collections expanded * fix: tune transition and collapsing conditions * fix: collectionIcon expanded props is no longer driven by expanded state * fix: sync issue * fix: managing state together * fix: remove comment * fix: simplify expanded state * fix: remove extra state * fix: remove animation and retain expanded state * fix: remove isCollectionDropped * fix: don't use ref * review suggestions * fix many functional and design issues * don't render every single document in the sidebar, just ones that the user has seen before * chore: Sidebar refinement (#3154) * stash * wip: More sidebar tweaks * Simplify draft bubble * disclosure refactor * wip wip * lint * tweak menu position * Use document emoji for starred docs where available * feat: Trigger cmd+k from sidebar (#3149) * feat: Trigger cmd+k from sidebar * Add hint when opening command bar from sidebar * fix: Clicking internal links in shared documents sometimes reroutes to Login * fix: Spacing issues on connected slack channels list * Merge * fix: Do not prefetch JS bundles on public share links * fix: Buttons show on collection empty state when user does not have permission to edit * fix: the hover area for the "collections" subheading was being obfuscated by the initial collection drop cursor * fix: top-align disclosures * fix: Disclosure color PR feedback fix: Starred no longer draggable * fix: Overflow on sidebar button * fix: Scrollbar in sidebar when command menu is open * Minor alignment issues, clarify back in settings sidebar * fix: Fade component causes SidebarButton missizing Co-authored-by: Nan Yu <thenanyu@gmail.com> Co-authored-by: Tom Moor <tom.moor@gmail.com> Co-authored-by: Nan Yu <thenanyu@gmail.com>
110 lines
2.8 KiB
TypeScript
110 lines
2.8 KiB
TypeScript
import { observable } from "mobx";
|
|
import { observer } from "mobx-react";
|
|
import * as React from "react";
|
|
import { withTranslation, WithTranslation } from "react-i18next";
|
|
import { Switch, Route } from "react-router-dom";
|
|
import RootStore from "~/stores/RootStore";
|
|
import ErrorSuspended from "~/scenes/ErrorSuspended";
|
|
import Layout from "~/components/Layout";
|
|
import RegisterKeyDown from "~/components/RegisterKeyDown";
|
|
import Sidebar from "~/components/Sidebar";
|
|
import SettingsSidebar from "~/components/Sidebar/Settings";
|
|
import history from "~/utils/history";
|
|
import {
|
|
searchPath,
|
|
matchDocumentSlug as slug,
|
|
newDocumentPath,
|
|
settingsPath,
|
|
} from "~/utils/routeHelpers";
|
|
import Fade from "./Fade";
|
|
import withStores from "./withStores";
|
|
|
|
const DocumentHistory = React.lazy(
|
|
() =>
|
|
import(
|
|
/* webpackChunkName: "document-history" */
|
|
"~/components/DocumentHistory"
|
|
)
|
|
);
|
|
const CommandBar = React.lazy(
|
|
() =>
|
|
import(
|
|
/* webpackChunkName: "command-bar" */
|
|
"~/components/CommandBar"
|
|
)
|
|
);
|
|
|
|
type Props = WithTranslation &
|
|
RootStore & {
|
|
children?: React.ReactNode;
|
|
};
|
|
|
|
@observer
|
|
class AuthenticatedLayout extends React.Component<Props> {
|
|
scrollable: HTMLDivElement | null | undefined;
|
|
|
|
@observable
|
|
keyboardShortcutsOpen = false;
|
|
|
|
goToSearch = (ev: KeyboardEvent) => {
|
|
if (!ev.metaKey && !ev.ctrlKey) {
|
|
ev.preventDefault();
|
|
ev.stopPropagation();
|
|
history.push(searchPath());
|
|
}
|
|
};
|
|
|
|
goToNewDocument = () => {
|
|
const { activeCollectionId } = this.props.ui;
|
|
if (!activeCollectionId) {
|
|
return;
|
|
}
|
|
const can = this.props.policies.abilities(activeCollectionId);
|
|
if (!can.update) {
|
|
return;
|
|
}
|
|
history.push(newDocumentPath(activeCollectionId));
|
|
};
|
|
|
|
render() {
|
|
const { auth } = this.props;
|
|
const { user, team } = auth;
|
|
const showSidebar = auth.authenticated && user && team;
|
|
if (auth.isSuspended) {
|
|
return <ErrorSuspended />;
|
|
}
|
|
|
|
const sidebar = showSidebar ? (
|
|
<Fade>
|
|
<Switch>
|
|
<Route path={settingsPath()} component={SettingsSidebar} />
|
|
<Route component={Sidebar} />
|
|
</Switch>
|
|
</Fade>
|
|
) : undefined;
|
|
|
|
const rightRail = (
|
|
<React.Suspense fallback={null}>
|
|
<Switch>
|
|
<Route
|
|
path={`/doc/${slug}/history/:revisionId?`}
|
|
component={DocumentHistory}
|
|
/>
|
|
</Switch>
|
|
</React.Suspense>
|
|
);
|
|
|
|
return (
|
|
<Layout title={team?.name} sidebar={sidebar} rightRail={rightRail}>
|
|
<RegisterKeyDown trigger="n" handler={this.goToNewDocument} />
|
|
<RegisterKeyDown trigger="t" handler={this.goToSearch} />
|
|
<RegisterKeyDown trigger="/" handler={this.goToSearch} />
|
|
{this.props.children}
|
|
<CommandBar />
|
|
</Layout>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default withTranslation()(withStores(AuthenticatedLayout));
|