Skip to content

Commit 5614542

Browse files
committed
Merge branch 'main' into pr/4064
2 parents bd71738 + d3a5de4 commit 5614542

File tree

32 files changed

+13557
-11372
lines changed

32 files changed

+13557
-11372
lines changed

docs/developer-resources/books.md

Lines changed: 0 additions & 75 deletions
This file was deleted.

docs/react/navigation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ const UsersListPage: React.FC = () => {
197197

198198
Other components that have the `routerLink` prop are `IonButton`, `IonCard`, `IonRouterLink`, `IonFabButton`, and `IonItemOption`.
199199

200-
Each of these components also have a `routerDirection` prop to explicitly set the type of page transition to use ("back", "forward", or "none").
200+
Each of these components also have a `routerDirection` prop to explicitly set the type of page transition to use (`"forward"`, `"back"`, or `"root"`).
201201

202202
Outside of these components that have the `routerLink` prop, you can also use React Routers [`Link`](https://v5.reactrouter.com/web/api/Link) component to navigate between views:
203203

docs/reference/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The current status of each Ionic Framework version is:
2323
| Version | Status | Released | Maintenance Ends | Ext. Support Ends |
2424
| :-----: | :------------: | :----------: | :--------------: | :---------------: |
2525
| V8 | **Active** | Apr 17, 2024 | TBD | TBD |
26-
| V7 | Maintenance | Mar 29, 2023 | Oct 17, 2024 | Apr 17, 2025 |
26+
| V7 | End of Support | Mar 29, 2023 | Oct 17, 2024 | Apr 17, 2025 |
2727
| V6 | End of Support | Dec 8, 2021 | Sep 29, 2023 | Mar 29, 2024 |
2828
| V5 | End of Support | Feb 11, 2020 | June 8, 2022 | Dec 8, 2022 |
2929
| V4 | End of Support | Jan 23, 2019 | Aug 11, 2020 | Sept 30, 2022 |

docs/vue/navigation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Both options provide the same navigation mechanism, just fitting different use c
138138

139139
The `router-link` attribute can be set on any Ionic Vue component, and the router will navigate to the route specified when the component is clicked. The `router-link` attribute accepts string values as well as named routes, just like `router.push` from Vue Router. For additional control, the `router-direction` and `router-animation` attributes can be set as well.
140140

141-
The `router-direction` attribute accepts values of `forward`, `back`, or `none` and is used to control the direction of the page transition.
141+
The `router-direction` attribute accepts values of `"forward"`, `"back"`, or `"root"` and is used to control the direction of the page transition.
142142

143143
The `router-animation` attribute accepts an `AnimationBuilder` function and is used to provide a custom page transition that is only used when clicking the component it is provided on. The `AnimationBuilder` type is a function that returns an Ionic Animation instance. See the [Animations documentation](../utilities/animations) for more information on using animations in Ionic Vue.
144144

docs/vue/utility-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ interface UseIonRouterResult {
7272
forward: (routerAnimation?: AnimationBuilder) => void;
7373
navigate: (
7474
location: string | Location,
75-
routerDirection?: 'forward' | 'back' | 'root' | 'none',
75+
routerDirection?: 'forward' | 'back' | 'root',
7676
routerAction?: 'push' | 'pop' | 'replace',
7777
routerAnimation?: AnimationBuilder
7878
) => void;

docusaurus.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const ArchivedVersionsDropdownItems = Object.entries(ARCHIVED_VERSIONS_JSON).spl
3333
const BASE_URL = '/docs';
3434

3535
module.exports = {
36-
title: 'Ionic Documentation',
36+
title: 'Ionic Framework',
3737
tagline:
3838
'Ionic is the app platform for web developers. Build amazing mobile and web apps with one shared code base and open web standards',
3939
url: 'https://ionicframework.com',
@@ -81,6 +81,7 @@ module.exports = {
8181
},
8282
exclude: ['README.md'],
8383
lastVersion: 'current',
84+
/** @type {import('@docusaurus/plugin-content-docs').VersionOptions} */
8485
versions: {
8586
current: {
8687
label: 'v8',
@@ -333,6 +334,7 @@ module.exports = {
333334
},
334335
},
335336
plugins: [
337+
// Allows usage of Sass/SCSS in the CSS preprocessor.
336338
'docusaurus-plugin-sass',
337339
[
338340
'docusaurus-plugin-module-alias',

0 commit comments

Comments
 (0)