Skip to content

Commit 52c509c

Browse files
authored
Merge branch 'facebook:main' into production
2 parents d79a052 + 8e7b74a commit 52c509c

26 files changed

Lines changed: 99 additions & 121 deletions

docs/appstate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ AppState is frequently used to determine the intent and proper behavior when han
1313
- `background` - The app is running in the background. The user is either:
1414
- in another app
1515
- on the home screen
16-
- [Android] on another `Activity` (even if it was launched by your app)
16+
- [Android] on another `Activity`, including temporary system activities such
17+
as autofill credential pickers (even if launched by your app or the system)
1718
- [iOS] `inactive` - This is a state that occurs when transitioning between foreground & background, and during periods of inactivity such as entering the multitasking view, opening the Notification Center or in the event of an incoming call.
1819

1920
For more information, see [Apple's documentation](https://developer.apple.com/documentation/uikit/app_and_scenes/managing_your_app_s_life_cycle)

docs/scrollview.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,16 @@ Tag used to log scroll performance on this scroll view. Will force momentum even
608608

609609
---
610610

611+
### `scrollsChildToFocus` <div className="label android">Android</div>
612+
613+
When `true`, the ScrollView automatically scrolls to bring a focused child into view. Set to `false` to disable this behavior and take manual control of scroll position when focus changes.
614+
615+
| Type | Default |
616+
| ---- | ------- |
617+
| bool | `true` |
618+
619+
---
620+
611621
### `scrollToOverflowEnabled` <div className="label ios">iOS</div>
612622

613623
When `true`, the scroll view can be programmatically scrolled beyond its content size.

docs/text-style-props.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,8 @@ Specifies text alignment. On Android, the value 'justify' is only supported on O
859859

860860
### `textAlignVertical` <div className="label android">Android</div>
861861

862+
An alias for `verticalAlign` style prop, if you use both properties, `verticalAlign` will take precedence over `textAlignVertical`
863+
862864
| Type | Default |
863865
| ----------------------------------------------- | -------- |
864866
| enum(`'auto'`, `'top'`, `'bottom'`, `'center'`) | `'auto'` |

website/versioned_docs/version-0.77/appstate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ AppState is frequently used to determine the intent and proper behavior when han
1313
- `background` - The app is running in the background. The user is either:
1414
- in another app
1515
- on the home screen
16-
- [Android] on another `Activity` (even if it was launched by your app)
16+
- [Android] on another `Activity`, including temporary system activities such
17+
as autofill credential pickers (even if launched by your app or the system)
1718
- [iOS] `inactive` - This is a state that occurs when transitioning between foreground & background, and during periods of inactivity such as entering the multitasking view, opening the Notification Center or in the event of an incoming call.
1819

1920
For more information, see [Apple's documentation](https://developer.apple.com/documentation/uikit/app_and_scenes/managing_your_app_s_life_cycle)

website/versioned_docs/version-0.77/text-style-props.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,8 @@ Specifies text alignment. On Android, the value 'justify' is only supported on O
870870

871871
### `textAlignVertical` <div className="label android">Android</div>
872872

873+
An alias for `verticalAlign` style prop, if you use both properties, `verticalAlign` will take precedence over `textAlignVertical`
874+
873875
| Type | Default |
874876
| ----------------------------------------------- | -------- |
875877
| enum(`'auto'`, `'top'`, `'bottom'`, `'center'`) | `'auto'` |

website/versioned_docs/version-0.78/appstate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ AppState is frequently used to determine the intent and proper behavior when han
1313
- `background` - The app is running in the background. The user is either:
1414
- in another app
1515
- on the home screen
16-
- [Android] on another `Activity` (even if it was launched by your app)
16+
- [Android] on another `Activity`, including temporary system activities such
17+
as autofill credential pickers (even if launched by your app or the system)
1718
- [iOS] `inactive` - This is a state that occurs when transitioning between foreground & background, and during periods of inactivity such as entering the multitasking view, opening the Notification Center or in the event of an incoming call.
1819

1920
For more information, see [Apple's documentation](https://developer.apple.com/documentation/uikit/app_and_scenes/managing_your_app_s_life_cycle)

website/versioned_docs/version-0.78/text-style-props.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,8 @@ Specifies text alignment. On Android, the value 'justify' is only supported on O
872872

873873
### `textAlignVertical` <div className="label android">Android</div>
874874

875+
An alias for `verticalAlign` style prop, if you use both properties, `verticalAlign` will take precedence over `textAlignVertical`
876+
875877
| Type | Default |
876878
| ----------------------------------------------- | -------- |
877879
| enum(`'auto'`, `'top'`, `'bottom'`, `'center'`) | `'auto'` |

website/versioned_docs/version-0.79/appstate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ AppState is frequently used to determine the intent and proper behavior when han
1313
- `background` - The app is running in the background. The user is either:
1414
- in another app
1515
- on the home screen
16-
- [Android] on another `Activity` (even if it was launched by your app)
16+
- [Android] on another `Activity`, including temporary system activities such
17+
as autofill credential pickers (even if launched by your app or the system)
1718
- [iOS] `inactive` - This is a state that occurs when transitioning between foreground & background, and during periods of inactivity such as entering the multitasking view, opening the Notification Center or in the event of an incoming call.
1819

1920
For more information, see [Apple's documentation](https://developer.apple.com/documentation/uikit/app_and_scenes/managing_your_app_s_life_cycle)

website/versioned_docs/version-0.79/text-style-props.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,8 @@ Specifies text alignment. On Android, the value 'justify' is only supported on O
872872

873873
### `textAlignVertical` <div className="label android">Android</div>
874874

875+
An alias for `verticalAlign` style prop, if you use both properties, `verticalAlign` will take precedence over `textAlignVertical`
876+
875877
| Type | Default |
876878
| ----------------------------------------------- | -------- |
877879
| enum(`'auto'`, `'top'`, `'bottom'`, `'center'`) | `'auto'` |

website/versioned_docs/version-0.80/appstate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ AppState is frequently used to determine the intent and proper behavior when han
1313
- `background` - The app is running in the background. The user is either:
1414
- in another app
1515
- on the home screen
16-
- [Android] on another `Activity` (even if it was launched by your app)
16+
- [Android] on another `Activity`, including temporary system activities such
17+
as autofill credential pickers (even if launched by your app or the system)
1718
- [iOS] `inactive` - This is a state that occurs when transitioning between foreground & background, and during periods of inactivity such as entering the multitasking view, opening the Notification Center or in the event of an incoming call.
1819

1920
For more information, see [Apple's documentation](https://developer.apple.com/documentation/uikit/app_and_scenes/managing_your_app_s_life_cycle)

0 commit comments

Comments
 (0)