From 6b61cd490d87c620533a3a79210c7c0ca96fdf56 Mon Sep 17 00:00:00 2001 From: Ahmed Abdelbaset Date: Wed, 16 Aug 2023 01:24:46 +0300 Subject: [PATCH 1/5] Annex to #6138 (#6226) * fix: wronge styles when applying RTL it was `top-0 left-0 ...` by wrong I made it `inset-x-0`. * fix wrong styles * fix wrong styles * style canary icon with RTL-friendly styles * chore: utilize mx-* instead of me-* & ms-* * utilize relative styles * chore: use mx-* instead of me-* & ms-* * style canary icon with RTL-frindly styles * Update OpenInTypeScriptPlayground.tsx --- src/components/Layout/HomeContent.js | 2 +- src/components/Layout/Sidebar/SidebarButton.tsx | 2 +- src/components/Layout/Sidebar/SidebarLink.tsx | 4 ++-- src/components/MDX/Sandpack/OpenInCodeSandboxButton.tsx | 2 +- src/components/MDX/Sandpack/OpenInTypeScriptPlayground.tsx | 2 +- src/components/MDX/Sandpack/ResetButton.tsx | 2 +- src/components/PageHeading.tsx | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Layout/HomeContent.js b/src/components/Layout/HomeContent.js index d395ff384..924b66f4c 100644 --- a/src/components/Layout/HomeContent.js +++ b/src/components/Layout/HomeContent.js @@ -849,7 +849,7 @@ function ExampleLayout({ {overlayStyles.map((styles, i) => (
))} diff --git a/src/components/Layout/Sidebar/SidebarButton.tsx b/src/components/Layout/Sidebar/SidebarButton.tsx index 7b9f027a8..dc1f29a8d 100644 --- a/src/components/Layout/Sidebar/SidebarButton.tsx +++ b/src/components/Layout/Sidebar/SidebarButton.tsx @@ -31,7 +31,7 @@ export function SidebarButton({ })}>
diff --git a/src/components/MDX/Sandpack/OpenInCodeSandboxButton.tsx b/src/components/MDX/Sandpack/OpenInCodeSandboxButton.tsx index f943ee6ff..78286aeaf 100644 --- a/src/components/MDX/Sandpack/OpenInCodeSandboxButton.tsx +++ b/src/components/MDX/Sandpack/OpenInCodeSandboxButton.tsx @@ -11,7 +11,7 @@ export const OpenInCodeSandboxButton = () => { className="text-sm text-primary dark:text-primary-dark inline-flex items-center hover:text-link duration-100 ease-in transition mx-1 ms-2 md:ms-1" title="Open in CodeSandbox"> diff --git a/src/components/MDX/Sandpack/OpenInTypeScriptPlayground.tsx b/src/components/MDX/Sandpack/OpenInTypeScriptPlayground.tsx index f4b7ba77d..7284912e3 100644 --- a/src/components/MDX/Sandpack/OpenInTypeScriptPlayground.tsx +++ b/src/components/MDX/Sandpack/OpenInTypeScriptPlayground.tsx @@ -16,7 +16,7 @@ export const OpenInTypeScriptPlaygroundButton = (props: {content: string}) => { target="_blank" rel="noreferrer"> diff --git a/src/components/MDX/Sandpack/ResetButton.tsx b/src/components/MDX/Sandpack/ResetButton.tsx index 243ce2349..0d1e22c80 100644 --- a/src/components/MDX/Sandpack/ResetButton.tsx +++ b/src/components/MDX/Sandpack/ResetButton.tsx @@ -15,7 +15,7 @@ export function ResetButton({onReset}: ResetButtonProps) { onClick={onReset} title="Reset Sandbox" type="button"> - Reset + Reset ); } diff --git a/src/components/PageHeading.tsx b/src/components/PageHeading.tsx index b6437b46b..076a38be9 100644 --- a/src/components/PageHeading.tsx +++ b/src/components/PageHeading.tsx @@ -35,13 +35,13 @@ function PageHeading({ {canary && ( )} {status ? —{status} : ''} {description && ( -

+

{description}

)} From 842c24c9aefaa60b7ae9b46b002bd1b3cf4d31f3 Mon Sep 17 00:00:00 2001 From: Thomas Charuel Date: Thu, 17 Aug 2023 04:17:59 +0200 Subject: [PATCH 2/5] Fix broken link for Typescript Discord invite (#6224) --- src/content/learn/typescript.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/learn/typescript.md b/src/content/learn/typescript.md index d437096e1..5695b755f 100644 --- a/src/content/learn/typescript.md +++ b/src/content/learn/typescript.md @@ -460,4 +460,4 @@ We recommend the following resources: - [React TypeScript Cheatsheet](https://react-typescript-cheatsheet.netlify.app/) is a community-maintained cheatsheet for using TypeScript with React, covering a lot of useful edge cases and providing more breadth than this document. - - [TypeScript Community Discord](discord.com/invite/typescript) is a great place to ask questions and get help with TypeScript and React issues. \ No newline at end of file + - [TypeScript Community Discord](https://discord.com/invite/typescript) is a great place to ask questions and get help with TypeScript and React issues. \ No newline at end of file From f67811befede7566393b0b8c7cf6f399069d4410 Mon Sep 17 00:00:00 2001 From: Luna Date: Mon, 21 Aug 2023 13:34:53 -0700 Subject: [PATCH 3/5] Clarify these features are not related to Next (#6229) Co-authored-by: Luna Wei --- src/content/reference/react/use-client.md | 8 +++++--- src/content/reference/react/use-server.md | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/content/reference/react/use-client.md b/src/content/reference/react/use-client.md index fc6173acb..f0510415b 100644 --- a/src/content/reference/react/use-client.md +++ b/src/content/reference/react/use-client.md @@ -51,7 +51,9 @@ When a file marked `'use client'` is imported from a server component, [compatib ## Usage {/*usage*/} +This section is a work in progress. -This section is incomplete. See also the [Next.js documentation for Server Components](https://beta.nextjs.org/docs/rendering/server-and-client-components). - - +This API can be used in any framework that supports React Server Components. You may find additional documentation from them. +* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials) +* More coming soon + \ No newline at end of file diff --git a/src/content/reference/react/use-server.md b/src/content/reference/react/use-server.md index 6b9e7df00..4acea191c 100644 --- a/src/content/reference/react/use-server.md +++ b/src/content/reference/react/use-server.md @@ -49,7 +49,9 @@ Alternatively, add `'use server';` at the very top of a file to mark all exports ## Usage {/*usage*/} +This section is a work in progress. -This section is incomplete. See also the [Next.js documentation for Server Components](https://beta.nextjs.org/docs/rendering/server-and-client-components). - - +This API can be used in any framework that supports React Server Components. You may find additional documentation from them. +* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials) +* More coming soon + \ No newline at end of file From 3189529259e89240a88c05680849ce4a8c454ed2 Mon Sep 17 00:00:00 2001 From: Eli White Date: Wed, 23 Aug 2023 14:53:20 -0700 Subject: [PATCH 4/5] Add React Native EU 2023 to the conferences page (#6254) React attends this conference hosted by Callstack. It's been on the page in previous years, missed it this year. https://www.react-native.eu/ --- src/content/community/conferences.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md index 2908f9cd0..974e4a825 100644 --- a/src/content/community/conferences.md +++ b/src/content/community/conferences.md @@ -15,8 +15,14 @@ August 17 & 18, 2023. Salt Lake City, UT, USA [Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/) +### React Native EU 2023 {/*react-native-eu-2023*/} +September 7 & 8, 2023. Wrocław, Poland + +[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu) + + ### React India 2023 {/*react-india-2023*/} -Oct 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day +October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day [Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w) From 74f97208ba16591e7fdc698bf642281d90629f6d Mon Sep 17 00:00:00 2001 From: Soichiro Miki Date: Mon, 28 Aug 2023 14:30:49 +0900 Subject: [PATCH 5/5] Resolve conflicts --- src/content/reference/react/use-client.md | 14 ++++---------- src/content/reference/react/use-server.md | 13 ++++--------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/content/reference/react/use-client.md b/src/content/reference/react/use-client.md index 12ec45b72..5f7b261d8 100644 --- a/src/content/reference/react/use-client.md +++ b/src/content/reference/react/use-client.md @@ -52,15 +52,9 @@ export default function RichTextEditor(props) { ## 使用法 {/*usage*/} -This section is a work in progress. +このセクションは未完成です。 -<<<<<<< HEAD -このセクションは未完成です。[Next.js のサーバコンポーネントに関するドキュメンテーション](https://beta.nextjs.org/docs/rendering/server-and-client-components)も参照してください。 - - -======= -This API can be used in any framework that supports React Server Components. You may find additional documentation from them. -* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials) -* More coming soon +この API は React Server Components を利用するフレームワークで使用できます。フレームワークごとの追加のドキュメントが公開されています。 +* [Next.js ドキュメント](https://nextjs.org/docs/getting-started/react-essentials) +* 今後追加予定 ->>>>>>> 3189529259e89240a88c05680849ce4a8c454ed2 diff --git a/src/content/reference/react/use-server.md b/src/content/reference/react/use-server.md index 7f5839412..58c89641b 100644 --- a/src/content/reference/react/use-server.md +++ b/src/content/reference/react/use-server.md @@ -49,14 +49,9 @@ async function addToCart(data) { ## 使用法 {/*usage*/} -This section is a work in progress. +このセクションは未完成です。 -<<<<<<< HEAD -このセクションは未完成です。[Next.js の Server Components についてのドキュメント](https://beta.nextjs.org/docs/rendering/server-and-client-components)も参照してください。 - -======= -This API can be used in any framework that supports React Server Components. You may find additional documentation from them. -* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials) -* More coming soon ->>>>>>> 3189529259e89240a88c05680849ce4a8c454ed2 +この API は React Server Components を利用するフレームワークで使用できます。フレームワークごとの追加のドキュメントが公開されています。 +* [Next.js ドキュメント](https://nextjs.org/docs/getting-started/react-essentials) +* 今後追加予定 \ No newline at end of file