IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web:Client:Article: fix interface jumping after change files root folder to room

Browse Source
This commit is contained in:
TimofeyBoyko 2022-10-13 12:22:09 +05:00
parent 9750335b3e
commit 7f72382d32
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
packages/client/src/components/Article/MainButton/index.js
View File

@ -445,27 +445,31 @@ const ArticleMainButtonContent = (props) => {
/>
)}
<input
id="customFileInput"
className="custom-file-input"
multiple
type="file"
onChange={onFileChange}
onClick={onInputClick}
ref={inputFilesElement}
style={{ display: "none" }}
/>
<input
id="customFolderInput"
className="custom-file-input"
webkitdirectory=""
mozdirectory=""
type="file"
onChange={onFileChange}
onClick={onInputClick}
ref={inputFolderElement}
style={{ display: "none" }}
/>
{isVisitor ? null : (
<>
<input
id="customFileInput"
className="custom-file-input"
multiple
type="file"
onChange={onFileChange}
onClick={onInputClick}
ref={inputFilesElement}
style={{ display: "none" }}
/>
<input
id="customFolderInput"
className="custom-file-input"
webkitdirectory=""
mozdirectory=""
type="file"
onChange={onFileChange}
onClick={onInputClick}
ref={inputFolderElement}
style={{ display: "none" }}
/>
</>
)}
</>
);
};

19
packages/client/src/pages/Files.jsx
View File

@ -132,12 +132,13 @@ const FilesSection = React.memo(({}) => {
exact
restricted
withManager
path={[
"/accounts",
"/accounts/filter",
"/accounts/create/:type",
"/accounts/view/@self",
]}
path={["/accounts", "/accounts/filter", "/accounts/create/:type"]}
component={Accounts}
/>
<PrivateRoute
exact
path={["/accounts/view/@self"]}
component={Accounts}
/>
@ -241,7 +242,7 @@ class FilesContent extends React.Component {
}
}
const Files = inject(({ auth, filesStore, treeFoldersStore }) => {
const Files = inject(({ auth, filesStore }) => {
const {
frameConfig,
isFrame,
@ -251,11 +252,9 @@ const Files = inject(({ auth, filesStore, treeFoldersStore }) => {
isEncryptionSupport,
} = auth.settingsStore;
const { isRoomsFolder } = treeFoldersStore;
const { isVisitor } = auth.userStore.user;
const withMainButton = !isVisitor || !isRoomsFolder;
const withMainButton = !isVisitor;
return {
isDesktop: isDesktopClient,