From b742947d3ed989278fbdb08815fd9a1a26e7d51f Mon Sep 17 00:00:00 2001
From: oghenenyerhovwo-e <oghenenyerhovwoemakuneyi@gmail.com>
Date: Tue, 17 Jun 2025 16:23:05 +0100
Subject: [PATCH 1/2] Fix: Correct blog post navigation order

---
 src/components/Layout/Page.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/Layout/Page.tsx b/src/components/Layout/Page.tsx
index c3224e5174a..e65b0ebc998 100644
--- a/src/components/Layout/Page.tsx
+++ b/src/components/Layout/Page.tsx
@@ -52,6 +52,12 @@ export function Page({
     cleanedPath,
     routeTree
   );
+  const getNavigationRoutes = () => {
+    if (section !== 'blog') return { nextRoute, prevRoute };
+    return { nextRoute: prevRoute, prevRoute: nextRoute }; // Swap for blog
+  };
+
+  const { nextRoute: finalNextRoute, prevRoute: finalPrevRoute } = getNavigationRoutes();
   const title = meta.title || route?.title || '';
   const version = meta.version;
   const description = meta.description || route?.description || '';
@@ -89,8 +95,8 @@ export function Page({
           {!isBlogIndex && (
             <DocsPageFooter
               route={route}
-              nextRoute={nextRoute}
-              prevRoute={prevRoute}
+              nextRoute={finalNextRoute}
+              prevRoute={finalPrevRoute}
             />
           )}
         </div>

From 709fb0339dca6706a8e5e32718eef5e62dc03912 Mon Sep 17 00:00:00 2001
From: Rick Hanlon <rickhanlonii@fb.com>
Date: Sat, 28 Jun 2025 15:56:50 -0400
Subject: [PATCH 2/2] Refactor

---
 src/components/DocsFooter.tsx  | 28 +++++++++++++++++-----------
 src/components/Layout/Page.tsx | 17 +++++------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/components/DocsFooter.tsx b/src/components/DocsFooter.tsx
index 5f2330e7eae..22a07818904 100644
--- a/src/components/DocsFooter.tsx
+++ b/src/components/DocsFooter.tsx
@@ -19,31 +19,37 @@ function areEqual(prevProps: DocsPageFooterProps, props: DocsPageFooterProps) {
 
 export const DocsPageFooter = memo<DocsPageFooterProps>(
   function DocsPageFooter({nextRoute, prevRoute, route}) {
-    if (!route || route?.heading) {
+    if (!route || route?.heading || !route.path || route.path === '/blog') {
       return null;
     }
 
+    let next;
+    let prev;
+    if (route.path.indexOf('/blog') === 0) {
+      next = prevRoute;
+      prev = nextRoute;
+    } else {
+      next = nextRoute;
+      prev = prevRoute;
+    }
+
     return (
       <>
-        {prevRoute?.path || nextRoute?.path ? (
+        {prev?.path || next?.path ? (
           <>
             <div className="grid grid-cols-1 gap-4 py-4 mx-auto max-w-7xl md:grid-cols-2 md:py-12">
-              {prevRoute?.path ? (
+              {prev?.path ? (
                 <FooterLink
                   type="Previous"
-                  title={prevRoute.title}
-                  href={prevRoute.path}
+                  title={prev.title}
+                  href={prev.path}
                 />
               ) : (
                 <div />
               )}
 
-              {nextRoute?.path ? (
-                <FooterLink
-                  type="Next"
-                  title={nextRoute.title}
-                  href={nextRoute.path}
-                />
+              {next?.path && next.path !== '/blog' ? (
+                <FooterLink type="Next" title={next.title} href={next.path} />
               ) : (
                 <div />
               )}
diff --git a/src/components/Layout/Page.tsx b/src/components/Layout/Page.tsx
index e65b0ebc998..060b5523cd9 100644
--- a/src/components/Layout/Page.tsx
+++ b/src/components/Layout/Page.tsx
@@ -52,12 +52,7 @@ export function Page({
     cleanedPath,
     routeTree
   );
-  const getNavigationRoutes = () => {
-    if (section !== 'blog') return { nextRoute, prevRoute };
-    return { nextRoute: prevRoute, prevRoute: nextRoute }; // Swap for blog
-  };
 
-  const { nextRoute: finalNextRoute, prevRoute: finalPrevRoute } = getNavigationRoutes();
   const title = meta.title || route?.title || '';
   const version = meta.version;
   const description = meta.description || route?.description || '';
@@ -92,13 +87,11 @@ export function Page({
               <LanguagesContext value={languages}>{children}</LanguagesContext>
             </TocContext>
           </div>
-          {!isBlogIndex && (
-            <DocsPageFooter
-              route={route}
-              nextRoute={finalNextRoute}
-              prevRoute={finalPrevRoute}
-            />
-          )}
+          <DocsPageFooter
+            route={route}
+            nextRoute={nextRoute}
+            prevRoute={prevRoute}
+          />
         </div>
       </div>
     );