diff --git a/app/components/Breadcrumb.js b/app/components/Breadcrumb.js
index b6a527588..421866a72 100644
--- a/app/components/Breadcrumb.js
+++ b/app/components/Breadcrumb.js
@@ -20,10 +20,11 @@ import useStores from "hooks/useStores";
import BreadcrumbMenu from "menus/BreadcrumbMenu";
import { collectionUrl } from "utils/routeHelpers";
-type Props = {
+type Props = {|
document: Document,
+ children?: React.Node,
onlyText: boolean,
-};
+|};
function Icon({ document }) {
const { t } = useTranslation();
@@ -79,10 +80,14 @@ function Icon({ document }) {
return null;
}
-const Breadcrumb = ({ document, onlyText }: Props) => {
+const Breadcrumb = ({ document, children, onlyText }: Props) => {
const { collections } = useStores();
const { t } = useTranslation();
+ if (!collections.isLoaded) {
+ return ;
+ }
+
let collection = collections.get(document.collectionId);
if (!collection) {
collection = {
@@ -140,6 +145,7 @@ const Breadcrumb = ({ document, onlyText }: Props) => {
>
)}
+ {children}
);
};
diff --git a/app/scenes/Document/components/Header.js b/app/scenes/Document/components/Header.js
index 8c39e7e18..c51984c3e 100644
--- a/app/scenes/Document/components/Header.js
+++ b/app/scenes/Document/components/Header.js
@@ -134,7 +134,6 @@ class Header extends React.Component {
@@ -148,8 +147,7 @@ class Header extends React.Component {
onSubmit={this.handleCloseShareModal}
/>
-
-
+
{!isEditing && (
<>
@@ -175,7 +173,7 @@ class Header extends React.Component {
>
)}
-
+
{this.isScrolled && (
@@ -349,15 +347,6 @@ const Status = styled.div`
color: ${(props) => props.theme.slate};
`;
-const BreadcrumbAndContents = styled(Flex)`
- display: none;
-
- ${breakpoint("tablet")`
- display: flex;
- width: 33.3%;
- `};
-`;
-
const Wrapper = styled(Flex)`
width: 100%;
align-self: flex-end;
@@ -391,6 +380,10 @@ const Actions = styled(Flex)`
${breakpoint("tablet")`
padding: ${(props) => (props.isCompact ? "12px" : `24px 24px 0`)};
+
+ > div {
+ width: 33.3%;
+ }
`};
`;