Skip to content

Commit acbebea

Browse files
committed
Merge branch 'main' into translation/jp
# Conflicts: # docs/updating/8-0.md # scripts/cli.mjs # static/code/stackblitz/v7/angular/package.json # static/code/stackblitz/v7/react/package-lock.json # static/code/stackblitz/v7/vue/package-lock.json # static/code/stackblitz/v8/angular/package.json # static/code/stackblitz/v8/html/package.json # static/code/stackblitz/v8/react/package-lock.json # static/code/stackblitz/v8/react/package.json # static/code/stackblitz/v8/vue/package-lock.json # static/code/stackblitz/v8/vue/package.json # static/usage/v8/fab/before-content/angular/example_component_ts.md # static/usage/v8/fab/before-content/index.md
2 parents d1189c2 + 7f91361 commit acbebea

File tree

528 files changed

+12663
-3009
lines changed

Some content is hidden

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

528 files changed

+12663
-3009
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,4 @@ The Ionic documentation's `main` branch is deployed automatically and separately
178178

179179
This repo is licensed and managed separately from Ionic itself.
180180

181-
By contributing to this repo, you agree to have your contributions licensed under the Apache 2.0 license. See [LICENSE](../LICENSE) for the full license text.
181+
By contributing to this repo, you agree to have your contributions licensed under the Apache 2.0 license. See [LICENSE](LICENSE) for the full license text.

