-
Notifications
You must be signed in to change notification settings - Fork 4.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: prepare docs for Docusaurus v3 upgrade - 2nd iteration #3830
Changes from 11 commits
2e5c5bb
7f63f7d
8194d1d
ee6f7c0
7501fae
bda8552
4667a2e
56797fd
277a5a8
9b45cc8
4d7f8e9
2311ae8
0a2b794
0e545b2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,7 +71,7 @@ To open the profile in Chrome DevTools: | |
2. Select the **Performance** tab. | ||
3. Right click and choose **Load profile...** | ||
|
||
<img src="/docs/assets/openChromeProfile.png" alt="Loading a performance profile on Chrome DevTools" /> | ||
<img src="/docs/assets/openChromeProfile.png" alt="Loading a performance profile on Chrome DevTools" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. unwanted extra space change list + image layout Before: https://reactnative.dev/docs/profile-hermes#open-the-downloaded-profile-in-chrome-devtools |
||
|
||
## How does the Hermes Profile Transformer work? | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -402,9 +402,9 @@ See what push permissions are currently enabled. | |
|
||
`callback` will be invoked with a `permissions` object: | ||
|
||
- `alert` :boolean | ||
- `badge` :boolean | ||
- `sound` :boolean | ||
- `alert: boolean` | ||
- `badge: boolean` | ||
- `sound: boolean` | ||
Comment on lines
-405
to
+407
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
This means you should avoid that in your code (unless escaped) otherwise those annotations will magically disappear when upgrading. I think it's reasonable to make the boolean part of the inline code block Before: https://reactnative.dev/docs/pushnotificationios#checkpermissions |
||
|
||
--- | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -751,7 +751,7 @@ Displays the scroll indicators momentarily. | |
scrollTo( | ||
options?: {x?: number, y?: number, animated?: boolean} | number, | ||
deprecatedX?: number, | ||
deprecatedAnimated?: boolean, | ||
deprecatedAnimated?: boolean, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. looks like a typo |
||
); | ||
``` | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -168,7 +168,7 @@ static SelectableBackground( | |
): ThemeAttributeBackgroundPropType; | ||
``` | ||
|
||
Creates an object that represents android theme's default background for selectable elements (?android:attr/selectableItemBackground). `rippleRadius` parameter controls the radius of the ripple effect. | ||
Creates an object that represents android theme's default background for selectable elements (`?android:attr/selectableItemBackground`). `rippleRadius` parameter controls the radius of the ripple effect. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
--- | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -160,7 +160,7 @@ React Native renderer leverages structural sharing to minimize the overhead of i | |
|
||
In the above example, React creates the new tree using these operations: | ||
|
||
1. CloneNode(**Node 3**, {backgroundColor: 'yellow'}) → **Node 3'** | ||
1. CloneNode(**Node 3**, `{backgroundColor: 'yellow'}`) → **Node 3'** | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. looks reasonable to wrap in code block
|
||
2. CloneNode(**Node 2**) → **Node 2'** | ||
3. AppendChild(**Node 2'**, **Node 3'**) | ||
4. AppendChild(**Node 2'**, **Node 4**) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,15 +53,15 @@ With this update, when you allow RTL layout for your app: | |
|
||
```objc | ||
// in AppDelegate.m | ||
[[RCTI18nUtil sharedInstance] allowRTL:YES]; | ||
[[RCTI18nUtil sharedInstance] allowRTL:YES]; | ||
``` | ||
|
||
Android: | ||
|
||
```java | ||
// in MainActivity.java | ||
I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance(); | ||
sharedI18nUtilInstance.allowRTL(context, true); | ||
I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance(); | ||
sharedI18nUtilInstance.allowRTL(context, true); | ||
Comment on lines
-56
to
+65
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
``` | ||
|
||
3. For Android, you need add `android:supportsRtl="true"` to the [`<application>`](https://developer.android.com/guide/topics/manifest/application-element.html) element in `AndroidManifest.xml` file. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -65,40 +65,40 @@ index e98ebb0..2fb6a11 100644 | |
--- a/ios/MyAwesomeApp/Info.plist | ||
+++ b/ios/MyAwesomeApp/Info.plist | ||
@@ -45,7 +45,7 @@ | ||
<dict> | ||
<key>localhost</key> | ||
<dict> | ||
- <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key> | ||
+ <key>NSExceptionAllowsInsecureHTTPLoads</key> | ||
<true/> | ||
</dict> | ||
</dict> | ||
<dict> | ||
<key>localhost</key> | ||
<dict> | ||
- <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key> | ||
+ <key>NSExceptionAllowsInsecureHTTPLoads</key> | ||
<true/> | ||
</dict> | ||
</dict> | ||
[...] | ||
``` | ||
|
||
All we need now is to apply this patch to your source files. While the old `react-native upgrade` process would have prompted you for any small difference, Git is able to merge most of the changes automatically using its 3-way merge algorithm and eventually leave us with familiar conflict delimiters: | ||
|
||
``` | ||
13B07F951A680F5B00A75B9A /* Release */ = { | ||
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||
13B07F951A680F5B00A75B9A /* Release */ = { | ||
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||
<<<<<<< ours | ||
CODE_SIGN_IDENTITY = "iPhone Developer"; | ||
FRAMEWORK_SEARCH_PATHS = ( | ||
"$(inherited)", | ||
"$(PROJECT_DIR)/HockeySDK.embeddedframework", | ||
"$(PROJECT_DIR)/HockeySDK-iOS/HockeySDK.embeddedframework", | ||
); | ||
CODE_SIGN_IDENTITY = "iPhone Developer"; | ||
FRAMEWORK_SEARCH_PATHS = ( | ||
"$(inherited)", | ||
"$(PROJECT_DIR)/HockeySDK.embeddedframework", | ||
"$(PROJECT_DIR)/HockeySDK-iOS/HockeySDK.embeddedframework", | ||
); | ||
======= | ||
CURRENT_PROJECT_VERSION = 1; | ||
CURRENT_PROJECT_VERSION = 1; | ||
>>>>>>> theirs | ||
HEADER_SEARCH_PATHS = ( | ||
"$(inherited)", | ||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, | ||
"$(SRCROOT)/../node_modules/react-native/React/**", | ||
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**", | ||
); | ||
HEADER_SEARCH_PATHS = ( | ||
"$(inherited)", | ||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, | ||
"$(SRCROOT)/../node_modules/react-native/React/**", | ||
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**", | ||
); | ||
``` | ||
Comment on lines
-68
to
102
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Replace tabs with space for consistency Avoid this unwanted extra spacing when upgrading: Before: https://reactnative.dev/blog/2016/12/05/easier-upgrades#how-does-it-work |
||
|
||
These conflicts are generally easy to reason about. The delimiter **ours** stands for "your team" whereas **theirs** could be seen as "the React Native team". | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -65,7 +65,7 @@ Android 12 introduces new [overscroll effect](https://developer.android.com/abou | |
|
||
#### Permission Updates | ||
|
||
Android 12 allows users of your app to only provide access to the approximate location if you request it with **`ACCESS_FINE_LOCATION`** permission**.** Learn more about it [here](https://developer.android.com/about/versions/12/approximate-location). | ||
Android 12 allows users of your app to only provide access to the approximate location if you request it with **`ACCESS_FINE_LOCATION`** permission. Learn more about it [here](https://developer.android.com/about/versions/12/approximate-location). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. looks like a typo |
||
|
||
Check out Google’s [detailed behavior changes](https://developer.android.com/about/versions/12/behavior-changes-all) for all apps running on Android 12. | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replace tab with space + reduce indentation for consistency
Avoid this extra spacing when upgrading:
Before: https://reactnative.dev/docs/native-components-ios#events
After: https://deploy-preview-3830--react-native.netlify.app/docs/native-components-ios#events