Shared:Utils:TryRedirectTo: rewrite to ts and move from common

This commit is contained in:
Timofey Boyko 2024-01-11 10:58:26 +03:00
parent d3dd8b8f2e
commit bcf73df800
7 changed files with 12 additions and 10 deletions

View File

@ -22,7 +22,7 @@ import i18n from "./i18n";
import moment from "moment-timezone";
//import ReactSmartBanner from "./components/SmartBanner";
import { useThemeDetector } from "@docspace/common/utils/useThemeDetector";
import { useThemeDetector } from "@docspace/shared/hooks/useThemeDetector";
import { isMobile, isIOS, isFirefox } from "react-device-detect";
import IndicatorLoader from "./components/IndicatorLoader";
import DialogsWrapper from "./components/dialogs/DialogsWrapper";

View File

@ -3,7 +3,7 @@ import PropTypes from "prop-types";
import { Loader } from "@docspace/shared/components/loader";
import Section from "@docspace/common/components/Section";
import { combineUrl } from "@docspace/common/utils";
import tryRedirectTo from "@docspace/common/utils/tryRedirectTo";
import tryRedirectTo from "@docspace/shared/utils/tryRedirectTo";
import { inject, observer } from "mobx-react";
import { EmployeeActivationStatus } from "@docspace/shared/enums";

View File

@ -4,7 +4,7 @@ import { inject, observer } from "mobx-react";
import { Loader } from "@docspace/shared/components/loader";
import Section from "@docspace/common/components/Section";
import { combineUrl } from "@docspace/common/utils";
import tryRedirectTo from "@docspace/common/utils/tryRedirectTo";
import tryRedirectTo from "@docspace/shared/utils/tryRedirectTo";
class ChangeEmail extends React.PureComponent {
componentDidMount() {

View File

@ -14,7 +14,7 @@ import { getLogoFromPath } from "@docspace/shared/utils";
import { useMounted } from "../helpers/useMounted";
import useIsomorphicLayoutEffect from "../hooks/useIsomorphicLayoutEffect";
import LoginContainer from "@docspace/shared/components/color-theme/sub-components/LoginContainer";
import { useThemeDetector } from "@docspace/common/utils/useThemeDetector";
import { useThemeDetector } from "@docspace/shared/hooks/useThemeDetector";
interface ILoginProps extends IInitialState {
isDesktopEditor?: boolean;

View File

@ -1,7 +1,7 @@
import React, { useEffect } from "react";
import { observer, Provider as MobxProvider } from "mobx-react";
import { I18nextProvider, useTranslation } from "react-i18next";
import tryRedirectTo from "@docspace/common/utils/tryRedirectTo";
import tryRedirectTo from "@docspace/shared/utils/tryRedirectTo";
import { Outlet } from "react-router-dom";
import { isMobileOnly } from "react-device-detect";

View File

@ -1,16 +1,16 @@
import { useState, useEffect } from "react";
import { useState, useEffect, useCallback } from "react";
import { isDesktop } from "react-device-detect";
export const useIsSmallWindow = (windowWidth: number): boolean => {
const [isSmallWindow, setIsSmallWindow] = useState(false);
const onCheckView = () => {
const onCheckView = useCallback(() => {
if (isDesktop && window.innerWidth < windowWidth) {
setIsSmallWindow(true);
} else {
setIsSmallWindow(false);
}
};
}, [windowWidth]);
useEffect(() => {
onCheckView();
@ -18,7 +18,7 @@ export const useIsSmallWindow = (windowWidth: number): boolean => {
window.addEventListener("resize", onCheckView);
return () => window.removeEventListener("resize", onCheckView);
}, []);
}, [onCheckView]);
return isSmallWindow;
};

View File

@ -1,4 +1,4 @@
export default function (page) {
function tryRedirectTo(page: string) {
if (
window.location.pathname === page ||
window.location.pathname.indexOf(page) !== -1
@ -10,3 +10,5 @@ export default function (page) {
return true;
}
export default tryRedirectTo;