Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
This commit is contained in:
commit
66d8f3dd9f
@ -59,7 +59,7 @@ const Main = (props) => {
|
||||
window.addEventListener("resize", onResize);
|
||||
|
||||
return () => {
|
||||
window.addEventListener("resize", onResize);
|
||||
window.removeEventListener("resize", onResize);
|
||||
|
||||
clearTimeout(updateSizeRef.current);
|
||||
};
|
||||
|
@ -31,9 +31,14 @@ const StyledModalDialog = styled(ModalDialog)`
|
||||
.modal-header {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.modal-body {
|
||||
padding: 0 0 8px;
|
||||
}
|
||||
`;
|
||||
|
||||
const StyledBody = styled.div`
|
||||
padding: 0 16px;
|
||||
.embedding-panel_header-link {
|
||||
margin: 10px 0 2px;
|
||||
}
|
||||
@ -132,10 +137,10 @@ const StyledBody = styled.div`
|
||||
${(props) =>
|
||||
props.theme.interfaceDirection === "rtl"
|
||||
? css`
|
||||
left: 16px;
|
||||
left: 32px;
|
||||
`
|
||||
: css`
|
||||
right: 16px;
|
||||
right: 32px;
|
||||
`}
|
||||
}
|
||||
|
||||
|
@ -2516,6 +2516,12 @@ class FilesActionStore {
|
||||
|
||||
clearFiles();
|
||||
|
||||
if (window.location.search.includes("group")) {
|
||||
setSelectedNode(["accounts", "groups", "filter"]);
|
||||
return window.DocSpace.navigate(`accounts/groups?${params}`, {
|
||||
replace: true,
|
||||
});
|
||||
}
|
||||
setSelectedNode(["accounts", "people", "filter"]);
|
||||
|
||||
if (fromHotkeys) return;
|
||||
|
@ -654,7 +654,7 @@ class HotkeyStore {
|
||||
},
|
||||
};
|
||||
|
||||
if (isPublic) {
|
||||
if (isPublic && !selections.rootFolderType) {
|
||||
this.dialogsStore.setMoveToPublicRoomVisible(true, operationData);
|
||||
return;
|
||||
}
|
||||
|
@ -427,7 +427,9 @@ const FilesSelectorComponent = ({
|
||||
isChecked: boolean,
|
||||
) => {
|
||||
const isPublic =
|
||||
breadCrumbs.findIndex((f) => f.roomType === RoomsType.PublicRoom) > -1;
|
||||
breadCrumbs.findIndex((f) => f.roomType === RoomsType.PublicRoom) >
|
||||
-1 && rootFolderType !== FolderType.Rooms;
|
||||
|
||||
const folderTitle = breadCrumbs[breadCrumbs.length - 1].label;
|
||||
|
||||
await onSubmit(
|
||||
|
Loading…
Reference in New Issue
Block a user