Merge pull request #257 from ONLYOFFICE/bugfix/empty-screen-warning

bugfix/empty-screen-warning

packages/client/src/components/EmptyContainer/EmptyFolderContainer.js

@@ -40,12 +40,12 @@ const EmptyFolderContainer = ({
   const imageSrc = useMemo(getIcon, [getIcon]);
   const headerText = useMemo(
     () => getHeaderText(type, displayRoomCondition, t),
-    [t, displayRoomCondition, type]
+    [t, displayRoomCondition, type],
   );
 
   const descriptionText = useMemo(
     () => getDescriptionText(type, canCreateFiles, t),
-    [t, canCreateFiles, type]
+    [t, canCreateFiles, type],
   );
 
   return (
@@ -76,8 +76,6 @@ export default inject(
     const { isLoading } = clientLoadingStore;
     const { isArchiveFolderRoot } = treeFoldersStore;
 
-    const { isEmptyPage } = filesStore;
-
     return {
       isLoading,
 
@@ -85,7 +83,6 @@ export default inject(
       canCreateFiles,
       isArchiveFolderRoot,
       theme: settingsStore.theme,
-      isEmptyPage,
     };
-  }
+  },
 )(withTranslation(["Files", "Translations"])(observer(EmptyFolderContainer)));

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

@@ -28,6 +28,7 @@ const EmptyContainer = ({
   setInviteUsersWarningDialogVisible,
   isRoot,
   isPublicRoom,
+  isEmptyPage,
 }) => {
   //const location = useLocation();
 
@@ -85,6 +86,7 @@ const EmptyContainer = ({
       onCreate={onCreate}
       linkStyles={linkStyles}
       type={type}
+      isEmptyPage={isEmptyPage}
     />
   );
 };
@@ -128,5 +130,5 @@ export default inject(
       isRoot,
       isPublicRoom,
     };
-  }
+  },
 )(observer(EmptyContainer));

packages/client/src/pages/Home/Section/Body/index.js

@@ -42,7 +42,7 @@ const SectionBodyContent = (props) => {
     filesList,
     uploaded,
     onClickBack,
-
+    isEmptyPage,
     movingInProgress,
     currentDeviceType,
   } = props;
@@ -53,7 +53,7 @@ const SectionBodyContent = (props) => {
 
   useEffect(() => {
     const customScrollElm = document.querySelector(
-      "#customScrollBar > .scroll-wrapper > .scroller"
+      "#customScrollBar > .scroll-wrapper > .scroller",
     );
 
     if (isTablet() || isMobile() || currentDeviceType !== DeviceType.desktop) {
@@ -104,7 +104,7 @@ const SectionBodyContent = (props) => {
         const bodyScroll =
           isMobile() || currentDeviceType === DeviceType.mobile
             ? document.querySelector(
-                "#customScrollBar > .scroll-wrapper > .scroller"
+                "#customScrollBar > .scroll-wrapper > .scroller",
               )
             : document.querySelector(".section-scroll");
 
@@ -262,14 +262,17 @@ const SectionBodyContent = (props) => {
 
   if (isEmptyFilesList && movingInProgress) return <></>;
 
-  const isEmptyPage = isEmptyFilesList;
+  const showEmptyPage = isEmptyFilesList;
 
   return (
     <Consumer>
       {(context) =>
-        isEmptyPage ? (
+        showEmptyPage ? (
           <>
-            <EmptyContainer sectionWidth={context.sectionWidth} />
+            <EmptyContainer
+              sectionWidth={context.sectionWidth}
+              isEmptyPage={isEmptyPage}
+            />
           </>
         ) : viewAs === "tile" ? (
           <>
@@ -318,7 +321,7 @@ export default inject(
       scrollToItem,
       setScrollToItem,
       filesList,
-
+      isEmptyPage,
       movingInProgress,
     } = filesStore;
     return {
@@ -346,10 +349,11 @@ export default inject(
       onClickBack: filesActionsStore.onClickBack,
       movingInProgress,
       currentDeviceType: settingsStore.currentDeviceType,
+      isEmptyPage,
     };
-  }
+  },
 )(
   withTranslation(["Files", "Common", "Translations"])(
-    withHotkeys(withLoader(observer(SectionBodyContent))())
-  )
+    withHotkeys(withLoader(observer(SectionBodyContent))()),
+  ),
 );