Skip to content

Commit 73a3943

Browse files
committed
Merge branch 'facebook-main' into production
# Conflicts: # .gitignore
2 parents bfa6a44 + a99d2dd commit 73a3943

File tree

218 files changed

+45755
-123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+45755
-123
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,7 @@ cnwebsite/build/
5050
!.yarn/releases
5151
!.yarn/sdks
5252
!.yarn/versions
53+
54+
55+
# Generated file(s) for llms
56+
llms.txt

docs/accessibility.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,8 @@ When adding support for standard actions, `name` must be one of the following:
427427
- `'increment'` - Increment an adjustable component. On iOS, VoiceOver generates this action when the component has a role of `'adjustable'` and the user places focus on it and swipes upward. On Android, TalkBack generates this action when the user places accessibility focus on the component and presses the volume-up button.
428428
- `'decrement'` - Decrement an adjustable component. On iOS, VoiceOver generates this action when the component has a role of `'adjustable'` and the user places focus on it and swipes downward. On Android, TalkBack generates this action when the user places accessibility focus on the component and presses the volume-down button.
429429
- `'longpress'` - Android only - This action is generated when the user places accessibility focus on the component, then double-taps and holds one finger on the screen. This should perform the same action with, or without, assistive technology.
430+
- `'expand'` - Android only - This action "expands" the component so that TalkBack will announce an "expanded" hint.
431+
- `'collapse'` - Android only - This action "collapses" the component so that TalkBack will announce a "collapsed" hint.
430432

431433
The `label` field is optional for standard actions and is often unused by assistive technologies. For custom actions, it is a localized string containing a description of the action to be presented to the user.
432434

docs/fabric-native-components.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,20 @@ Use this specification for our WebView Component:
6060
<TabItem value="typescript">
6161

6262
```typescript title="Demo/specs/WebViewNativeComponent.ts"
63-
import type {HostComponent, ViewProps} from 'react-native';
64-
import type {BubblingEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
65-
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
63+
import type {
64+
CodegenTypes,
65+
HostComponent,
66+
ViewProps,
67+
} from 'react-native';
68+
import {codegenNativeComponent} from 'react-native';
6669

6770
type WebViewScriptLoadedEvent = {
6871
result: 'success' | 'error';
6972
};
7073

7174
export interface NativeProps extends ViewProps {
7275
sourceURL?: string;
73-
onScriptLoaded?: BubblingEventHandler<WebViewScriptLoadedEvent> | null;
76+
onScriptLoaded?: CodegenTypes.BubblingEventHandler<WebViewScriptLoadedEvent> | null;
7477
}
7578

7679
export default codegenNativeComponent<NativeProps>(
@@ -84,9 +87,8 @@ export default codegenNativeComponent<NativeProps>(
8487
```ts title="Demo/RCTWebView/js/RCTWebViewNativeComponent.js":
8588
// @flow strict-local
8689

87-
import type {HostComponent, ViewProps} from 'react-native';
88-
import type {BubblingEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
89-
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
90+
import type {CodegenTypes, HostComponent, ViewProps} from 'react-native';
91+
import {codegenNativeComponent} from 'react-native';
9092

9193
type WebViewScriptLoadedEvent = $ReadOnly<{|
9294
result: "success" | "error",
@@ -95,7 +97,7 @@ type WebViewScriptLoadedEvent = $ReadOnly<{|
9597
type NativeProps = $ReadOnly<{|
9698
...ViewProps,
9799
sourceURL?: string;
98-
onScriptLoaded?: BubblingEventHandler<WebViewScriptLoadedEvent>?;
100+
onScriptLoaded?: CodegenTypes.BubblingEventHandler<WebViewScriptLoadedEvent>?;
99101
|}>;
100102

101103
export default (codegenNativeComponent<NativeProps>(

docs/headless-js-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import com.facebook.react.bridge.Arguments
7676
import com.facebook.react.jstasks.HeadlessJsTaskConfig
7777

7878
class MyTaskService : HeadlessJsTaskService() {
79-
override fun getTaskConfig(intent: Intent): HeadlessJsTaskConfig? {
79+
override fun getTaskConfig(intent: Intent?): HeadlessJsTaskConfig? {
8080
return intent.extras?.let {
8181
HeadlessJsTaskConfig(
8282
"SomeTaskName",

docs/scrollview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ When `true`, shows a vertical scroll indicator.
640640

641641
---
642642

643-
### `snapToAlignment` <div class="label ios">iOS</div>
643+
### `snapToAlignment`
644644

645645
When `snapToInterval` is set, `snapToAlignment` will define the relationship of the snapping to the scroll view.
646646

docs/the-new-architecture/pure-cxx-modules.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,13 @@ Modify the `package.json` as it follows:
388388
"jsSrcsDir": "specs",
389389
"android": {
390390
"javaPackageName": "com.sampleapp.specs"
391-
}
392391
// highlight-add-start
393-
"ios":
392+
},
393+
"ios": {
394394
"modulesProvider": {
395395
"NativeSampleModule": "NativeSampleModuleProvider"
396396
}
397+
}
397398
// highlight-add-end
398399
},
399400

0 commit comments

Comments
 (0)