Skip to content

Commit a7e550b

Browse files
committed
Merge branch 'main' of github.com:ionic-team/ionic-docs
# Conflicts: # docs/api/reorder.md # docs/reference/glossary.md
2 parents 02ad5a2 + b4ce82a commit a7e550b

File tree

2,055 files changed

+17550
-4904
lines changed

Some content is hidden

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

2,055 files changed

+17550
-4904
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ docs/api
77
docs/native
88
versioned_docs/version-v*/native
99
docs/cli/commands
10+
docs/reference/glossary.md
1011

1112
static/code/stackblitz
1213

_templates/playground/new/angular.md.ejs.t

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
to: "<%= `static/usage/v${version}/${name}/${path}/angular/example_component_html.md` %>"
3+
---
4+
```html
5+
<<%= component %>></<%= component %>>
6+
```
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
---
2-
# this file only gets generated if `angular_ts` (from the command line prompt) is true
3-
to: "<%= angular_ts ? `static/usage/v${version}/${name}/${path}/angular/example_component_ts.md` : null %>"
2+
arbitrary: <% pascalComponent = h.changeCase.pascal(component) %>
3+
to: "<%= `static/usage/v${version}/${name}/${path}/angular/example_component_ts.md` %>"
44
---
55
```ts
66
import { Component } from '@angular/core';
7+
import { <%= pascalComponent %> } from '@ionic/angular/standalone';
78

89
@Component({
910
selector: 'app-example',
1011
templateUrl: 'example.component.html',
11-
<% if (css){ -%>
1212
styleUrls: ['./example.component.css'],
13-
<% } -%>
13+
imports: [<%= pascalComponent %>],
1414
})
15-
export class ExampleComponent {
16-
}
15+
export class ExampleComponent {}
1716
```

_templates/playground/new/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ module.exports = {
6262
name: 'css',
6363
message: 'Generate custom CSS files?',
6464
},
65-
{
66-
type: 'toggle',
67-
name: 'angular_ts',
68-
message: 'Generate an Angular TypeScript file?',
69-
},
7065
])
7166
.then((answers) => {
7267
answers.name = answers.name || answers.component.replace('ion-', '');

_templates/playground/new/index.md.ejs.t

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ import react_main_css from './react/main_css.md';
1212
import react from './react.md';
1313
<% } -%>
1414
import vue from './vue.md';
15-
<% if (css || angular_ts){ %>
15+
1616
import angular_example_component_html from './angular/example_component_html.md';
17-
<% } else { -%>
18-
import angular from './angular.md';
19-
<% } -%>
20-
<% if (angular_ts){ -%>
21-
import angular_example_component_ts from './angular/example_component_ts.md';
22-
<% } -%>
2317
<% if (css){ -%>
2418
import angular_example_component_css from './angular/example_component_css.md';
2519
<% } -%>
20+
import angular_example_component_ts from './angular/example_component_ts.md';
2621

2722
<Playground
2823
version="<%= version %>"
@@ -39,21 +34,15 @@ import angular_example_component_css from './angular/example_component_css.md';
3934
react,
4035
<% } -%>
4136
vue,
42-
<% if (angular_ts || css){ -%>
4337
angular: {
4438
files: {
4539
'src/app/example.component.html': angular_example_component_html,
46-
<% if (angular_ts){ -%>
47-
'src/app/example.component.ts': angular_example_component_ts,
48-
<% } -%>
4940
<% if (css){ -%>
5041
'src/app/example.component.css': angular_example_component_css,
5142
<% } -%>
43+
'src/app/example.component.ts': angular_example_component_ts,
5244
},
5345
},
54-
<% } else { -%>
55-
angular,
56-
<% } -%>
5746
}}
5847
src="usage/v<%= version %>/<%= name %>/<%= path %>/demo.html"
5948
/>

_templates/playground/new/react.md.ejs.t

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import './main.css';<% } %>
1111

