wip

2018-07-01 09:16:38 -07:00
parent 7780efce0e
commit 899b637979
8 changed files with 295 additions and 157 deletions
--- a/app/components/Actions/Actions.js
+++ b/app/components/Actions/Actions.js
@ -7,6 +7,7 @@ export const Action = styled(Flex)`
  justify-content: center;
  align-items: center;
  padding: 0 0 0 12px;
+  font-size: 15px;

  a {
    color: ${props => props.theme.text};
@ -37,8 +38,7 @@ const Actions = styled(Flex)`

  ${breakpoint('tablet')`
    left: auto;
-    padding: ${props => props.theme.vpadding} ${props =>
-    props.theme.hpadding} 8px 8px;
+    padding: ${props => props.theme.vpadding} ${props => props.theme.hpadding};
  `};
 `;

--- a/app/components/Collaborators/Collaborators.js
+++ b/app/components/Collaborators/Collaborators.js
@ -31,22 +31,21 @@ const Collaborators = ({ document }: Props) => {

  return (
    <Avatars>
-      <StyledTooltip tooltip={tooltip} placement="bottom">
      {collaborators.map(user => (
-          <AvatarWrapper key={user.id}>
+        <Tooltip
+          tooltip={collaborators.length > 1 ? user.name : tooltip}
+          placement="bottom"
+          key={user.id}
+        >
+          <AvatarWrapper>
            <Avatar src={user.avatarUrl} />
          </AvatarWrapper>
+        </Tooltip>
      ))}
-      </StyledTooltip>
    </Avatars>
  );
 };

-const StyledTooltip = styled(Tooltip)`
-  display: flex;
-  flex-direction: row-reverse;
-`;
-
 const AvatarWrapper = styled.div`
  width: 24px;
  height: 24px;
--- a/app/models/Document.js
+++ b/app/models/Document.js
@ -8,7 +8,7 @@ import UiStore from 'stores/UiStore';
 import parseTitle from '../../shared/utils/parseTitle';
 import unescape from '../../shared/utils/unescape';

-import type { User } from 'types';
+import type { NavigationNode, User } from 'types';
 import BaseModel from './BaseModel';
 import Collection from './Collection';

@ -52,17 +52,11 @@ class Document extends BaseModel {
  }

  @computed
