Skip to content

Commit d4fea01

Browse files
authored
Merge branch 'main' into nc/internal-mirror
2 parents 02a60c2 + 9eca986 commit d4fea01

15 files changed

Lines changed: 113 additions & 12 deletions

docs/_integration-with-existing-apps-kotlin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class MyReactActivity : ReactActivity() {
424424
</TabItem>
425425
</Tabs>
426426

427-
As usual, here the [MainActivity.kt Community template file as reference](https://github.com/react-native-community/template/blob/0.77-stable/template/android/app/src/main/java/com/helloworld/MainApplication.kt)
427+
As usual, here the [MainActivity.kt Community template file as reference](https://github.com/react-native-community/template/blob/0.80-stable/template/android/app/src/main/java/com/helloworld/MainActivity.kt)
428428

429429
Whenever you create a new Activity, you need to add it to your `AndroidManifest.xml` file. You also need set the theme of `MyReactActivity` to `Theme.AppCompat.Light.NoActionBar` (or to any non-ActionBar theme) as otherwise your application will render an ActionBar on top of your React Native screen:
430430

docs/layout-props.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,21 @@ It works similarly to `height` in CSS, but in React Native you must use points o
661661

662662
---
663663

664+
### `isolation`
665+
666+
`isolation` lets you form a [stacking context](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_positioned_layout/Stacking_context). This prop is only available on the [New Architecture](/architecture/landing-page).
667+
668+
There are two values:
669+
670+
- `auto` (default): Does nothing.
671+
- `isolate`: Forms a stacking context.
672+
673+
| Type | Required |
674+
| ----------------------- | -------- |
675+
| enum('auto', 'isolate') | No |
676+
677+
---
678+
664679
### `justifyContent`
665680

666681
`justifyContent` aligns children in the main direction. For example, if children are flowing vertically, `justifyContent` controls how they align vertically. It works like `justify-content` in CSS (default: flex-start). See https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content for more details.

docs/safeareaview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ id: safeareaview
33
title: SafeAreaView
44
---
55

6+
> **Deprecated.** Use [react-native-safe-area-context](https://github.com/AppAndFlow/react-native-safe-area-context) instead.
7+
68
The purpose of `SafeAreaView` is to render content within the safe area boundaries of a device. It is currently only applicable to iOS devices with iOS version 11 or later.
79

810
`SafeAreaView` renders nested content and automatically applies padding to reflect the portion of the view that is not covered by navigation bars, tab bars, toolbars, and other ancestor views. Moreover, and most importantly, Safe Area's paddings reflect the physical limitation of the screen, such as rounded corners or camera notches (i.e. the sensor housing area on iPhone 13).

docs/the-new-architecture/using-codegen.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ npx @react-native-community/cli@latest init SampleApp --version 0.76.0
3939
"modules": {
4040
"TestModule": {
4141
"className": "<iOS-class-implementing-the-RCTModuleProvider-protocol>",
42-
"unstableRequiresMainQueueSetup": false
42+
"unstableRequiresMainQueueSetup": false,
4343
"conformsToProtocols": ["RCTImageURLLoader", "RCTURLRequestHandler", "RCTImageDataDecoder"],
4444
}
4545
},
@@ -54,7 +54,7 @@ npx @react-native-community/cli@latest init SampleApp --version 0.76.0
5454

5555
You can add this snippet to your app and customize the various fields:
5656

57-
- `name:` Name of the codegen config. This will customize the codgen output: the filenames, and the code.
57+
- `name:` Name of the codegen config. This will customize the codegen output: the filenames, and the code.
5858
- `type:`
5959
- `modules:` Only generate code for modules.
6060
- `components:` Only generate code for components.

docs/turbo-native-modules-ios.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,11 @@ Modify the `package.json` as it follows:
139139
"javaPackageName": "com.sampleapp.specs"
140140
}
141141
// highlight-add-start
142-
"ios":
142+
"ios": {
143143
"modulesProvider": {
144144
"NativeLocalStorage": "RCTNativeLocalStorage"
145145
}
146+
},
146147
// highlight-add-end
147148
},
148149

website/contributing/how-to-contribute-code.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Now you are set up to run several commands:
3232
- `yarn test-ios` runs the iOS test suite (macOS required).
3333
- `yarn build` builds all configured packages — in general, this command only needs to be run by CI ahead of publishing.
3434
- Packages which require a build are configured in [scripts/build/config.js](https://github.com/facebook/react-native/blob/main/scripts/build/config.js).
35+
- `yarn build-types` generates TypeScript types for the public API and updates the snapshot.
3536

3637
## Testing your Changes
3738

@@ -70,11 +71,12 @@ Code-level contributions to React Native generally come in the form of [a pull r
7071
3. If you've changed APIs, update the documentation.
7172
4. Ensure the test suite passes, either locally or on CI once you opened a pull request.
7273
5. Make sure your code lints (for example via `yarn lint --fix`).
73-
6. Push the changes to your fork.
74-
7. Create a pull request to the React Native repository.
75-
8. Review and address comments on your pull request.
76-
9. A bot may comment with suggestions. Generally we ask you to resolve these first before a maintainer will review your code.
77-
10. If you haven't already, submit the [Contributor License Agreement ("CLA")](#contributor-license-agreement).
74+
6. Verify if your code modifies the JS public API with `yarn build-types --validate`. If so, regenerate the snapshot using `yarn build-types`.
75+
7. Push the changes to your fork.
76+
8. Create a pull request to the React Native repository.
77+
9. Review and address comments on your pull request.
78+
10. A bot may comment with suggestions. Generally we ask you to resolve these first before a maintainer will review your code.
79+
11. If you haven't already, submit the [Contributor License Agreement ("CLA")](#contributor-license-agreement).
7880

7981
If all goes well, your pull request will be merged. If it is not merged, maintainers will do their best to explain their reasoning.
8082

website/versioned_docs/version-0.76/_integration-with-existing-apps-kotlin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class MyReactActivity : ReactActivity() {
424424
</TabItem>
425425
</Tabs>
426426

427-
As usual, here the [MainActivity.kt Community template file as reference](https://github.com/react-native-community/template/blob/0.76-stable/template/android/app/src/main/java/com/helloworld/MainApplication.kt)
427+
As usual, here the [MainActivity.kt Community template file as reference](https://github.com/react-native-community/template/blob/0.76-stable/template/android/app/src/main/java/com/helloworld/MainActivity.kt)
428428

429429
Whenever you create a new Activity, you need to add it to your `AndroidManifest.xml` file. You also need set the theme of `MyReactActivity` to `Theme.AppCompat.Light.NoActionBar` (or to any non-ActionBar theme) as otherwise your application will render an ActionBar on top of your React Native screen:
430430

website/versioned_docs/version-0.76/layout-props.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,21 @@ It works similarly to `height` in CSS, but in React Native you must use points o
651651

652652
---
653653

654+
### `isolation`
655+
656+
`isolation` lets you form a [stacking context](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_positioned_layout/Stacking_context). This prop is only available on the [New Architecture](/architecture/landing-page).
657+
658+
There are two values:
659+
660+
- `auto` (default): Does nothing.
661+
- `isolate`: Forms a stacking context.
662+
663+
| Type | Required |
664+
| ----------------------- | -------- |
665+
| enum('auto', 'isolate') | No |
666+
667+
---
668+
654669
### `justifyContent`
655670

656671
`justifyContent` aligns children in the main direction. For example, if children are flowing vertically, `justifyContent` controls how they align vertically. It works like `justify-content` in CSS (default: flex-start). See https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content for more details.

website/versioned_docs/version-0.77/_integration-with-existing-apps-kotlin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class MyReactActivity : ReactActivity() {
424424
</TabItem>
425425
</Tabs>
426426

427-
As usual, here the [MainActivity.kt Community template file as reference](https://github.com/react-native-community/template/blob/0.77-stable/template/android/app/src/main/java/com/helloworld/MainApplication.kt)
427+
As usual, here the [MainActivity.kt Community template file as reference](https://github.com/react-native-community/template/blob/0.77-stable/template/android/app/src/main/java/com/helloworld/MainActivity.kt)
428428

429429
Whenever you create a new Activity, you need to add it to your `AndroidManifest.xml` file. You also need set the theme of `MyReactActivity` to `Theme.AppCompat.Light.NoActionBar` (or to any non-ActionBar theme) as otherwise your application will render an ActionBar on top of your React Native screen:
430430

website/versioned_docs/version-0.77/layout-props.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,21 @@ It works similarly to `height` in CSS, but in React Native you must use points o
661661

662662
---
663663

664+
### `isolation`
665+
666+
`isolation` lets you form a [stacking context](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_positioned_layout/Stacking_context). This prop is only available on the [New Architecture](/architecture/landing-page).
667+
668+
There are two values:
669+
670+
- `auto` (default): Does nothing.
671+
- `isolate`: Forms a stacking context.
672+
673+
| Type | Required |
674+
| ----------------------- | -------- |
675+
| enum('auto', 'isolate') | No |
676+
677+
---
678+
664679
### `justifyContent`
665680

666681
`justifyContent` aligns children in the main direction. For example, if children are flowing vertically, `justifyContent` controls how they align vertically. It works like `justify-content` in CSS (default: flex-start). See https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content for more details.

0 commit comments

Comments
 (0)