Skip to content

Commit 5880f00

Browse files
brandyscarneybrandyscarney
committed
Merge branch 'main' into FW-6238
2 parents 1f0d31f + d9ffaf6 commit 5880f00

File tree

50 files changed

+1275
-1110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1275
-1110
lines changed

‎docs/reference/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The Ionic team has compiled a set of recommendations for using the Ionic Framewo
4444

4545
| Framework | Minimum Angular Version | Maximum Angular Version | TypeScript |
4646
| :-------: | :---------------------: | :---------------------: | :--------: |
47-
| v8 | v16 | v19.x[^3] | 4.9.3+ |
47+
| v8 | v16 | v20.x[^3] | 4.9.3+ |
4848
| v7 | v14 | v17.x[^2] | 4.6+ |
4949
| v6 | v12 | v15.x[^1] | 4.0+ |
5050
| v5 | v8.2 | v12.x | 3.5+ |

‎docs/theming/high-contrast-mode.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ This approach activates the high contrast palette when the [CSS media query for
120120
The following example uses the system settings to decide when to show high contrast mode.
121121

122122
:::info
123-
Not sure how to change the system settings? Here's how to enable high contrast mode on [Windows 11](hhttps://support.microsoft.com/en-us/windows/turn-high-contrast-mode-on-or-off-in-windows-909e9d89-a0f9-a3a9-b993-7a6dcee85025) and on [macOS](https://support.apple.com/guide/mac-help/change-display-settings-for-accessibility-unac089/mac).
123+
Not sure how to change the system settings? Here's how to enable high contrast mode on [Windows 11](https://support.microsoft.com/en-us/windows/turn-high-contrast-mode-on-or-off-in-windows-909e9d89-a0f9-a3a9-b993-7a6dcee85025) and on [macOS](https://support.apple.com/guide/mac-help/change-display-settings-for-accessibility-unac089/mac).
124124
:::
125125

126126
import SystemHighContrastMode from '@site/static/usage/v8/theming/system-high-contrast-mode/index.md';
@@ -178,7 +178,7 @@ This approach activates the high contrast palette when the `.ion-palette-high-co
178178
The following example combines site settings, system settings, and the toggle to decide when to show high contrast mode. The site's palette takes precedence over system settings. If your system settings differ from the site's palette when the demo loads, it will use the site's palette.
179179

180180
:::info
181-
Not sure how to change the system settings? Here's how to enable high contrast mode on [Windows 11](hhttps://support.microsoft.com/en-us/windows/turn-high-contrast-mode-on-or-off-in-windows-909e9d89-a0f9-a3a9-b993-7a6dcee85025) and on [macOS](https://support.apple.com/guide/mac-help/change-display-settings-for-accessibility-unac089/mac).
181+
Not sure how to change the system settings? Here's how to enable high contrast mode on [Windows 11](https://support.microsoft.com/en-us/windows/turn-high-contrast-mode-on-or-off-in-windows-909e9d89-a0f9-a3a9-b993-7a6dcee85025) and on [macOS](https://support.apple.com/guide/mac-help/change-display-settings-for-accessibility-unac089/mac).
182182
:::
183183

184184
import ClassHighContrastMode from '@site/static/usage/v8/theming/class-high-contrast-mode/index.md';

‎docusaurus.config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,9 @@ module.exports = {
323323
},
324324
prism: {
325325
theme: { plain: {}, styles: [] },
326-
// https://github.com/FormidableLabs/prism-react-renderer/blob/e6d323332b0363a633407fabab47b608088e3a4d/packages/generate-prism-languages/index.ts#L9-L25
327-
additionalLanguages: ['shell-session', 'http'],
326+
// Prism provides a [default list of languages](https://github.com/FormidableLabs/prism-react-renderer/blob/e1c83a468b05df7f452b3ad7e4ae5ab874574d4e/packages/generate-prism-languages/index.ts#L9-L26).
327+
// A list of [additional languages](https://prismjs.com/#supported-languages) that are supported can be found at their website.
328+
additionalLanguages: ['shell-session', 'http', 'diff'],
328329
},
329330
algolia: {
330331
appId: 'O9QSL985BS',

‎plugins/docusaurus-plugin-ionic-component-api/index.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,25 @@ function renderEvents({ events }) {
173173
${events.map((event) => `| \`${event.event}\` | ${formatMultiline(event.docs)} | \`${event.bubbles}\` |`).join('\n')}`;
174174
}
175175

176+
/**
177+
* Formats method parameters for the optional Parameters row of each method table
178+
* @param {*} paramsArr Array of method parameters
179+
* @returns formatted parameters for methods table
180+
*/
181+
function renderParameters(paramsArr) {
182+
if (!paramsArr.some((param) => param.docs)) {
183+
return '';
184+
}
185+
186+
const documentedParams = paramsArr.filter((param) => param.docs);
187+
const formattedParams = documentedParams
188+
.map((param) => {
189+
return `**${param.name}**: ${formatMultiline(param.docs)}`;
190+
})
191+
.join('<br/>');
192+
return `| **Parameters** | ${formattedParams} |`;
193+
}
194+
176195
function renderMethods({ methods }) {
177196
if (methods.length === 0) {
178197
return 'No public methods available for this component.';
@@ -189,6 +208,7 @@ ${methods
189208
| --- | --- |
190209
| **Description** | ${formatMultiline(method.docs)} |
191210
| **Signature** | \`${method.signature.replace(/\|/g, '\uff5c')}\` |
211+
${method.parameters.length !== 0 ? renderParameters(method.parameters) : ''}
192212
`
193213
)
194214
.join('\n')}

