Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme

products/ASC.Files/Client/src/components/panels/SharingDialog/index.js

@@ -16,6 +16,7 @@ const SharingDialog = ({
   onCancel,
   setSelection,
   theme,
+  sharingPanelVisible,
 }) => {
   useEffect(() => {
     setSharingPanelVisible(isVisible);
@@ -27,7 +28,7 @@ const SharingDialog = ({
 
   return (
     <>
-      {isVisible && (
+      {sharingPanelVisible && (
         <SharingPanel
           key="sharing-panel"
           uploadPanelVisible={false}
@@ -42,11 +43,12 @@ const SharingDialog = ({
 
 const SharingDialogWrapper = inject(({ dialogsStore, filesStore }) => {
   const { getShareUsers, setSelection } = filesStore;
-  const { setSharingPanelVisible } = dialogsStore;
+  const { setSharingPanelVisible, sharingPanelVisible } = dialogsStore;
   return {
     setSharingPanelVisible,
     getShareUsers,
     setSelection,
+    sharingPanelVisible,
   };
 })(observer(SharingDialog));
 

web/ASC.Web.Editor/src/Editor.jsx

@@ -804,7 +804,7 @@ const Editor = () => {
         {!isLoading ? (
           <>
             <div id="editor"></div>
-            {isSharingAccess && (
+            {isSharingAccess && isVisible && (
               <SharingDialog
                 isVisible={isVisible}
                 sharingObject={fileInfo}