Merge branch 'hotfix/v2.5.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.5.1
This commit is contained in:
commit
63dfb64457
@ -78,7 +78,6 @@ const ChangeRoomOwner = (props) => {
|
||||
} = props;
|
||||
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [isChecked, setIsChecked] = useState(!showBackButton);
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener("keyup", onKeyUp, false);
|
||||
@ -93,7 +92,12 @@ const ChangeRoomOwner = (props) => {
|
||||
if (e.keyCode === 13 || e.which === 13) onChangeRoomOwner();
|
||||
};
|
||||
|
||||
const onChangeRoomOwner = async (user) => {
|
||||
const onChangeRoomOwner = async (
|
||||
user,
|
||||
selectedAccess,
|
||||
newFooterInputValue,
|
||||
isChecked,
|
||||
) => {
|
||||
if (showBackButton) {
|
||||
setRoomParams && setRoomParams(user[0]);
|
||||
} else {
|
||||
@ -146,8 +150,7 @@ const ChangeRoomOwner = (props) => {
|
||||
isLoading={isLoading}
|
||||
withFooterCheckbox={!showBackButton}
|
||||
footerCheckboxLabel={t("Files:LeaveTheRoom")}
|
||||
isChecked={isChecked}
|
||||
setIsChecked={setIsChecked}
|
||||
isChecked={!showBackButton}
|
||||
withOutCurrentAuthorizedUser
|
||||
filterUserId={roomOwnerId}
|
||||
currentUserId={userId}
|
||||
|
@ -42,6 +42,7 @@ import { Button } from "@docspace/shared/components/button";
|
||||
import { FieldContainer } from "@docspace/shared/components/field-container";
|
||||
import ErrorContainer from "@docspace/shared/components/error-container/ErrorContainer";
|
||||
import { FileInput } from "@docspace/shared/components/file-input";
|
||||
import { Scrollbar } from "@docspace/shared/components/scrollbar";
|
||||
|
||||
import { Loader } from "@docspace/shared/components/loader";
|
||||
|
||||
@ -314,6 +315,7 @@ const Wizard = (props) => {
|
||||
return (
|
||||
<Wrapper>
|
||||
<div className="bg-cover"></div>
|
||||
<Scrollbar id="customScrollBar">
|
||||
<StyledContent>
|
||||
<WizardContainer>
|
||||
<DocspaceLogo className="docspace-logo" />
|
||||
@ -515,6 +517,7 @@ const Wizard = (props) => {
|
||||
</FormWrapper>
|
||||
</WizardContainer>
|
||||
</StyledContent>
|
||||
</Scrollbar>
|
||||
</Wrapper>
|
||||
);
|
||||
};
|
||||
|
@ -35,7 +35,6 @@ import AppLoader from "@docspace/shared/components/app-loader";
|
||||
import { TResponse } from "@/types";
|
||||
import useError from "@/hooks/useError";
|
||||
|
||||
import useDeviceType from "@/hooks/useDeviceType";
|
||||
import useRootInit from "@/hooks/useRootInit";
|
||||
import useDeepLink from "@/hooks/useDeepLink";
|
||||
import useSelectFileDialog from "@/hooks/useSelectFileDialog";
|
||||
@ -85,7 +84,6 @@ const Root = ({
|
||||
editorUrl: documentserverUrl,
|
||||
});
|
||||
|
||||
const { currentDeviceType } = useDeviceType();
|
||||
const { isShowDeepLink, setIsShowDeepLink } = useDeepLink({
|
||||
settings,
|
||||
fileInfo,
|
||||
@ -159,7 +157,6 @@ const Root = ({
|
||||
<DeepLink
|
||||
fileInfo={fileInfo}
|
||||
userEmail={user?.email}
|
||||
currentDeviceType={currentDeviceType}
|
||||
deepLinkConfig={settings?.deepLink}
|
||||
setIsShowDeepLink={setIsShowDeepLink}
|
||||
/>
|
||||
|
@ -109,26 +109,34 @@ export const BgBlock = styled.div<{ bgPattern: string }>`
|
||||
`;
|
||||
|
||||
export const StyledWrapper = styled.div`
|
||||
height: 100%;
|
||||
width: 100vw;
|
||||
max-width: 960px;
|
||||
|
||||
@media ${mobile} {
|
||||
margin: 0 auto;
|
||||
align-items: flex-start;
|
||||
}
|
||||
`;
|
||||
|
||||
export const StyledBody = styled.div`
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
margin: 56px auto;
|
||||
|
||||
max-width: 960px;
|
||||
width: 100vw;
|
||||
|
||||
@media ${mobile} {
|
||||
margin: 0 auto;
|
||||
align-items: flex-start;
|
||||
}
|
||||
`;
|
||||
|
||||
export const LogoWrapper = styled.div`
|
||||
width: 386px;
|
||||
height: 44px;
|
||||
margin-top: auto;
|
||||
margin-bottom: 64px;
|
||||
margin-top: 56px;
|
||||
|
||||
@media ${mobile} {
|
||||
display: none;
|
||||
margin-top: 32px;
|
||||
}
|
||||
`;
|
||||
|
||||
|
@ -35,7 +35,7 @@ export interface DeepLinkProps {
|
||||
fileInfo?: TFile;
|
||||
userEmail?: string;
|
||||
|
||||
currentDeviceType: DeviceType;
|
||||
currentDeviceType?: DeviceType;
|
||||
deepLinkConfig?: TDeepLinkConfig;
|
||||
|
||||
setIsShowDeepLink: (value: boolean) => void;
|
||||
|
@ -35,12 +35,11 @@ import { Button, ButtonSize } from "@docspace/shared/components/button";
|
||||
import { Link, LinkType } from "@docspace/shared/components/link";
|
||||
import { FormWrapper } from "@docspace/shared/components/form-wrapper";
|
||||
import { getBgPattern } from "@docspace/shared/utils/common";
|
||||
import { getLogoUrl } from "@docspace/shared/utils";
|
||||
import { DeviceType, WhiteLabelLogoType } from "@docspace/shared/enums";
|
||||
import DocspaceLogo from "@docspace/shared/components/docspace-logo/DocspaceLogo";
|
||||
import { Scrollbar } from "@docspace/shared/components/scrollbar";
|
||||
|
||||
import { getDeepLink } from "./DeepLink.helper";
|
||||
import {
|
||||
StyledSimpleNav,
|
||||
StyledDeepLink,
|
||||
StyledBodyWrapper,
|
||||
StyledFileTile,
|
||||
@ -48,14 +47,15 @@ import {
|
||||
BgBlock,
|
||||
StyledWrapper,
|
||||
LogoWrapper,
|
||||
StyledBody,
|
||||
} from "./DeepLink.styled";
|
||||
import { DeepLinkProps } from "./DeepLink.types";
|
||||
|
||||
|
||||
const DeepLink = ({
|
||||
fileInfo,
|
||||
userEmail,
|
||||
setIsShowDeepLink,
|
||||
currentDeviceType,
|
||||
deepLinkConfig,
|
||||
}: DeepLinkProps) => {
|
||||
const { t } = useTranslation(["DeepLink", "Common"]);
|
||||
@ -95,31 +95,16 @@ const DeepLink = ({
|
||||
: fileInfo?.title || "";
|
||||
};
|
||||
|
||||
const renderLogo = () => {
|
||||
const logo = getLogoUrl(WhiteLabelLogoType.LightSmall, !theme.isBase);
|
||||
|
||||
if (currentDeviceType === DeviceType.mobile) {
|
||||
return (
|
||||
<StyledSimpleNav>
|
||||
<img src={logo} alt="" />
|
||||
</StyledSimpleNav>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<LogoWrapper>
|
||||
<img src={logo} alt="docspace-logo" />
|
||||
</LogoWrapper>
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const bgPattern = getBgPattern(theme.currentColorScheme?.id);
|
||||
|
||||
const logoElement = renderLogo();
|
||||
|
||||
return (
|
||||
<StyledWrapper>
|
||||
{logoElement}
|
||||
<BgBlock bgPattern={bgPattern} />
|
||||
<Scrollbar>
|
||||
<StyledBody>
|
||||
<LogoWrapper>
|
||||
<DocspaceLogo className="docspace-logo" isResizable />
|
||||
</LogoWrapper>
|
||||
<FormWrapper>
|
||||
<StyledDeepLink>
|
||||
<StyledBodyWrapper>
|
||||
@ -158,10 +143,10 @@ const DeepLink = ({
|
||||
</StyledActionsWrapper>
|
||||
</StyledDeepLink>
|
||||
</FormWrapper>
|
||||
<BgBlock bgPattern={bgPattern} />
|
||||
</StyledBody>
|
||||
</Scrollbar>
|
||||
</StyledWrapper>
|
||||
);
|
||||
};
|
||||
|
||||
export default DeepLink;
|
||||
|
||||
|
@ -107,7 +107,6 @@ const Selector = ({
|
||||
withFooterCheckbox,
|
||||
footerCheckboxLabel,
|
||||
isChecked,
|
||||
setIsChecked,
|
||||
|
||||
items,
|
||||
renderCustomItem,
|
||||
@ -517,12 +516,10 @@ const Selector = ({
|
||||
footerCheckboxLabel,
|
||||
isChecked: isFooterCheckboxChecked,
|
||||
setIsFooterCheckboxChecked,
|
||||
setIsChecked,
|
||||
}
|
||||
: ({
|
||||
isChecked: isFooterCheckboxChecked,
|
||||
setIsFooterCheckboxChecked,
|
||||
setIsChecked,
|
||||
} as TSelectorFooterCheckbox);
|
||||
|
||||
const tabsProps: TWithTabs = withTabs
|
||||
|
@ -283,13 +283,11 @@ export type TSelectorCheckbox =
|
||||
withFooterCheckbox: true;
|
||||
footerCheckboxLabel: string;
|
||||
isChecked: boolean;
|
||||
setIsChecked: React.Dispatch<React.SetStateAction<boolean>>;
|
||||
}
|
||||
| {
|
||||
withFooterCheckbox?: undefined;
|
||||
footerCheckboxLabel?: undefined;
|
||||
isChecked?: boolean;
|
||||
setIsChecked?: undefined;
|
||||
};
|
||||
|
||||
export type TSelectorFooterCheckbox = TSelectorCheckbox & {
|
||||
|
@ -63,7 +63,6 @@ const Footer = React.memo(
|
||||
setNewFooterInputValue,
|
||||
isChecked,
|
||||
setIsFooterCheckboxChecked,
|
||||
setIsChecked,
|
||||
submitButtonId,
|
||||
cancelButtonId,
|
||||
|
||||
@ -82,8 +81,6 @@ const Footer = React.memo(
|
||||
};
|
||||
|
||||
const onChangeCheckbox = () => {
|
||||
setIsChecked?.((value: boolean) => !value);
|
||||
|
||||
setIsFooterCheckboxChecked?.((value: boolean) => !value);
|
||||
};
|
||||
|
||||
|
@ -510,7 +510,6 @@ const FilesSelector = ({
|
||||
withFooterCheckbox,
|
||||
footerCheckboxLabel,
|
||||
isChecked: false,
|
||||
setIsChecked: () => {},
|
||||
}
|
||||
: {};
|
||||
|
||||
|
@ -129,7 +129,6 @@ const PeopleSelector = ({
|
||||
withFooterCheckbox,
|
||||
footerCheckboxLabel,
|
||||
isChecked,
|
||||
setIsChecked,
|
||||
|
||||
withHeader,
|
||||
headerProps,
|
||||
@ -338,7 +337,6 @@ const PeopleSelector = ({
|
||||
withFooterCheckbox,
|
||||
footerCheckboxLabel,
|
||||
isChecked,
|
||||
setIsChecked,
|
||||
}
|
||||
: {};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user