1212
function Example() {
1313
return (
14-
<<%= pascalComponent %>></<%= pascalComponent %>>
14+
<>
15+
<<%= pascalComponent %>></<%= pascalComponent %>>
16+
</>
1517
);
1618
}
1719
export default Example;
1820
```
19-

docs/api/infinite-scroll.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Infinite Scrollコンポーネントは、ユーザーがページの下部ま
2121

2222
ユーザが定義された距離に達したときに、`ionInfinite` イベントに割り当てられた関数が呼び出されます。この関数がすべてのタスクを完了したら、無限スクロールインスタンスに対して `complete()` メソッドを呼び出す必要があります。
2323

24+
## Basic Usage
25+
2426
import Basic from '@site/static/usage/v8/infinite-scroll/basic/index.md';
2527

2628
<Basic />
@@ -118,4 +120,4 @@ interface InfiniteScrollCustomEvent extends CustomEvent {
118120
<CustomProps />
119121

120122
## Slots
121-
<Slots />
123+
<Slots />

docs/api/input-password-toggle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "ion-password-toggle"
2+
title: "ion-input-password-toggle"
33
---
44
import Props from '@ionic-internal/component-api/v8/input-password-toggle/props.md';
55
import Events from '@ionic-internal/component-api/v8/input-password-toggle/events.md';

docs/developing/android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import DocsCards from '@components/global/DocsCards';
1616

1717
:::info Looking for the legacy Android guide?
1818

19-
The Developing for Android guide has officially migrated to the [Capacitor documentation for Android](https://capacitorjs.com/docs/android). If you need to access the legacy documentation, you can find it under the [legacy developing for Android guide](/docs/v6/developing/android).
19+
The Developing for Android guide has officially migrated to the [Capacitor documentation for Android](https://capacitorjs.com/docs/android). If you need to access the legacy documentation, you can find it under the [legacy developing for Android guide](https://ionic-docs-o31kiyk8l-ionic1.vercel.app/docs/v6/developing/android).
2020

2121
:::
2222

@@ -30,7 +30,7 @@ The Developing for Android guide has officially migrated to the [Capacitor docum
3030
</DocsCard>
3131
<DocsCard
3232
header="Developing for Android with Cordova (Legacy)"
33-
href="https://github.com/docs/v6/developing/android"
33+
href="https://ionic-docs-o31kiyk8l-ionic1.vercel.app/docs/v6/developing/android"
3434
icon="/icons/native-cordova-bot.png"
3535
>
3636
<p>Learn the fundamentals you need to know to start building Android apps with Ionic Framework and Cordova.</p>

docs/developing/hardware-back-button.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ The `ionBackButton` event will not be emitted when running an app in a browser o
6767
<TabItem value="javascript">
6868
6969
```javascript
70-
document.addEventListener('ionBackButton', (ev) => {
71-
ev.detail.register(10, () => {
70+
document.addEventListener('ionBackButton', (event) => {
71+
event.detail.register(10, () => {
7272
console.log('Handler was called!');
7373
});
7474
});
@@ -108,8 +108,8 @@ constructor(private platform: Platform) {
108108
<TabItem value="react">
109109
110110
```tsx
111-
document.addEventListener('ionBackButton', (ev) => {
112-
ev.detail.register(10, () => {
111+
document.addEventListener('ionBackButton', (event) => {
112+
event.detail.register(10, () => {
113113
console.log('Handler was called!');
114114
});
115115
});
@@ -157,12 +157,12 @@ export default {
157157
<TabItem value="javascript">
158158
159159
```javascript
160-
document.addEventListener('ionBackButton', (ev) => {
161-
ev.detail.register(5, () => {
160+
document.addEventListener('ionBackButton', (event) => {
161+
event.detail.register(5, () => {
162162
console.log('Another handler was called!');
163163
});
164164
165-
ev.detail.register(10, (processNextHandler) => {
165+
event.detail.register(10, (processNextHandler) => {
166166
console.log('Handler was called!');
167167
168168
processNextHandler();
@@ -216,12 +216,12 @@ constructor(private platform: Platform) {
216216
<TabItem value="react">
217217
218218
```tsx
219-
document.addEventListener('ionBackButton', (ev) => {
220-
ev.detail.register(5, () => {
219+
document.addEventListener('ionBackButton', (event) => {
220+
event.detail.register(5, () => {
221221
console.log('Another handler was called!');
222222
});
223223
224-
ev.detail.register(10, (processNextHandler) => {
224+
event.detail.register(10, (processNextHandler) => {
225225
console.log('Handler was called!');
226226
227227
processNextHandler();
@@ -261,16 +261,16 @@ export default {
261261
内部的には、Ionic Framework はハードウェアのバックボタンハンドラを管理するためにプライオリティキューに似たものを使用します。優先順位の値が最大のハンドラが最初に呼び出されます。同じ優先順位のハンドラが複数存在する場合、このキューに追加された同じ優先順位の _last_ handler が、最初に呼び出されるハンドラになります。
262262

263263
```javascript
264-
document.addEventListener('ionBackButton', (ev) => {
264+
document.addEventListener('ionBackButton', (event) => {
265265
// Handler A
266-
ev.detail.register(10, (processNextHandler) => {
266+
event.detail.register(10, (processNextHandler) => {
267267
console.log('Handler A was called!');
268268

269269
processNextHandler();
270270
});
271271

272272
// Handler B
273-
ev.detail.register(10, (processNextHandler) => {
273+
event.detail.register(10, (processNextHandler) => {
274274
console.log('Handler B was called!');
275275

276276
processNextHandler();
@@ -305,8 +305,8 @@ import { App } from '@capacitor/app';
305305
...
306306
307307
const routerEl = document.querySelector('ion-router');
308-
document.addEventListener('ionBackButton', (ev: BackButtonEvent) => {
309-
ev.detail.register(-1, () => {
308+
document.addEventListener('ionBackButton', (event: BackButtonEvent) => {
309+
event.detail.register(-1, () => {
310310
const path = window.location.pathname;
311311
if (path === routerEl.root) {
312312
App.exitApp();
@@ -368,8 +368,8 @@ import { App } from '@capacitor/app';
368368
...
369369
370370
const ionRouter = useIonRouter();
371-
document.addEventListener('ionBackButton', (ev) => {
372-
ev.detail.register(-1, () => {
371+
document.addEventListener('ionBackButton', (event) => {
372+
event.detail.register(-1, () => {
373373
if (!ionRouter.canGoBack()) {
374374
App.exitApp();
375375
}

docs/developing/ios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import DocsCards from '@components/global/DocsCards';
1717

1818
:::info Looking for the legacy iOS guide?
1919

20-
The Developing for iOS guide has officially migrated to the [Capacitor documentation for iOS](https://capacitorjs.com/docs/ios). If you need to access the legacy documentation, you can find it under the [legacy developing for iOS guide](/docs/v6/developing/ios).
20+
The Developing for iOS guide has officially migrated to the [Capacitor documentation for iOS](https://capacitorjs.com/docs/ios). If you need to access the legacy documentation, you can find it under the [legacy developing for iOS guide](https://ionic-docs-o31kiyk8l-ionic1.vercel.app/docs/v6/developing/ios).
2121

2222
:::
2323

@@ -31,7 +31,7 @@ The Developing for iOS guide has officially migrated to the [Capacitor documenta
3131
</DocsCard>
3232
<DocsCard
3333
header="Developing for iOS with Cordova (Legacy)"
34-
href="https://github.com/docs/v6/developing/ios"
34+
href="https://ionic-docs-o31kiyk8l-ionic1.vercel.app/docs/v6/developing/ios"
3535
icon="/icons/native-cordova-bot.png"
3636
>
3737
<p>Learn the fundamentals you need to know to start building iOS apps with Ionic Framework and Cordova.</p>

docs/developing/keyboard.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ When running an app in Capacitor or Cordova, it is possible to hide the accessor
9191
<TabItem value="javascript">
9292
9393
```javascript
94-
window.addEventListener('ionKeyboardDidShow', ev => {
95-
const { keyboardHeight } = ev;
94+
window.addEventListener('ionKeyboardDidShow', event => {
95+
const { keyboardHeight } = event;
9696
// Do something with the keyboard height such as translating an input above the keyboard.
9797
});
9898
@@ -109,8 +109,8 @@ import { Platform } from '@ionic/angular';
109109
...
110110
111111
constructor(private platform: Platform) {
112-
this.platform.keyboardDidShow.subscribe(ev => {
113-
const { keyboardHeight } = ev;
112+
this.platform.keyboardDidShow.subscribe(event => {
113+
const { keyboardHeight } = event;
114114
// Do something with the keyboard height such as translating an input above the keyboard.
115115
});
116116
@@ -128,8 +128,8 @@ import { Platform } from '@ionic/angular/standalone';
128128
...
129129
130130
constructor(private platform: Platform) {
131-
this.platform.keyboardDidShow.subscribe(ev => {
132-
const { keyboardHeight } = ev;
131+
this.platform.keyboardDidShow.subscribe(event => {
132+
const { keyboardHeight } = event;
133133
// Do something with the keyboard height such as translating an input above the keyboard.
134134
});
135135

docs/developing/tips.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ npm は最初に `package.lock.json` からパッケージのバージョンを
9696
選択できるコードエディターはたくさんあります。ここに私たちのお気に入りのいくつかがあります:
9797

9898
- [Visual Studio Code](https://code.visualstudio.com): a popular and free text editor made by Microsoft
99-
- [Atom](https://atom.io): a hackable text editor made by GitHub
10099
- [WebStorm](https://www.jetbrains.com/webstorm/): a powerful non-free editor by JetBrains
101100

102101
## デバッガの利用

0 commit comments

Comments
 (0)