Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1

This commit is contained in:
Akmal Isomadinov 2023-05-18 18:23:46 +05:00
commit ca151d51b1
4 changed files with 10 additions and 2 deletions

View File

@ -34,6 +34,7 @@ class SectionBodyContent extends React.Component {
) {
setSelection([]);
setBufferSelection(null);
window?.getSelection()?.removeAllRanges();
}
};

View File

@ -40,6 +40,7 @@ const FloatingButton = (props) => {
onClick,
color,
clearUploadedFilesHistory,
showTwoProgress,
...rest
} = props;
@ -67,7 +68,10 @@ const FloatingButton = (props) => {
}, [percent, setAnimationCompleted]);
return (
<StyledFloatingButtonWrapper className="layout-progress-bar_wrapper">
<StyledFloatingButtonWrapper
showTwoProgress={showTwoProgress}
className="layout-progress-bar_wrapper"
>
<ColorTheme
{...props}
themeId={ThemeType.FloatingButton}

View File

@ -8,7 +8,7 @@ const StyledFloatingButtonWrapper = styled.div`
position: absolute;
z-index: 300;
right: 0;
bottom: 0;
bottom: ${(props) => (props.showTwoProgress ? "96px" : "0")};
${!isMobile &&
css`

View File

@ -320,6 +320,9 @@ class Section extends React.Component {
icon={secondaryProgressBarIcon}
percent={secondaryProgressBarValue}
alert={showSecondaryButtonAlert}
showTwoProgress={
showPrimaryProgressBar && showSecondaryProgressBar
}
/>
</>
) : showPrimaryProgressBar &&