-  get pathToDocument(): Array<{ id: string, title: string }> {
+  get pathToDocument(): NavigationNode[] {
    let path;
    const traveler = (nodes, previousPath) => {
      nodes.forEach(childNode => {
-        const newPath = [
-          ...previousPath,
-          {
-            id: childNode.id,
-            title: childNode.title,
-          },
-        ];
+        const newPath = [...previousPath, childNode];
        if (childNode.id === this.id) {
          path = newPath;
          return;
--- a/app/scenes/Document/Document.js
+++ b/app/scenes/Document/Document.js
@ -21,7 +21,7 @@ import { uploadFile } from 'utils/uploadFile';
 import isInternalUrl from 'utils/isInternalUrl';

 import Document from 'models/Document';
-import Actions from './components/Actions';
+import Header from './components/Header';
 import DocumentMove from './components/DocumentMove';
 import UiStore from 'stores/UiStore';
 import AuthStore from 'stores/AuthStore';
@ -248,7 +248,7 @@ class DocumentScene extends React.Component<Props> {
  };

  render() {
-    const { location, match } = this.props;
+    const { location, match, ui } = this.props;
    const Editor = this.editorComponent;
    const isMoving = match.path === matchDocumentMove;
    const document = this.document;
@ -269,7 +269,7 @@ class DocumentScene extends React.Component<Props> {
    }

    return (
-      <Container key={document ? document.id : undefined} column auto>
+      <Container column auto>
        {isMoving && document && <DocumentMove document={document} />}
        {titleText && <PageTitle title={titleText} />}
        {(this.isUploading || this.isSaving) && <LoadingIndicator />}
@ -290,6 +290,7 @@ class DocumentScene extends React.Component<Props> {
            )}
            <MaxWidth column auto>
              <Editor
+                key={document ? document.id : undefined}
                titlePlaceholder="Start with a title…"
                bodyPlaceholder="…the rest is your canvas"
                defaultValue={document.text}
@ -308,7 +309,7 @@ class DocumentScene extends React.Component<Props> {
            </MaxWidth>
            {document &&
              !isShare && (
-                <Actions
+                <Header
                  document={document}
                  isDraft={!document.publishedAt}
                  isEditing={this.isEditing}
@ -318,6 +319,7 @@ class DocumentScene extends React.Component<Props> {
                  history={this.props.history}
                  onDiscard={this.onDiscard}
                  onSave={this.onSave}
+                  editMode={ui.editMode}
                />
              )}
          </Flex>
--- a/app/scenes/Document/components/Actions.js
+++ b/app/scenes/Document/components/Actions.js
@ -1,130 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-import { NewDocumentIcon } from 'outline-icons';
-import Document from 'models/Document';
-import { documentEditUrl, documentNewUrl } from 'utils/routeHelpers';
-
-import DocumentMenu from 'menus/DocumentMenu';
-import Collaborators from 'components/Collaborators';
-import Actions, { Action, Separator } from 'components/Actions';
-
-type Props = {
-  document: Document,
-  isDraft: boolean,
-  isEditing: boolean,
-  isSaving: boolean,
-  isPublishing: boolean,
-  savingIsDisabled: boolean,
-  onDiscard: () => *,
-  onSave: ({
-    done?: boolean,
-    publish?: boolean,
-    autosave?: boolean,
-  }) => *,
-  history: Object,
-};
-
-class DocumentActions extends React.Component<Props> {
-  handleNewDocument = () => {
-    this.props.history.push(documentNewUrl(this.props.document));
-  };
-
-  handleEdit = () => {
-    this.props.history.push(documentEditUrl(this.props.document));
-  };
-
-  handleSave = () => {
-    this.props.onSave({ done: true });
-  };
-
-  handlePublish = () => {
-    this.props.onSave({ done: true, publish: true });
-  };
-
-  render() {
-    const {
-      document,
-      isEditing,
-      isDraft,
-      isPublishing,
-      isSaving,
-      savingIsDisabled,
-    } = this.props;
-
-    return (
-      <Actions align="center" justify="flex-end" readOnly={!isEditing}>
-        {!isDraft && !isEditing && <Collaborators document={document} />}
-        {isDraft && (
-          <Action>
-            <Link
-              onClick={this.handlePublish}
-              title="Publish document (Cmd+Enter)"
-              disabled={savingIsDisabled}
-              highlight
-            >
-              {isPublishing ? 'Publishing…' : 'Publish'}
-            </Link>
-          </Action>
-        )}
-        {isEditing && (
-          <React.Fragment>
-            <Action>
-              <Link
-                onClick={this.handleSave}
-                title="Save changes (Cmd+Enter)"
-                disabled={savingIsDisabled}
-                isSaving={isSaving}
-                highlight={!isDraft}
-              >
-                {isSaving && !isPublishing ? 'Saving…' : 'Save'}
-              </Link>
-            </Action>
-            {isDraft && <Separator />}
-          </React.Fragment>
-        )}
-        {!isEditing && (
-          <Action>
-            <a onClick={this.handleEdit}>Edit</a>
-          </Action>
-        )}
-        {isEditing && (
-          <Action>
-            <a onClick={this.props.onDiscard}>
-              {document.hasPendingChanges ? 'Discard' : 'Done'}
-            </a>
-          </Action>
-        )}
-        {!isEditing && (
-          <Action>
-            <DocumentMenu document={document} showPrint />
-          </Action>
-        )}
-        {!isEditing &&
-          !isDraft && (
-            <React.Fragment>
-              <Separator />
-              <Action>
-                <a onClick={this.handleNewDocument}>
-                  <NewDocumentIcon />
-                </a>
-              </Action>
-            </React.Fragment>
-          )}
-      </Actions>
-    );
-  }
-}
-
-const Link = styled.a`
-  display: flex;
-  align-items: center;
-  font-weight: ${props => (props.highlight ? 500 : 'inherit')};
-  color: ${props =>
-    props.highlight ? `${props.theme.primary} !important` : 'inherit'};
-  opacity: ${props => (props.disabled ? 0.5 : 1)};
-  pointer-events: ${props => (props.disabled ? 'none' : 'auto')};
-  cursor: ${props => (props.disabled ? 'default' : 'pointer')};
-`;
-
-export default DocumentActions;
--- a/app/scenes/Document/components/Breadcrumb.js
+++ b/app/scenes/Document/components/Breadcrumb.js
@ -0,0 +1,61 @@
+// @flow
+import * as React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { CollectionIcon, GoToIcon } from 'outline-icons';
+
+import { collectionUrl } from 'utils/routeHelpers';
+import Flex from 'shared/components/Flex';
+import Document from 'models/Document';
+
+type Props = {
+  document: Document,
+};
+
+const Breadcrumb = ({ document }: Props) => {
+  const path = document.pathToDocument.slice(0, -1);
+
+  return (
+    <Wrapper justify="flex-start" align="center">
+      <CollectionName to={collectionUrl(document.collectionId)}>
+        <CollectionIcon color={document.collection.color} />{' '}
+        <span>{document.collection.name}</span>
+      </CollectionName>
+      {path.map(n => (
+        <React.Fragment>
+          <Slash /> <Crumb to={n.url}>{n.title}</Crumb>
+        </React.Fragment>
+      ))}
+    </Wrapper>
+  );
+};
+
+const Wrapper = styled(Flex)`
+  width: 33.3%;
+`;
+
+const Slash = styled(GoToIcon)`
+  opacity: 0.25;
+`;
+
+const Crumb = styled(Link)`
+  color: ${props => props.theme.text};
+  font-size: 15px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+
+  &:hover {
+    text-decoration: underline;
+  }
+`;
+
+const CollectionName = styled(Link)`
+  color: ${props => props.theme.text};
+  font-size: 15px;
+  display: flex;
+  font-weight: 500;
+`;
+
+export default Breadcrumb;
--- a/app/scenes/Document/components/Header.js
+++ b/app/scenes/Document/components/Header.js
@ -0,0 +1,212 @@
+// @flow
+import * as React from 'react';
+import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
+import { observable } from 'mobx';
+import { observer } from 'mobx-react';
+import styled from 'styled-components';
+import breakpoint from 'styled-components-breakpoint';
+import { NewDocumentIcon } from 'outline-icons';
+import Document from 'models/Document';
+import { documentEditUrl, documentNewUrl } from 'utils/routeHelpers';
+
+import Flex from 'shared/components/Flex';
+import Breadcrumb from './Breadcrumb';
+import DocumentMenu from 'menus/DocumentMenu';
+import Collaborators from 'components/Collaborators';
+import { Action, Separator } from 'components/Actions';
+
+type Props = {
+  document: Document,
+  isDraft: boolean,
+  isEditing: boolean,
+  isSaving: boolean,
+  isPublishing: boolean,
+  savingIsDisabled: boolean,
+  editMode: boolean,
+  onDiscard: () => *,
+  onSave: ({
+    done?: boolean,
+    publish?: boolean,
+    autosave?: boolean,
+  }) => *,
+  history: Object,
+};
+
+@observer
+class Header extends React.Component<Props> {
+  @observable isScrolled = false;
+
+  componentWillMount() {
+    this.handleScroll();
+  }
+
+  componentDidMount() {
+    window.addEventListener('scroll', this.handleScroll);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('scroll', this.handleScroll);
+  }
+
+  handleScroll = () => {
+    this.isScrolled = window.scrollY > 75;
+  };
+
+  handleNewDocument = () => {
+    this.props.history.push(documentNewUrl(this.props.document));
+  };
+
+  handleEdit = () => {
+    this.props.history.push(documentEditUrl(this.props.document));
+  };
+
+  handleSave = () => {
+    this.props.onSave({ done: true });
+  };
+
+  handlePublish = () => {
+    this.props.onSave({ done: true, publish: true });
+  };
+
+  render() {
+    const {
+      document,
+      isEditing,
+      isDraft,
+      isPublishing,
+      isSaving,
+      savingIsDisabled,
+      editMode,
+    } = this.props;
+
+    return (
+      <Actions
+        align="center"
+        justify="space-between"
+        editMode={editMode}
+        readOnly={!isEditing}
+        isCompact={this.isScrolled}
+      >
+        <Breadcrumb document={document} />
+        <Title isHidden={!this.isScrolled}>{document.title}</Title>
+        <Wrapper align="center" justify="flex-end">
+          {!isDraft && !isEditing && <Collaborators document={document} />}
+          {isDraft && (
+            <Action>
+              <Link
+                onClick={this.handlePublish}
+                title="Publish document (Cmd+Enter)"
+                disabled={savingIsDisabled}
+                highlight
+              >
+                {isPublishing ? 'Publishing…' : 'Publish'}
+              </Link>
+            </Action>
+          )}
+          {isEditing && (
+            <React.Fragment>
+              <Action>
+                {isSaving && !isPublishing && <Status>Saving…</Status>}
+                <Link
+                  onClick={this.handleSave}
+                  title="Save changes (Cmd+Enter)"
+                  disabled={savingIsDisabled}
+                  isSaving={isSaving}
+                  highlight={!isDraft}
+                >
+                  Done
+                </Link>
+              </Action>
+              {isDraft && <Separator />}
+            </React.Fragment>
+          )}
+          {!isEditing && (
+            <Action>
+              <Link onClick={this.handleEdit}>Edit</Link>
+            </Action>
+          )}
+          {isEditing &&
+            !isSaving &&
+            document.hasPendingChanges && (
+              <Action>
+                <Link onClick={this.props.onDiscard}>Discard</Link>
+              </Action>
+            )}
+          {!isEditing && (
+            <Action>
+              <DocumentMenu document={document} showPrint />
+            </Action>
+          )}
+          {!isEditing &&
+            !isDraft && (
+              <React.Fragment>
+                <Separator />
+                <Action>
+                  <a onClick={this.handleNewDocument}>
+                    <NewDocumentIcon />
+                  </a>
+                </Action>
+              </React.Fragment>
+            )}
+        </Wrapper>
+      </Actions>
+    );
+  }
+}
+
+const Status = styled.div`
+  color: ${props => props.theme.slate};
+  margin-right: 12px;
+`;
+
+const Wrapper = styled(Flex)`
+  width: 33.3%;
+`;
+
+const Actions = styled(Flex)`
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: ${props => (props.editMode ? '0' : props.theme.sidebarWidth)};
+  background: rgba(255, 255, 255, 0.9);
+  border-bottom: 1px solid
+    ${props => (props.isCompact ? props.theme.smoke : 'transparent')};
+  padding: 12px;
+  transition: all 100ms ease-out;
+  -webkit-backdrop-filter: blur(20px);
+
+  @media print {
+    display: none;
+  }
+
+  ${breakpoint('tablet')`
+    padding: ${props =>
+      props.isCompact ? '12px' : `${props.theme.padding} 0`};
+  `};
+`;
+
+const Title = styled.div`
+  width: 33.3%;
+  font-size: 16px;
+  font-weight: 600;
+  text-align: center;
+  justify-content: center;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  transition: opacity 100ms ease-in-out;
+  opacity: ${props => (props.isHidden ? '0' : '1')};
+`;
+
+const Link = styled.a`
+  display: flex;
+  align-items: center;
+  font-weight: ${props => (props.highlight ? 500 : 'inherit')};
+  color: ${props =>
+    props.highlight ? `${props.theme.primary} !important` : 'inherit'};
+  opacity: ${props => (props.disabled ? 0.5 : 1)};
+  pointer-events: ${props => (props.disabled ? 'none' : 'auto')};
+  cursor: ${props => (props.disabled ? 'default' : 'pointer')};
+`;
+
+export default Header;
--- a/shared/styles/theme.js
+++ b/shared/styles/theme.js
@ -27,8 +27,8 @@ const theme = {
  black: '#000000',
  blackLight: '#2f3336',

-  padding: '1.5vw 1.875vw',
-  vpadding: '1.5vw',
+  padding: '1.6vw 1.875vw',
+  vpadding: '1.6vw',
  hpadding: '1.875vw',
  sidebarWidth: '280px',
  sidebarMinWidth: '250px',