Merge pull request #131 from ONLYOFFICE/bugfix/interface-jumps

bugfix/interface-jumps
This commit is contained in:
Alexey Safronov 2023-12-15 12:41:45 +04:00 committed by GitHub
commit ea96d31b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions

View File

@ -104,7 +104,14 @@ const Item = ({
const onClickAction = React.useCallback(
(folderId) => {
setBufferSelection(null);
onClick && onClick(folderId, item.title, item.rootFolderType);
onClick &&
onClick(
folderId,
item.title,
item.rootFolderType,
item.security.Create
);
},
[onClick, item.title, item.rootFolderType]
);

View File

@ -68,7 +68,7 @@ const ArticleBodyContent = (props) => {
const isAccounts = location.pathname.includes("accounts/filter");
const onClick = React.useCallback(
(folderId, title, rootFolderType) => {
(folderId, title, rootFolderType, canCreate) => {
const { toggleArticleOpen } = props;
let params = null;
@ -79,6 +79,7 @@ const ArticleBodyContent = (props) => {
isRoot: true,
isPublicRoomType: false,
rootFolderType,
canCreate,
};
let withTimer = !!selectedFolderId;

View File

@ -991,6 +991,7 @@ const SectionHeaderContent = (props) => {
}
const stateTitle = location?.state?.title;
const stateCanCreate = location?.state?.canCreate;
const stateIsRoot = location?.state?.isRoot;
const stateIsRoom = location?.state?.isRoom;
const stateRootRoomTitle = location?.state?.rootRoomTitle;
@ -1009,6 +1010,11 @@ const SectionHeaderContent = (props) => {
? stateTitle
: title;
const currentCanCreate =
isLoading && location?.state?.hasOwnProperty("canCreate")
? stateCanCreate
: security?.Create;
const currentRootRoomTitle =
isLoading && stateRootRoomTitle
? stateRootRoomTitle
@ -1053,7 +1059,7 @@ const SectionHeaderContent = (props) => {
showText={showText}
isRootFolder={isRoot}
canCreate={
(security?.Create || isAccountsPage) &&
(currentCanCreate || isAccountsPage) &&
!isSettingsPage &&
!isPublicRoom
}