Remove sidebar scrolling

Fixes #473
This commit is contained in:
Jori Lallo 2017-12-05 00:16:05 -08:00
parent 553095692c
commit 5a0f3d027a
2 changed files with 2 additions and 30 deletions

View File

@ -29,7 +29,6 @@ type Props = {
@observer
class Sidebar extends Component {
props: Props;
scrollable: ?HTMLDivElement;
handleCreateCollection = () => {
this.props.ui.setActiveModal('collection-new');
@ -39,20 +38,6 @@ class Sidebar extends Component {
this.props.ui.setActiveModal('collection-edit');
};
setScrollableRef = ref => {
this.scrollable = ref;
};
scrollToActiveDocument = ref => {
const scrollable = this.scrollable;
if (!ref || !scrollable) return;
const container = scrollable.getBoundingClientRect();
const bounds = ref.getBoundingClientRect();
const scrollTop = bounds.top + container.top;
scrollable.scrollTop = scrollTop;
};
render() {
const { auth, ui } = this.props;
const { user, team } = auth;
@ -71,7 +56,7 @@ class Sidebar extends Component {
/>
<Flex auto column>
<Scrollable innerRef={this.setScrollableRef}>
<Scrollable>
<Section>
<SidebarLink to="/dashboard" icon={<HomeIcon />}>
Home
@ -88,7 +73,6 @@ class Sidebar extends Component {
history={this.props.history}
location={this.props.location}
onCreateCollection={this.handleCreateCollection}
activeDocumentRef={this.scrollToActiveDocument}
/>
</Section>
</Scrollable>

View File

@ -27,7 +27,6 @@ type Props = {
collections: CollectionsStore,
documents: DocumentsStore,
onCreateCollection: () => void,
activeDocumentRef: HTMLElement => void,
ui: UiStore,
};
@ -36,14 +35,7 @@ class Collections extends Component {
props: Props;
render() {
const {
history,
location,
collections,
ui,
activeDocumentRef,
documents,
} = this.props;
const { history, location, collections, ui, documents } = this.props;
return (
<Flex column>
@ -55,7 +47,6 @@ class Collections extends Component {
location={location}
collection={collection}
activeDocument={documents.active}
activeDocumentRef={activeDocumentRef}
prefetchDocument={documents.prefetchDocument}
ui={ui}
/>
@ -79,7 +70,6 @@ type CollectionLinkProps = {
collection: Collection,
ui: UiStore,
activeDocument: ?Document,
activeDocumentRef: HTMLElement => void,
prefetchDocument: (id: string) => Promise<void>,
};
@ -100,7 +90,6 @@ class CollectionLink extends Component {
collection,
activeDocument,
ui,
activeDocumentRef,
prefetchDocument,
} = this.props;
const expanded = collection.id === ui.activeCollectionId;
@ -140,7 +129,6 @@ class CollectionLink extends Component {
{collection.documents.map(document => (
<DocumentLink
key={document.id}
activeDocumentRef={activeDocumentRef}
history={history}
document={document}
activeDocument={activeDocument}