Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0

This commit is contained in:
Nikita Gopienko 2024-07-16 17:41:06 +03:00
commit 670743ffb6
5 changed files with 13 additions and 4 deletions

View File

@ -44,7 +44,7 @@ const StyledEditLinkPanel = styled(ModalDialog)`
}
.modal-body {
padding: 0px 0px 8px;
padding: 0;
}
.field-label-icon {
@ -55,7 +55,7 @@ const StyledEditLinkPanel = styled(ModalDialog)`
padding: 4px 0px 0px;
.edit-link_link-block {
padding: 0px 16px 20px 16px;
padding: 16px 16px 20px 16px;
.edit-link-text {
display: inline-flex;

View File

@ -33,7 +33,7 @@ const StyledModalDialog = styled(ModalDialog)`
}
.modal-body {
padding: 0 0 8px;
padding: 0;
}
`;

View File

@ -75,6 +75,10 @@ const Search = ({ setSearchValue, resetSearch }: SearchProps) => {
return () => window.removeEventListener("keyup", onEscapeUp);
}, []);
useEffect(() => {
return () => debouncedSearch.cancel();
}, [debouncedSearch]);
return (
<StyledSearchContainer>
<TextInput

View File

@ -160,7 +160,6 @@ const StyledHeader = styled.div`
align-items: center;
border-bottom: ${(props) =>
`1px solid ${props.theme.modalDialog.headerBorderColor}`};
margin-bottom: 16px;
height: 52px;
padding: 0 16px 0;

View File

@ -51,6 +51,8 @@ const useSocketHelper = ({
}: UseSocketHelperProps) => {
const { getIcon } = React.useContext(SettingsContext);
const initRef = React.useRef(false);
const subscribedId = React.useRef<null | number>(null);
const unsubscribe = React.useCallback(
@ -281,6 +283,10 @@ const useSocketHelper = ({
);
React.useEffect(() => {
if (initRef.current) return;
initRef.current = true;
socketHelper.on("s:modify-folder", (opt?: TOptSocket) => {
switch (opt?.cmd) {
case "create":