‎renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"schedule": ["every weekday before 11am"]
1010
},
1111
{
12-
"matchPackagePatterns": ["@angular/"],
12+
"matchPackagePatterns": ["@angular/", "@angular-devkit/"],
1313
"groupName": "angular",
1414
"schedule": ["on the first day of the month"]
1515
},

‎src/styles/components/_code.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ pre[class*='language-'] {
137137
.token.selector,
138138
.token.char,
139139
.token.function,
140-
.token.builtin,
141-
.token.inserted {
140+
.token.builtin {
142141
color: #ff6810;
143142
}
144143

@@ -149,7 +148,9 @@ pre[class*='language-'] {
149148
.token.attr-value,
150149
.language-css .token.string,
151150
.style .token.string,
152-
.token.variable {
151+
.token.variable,
152+
// Code additions (indicated by a leading '+') within a diff.
153+
.token.inserted {
153154
color: #42b983;
154155
}
155156

@@ -175,6 +176,7 @@ pre[class*='language-'] {
175176
cursor: help;
176177
}
177178

179+
// Code removals (indicated by a leading '-') within a diff.
178180
.token.deleted {
179181
color: red;
180182
}

‎static/code/stackblitz/v7/angular/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
"build": "ng build"
88
},
99
"dependencies": {
10-
"@angular/animations": "^19.0.0",
11-
"@angular/common": "^19.0.0",
12-
"@angular/compiler": "^19.0.0",
13-
"@angular/core": "^19.0.0",
14-
"@angular/forms": "^19.0.0",
15-
"@angular/platform-browser": "^19.0.0",
16-
"@angular/platform-browser-dynamic": "^19.0.0",
17-
"@angular/router": "^19.0.0",
10+
"@angular/animations": "^20.0.0",
11+
"@angular/common": "^20.0.0",
12+
"@angular/compiler": "^20.0.0",
13+
"@angular/core": "^20.0.0",
14+
"@angular/forms": "^20.0.0",
15+
"@angular/platform-browser": "^20.0.0",
16+
"@angular/platform-browser-dynamic": "^20.0.0",
17+
"@angular/router": "^20.0.0",
1818
"@ionic/angular": "^7.0.0",
1919
"@ionic/core": "^7.0.0",
20-
"ionicons": "8.0.8",
20+
"ionicons": "8.0.9",
2121
"rxjs": "^7.8.1",
2222
"tslib": "^2.5.0",
2323
"zone.js": "~0.15.0"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "^19.0.0",
27-
"@angular/build": "^19.0.0",
28-
"@angular/cli": "^19.0.0",
29-
"@angular/compiler-cli": "^19.0.0",
30-
"typescript": "^5.6.3"
26+
"@angular-devkit/build-angular": "^20.0.0",
27+
"@angular/build": "^20.0.0",
28+
"@angular/cli": "^20.0.0",
29+
"@angular/compiler-cli": "^20.0.0",
30+
"typescript": "^5.8.0"
3131
}
3232
}

‎static/code/stackblitz/v7/html/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@ionic/core": "^7.0.0",
13-
"ionicons": "8.0.8"
13+
"ionicons": "8.0.9"
1414
},
1515
"devDependencies": {
1616
"typescript": "^5.0.0",

0 commit comments

Comments
 (0)