keigo-h 3 лет назад
Родитель
Сommit
8277639269

+ 4 - 11
packages/app/src/client/services/ShowPageAccessories.tsx

@@ -5,12 +5,6 @@ import { usePageAccessoriesModal, PageAccessoriesModalContents } from '~/stores/
 function getURLQueryParamValue(key: string): string | null {
 // window.location.href is page URL;
   const queryStr: URLSearchParams = new URL(window.location.href).searchParams;
-  if (queryStr === null) {
-    return null;
-  }
-  if (queryStr.get(key) === null) {
-    return null;
-  }
   return queryStr.get(key);
 }
 
@@ -18,11 +12,10 @@ const ShowPageAccessoriesModal = (): JSX.Element => {
   const { open: openPageAccessories } = usePageAccessoriesModal();
   useEffect(() => {
     const pageIdParams = getURLQueryParamValue('compare');
-    if (pageIdParams === null) {
-      return;
-    }
-    if (pageIdParams.split('...').length > 1) {
-      openPageAccessories(PageAccessoriesModalContents.PageHistory);
+    if (pageIdParams != null) {
+      if (pageIdParams.split('...').length > 1) {
+        openPageAccessories(PageAccessoriesModalContents.PageHistory);
+      }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

+ 1 - 3
packages/app/src/components/PageAccessoriesModal.tsx

@@ -42,9 +42,7 @@ const PageAccessoriesModal = (props: Props): JSX.Element => {
   const { data: isSharedUser } = useIsSharedUser();
   const { data: isGuestUser } = useIsGuestUser();
 
-  const {
-    data: status, mutate, close,
-  } = usePageAccessoriesModal();
+  const { data: status, mutate, close } = usePageAccessoriesModal();
 
   // add event handler when opened
   useEffect(() => {