Revert "[a11y] Route Announcements" (#23082)

Reverts #20428 temporarily to move this feature into the next canary release.
vercel · Mar 15, 2021 · 732c49c · 732c49c
1 parent 688611a
commit 732c49c
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 260 deletions.
diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -21,11 +21,9 @@ import {
   NEXT_DATA,
   ST,
 } from '../next-server/lib/utils'
-import { Portal } from './portal'
 import initHeadManager from './head-manager'
 import PageLoader, { StyleSheetTuple } from './page-loader'
 import measureWebVitals from './performance-relayer'
-import { RouteAnnouncer } from './route-announcer'
 import { createRouter, makePublicRouterInstance } from './router'
 
 /// <reference types="react-dom/experimental" />
@@ -786,9 +784,6 @@ function doRender(input: RenderRouteInfo): Promise<any> {
       <Head callback={onHeadCommit} />
       <AppContainer>
         <App {...appProps} />
-        <Portal type="next-route-announcer">
-          <RouteAnnouncer />
-        </Portal>
       </AppContainer>
     </Root>
   )

diff --git a/packages/next/client/link.tsx b/packages/next/client/link.tsx
@@ -103,6 +103,12 @@ function linkClicked(
     shallow,
     locale,
     scroll,
+  }).then((success: boolean) => {
+    if (!success) return
+    if (scroll) {
+      // FIXME: proper route announcing at Router level, not Link:
+      document.body.focus()
+    }
   })
 }
 

diff --git a/packages/next/client/portal/LICENSE b/packages/next/client/portal/LICENSE
diff --git a/packages/next/client/portal/index.tsx b/packages/next/client/portal/index.tsx
diff --git a/packages/next/client/route-announcer.tsx b/packages/next/client/route-announcer.tsx
diff --git a/test/integration/build-output/test/index.test.js b/test/integration/build-output/test/index.test.js
@@ -94,17 +94,17 @@ describe('Build Output', () => {
       expect(parseFloat(indexSize) - 266).toBeLessThanOrEqual(0)
       expect(indexSize.endsWith('B')).toBe(true)
 
-      // should be no bigger than 64.6 kb
-      expect(parseFloat(indexFirstLoad)).toBeCloseTo(64.6, 1)
+      // should be no bigger than 63.9 kb
+      expect(parseFloat(indexFirstLoad)).toBeCloseTo(64.1, 1)
       expect(indexFirstLoad.endsWith('kB')).toBe(true)
 
       expect(parseFloat(err404Size) - 3.7).toBeLessThanOrEqual(0)
       expect(err404Size.endsWith('kB')).toBe(true)
 
-      expect(parseFloat(err404FirstLoad)).toBeCloseTo(67.8, 0)
+      expect(parseFloat(err404FirstLoad)).toBeCloseTo(67.1, 0)
       expect(err404FirstLoad.endsWith('kB')).toBe(true)
 
-      expect(parseFloat(sharedByAll)).toBeCloseTo(64.4, 1)
+      expect(parseFloat(sharedByAll)).toBeCloseTo(63.9, 1)
       expect(sharedByAll.endsWith('kB')).toBe(true)
 
       if (_appSize.endsWith('kB')) {

diff --git a/test/integration/client-navigation-a11y/next.config.js b/test/integration/client-navigation-a11y/next.config.js
diff --git a/test/integration/client-navigation-a11y/pages/index.js b/test/integration/client-navigation-a11y/pages/index.js
diff --git a/test/integration/client-navigation-a11y/pages/page-with-h1.js b/test/integration/client-navigation-a11y/pages/page-with-h1.js
diff --git a/test/integration/client-navigation-a11y/pages/page-with-title.js b/test/integration/client-navigation-a11y/pages/page-with-title.js
diff --git a/test/integration/client-navigation-a11y/pages/page-without-h1-or-title.js b/test/integration/client-navigation-a11y/pages/page-without-h1-or-title.js
diff --git a/test/integration/client-navigation-a11y/test/index.test.js b/test/integration/client-navigation-a11y/test/index.test.js
diff --git a/test/integration/fallback-modules/test/index.test.js b/test/integration/fallback-modules/test/index.test.js
@@ -44,7 +44,7 @@ describe('Build Output', () => {
       expect(parseFloat(indexSize)).toBeGreaterThanOrEqual(2)
       expect(indexSize.endsWith('kB')).toBe(true)
 
-      expect(parseFloat(indexFirstLoad)).toBeLessThanOrEqual(67.8)
+      expect(parseFloat(indexFirstLoad)).toBeLessThanOrEqual(67.5)
       expect(parseFloat(indexFirstLoad)).toBeGreaterThanOrEqual(60)
       expect(indexFirstLoad.endsWith('kB')).toBe(true)
     })

diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
@@ -81,6 +81,6 @@ describe('Production response size', () => {
     const delta = responseSizesBytes / 1024
 
     // Expected difference: < 0.5
-    expect(delta).toBeCloseTo(286.7, 0)
+    expect(delta).toBeCloseTo(285.3, 0)
   })
 })