fix: View recorded when toggling embeds

app/menus/DocumentMenu.tsx

@@ -136,14 +136,14 @@ type MenuContentProps = {
   showToggleEmbeds?: boolean;
 };
 
-const MenuContent: React.FC<MenuContentProps> = ({
+const MenuContent: React.FC<MenuContentProps> = observer(function MenuContent_({
   onOpen,
   onClose,
   onFindAndReplace,
   onRename,
   showDisplayOptions,
   showToggleEmbeds,
-}) => {
+}) {
   const user = useCurrentUser();
   const { model: document, menuState } = useMenuContext<Document>();
   const can = usePolicy(document);
@@ -348,7 +348,7 @@ const MenuContent: React.FC<MenuContentProps> = ({
       )}
     </ContextMenu>
   ) : null;
-};
+});
 
 function DocumentMenu({
   document,

app/scenes/Document/components/DataLoader.tsx

@@ -23,6 +23,7 @@ import {
 import history from "~/utils/history";
 import { matchDocumentEdit, settingsPath } from "~/utils/routeHelpers";
 import Loading from "./Loading";
+import MarkAsViewed from "./MarkAsViewed";
 
 type Params = {
   /** The document urlId + slugified title  */
@@ -222,16 +223,19 @@ function DataLoader({ match, children }: Props) {
   const readOnly = !isEditing || !canEdit;
 
   return (
-    <React.Fragment key={canEdit ? "edit" : "read"}>
-      {children({
-        document,
-        revision,
-        abilities: can,
-        readOnly,
-        onCreateLink,
-        sharedTree,
-      })}
-    </React.Fragment>
+    <>
+      {!shareId && !revision && <MarkAsViewed document={document} />}
+      <React.Fragment key={canEdit ? "edit" : "read"}>
+        {children({
+          document,
+          revision,
+          abilities: can,
+          readOnly,
+          onCreateLink,
+          sharedTree,
+        })}
+      </React.Fragment>
+    </>
   );
 }
 

app/scenes/Document/components/Document.tsx

@@ -59,7 +59,6 @@ import Contents from "./Contents";
 import Editor from "./Editor";
 import Header from "./Header";
 import KeyboardShortcutsButton from "./KeyboardShortcutsButton";
-import MarkAsViewed from "./MarkAsViewed";
 import { MeasuredContainer } from "./MeasuredContainer";
 import Notices from "./Notices";
 import PublicReferences from "./PublicReferences";
@@ -583,7 +582,7 @@ class DocumentScene extends React.Component<Props> {
                         canUpdate={abilities.update}
                         canComment={abilities.comment}
                       >
-                        {shareId && (
+                        {shareId ? (
                           <ReferencesWrapper>
                             <PublicReferences
                               shareId={shareId}
@@ -591,15 +590,11 @@ class DocumentScene extends React.Component<Props> {
                               sharedTree={this.props.sharedTree}
                             />
                           </ReferencesWrapper>
-                        )}
-                        {!isShare && !revision && (
-                          <>
-                            <MarkAsViewed document={document} />
-                            <ReferencesWrapper>
-                              <References document={document} />
-                            </ReferencesWrapper>
-                          </>
-                        )}
+                        ) : !revision ? (
+                          <ReferencesWrapper>
+                            <References document={document} />
+                          </ReferencesWrapper>
+                        ) : null}
                       </Editor>
                     </MeasuredContainer>
                   </>