fix: Fixed typecheeck errors

gravity-ui · Jan 16, 2024 · 2370fd2 · 2370fd2
1 parent dacad10
commit 2370fd2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/components/Component/Component.tsx b/src/components/Component/Component.tsx
@@ -81,22 +81,22 @@ export const Component: React.FC<ComponentProps> = ({
     );
 
     const currentIndex = useMemo(() => {
-        if (!currentSection) {
+        if (!currentSection || !currentSection.subSections || !currentIndex) {
             return null;
         }
         return currentSection.subSections.findIndex((item) => item.id === component.id);
     }, [currentSection, component.id]);
 
     const nextSection = useMemo(() => {
-        if (!currentSection) {
+        if (!currentSection || !currentSection.subSections || !currentIndex) {
             return null;
         }
         const nextIndex = (currentIndex + 1) % currentSection.subSections.length;
         return currentSection.subSections[nextIndex];
     }, [currentIndex, currentSection]);
 
     const prevSection = useMemo(() => {
-        if (!currentSection) {
+        if (!currentSection || !currentSection.subSections || !currentIndex) {
             return null;
         }
         const prevIndex =
@@ -116,11 +116,17 @@ export const Component: React.FC<ComponentProps> = ({
     }, []);
 
     const onNextHandler = () => {
+        if (!nextSection) {
+            return;
+        }
         router.push(nextSection.url);
         scrollTop();
     };
 
     const onPrevHandler = () => {
+        if (!prevSection) {
+            return;
+        }
         router.push(prevSection.url);
         scrollTop();
     };
@@ -199,7 +205,7 @@ export const Component: React.FC<ComponentProps> = ({
                             rewriteLinks={rewriteLinks}
                             withComponents
                         />
-                        {typeof window !== 'undefined' ? (
+                        {typeof window !== 'undefined' && prevSection && nextSection ? (
                             <div className={b('navigation')}>
                                 <ArticleNavigations
                                     prevHandler={onPrevHandler}

diff --git a/src/pages/design/[sectionId]/[articleId].tsx b/src/pages/design/[sectionId]/[articleId].tsx
@@ -60,22 +60,22 @@ export const ArticlePage = ({sectionId, articleId}: {sectionId: string; articleI
     );
 
     const currentIndex = useMemo(() => {
-        if (!currentSection) {
+        if (!currentSection || !currentSection.subSections) {
             return null;
         }
         return currentSection.subSections.findIndex((item) => item.id === articleId);
     }, [currentSection, articleId]);
 
     const nextSection = useMemo(() => {
-        if (!currentSection) {
+        if (!currentSection || !currentSection.subSections || !currentIndex) {
             return null;
         }
         const nextIndex = (currentIndex + 1) % currentSection.subSections.length;
         return currentSection.subSections[nextIndex];
     }, [currentIndex, currentSection]);
 
     const prevSection = useMemo(() => {
-        if (!currentSection) {
+        if (!currentSection || !currentSection.subSections || !currentIndex) {
             return null;
         }
         const prevIndex =
@@ -95,11 +95,17 @@ export const ArticlePage = ({sectionId, articleId}: {sectionId: string; articleI
     }, []);
 
     const onNextHandler = () => {
+        if (!nextSection) {
+            return;
+        }
         router.push(nextSection.url);
         scrollTop();
     };
 
     const onPrevHandler = () => {
+        if (!prevSection) {
+            return;
+        }
         router.push(prevSection.url);
         scrollTop();
     };
@@ -112,8 +118,8 @@ export const ArticlePage = ({sectionId, articleId}: {sectionId: string; articleI
                     articleId={articleId}
                     prevHandler={onPrevHandler}
                     nextHandler={onNextHandler}
-                    previousTitle={prevSection.title}
-                    nextTitle={nextSection.title}
+                    previousTitle={prevSection ? prevSection.title : ''}
+                    nextTitle={nextSection ? nextSection.title : ''}
                 />
             </DesignLayout>
         </Layout>