From 4b0935b8c119d03278f709681c63ad8a940b22b5 Mon Sep 17 00:00:00 2001 From: Jordan Thomson Date: Mon, 20 Oct 2025 23:15:38 +1100 Subject: [PATCH 1/3] Add `` bullet to built-in components section (#8087) --- src/content/reference/react/components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/content/reference/react/components.md b/src/content/reference/react/components.md index 7ce3fab63..081f206c0 100644 --- a/src/content/reference/react/components.md +++ b/src/content/reference/react/components.md @@ -16,6 +16,7 @@ React exposes a few built-in components that you can use in your JSX. * [``](/reference/react/Profiler) lets you measure rendering performance of a React tree programmatically. * [``](/reference/react/Suspense) lets you display a fallback while the child components are loading. * [``](/reference/react/StrictMode) enables extra development-only checks that help you find bugs early. +* [``](/reference/react/Activity) lets you hide and restore the UI and internal state of its children. --- From 2c7798dcc51fbd07ebe41f49e5ded4839a029f72 Mon Sep 17 00:00:00 2001 From: lauren Date: Mon, 20 Oct 2025 13:31:58 -0400 Subject: [PATCH 2/3] Fix typo in react compiler blog post date (#8091) Fix a small typo --- src/sidebarBlog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sidebarBlog.json b/src/sidebarBlog.json index 56aa0ee2c..7bcd4a000 100644 --- a/src/sidebarBlog.json +++ b/src/sidebarBlog.json @@ -22,7 +22,7 @@ "title": "React Compiler v1.0", "titleForHomepage": "React Compiler v1.0", "icon": "blog", - "date": "October 8, 2025", + "date": "October 7, 2025", "path": "/blog/2025/10/07/react-compiler-1" }, { From 7eddf894cc889c65178287895a5c6727ebc17eae Mon Sep 17 00:00:00 2001 From: Soichiro Miki Date: Mon, 27 Oct 2025 14:12:09 +0900 Subject: [PATCH 3/3] Resolve conflicts --- src/content/reference/react/components.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/content/reference/react/components.md b/src/content/reference/react/components.md index eb4a94fd1..1dd6b4c99 100644 --- a/src/content/reference/react/components.md +++ b/src/content/reference/react/components.md @@ -12,18 +12,11 @@ React は、JSX で使用できるいくつかの組み込みコンポーネン ## 組み込みコンポーネント {/*built-in-components*/} -<<<<<<< HEAD * [``](/reference/react/Fragment) を使い、複数の JSX ノードをまとめることができます。別の書き方として `<>...` があります。 * [``](/reference/react/Profiler) を使い、React ツリーのレンダーパフォーマンスをプログラム上で測定することができます。 * [``](/reference/react/Suspense) を使い、子コンポーネントがロードされる間、フォールバックを表示することができます。 * [``](/reference/react/StrictMode) を使い、バグを早期に見つけるための追加の開発環境専用チェックを有効化します。 -======= -* [``](/reference/react/Fragment), alternatively written as `<>...`, lets you group multiple JSX nodes together. -* [``](/reference/react/Profiler) lets you measure rendering performance of a React tree programmatically. -* [``](/reference/react/Suspense) lets you display a fallback while the child components are loading. -* [``](/reference/react/StrictMode) enables extra development-only checks that help you find bugs early. -* [``](/reference/react/Activity) lets you hide and restore the UI and internal state of its children. ->>>>>>> 2c7798dcc51fbd07ebe41f49e5ded4839a029f72 +* [``](/reference/react/Activity) を使い、内部状態を復元しつつ UI の表示状態を切り替えます。 ---