Skip to content

Commit 8b72763

Browse files
committed
git: revert files updated on main
1 parent d403ae8 commit 8b72763

File tree

4 files changed

+11
-27
lines changed

4 files changed

+11
-27
lines changed

core/src/components/backdrop/backdrop.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export class Backdrop implements ComponentInterface {
5151
const mode = getIonMode(this);
5252
return (
5353
<Host
54+
tabindex="-1"
5455
aria-hidden="true"
5556
class={{
5657
[mode]: true,

packages/angular/standalone/src/directives/radio-group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { defineCustomElement } from '@ionic/core/components/ion-radio-group.js';
1616

1717
import { ProxyCmp, proxyOutputs } from './angular-component-lib/utils';
1818

19-
const RADIO_GROUP_INPUTS = ['allowEmptySelection', 'compareWith', 'name', 'value'];
19+
const RADIO_GROUP_INPUTS = ['allowEmptySelection', 'name', 'value'];
2020

2121
/**
2222
* Pulling the provider into an object and using PURE works

packages/vue-router/__tests__/locationHistory.spec.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,25 +84,4 @@ describe('Location History', () => {
8484
expect(locationHistory.canGoBack(1, 0, 1)).toEqual(true);
8585
expect(locationHistory.canGoBack(2, 0, 1)).toEqual(false);
8686
});
87-
88-
it('should correctly find the last location', () => {
89-
const [home, pageA, pageB, pageC] = [
90-
{ pathname: '/home' },
91-
{ pathname: '/page-a', pushedByRoute: '/home' },
92-
{ pathname: '/page-b', pushedByRoute: '/page-a' },
93-
{ pathname: '/page-c', pushedByRoute: '/page-b' },
94-
];
95-
96-
locationHistory.add(home);
97-
locationHistory.add(pageA);
98-
locationHistory.add(pageB);
99-
locationHistory.add(pageC);
100-
101-
expect(locationHistory.findLastLocation(pageB)).toEqual(pageA);
102-
expect(locationHistory.findLastLocation(pageB, -2)).toEqual(home);
103-
104-
expect(locationHistory.findLastLocation(pageC)).toEqual(pageB);
105-
expect(locationHistory.findLastLocation(pageC, -2)).toEqual(pageA);
106-
expect(locationHistory.findLastLocation(pageC, -3)).toEqual(home);
107-
});
10887
});

packages/vue-router/src/locationHistory.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,15 @@ export const createLocationHistory = () => {
239239
}
240240
}
241241
}
242-
for (let i = locationHistory.length - 2; i >= 0; i--) {
243-
const ri = locationHistory[i];
244-
if (ri) {
245-
if (ri.pathname === routeInfo.pushedByRoute) {
246-
return locationHistory[i + 1 + delta]
242+
if (delta < -1) {
243+
return locationHistory[locationHistory.length - 1 + delta];
244+
} else {
245+
for (let i = locationHistory.length - 2; i >= 0; i--) {
246+
const ri = locationHistory[i];
247+
if (ri) {
248+
if (ri.pathname === routeInfo.pushedByRoute) {
249+
return ri;
250+
}
247251
}
248252
}
249253
}

0 commit comments

Comments
 (0)