From 7294e969bb913692eaf28e54860614f445132713 Mon Sep 17 00:00:00 2001
From: Maria Hutt <thetaPC@users.noreply.github.com>
Date: Tue, 22 Oct 2024 08:07:36 -0700
Subject: [PATCH 1/9] fix(backdrop): remove tabindex for improved accessibility
 (#29956)

Issue number: resolves #29773

---------

<!-- Please do not submit updates to dependencies unless it fixes an
issue. -->

<!-- Please try to limit your pull request to one type (bugfix, feature,
etc). Submit multiple pull requests if needed. -->

## What is the current behavior?
<!-- Please describe the current behavior that you are modifying. -->

Certain Chrome and Edge versions (confirmed: Chrome v127 and Edge v127)
would indicate that the backdrop has an accessibility violation:

```
Blocked aria-hidden on a <ion-backdrop> element because the element that just received
focus must not be hidden from assistive technology users. Avoid using aria-hidden on a
focused element or its ancestor. Consider using the inert attribute instead, which will also
prevent focus. For more details, see the aria-hidden section of the WAI-ARIA specification at
```

The error is happening because `tabindex` and `aria-hidden` are being
passed to `ion-backdrop`. The `tabindex` attribute is used to make an
element focusable, regardless of value. When `aria-hidden` is applied to
an element, then the element is hidden from screen readers. This
violates the accessibility standards since `ion-backdrop` would be
considered a focusable element but not visible to screen readers.

## What is the new behavior?
<!-- Please describe the behavior or changes that are being added by
this PR. -->

- Removed `tabindex`, this aligns with frameworks known for
accessibility (Chakra UI)

## Does this introduce a breaking change?

- [ ] Yes
- [x] No

<!--
  If this introduces a breaking change:
1. Describe the impact and migration path for existing applications
below.
  2. Update the BREAKING.md file with the breaking change.
3. Add "BREAKING CHANGE: [...]" to the commit description when merging.
See
https://github.com/ionic-team/ionic-framework/blob/main/docs/CONTRIBUTING.md#footer
for more information.
-->


## Other information

<!-- Any other information that is important to this PR such as
screenshots of how the component looks before and after the change. -->

Dev build: `8.3.4-dev.11729533091.1ac77a0c`

How to test:

1. Use either Chrome v127 or Edge v127
2. Navigate to the [alert basic
page](https://ionic-framework-3pvgcj4b9-ionic1.vercel.app/src/components/alert/test/basic)
from the `main` branch
3. Open browser console
4. Click on the first button on the alert page
5. Click on the backdrop
6. Notice the error message in the browser console (if you don't see it,
then use a private browser or clear cache)
7. Navigate to the [alert basic
page](https://ionic-framework-git-rou-11175-ionic1.vercel.app/src/components/alert/test/basic)
from the `ROU-11175` branch
8. Repeat steps 2-6
9. Verify that the error does not appear
---
 core/src/components/backdrop/backdrop.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/components/backdrop/backdrop.tsx b/core/src/components/backdrop/backdrop.tsx
index 7d85b485cc0..9468f02526c 100644
--- a/core/src/components/backdrop/backdrop.tsx
+++ b/core/src/components/backdrop/backdrop.tsx
@@ -51,7 +51,6 @@ export class Backdrop implements ComponentInterface {
     const mode = getIonMode(this);
     return (
       <Host
-        tabindex="-1"
         aria-hidden="true"
         class={{
           [mode]: true,

From 47ba703a57d1ca506f943f6b790d0bf7583d79cb Mon Sep 17 00:00:00 2001
From: Ehsan Barooni <66495214+ebarooni@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:43:35 +0200
Subject: [PATCH 2/9] fix(angular): add missing 'compareWith' input to
 standalone ion-radio-group (#29870)

Issue number: resolves #29826

---------

## What is the current behavior?

When using `compareWith` on `ion-radio-group` in Ionic Angular
Standalone the following error is thrown:

```
NG8002: Can't bind to 'compareWith' since it isn't a known property of 'ion-radio-group'.
```

## What is the new behavior?

- `compareWith` on `ion-radio-group` in Angular Standalone is available

## Does this introduce a breaking change?

- [ ] Yes
- [x] No
---
 packages/angular/standalone/src/directives/radio-group.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/standalone/src/directives/radio-group.ts b/packages/angular/standalone/src/directives/radio-group.ts
index ecde568d444..925f48182b9 100644
--- a/packages/angular/standalone/src/directives/radio-group.ts
+++ b/packages/angular/standalone/src/directives/radio-group.ts
@@ -16,7 +16,7 @@ import { defineCustomElement } from '@ionic/core/components/ion-radio-group.js';
 
 import { ProxyCmp, proxyOutputs } from './angular-component-lib/utils';
 
-const RADIO_GROUP_INPUTS = ['allowEmptySelection', 'name', 'value'];
+const RADIO_GROUP_INPUTS = ['allowEmptySelection', 'compareWith', 'name', 'value'];
 
 /**
  * Pulling the provider into an object and using PURE  works

From e32fbe02102fe80db29f73c26496a40852032354 Mon Sep 17 00:00:00 2001
From: Bentley O'Kane-Chase <bentleyo@gmail.com>
Date: Wed, 23 Oct 2024 06:31:23 +1000
Subject: [PATCH 3/9] fix(vue): incorrect view rendered when using
 router.go(-n) (#29877)

resolves #28201

This PR fixes the navigation issue related to `router.go` that was
identified in issue #28201. After working on this issue I realised that
@xxllxhdj has already created a PR for this in #29847. While their fix
is great, I have added tests to replicate the issue, reused existing
code and `undefined` will be returned in unexpected situations - which
matches the existing functionality.

## What is the current behavior?

If a user navigates from `/home` -> `/pageA` -> `/pageB` -> `/pageC` ->
back to `/pageB` -> then `router.go(-2)` is called the URL will be
updated to `/home` correctly, but the app will try to render `/pageA`.

This happens for any delta < -1.

## What is the new behavior?

The app will correctly render `/pageA`, which matches the URL.

## Does this introduce a breaking change?

- [ ] Yes
- [X] No

---------

Co-authored-by: xxllxhdj <12881488+xxllxhdj@users.noreply.github.com>
---
 .../__tests__/locationHistory.spec.ts         | 21 +++++++++++++++++++
 packages/vue-router/src/locationHistory.ts    | 14 +++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/packages/vue-router/__tests__/locationHistory.spec.ts b/packages/vue-router/__tests__/locationHistory.spec.ts
index fe7f94e723d..196dcc75d88 100644
--- a/packages/vue-router/__tests__/locationHistory.spec.ts
+++ b/packages/vue-router/__tests__/locationHistory.spec.ts
@@ -84,4 +84,25 @@ describe('Location History', () => {
     expect(locationHistory.canGoBack(1, 0, 1)).toEqual(true);
     expect(locationHistory.canGoBack(2, 0, 1)).toEqual(false);
   });
+
+  it('should correctly find the last location', () => {
+    const [home, pageA, pageB, pageC] = [
+      { pathname: '/home' },
+      { pathname: '/page-a', pushedByRoute: '/home' },
+      { pathname: '/page-b', pushedByRoute: '/page-a' },
+      { pathname: '/page-c', pushedByRoute: '/page-b' },
+    ];
+
+    locationHistory.add(home);
+    locationHistory.add(pageA);
+    locationHistory.add(pageB);
+    locationHistory.add(pageC);
+
+    expect(locationHistory.findLastLocation(pageB)).toEqual(pageA);
+    expect(locationHistory.findLastLocation(pageB, -2)).toEqual(home);
+
+    expect(locationHistory.findLastLocation(pageC)).toEqual(pageB);
+    expect(locationHistory.findLastLocation(pageC, -2)).toEqual(pageA);
+    expect(locationHistory.findLastLocation(pageC, -3)).toEqual(home);
+  });
 });
diff --git a/packages/vue-router/src/locationHistory.ts b/packages/vue-router/src/locationHistory.ts
index f48499254ea..9e12afd799a 100644
--- a/packages/vue-router/src/locationHistory.ts
+++ b/packages/vue-router/src/locationHistory.ts
@@ -239,15 +239,11 @@ export const createLocationHistory = () => {
         }
       }
     }
-    if (delta < -1) {
-      return locationHistory[locationHistory.length - 1 + delta];
-    } else {
-      for (let i = locationHistory.length - 2; i >= 0; i--) {
-        const ri = locationHistory[i];
-        if (ri) {
-          if (ri.pathname === routeInfo.pushedByRoute) {
-            return ri;
-          }
+    for (let i = locationHistory.length - 2; i >= 0; i--) {
+      const ri = locationHistory[i];
+      if (ri) {
+        if (ri.pathname === routeInfo.pushedByRoute) {
+          return locationHistory[i + 1 + delta]
         }
       }
     }

From 4d91deac1c7c004613b58dd8b41802b8a0f8ad81 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 7 Oct 2024 15:15:47 -0400
Subject: [PATCH 4/9] fix(alert): use semantic heading structure for headers

---
 core/src/components/alert/alert.tsx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/src/components/alert/alert.tsx b/core/src/components/alert/alert.tsx
index ca7efa30fb9..e763d8bcc6f 100644
--- a/core/src/components/alert/alert.tsx
+++ b/core/src/components/alert/alert.tsx
@@ -730,10 +730,12 @@ export class Alert implements ComponentInterface, OverlayInterface {
     const role = this.inputs.length > 0 || this.buttons.length > 0 ? 'alertdialog' : 'alert';
 
     /**
-     * If the header is defined, use that. Otherwise, fall back to the subHeader.
-     * If neither is defined, don't set aria-labelledby.
+     * Use both the header and subHeader ids if they are defined.
+     * If only the header is defined, use the header id.
+     * If only the subHeader is defined, use the subHeader id.
+     * If neither are defined, do not set aria-labelledby.
      */
-    const ariaLabelledBy = header ? hdrId : subHeader ? subHdrId : null;
+    const ariaLabelledBy = header && subHeader ? `${hdrId} ${subHdrId}` : header ? hdrId : subHeader ? subHdrId : null;
 
     return (
       <Host
@@ -766,11 +768,18 @@ export class Alert implements ComponentInterface, OverlayInterface {
                 {header}
               </h2>
             )}
-            {subHeader && (
+            {/* If no header exists, subHeader should be the highest heading level, h2 */}
+            {subHeader && !header && (
               <h2 id={subHdrId} class="alert-sub-title">
                 {subHeader}
               </h2>
             )}
+            {/* If a header exists, subHeader should be one level below it, h3 */}
+            {subHeader && header && (
+              <h3 id={subHdrId} class="alert-sub-title">
+                {subHeader}
+              </h3>
+            )}
           </div>
 
           {this.renderAlertMessage(msgId)}

From 5afe018ca4fefcd999664f16a0a8d05e54e3f9ce Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 7 Oct 2024 16:09:08 -0400
Subject: [PATCH 5/9] test(alert): test for the correct heading aria values and
 tag names

---
 .../components/alert/test/alert-aria.spec.tsx | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 core/src/components/alert/test/alert-aria.spec.tsx

diff --git a/core/src/components/alert/test/alert-aria.spec.tsx b/core/src/components/alert/test/alert-aria.spec.tsx
new file mode 100644
index 00000000000..9434fb4970c
--- /dev/null
+++ b/core/src/components/alert/test/alert-aria.spec.tsx
@@ -0,0 +1,54 @@
+import { newSpecPage } from '@stencil/core/testing';
+
+import { Alert } from '../alert';
+
+describe('alert: aria', () => {
+  it('alert should assign proper aria attributes and tag names with a header, subHeader and message', async () => {
+    const page = await newSpecPage({
+      components: [Alert],
+      html: `<ion-alert is-open="true" header="Alert" sub-header="Subtitle" message="This is an alert message."></ion-alert>`,
+    });
+
+    const alert = page.body.querySelector('ion-alert')!;
+
+    expect(alert.getAttribute('id')).toBe('ion-overlay-1');
+    expect(alert.getAttribute('aria-labelledby')).toBe('alert-1-hdr alert-1-sub-hdr');
+    expect(alert.getAttribute('aria-describedby')).toBe('alert-1-msg');
+
+    const header = page.body.querySelector('.alert-title')!;
+    expect(header.tagName).toBe('H2');
+
+    const subHeader = page.body.querySelector('.alert-sub-title')!;
+    expect(subHeader.tagName).toBe('H3');
+  });
+
+  it('alert should assign proper aria attributes and tag name with only a header', async () => {
+    const page = await newSpecPage({
+      components: [Alert],
+      html: `<ion-alert is-open="true" header="Alert"></ion-alert>`,
+    });
+
+    const alert = page.body.querySelector('ion-alert')!;
+
+    expect(alert.getAttribute('id')).toBe('ion-overlay-2');
+    expect(alert.getAttribute('aria-labelledby')).toBe('alert-2-hdr');
+
+    const header = page.body.querySelector('.alert-title')!;
+    expect(header.tagName).toBe('H2');
+  });
+
+  it('alert should assign proper aria attributes and tag name with only a subHeader', async () => {
+    const page = await newSpecPage({
+      components: [Alert],
+      html: `<ion-alert is-open="true" sub-header="Subtitle"></ion-alert>`,
+    });
+
+    const alert = page.body.querySelector('ion-alert')!;
+
+    expect(alert.getAttribute('id')).toBe('ion-overlay-3');
+    expect(alert.getAttribute('aria-labelledby')).toBe('alert-3-sub-hdr');
+
+    const subHeader = page.body.querySelector('.alert-sub-title')!;
+    expect(subHeader.tagName).toBe('H2');
+  });
+});

From d913f13f8779e02ff6f652b92742c16ddcb58d57 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 23 Oct 2024 17:27:42 -0400
Subject: [PATCH 6/9] test(alert): fix a11y test to use new aria-labelledby
 values

---
 .../components/alert/test/a11y/alert.e2e.ts   | 16 ++++++++++++----
 .../src/components/alert/test/a11y/index.html | 19 +++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/core/src/components/alert/test/a11y/alert.e2e.ts b/core/src/components/alert/test/a11y/alert.e2e.ts
index 12add8b2eca..ec70b0c3aaa 100644
--- a/core/src/components/alert/test/a11y/alert.e2e.ts
+++ b/core/src/components/alert/test/a11y/alert.e2e.ts
@@ -124,16 +124,24 @@ configs({ directions: ['ltr'] }).forEach(({ config, title }) => {
       await page.goto(`/src/components/alert/test/a11y`, config);
     });
 
-    test('should have aria-labelledby when header is set', async ({ page }) => {
-      await testAria(page, 'noMessage', 'alert-1-hdr', null);
+    test('should have aria-labelledby set to both when header and subHeader are set', async ({ page }) => {
+      await testAria(page, 'bothHeadersOnly', 'alert-1-hdr alert-1-sub-hdr', null);
+    });
+
+    test('should have aria-labelledby set when only header is set', async ({ page }) => {
+      await testAria(page, 'headerOnly', 'alert-1-hdr', null);
+    });
+
+    test('should fall back to subHeader for aria-labelledby if header is not defined', async ({ page }) => {
+      await testAria(page, 'subHeaderOnly', 'alert-1-sub-hdr', null);
     });
 
     test('should have aria-describedby when message is set', async ({ page }) => {
       await testAria(page, 'noHeaders', null, 'alert-1-msg');
     });
 
-    test('should fall back to subHeader for aria-labelledby if header is not defined', async ({ page }) => {
-      await testAria(page, 'subHeaderOnly', 'alert-1-sub-hdr', 'alert-1-msg');
+    test('should have aria-labelledby and aria-describedby when headers and message are set', async ({ page }) => {
+      await testAria(page, 'headersAndMessage', 'alert-1-hdr alert-1-sub-hdr', 'alert-1-msg');
     });
 
     test('should allow for manually specifying aria attributes', async ({ page }) => {
diff --git a/core/src/components/alert/test/a11y/index.html b/core/src/components/alert/test/a11y/index.html
index 00b3e1d928c..cb137ba7314 100644
--- a/core/src/components/alert/test/a11y/index.html
+++ b/core/src/components/alert/test/a11y/index.html
@@ -19,10 +19,11 @@
     <main class="ion-padding">
       <h1>Alert - A11y</h1>
 
-      <button class="expand" id="bothHeaders" onclick="presentBothHeaders()">Both Headers</button>
+      <button class="expand" id="bothHeadersOnly" onclick="presentBothHeadersOnly()">Both Headers Only</button>
+      <button class="expand" id="headerOnly" onclick="presentHeaderOnly()">Header Only</button>
       <button class="expand" id="subHeaderOnly" onclick="presentSubHeaderOnly()">Subheader Only</button>
       <button class="expand" id="noHeaders" onclick="presentNoHeaders()">No Headers</button>
-      <button class="expand" id="noMessage" onclick="presentNoMessage()">No Message</button>
+      <button class="expand" id="headersAndMessage" onclick="presentHeadersAndMessage()">Headers and Message</button>
       <button class="expand" id="customAria" onclick="presentCustomAria()">Custom Aria</button>
       <button class="expand" id="ariaLabelButton" onclick="presentAriaLabelButton()">Aria Label Button</button>
       <button class="expand" id="checkbox" onclick="presentAlertCheckbox()">Checkbox</button>
@@ -34,11 +35,17 @@ <h1>Alert - A11y</h1>
         await alert.present();
       }
 
-      function presentBothHeaders() {
+      function presentBothHeadersOnly() {
         openAlert({
           header: 'Header',
           subHeader: 'Subtitle',
-          message: 'This is an alert message.',
+          buttons: ['OK'],
+        });
+      }
+
+      function presentHeaderOnly() {
+        openAlert({
+          header: 'Header',
           buttons: ['OK'],
         });
       }
@@ -46,7 +53,6 @@ <h1>Alert - A11y</h1>
       function presentSubHeaderOnly() {
         openAlert({
           subHeader: 'Subtitle',
-          message: 'This is an alert message.',
           buttons: ['OK'],
         });
       }
@@ -58,10 +64,11 @@ <h1>Alert - A11y</h1>
         });
       }
 
-      function presentNoMessage() {
+      function presentHeadersAndMessage() {
         openAlert({
           header: 'Header',
           subHeader: 'Subtitle',
+          message: 'This is an alert message.',
           buttons: ['OK'],
         });
       }

From b866eca5405512d88fd9e08236eb6ffa36ef3d44 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 23 Oct 2024 17:44:07 -0400
Subject: [PATCH 7/9] test(alert): update to move spec test logic to existing
 e2e test

---
 .../components/alert/test/a11y/alert.e2e.ts   | 21 ++++++++
 .../components/alert/test/alert-aria.spec.tsx | 54 -------------------
 2 files changed, 21 insertions(+), 54 deletions(-)
 delete mode 100644 core/src/components/alert/test/alert-aria.spec.tsx

diff --git a/core/src/components/alert/test/a11y/alert.e2e.ts b/core/src/components/alert/test/a11y/alert.e2e.ts
index ec70b0c3aaa..5995fd2e96b 100644
--- a/core/src/components/alert/test/a11y/alert.e2e.ts
+++ b/core/src/components/alert/test/a11y/alert.e2e.ts
@@ -17,6 +17,27 @@ const testAria = async (
 
   const alert = page.locator('ion-alert');
 
+  const header = alert.locator('.alert-title');
+  const subHeader = alert.locator('.alert-sub-title');
+
+  // If a header exists, it should be an h2 element
+  if (await header.count() > 0) {
+    const headerTagName = await header.evaluate((el) => el.tagName);
+    expect(headerTagName).toBe('H2');
+  }
+
+  // If a header and subHeader exist, the subHeader should be an h3 element
+  if (await header.count() > 0 && await subHeader.count() > 0) {
+    const subHeaderTagName = await subHeader.evaluate((el) => el.tagName);
+    expect(subHeaderTagName).toBe('H3');
+  }
+
+  // If a subHeader exists without a header, the subHeader should be an h2 element
+  if (await header.count() === 0 && await subHeader.count() > 0) {
+    const subHeaderTagName = await subHeader.evaluate((el) => el.tagName);
+    expect(subHeaderTagName).toBe('H2');
+  }
+
   /**
    * expect().toHaveAttribute() can't check for a null value, so grab and check
    * the values manually instead.
diff --git a/core/src/components/alert/test/alert-aria.spec.tsx b/core/src/components/alert/test/alert-aria.spec.tsx
deleted file mode 100644
index 9434fb4970c..00000000000
--- a/core/src/components/alert/test/alert-aria.spec.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { newSpecPage } from '@stencil/core/testing';
-
-import { Alert } from '../alert';
-
-describe('alert: aria', () => {
-  it('alert should assign proper aria attributes and tag names with a header, subHeader and message', async () => {
-    const page = await newSpecPage({
-      components: [Alert],
-      html: `<ion-alert is-open="true" header="Alert" sub-header="Subtitle" message="This is an alert message."></ion-alert>`,
-    });
-
-    const alert = page.body.querySelector('ion-alert')!;
-
-    expect(alert.getAttribute('id')).toBe('ion-overlay-1');
-    expect(alert.getAttribute('aria-labelledby')).toBe('alert-1-hdr alert-1-sub-hdr');
-    expect(alert.getAttribute('aria-describedby')).toBe('alert-1-msg');
-
-    const header = page.body.querySelector('.alert-title')!;
-    expect(header.tagName).toBe('H2');
-
-    const subHeader = page.body.querySelector('.alert-sub-title')!;
-    expect(subHeader.tagName).toBe('H3');
-  });
-
-  it('alert should assign proper aria attributes and tag name with only a header', async () => {
-    const page = await newSpecPage({
-      components: [Alert],
-      html: `<ion-alert is-open="true" header="Alert"></ion-alert>`,
-    });
-
-    const alert = page.body.querySelector('ion-alert')!;
-
-    expect(alert.getAttribute('id')).toBe('ion-overlay-2');
-    expect(alert.getAttribute('aria-labelledby')).toBe('alert-2-hdr');
-
-    const header = page.body.querySelector('.alert-title')!;
-    expect(header.tagName).toBe('H2');
-  });
-
-  it('alert should assign proper aria attributes and tag name with only a subHeader', async () => {
-    const page = await newSpecPage({
-      components: [Alert],
-      html: `<ion-alert is-open="true" sub-header="Subtitle"></ion-alert>`,
-    });
-
-    const alert = page.body.querySelector('ion-alert')!;
-
-    expect(alert.getAttribute('id')).toBe('ion-overlay-3');
-    expect(alert.getAttribute('aria-labelledby')).toBe('alert-3-sub-hdr');
-
-    const subHeader = page.body.querySelector('.alert-sub-title')!;
-    expect(subHeader.tagName).toBe('H2');
-  });
-});

From effbfb024478f7786d3987bf3b01714e7ecbe476 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 23 Oct 2024 17:49:52 -0400
Subject: [PATCH 8/9] style: lint

---
 core/src/components/alert/test/a11y/alert.e2e.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/components/alert/test/a11y/alert.e2e.ts b/core/src/components/alert/test/a11y/alert.e2e.ts
index 5995fd2e96b..56aef1f94a8 100644
--- a/core/src/components/alert/test/a11y/alert.e2e.ts
+++ b/core/src/components/alert/test/a11y/alert.e2e.ts
@@ -21,19 +21,19 @@ const testAria = async (
   const subHeader = alert.locator('.alert-sub-title');
 
   // If a header exists, it should be an h2 element
-  if (await header.count() > 0) {
+  if ((await header.count()) > 0) {
     const headerTagName = await header.evaluate((el) => el.tagName);
     expect(headerTagName).toBe('H2');
   }
 
   // If a header and subHeader exist, the subHeader should be an h3 element
-  if (await header.count() > 0 && await subHeader.count() > 0) {
+  if ((await header.count()) > 0 && (await subHeader.count()) > 0) {
     const subHeaderTagName = await subHeader.evaluate((el) => el.tagName);
     expect(subHeaderTagName).toBe('H3');
   }
 
   // If a subHeader exists without a header, the subHeader should be an h2 element
-  if (await header.count() === 0 && await subHeader.count() > 0) {
+  if ((await header.count()) === 0 && (await subHeader.count()) > 0) {
     const subHeaderTagName = await subHeader.evaluate((el) => el.tagName);
     expect(subHeaderTagName).toBe('H2');
   }

From 8b727637c102248ae3df106fdef1aace101baf67 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 24 Oct 2024 14:27:37 -0400
Subject: [PATCH 9/9] git: revert files updated on main

---
 core/src/components/backdrop/backdrop.tsx     |  1 +
 .../standalone/src/directives/radio-group.ts  |  2 +-
 .../__tests__/locationHistory.spec.ts         | 21 -------------------
 packages/vue-router/src/locationHistory.ts    | 14 ++++++++-----
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/core/src/components/backdrop/backdrop.tsx b/core/src/components/backdrop/backdrop.tsx
index 9468f02526c..7d85b485cc0 100644
--- a/core/src/components/backdrop/backdrop.tsx
+++ b/core/src/components/backdrop/backdrop.tsx
@@ -51,6 +51,7 @@ export class Backdrop implements ComponentInterface {
     const mode = getIonMode(this);
     return (
       <Host
+        tabindex="-1"
         aria-hidden="true"
         class={{
           [mode]: true,
diff --git a/packages/angular/standalone/src/directives/radio-group.ts b/packages/angular/standalone/src/directives/radio-group.ts
index 925f48182b9..ecde568d444 100644
--- a/packages/angular/standalone/src/directives/radio-group.ts
+++ b/packages/angular/standalone/src/directives/radio-group.ts
@@ -16,7 +16,7 @@ import { defineCustomElement } from '@ionic/core/components/ion-radio-group.js';
 
 import { ProxyCmp, proxyOutputs } from './angular-component-lib/utils';
 
-const RADIO_GROUP_INPUTS = ['allowEmptySelection', 'compareWith', 'name', 'value'];
+const RADIO_GROUP_INPUTS = ['allowEmptySelection', 'name', 'value'];
 
 /**
  * Pulling the provider into an object and using PURE  works
diff --git a/packages/vue-router/__tests__/locationHistory.spec.ts b/packages/vue-router/__tests__/locationHistory.spec.ts
index 196dcc75d88..fe7f94e723d 100644
--- a/packages/vue-router/__tests__/locationHistory.spec.ts
+++ b/packages/vue-router/__tests__/locationHistory.spec.ts
@@ -84,25 +84,4 @@ describe('Location History', () => {
     expect(locationHistory.canGoBack(1, 0, 1)).toEqual(true);
     expect(locationHistory.canGoBack(2, 0, 1)).toEqual(false);
   });
-
-  it('should correctly find the last location', () => {
-    const [home, pageA, pageB, pageC] = [
-      { pathname: '/home' },
-      { pathname: '/page-a', pushedByRoute: '/home' },
-      { pathname: '/page-b', pushedByRoute: '/page-a' },
-      { pathname: '/page-c', pushedByRoute: '/page-b' },
-    ];
-
-    locationHistory.add(home);
-    locationHistory.add(pageA);
-    locationHistory.add(pageB);
-    locationHistory.add(pageC);
-
-    expect(locationHistory.findLastLocation(pageB)).toEqual(pageA);
-    expect(locationHistory.findLastLocation(pageB, -2)).toEqual(home);
-
-    expect(locationHistory.findLastLocation(pageC)).toEqual(pageB);
-    expect(locationHistory.findLastLocation(pageC, -2)).toEqual(pageA);
-    expect(locationHistory.findLastLocation(pageC, -3)).toEqual(home);
-  });
 });
diff --git a/packages/vue-router/src/locationHistory.ts b/packages/vue-router/src/locationHistory.ts
index 9e12afd799a..f48499254ea 100644
--- a/packages/vue-router/src/locationHistory.ts
+++ b/packages/vue-router/src/locationHistory.ts
@@ -239,11 +239,15 @@ export const createLocationHistory = () => {
         }
       }
     }
-    for (let i = locationHistory.length - 2; i >= 0; i--) {
-      const ri = locationHistory[i];
-      if (ri) {
-        if (ri.pathname === routeInfo.pushedByRoute) {
-          return locationHistory[i + 1 + delta]
+    if (delta < -1) {
+      return locationHistory[locationHistory.length - 1 + delta];
+    } else {
+      for (let i = locationHistory.length - 2; i >= 0; i--) {
+        const ri = locationHistory[i];
+        if (ri) {
+          if (ri.pathname === routeInfo.pushedByRoute) {
+            return ri;
+          }
         }
       }
     }