Merge branch 'develop' into feature/create-room-selector

packages/client/src/components/MainBar/index.js

@@ -30,6 +30,7 @@ import styled, { css } from "styled-components";
 import { useLocation } from "react-router-dom";
 
 import { mobile } from "@docspace/shared/utils";
+import { isPublicPreview } from "@docspace/shared/utils/common";
 import Bar from "./Bar";
 
 const StyledContainer = styled.div`
@@ -75,7 +76,8 @@ const MainBar = ({
     !isNotPaidPeriod &&
     !pathname.includes("error") &&
     !pathname.includes("confirm") &&
-    !pathname.includes("preparation-portal");
+    !pathname.includes("preparation-portal") &&
+    !isPublicPreview();
 
   return (
     <StyledContainer id={"main-bar"} className={"main-bar"}>

packages/shared/components/media-viewer/MediaViewer.tsx

@@ -59,12 +59,12 @@ const MediaViewer = (props: MediaViewerProps): JSX.Element | undefined => {
     playlistPos,
     currentFileId,
     isPreviewFile,
-    setBufferSelection,
     extsImagePreviewed,
     deleteDialogVisible,
     pluginContextMenuItems,
     currentDeviceType,
-    isPublicFile,
+    isPublicFile = false,
+
     t,
     getIcon,
     onClose,
@@ -74,6 +74,7 @@ const MediaViewer = (props: MediaViewerProps): JSX.Element | undefined => {
     onDownload,
     onChangeUrl,
     setActiveFiles,
+    setBufferSelection,
     onEmptyPlaylistError,
 
     ...other
@@ -132,7 +133,7 @@ const MediaViewer = (props: MediaViewerProps): JSX.Element | undefined => {
       t,
       targetFile,
       archiveRoom,
-      Boolean(isPublicFile),
+      isPublicFile,
       {
         onClickDownload,
         onClickRename,
@@ -140,11 +141,7 @@ const MediaViewer = (props: MediaViewerProps): JSX.Element | undefined => {
       },
     );
 
-    const model = getMobileMediaContextModel(
+    const model = getMobileMediaContextModel(t, targetFile, isPublicFile, {
-      t,
-      targetFile,
-      Boolean(isPublicFile),
-      {
       onShowInfoPanel,
       onClickDownload,
       onMoveAction,
@@ -152,8 +149,7 @@ const MediaViewer = (props: MediaViewerProps): JSX.Element | undefined => {
       onDuplicate,
       onClickRename,
       onClickDelete,
-      },
+    });
-    );
 
     if (isPdf)
       return getPDFContextModel(t, targetFile, {

packages/shared/components/media-viewer/sub-components/Viewer/index.tsx

@@ -251,7 +251,7 @@ export const Viewer = (props: ViewerProps) => {
 
       {isImage ? (
         <ImageViewer
-          key={fileUrl}
+          key={targetFile?.viewUrl}
           isTiff={isTiff}
           devices={devices}
           toolbar={toolbar}