docs/angular/navigation.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,10 @@ Developers can use the existing syntax for standalone component routing from Ang
193193
export class AppRoutingModule {}
194194
```
195195

196+
:::tip
197+
If you are using `routerLink`, `routerDirection`, or `routerAction` be sure to also import the `IonRouterLink` directive for Ionic components or the `IonRouterLinkWithHref` directive for `<a>` elements. An example of this is available in the [Ionic Angular Build Options docs](./build-options.md#migrating-from-modules-to-standalone).
198+
:::
199+
196200
To get started with standalone components [visit Angular's official docs](https://angular.io/guide/standalone-components).
197201

198202
## Live Example

docs/angular/slides.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The `ion-slides` component had additional styling that helped create a native lo
101101

102102
```css
103103
swiper-container {
104-
--swiper-pagination-bullet-inactive-color: var(--ion-color-step-200, #cccccc);
104+
--swiper-pagination-bullet-inactive-color: var(--ion-text-color-step-800, #cccccc);
105105
--swiper-pagination-color: var(--ion-color-primary, #0054e9);
106106
--swiper-pagination-progressbar-bg-color: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.25);
107107
--swiper-scrollbar-bg-color: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.1);

docs/api/accordion.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,19 +170,19 @@ import AccessibilityAnimations from '@site/static/usage/v8/accordion/accessibili
170170

171171
<AccessibilityAnimations />
172172

173-
### キーボードナビゲーション
173+
### キーボードインタラクション
174174

175175
`ion-accordion-group` の中で使用する場合、`ion-accordion` はキーボードによる操作を完全にサポートしています。次の表は、それぞれのキーが何をするのかの詳細です。
176176

177-
| Key | Function |
178-
| ------------------ | ------------------------------------------------------------ |
179-
| `Space` or `Enter` | When focus is on the accordion header, the accordion will collapse or expand depending on the state of the component. |
180-
| `Tab` | Moves focus to the next focusable element. |
181-
| `Shift` + `Tab` | Moves focus to the previous focusable element. |
182-
| `Down Arrow` | - When focus is on an accordion header, moves focus to the next accordion header. <br />- When focus is on the last accordion header, moves focus to the first accordion header. |
183-
| `Up Arrow` | - When focus is on an accordion header, moves focus to the previous accordion header. <br />- When focus is on the first accordion header, moves focus to the last accordion header. |
184-
| `Home` | When focus is on an accordion header, moves focus to the first accordion header. |
185-
| `End` | When focus is on an accordion header, moves focus to the last accordion header. |
177+
| Key | Description |
178+
| ------------------------------------ | ------------------------------------------------------------ |
179+
| <kbd>Space</kbd> or <kbd>Enter</kbd> | When focus is on the accordion header, the accordion will collapse or expand depending on the state of the component. |
180+
| <kbd>Tab</kbd> | Moves focus to the next focusable element. |
181+
| <kbd>Shift</kbd> + <kbd>Tab</kbd> | Moves focus to the previous focusable element. |
182+
| <kbd>Down Arrow</kbd> | - When focus is on an accordion header, moves focus to the next accordion header. <br />- When focus is on the last accordion header, moves focus to the first accordion header. |
183+
| <kbd>Up Arrow</kbd> | - When focus is on an accordion header, moves focus to the previous accordion header. <br />- When focus is on the first accordion header, moves focus to the last accordion header. |
184+
| <kbd>Home</kbd> | When focus is on an accordion header, moves focus to the first accordion header. |
185+
| <kbd>End</kbd> | When focus is on an accordion header, moves focus to the last accordion header. |
186186

187187
## パフォーマンス
188188

docs/api/app.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ import Slots from '@ionic-internal/component-api/v8/app/slots.md';
1515

1616
import EncapsulationPill from '@components/page/api/EncapsulationPill';
1717

18-
19-
AppはIonicアプリケーションのコンテナ要素です。プロジェクトごとに `<ion-app>` 要素は1つだけにしてください。アプリケーションには、menus, headers, content, footersなど、多くのIonicコンポーネントを含めることができます。オーバーレイコンポーネントは、表示されるときに `<ion-app>` に追加されます。
18+
AppはIonicアプリケーションのコンテナ要素です。1つのプロジェクトにつき`<ion-app>`要素は1つだけです。アプリはメニュー、ヘッダー、コンテンツ、フッターなど多くのIonicコンポーネントを持つことができます。オーバーレイコンポーネントは表示時に `<ion-app>` に追加されます。
2019

2120
`ion-app`を使用すると、以下の動作が可能になります。
2221

@@ -27,6 +26,13 @@ AppはIonicアプリケーションのコンテナ要素です。プロジェク
2726
* Material Design モードでのボタン操作時の[Ripple effect](./リップルエフェクト) が使えます。
2827
* Ionicアプリの使用感をよりネイティブなものにする、その他のタップやフォーカスのユーティリティが使えます。
2928

29+
## Programmatic Focus
30+
31+
Ionic offers focus utilities for components with the `ion-focusable` class. These utilities automatically manage focus for components when certain keyboard keys, like <kbd>Tab</kbd>, are pressed. Components can also be programmatically focused in response to user actions using the `setFocus` method from `ion-app`.
32+
33+
import SetFocus from '@site/static/usage/v8/app/set-focus/index.md';
34+
35+
<SetFocus />
3036

3137
## プロパティ
3238
<Props />

docs/api/datetime.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Ionic Frameworkでは、[Intl.DatetimeFormat](https://developer.mozilla.org/en-U
204204

205205
### 月と年の選択
206206

207-
月と年の選択は、 `presentation` プロパティに `month-year` , `year-month` , `month` , または `year` を渡すことで行うことができます。
207+
月と年の選択は、 `presentation` プロパティに `month-year` , `month` , または `year` を渡すことで行うことができます。
208208

209209
この例では、 `month-year` を設定した datetime を示しています。
210210

@@ -416,30 +416,30 @@ JavaScriptで日付を扱うために [date-fns](https://date-fns.org) を使う
416416

417417
## アクセシビリティ
418418

419-
### キーボードナビゲーション
419+
### キーボードインタラクション
420420

421421
`ion-datetime` は、コンポーネント内のフォーカス可能な要素間を移動するためのフルキーボードサポートを備えています。次の表は、それぞれのキーが何をするのかの詳細です。
422422

423-
| Key | Function |
424-
| ------------------ | ------------------------------------------------------------ |
425-
| `Tab` | Moves focus to the next focusable element. |
426-
| `Shift` + `Tab` | Moves focus to the previous focusable element. |
427-
| `Space` or `Enter` | Clicks the focusable element. |
423+
| Key | Description |
424+
| ------------------------------------ | ---------------------------------------------- |
425+
| <kbd>Tab</kbd> | Moves focus to the next focusable element. |
426+
| <kbd>Shift</kbd> + <kbd>Tab</kbd> | Moves focus to the previous focusable element. |
427+
| <kbd>Space</kbd> or <kbd>Enter</kbd> | Clicks the focusable element. |
428428

429429
#### 日付の表示
430430

431-
| Key | Function |
432-
| ------------------ | ------------------------------------------------------------ |
433-
| `ArrowUp` | Moves focus to the same day of the previous week. |
434-
| `ArrowDown` | Moves focus to the same day of the next week. |
435-
| `ArrowRight` | Moves focus to the next day. |
436-
| `ArrowLeft` | Moves focus to the previous day. |
437-
| `Home` | Moves focus to the first day of the current week. |
438-
| `End` | Moves focus to the last day of the current week. |
439-
| `PageUp` | Changes the grid of dates to the previous month. |
440-
| `PageDown` | Changes the grid of dates to the next month. |
441-
| `Shift` + `PageUp` | Changes the grid of dates to the previous year. |
442-
| `Shift` + `PageDown` | Changes the grid of dates to the next year. |
431+
| Key | Description |
432+
| -------------------------------------- | ------------------------------------------------- |
433+
| <kbd>ArrowUp</kbd> | Moves focus to the same day of the previous week. |
434+
| <kbd>ArrowDown</kbd> | Moves focus to the same day of the next week. |
435+
| <kbd>ArrowRight</kbd> | Moves focus to the next day. |
436+
| <kbd>ArrowLeft</kbd> | Moves focus to the previous day. |
437+
| <kbd>Home</kbd> | Moves focus to the first day of the current week. |
438+
| <kbd>End</kbd> | Moves focus to the last day of the current week. |
439+
| <kbd>PageUp</kbd> | Changes the grid of dates to the previous month. |
440+
| <kbd>PageDown</kbd> | Changes the grid of dates to the next month. |
441+
| <kbd>Shift</kbd> + <kbd>PageUp</kbd> | Changes the grid of dates to the previous year. |
442+
| <kbd>Shift</kbd> + <kbd>PageDown</kbd> | Changes the grid of dates to the next year. |
443443

444444
#### 時刻、月、年のホイール
445445

docs/api/input.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,11 @@ import Clear from '@site/static/usage/v8/input/clear/index.md';
8383

8484
Material Design では、Inputに塗りつぶしのスタイルが用意されています。Inputの `fill` プロパティは `"solid"` または `"outline"` のいずれかに設定することができます。
8585

86-
`fill` スタイルはInputコンテナを視覚的に定義するため、`fill` を使用するInputは `ion-item` で使用すべきではありません
86+
Filled inputs をiOSで使うためには、inputの `mode``md` に設定する必要があります
8787

88-
Filled inputs can be used on iOS by setting Input's `mode` to `md`.
88+
:::warning
89+
Inputs that use `fill` should not be used in an `ion-item` due to styling conflicts between the components.
90+
:::
8991

9092
import Fill from '@site/static/usage/v8/input/fill/index.md';
9193

@@ -160,7 +162,7 @@ In most cases, [Icon](./icon.md) components placed in these slots should have `a
160162
If slot content is meant to be interacted with, it should be wrapped in an interactive element such as a [Button](./button.md). This ensures that the content can be tabbed to.
161163
:::
162164

163-
import StartEndSlots from '@site/static/usage/v7/input/start-end-slots/index.md';
165+
import StartEndSlots from '@site/static/usage/v8/input/start-end-slots/index.md';
164166

165167
<StartEndSlots />
166168

0 commit comments

Comments
 (0)