Skip to content

Commit 7b4231f

Browse files
committed
Merge branch 'main' into tts-span
2 parents 24c182a + 114098d commit 7b4231f

File tree

173 files changed

+1984
-2003
lines changed

Some content is hidden

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

173 files changed

+1984
-2003
lines changed

.circleci/Dockerfiles/Dockerfile.android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# and build a Android application that can be used to run the
1515
# tests specified in the scripts/ directory.
1616
#
17-
FROM reactnativecommunity/react-native-android:6.0
17+
FROM reactnativecommunity/react-native-android:6.1
1818

1919
LABEL Description="React Native Android Test Image"
2020
LABEL maintainer="Héctor Ramos <[email protected]>"

.circleci/config.yml

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ executors:
102102
reactnativeandroid:
103103
<<: *defaults
104104
docker:
105-
- image: reactnativecommunity/react-native-android:6.0
105+
- image: reactnativecommunity/react-native-android:6.1
106106
resource_class: "xlarge"
107107
environment:
108108
- TERM: "dumb"
@@ -132,10 +132,7 @@ commands:
132132
type: string
133133
steps:
134134
- restore_cache:
135-
keys:
136-
- << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
137-
- << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-
138-
- << parameters.checkout_base_cache_key >>-{{ arch }}-
135+
key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
139136
- checkout
140137
- save_cache:
141138
key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
@@ -967,8 +964,8 @@ jobs:
967964
environment:
968965
- ANDROID_HOME: "C:\\Android\\android-sdk"
969966
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
970-
- ANDROID_BUILD_VERSION: 31
971-
- ANDROID_TOOLS_VERSION: 31.0.0
967+
- ANDROID_BUILD_VERSION: 33
968+
- ANDROID_TOOLS_VERSION: 33.0.0
972969
- GRADLE_OPTS: -Dorg.gradle.daemon=false
973970
steps:
974971
- checkout_code_with_cache
@@ -1495,43 +1492,6 @@ jobs:
14951492
-d "{\"event_type\": \"publish\", \"client_payload\": { \"version\": \"${CIRCLE_TAG:1}\" }}"
14961493
# END: Stable releases
14971494

1498-
# START: Stables and commitlies
1499-
- when:
1500-
condition:
1501-
or:
1502-
- equal: [ "release", << parameters.release_type >> ]
1503-
- equal: [ "dry-run", << parameters.release_type >> ]
1504-
steps:
1505-
- run:
1506-
name: Install dependencies
1507-
command: apt update && apt install -y jq jo
1508-
- run:
1509-
name: Create draft GitHub Release and upload Hermes binaries
1510-
command: |
1511-
RELEASE_VERSION=$(cat build/.version)
1512-
if [[ << parameters.release_type >> == "release" ]]; then
1513-
GIT_TAG=$CIRCLE_TAG
1514-
elif [[ << parameters.release_type >> == "dry-run" ]]; then
1515-
GIT_TAG=v1000.0.0
1516-
fi
1517-
1518-
ARTIFACTS=("")
1519-
for build_type in "Debug" "Release"; do
1520-
TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js \
1521-
--buildType $build_type \
1522-
--releaseVersion $RELEASE_VERSION)
1523-
1524-
ARTIFACTS+=("$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME")
1525-
done
1526-
1527-
./scripts/circleci/create_github_release.sh \
1528-
<< parameters.release_type >> \
1529-
$GIT_TAG \
1530-
$RELEASE_VERSION \
1531-
$GITHUB_TOKEN \
1532-
"${ARTIFACTS[@]}"
1533-
# END: Stable and commitlies
1534-
15351495
# -------------------------
15361496
# JOBS: Nightly
15371497
# -------------------------

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ untyped-import
7373
untyped-type-import
7474

7575
[version]
76-
^0.191.0
76+
^0.192.0

.flowconfig.android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ untyped-import
7373
untyped-type-import
7474

7575
[version]
76-
^0.191.0
76+
^0.192.0

BUCK

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ load(
1010
)
1111
load(
1212
"//tools/build_defs/oss:rn_defs.bzl",
13+
"ANDROID",
14+
"APPLE",
15+
"CXX",
1316
"HERMES_BYTECODE_VERSION",
1417
"IOS",
1518
"RCT_IMAGE_DATA_DECODER_SOCKET",
@@ -1172,6 +1175,7 @@ rn_apple_library(
11721175
],
11731176
),
11741177
autoglob = False,
1178+
extension_api_only = True,
11751179
frameworks = [
11761180
"Foundation",
11771181
],
@@ -1453,3 +1457,28 @@ rn_xplat_cxx_library2(
14531457
"//fbobjc/VendorLib/react-native-maps:react-native-maps",
14541458
],
14551459
)
1460+
1461+
rn_xplat_cxx_library2(
1462+
name = "RCTWebPerformance",
1463+
srcs = glob([
1464+
"Libraries/WebPerformance/**/*.cpp",
1465+
]),
1466+
header_namespace = "",
1467+
exported_headers = subdir_glob(
1468+
[("Libraries/WebPerformance", "*.h")],
1469+
prefix = "RCTWebPerformance",
1470+
),
1471+
fbandroid_compiler_flags = [
1472+
"-fexceptions",
1473+
"-frtti",
1474+
],
1475+
labels = [
1476+
"depslint_never_remove",
1477+
"pfh:ReactNative_CommonInfrastructurePlaceholder",
1478+
],
1479+
platforms = (ANDROID, APPLE, CXX),
1480+
visibility = ["PUBLIC"],
1481+
deps = [
1482+
":FBReactNativeSpecJSI",
1483+
],
1484+
)

CHANGELOG.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Changelog
22

3+
## v0.70.5
4+
5+
### Fixed
6+
7+
- Force dependencies resolution to minor series for 0.70 ([59407a4d34](https://github.com/facebook/react-native/commit/59407a4d3442dddb7f4c29049bf56bbc345f950f) by [@cortinico](https://github.com/cortinico))
8+
9+
## v0.70.4
10+
11+
### Changed
12+
13+
- Bump CLI to 9.2.1 ([a24c8946e0](https://github.com/facebook/react-native/commit/a24c8946e065ca89048e574abd7c2dc0434a350b) by [@kelset](https://github.com/kelset))
14+
- Bump react-native-codegen to 0.70.6 ([866021b58c](https://github.com/facebook/react-native/commit/866021b58c28a1f1c394294ddc4ed69d4ecef10a) by [@dmytrorykun](https://github.com/dmytrorykun))
15+
16+
### Fixed
17+
18+
- Load react-native.config.js from correct path during codegen ([74fda10702](https://github.com/facebook/react-native/commit/74fda1070266df13e1b58680a670dde3acf9d205) by [@krystofwoldrich](https://github.com/krystofwoldrich))
19+
20+
#### iOS specific
21+
22+
- Fix error in the Codegen template for ThirdPartyFabricComponentsProvider ([2f6b2127d9](https://github.com/facebook/react-native/commit/2f6b2127d933094f864523749d13cfbb140b5b63) by [@gispada](https://github.com/gispada))
23+
- Center text if line height isn't 0 ([70cc27c901](https://github.com/facebook/react-native/commit/70cc27c901aeb447910e30ac3ceac85990d3c16d) by [@sammy-SC](https://github.com/sammy-SC))
24+
325
## v0.70.3
426

527
### Fixed
@@ -251,6 +273,12 @@
251273
- Add GitHub token permissions for workflows ([3da3d82320](https://github.com/facebook/react-native/commit/3da3d82320bd035c6bd361a82ea12a70dba4e851) by [@varunsh-coder](https://github.com/varunsh-coder))
252274
- Bump RCT-Folly to 2021-07-22 ([68f3a42fc7](https://github.com/facebook/react-native/commit/68f3a42fc7380051714253f43b42175de361f8bd) by [@luissantana](https://github.com/luissantana))
253275

276+
## v0.69.7
277+
278+
### Fixed
279+
280+
- Force dependencies resolution to minor series for 0.69 ([c4da74c463](https://github.com/facebook/react-native/commit/c4da74c4636cbbd6bbf681d39a8a8cca49f11f56) by [@Titozzz](https://github.com/Titozzz))
281+
254282
## v0.69.6
255283

256284
### Changed
@@ -545,6 +573,12 @@
545573

546574
- Encode URL params in URLSearchParams.toString() ([1042a8012f](https://github.com/facebook/react-native/commit/1042a8012fb472bd5c882b469fe507dd6279d562) by [@sshic](https://github.com/sshic))
547575

576+
## v0.68.5
577+
578+
### Fixed
579+
580+
- Force dependencies resolution to minor series for 0.68 ([edcb3ca996](https://github.com/facebook/react-native/commit/edcb3ca996fb3296762af300a36c1d46356f1b24) by [@Titozzz](https://github.com/Titozzz))
581+
548582
## v0.68.4
549583

550584
### Changed
@@ -807,6 +841,13 @@
807841

808842
- Remove RCTUIManagerObserver from RCTNativeAnimatedTurboModule ([e9ed115bab](https://github.com/facebook/react-native/commit/e9ed115babbc82968380dae22fa928d4ce3cd6da) by [@p-sun](https://github.com/p-sun))
809843

844+
## v0.67.5
845+
846+
🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
847+
848+
### Fixed
849+
850+
- Force dependencies resolution to minor series for 0.67 ([9f2acda1b8](https://github.com/facebook/react-native/commit/9f2acda1b807e790b3e7562ce3436b93bcc2ad09) by [@cortinico](https://github.com/cortinico))
810851

811852
## v0.67.4
812853

@@ -949,6 +990,14 @@
949990

950991
- Avoiding logging root view params outside of dev / debug mode builds ([e612d3a116](https://github.com/facebook/react-native/commit/e612d3a116f39ab354169643bab0d4bb9cfc1a85) by [@sterlingwes](https://github.com/sterlingwes))
951992

993+
## v0.66.5
994+
995+
🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
996+
997+
### Fixed
998+
999+
- Force dependencies resolution to minor series for 0.66 ([201824c89e](https://github.com/facebook/react-native/commit/201824c89ecebd749ba7e603415edbe6a5b9b73d) by [@cortinico](https://github.com/cortinico))
1000+
9521001
## v0.66.4
9531002

9541003
### Fixed
@@ -1119,6 +1168,14 @@
11191168
- <TextInput> content is reset when emoji is entered at the max length ([f3b8d4976f](https://github.com/facebook/react-native/commit/f3b8d4976f8608c2cda1f071923f14b6d4538967))
11201169
- Use `actionName` in accessibility event callback ([fed6ad5bad](https://github.com/facebook/react-native/commit/fed6ad5badb4196a1895370fc81c522572cb34b4) by [@ShikaSD](https://github.com/ShikaSD))
11211170

1171+
## v0.65.3
1172+
1173+
🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
1174+
1175+
### Fixed
1176+
1177+
- Force dependencies resolution to minor series for 0.65 ([9548eaea74](https://github.com/facebook/react-native/commit/9548eaea74c6ad242c015d1984503c4b7eb19b6f) by [@kelset](https://github.com/kelset))
1178+
11221179
## v0.65.2
11231180

11241181
### Fixed
@@ -1358,6 +1415,15 @@
13581415
- Fix builds on Xcode 12.5 ([36b58a824e](https://github.com/facebook/react-native/commit/36b58a824ea20daa22fe7c528a3bf0ff4e6a4cb5) by [@PeteTheHeat](https://github.com/PeteTheHeat))
13591416
- Fix running React Native project with Xcode 12 in Release on iPhone Simulator ([fdcacd7f76](https://github.com/facebook/react-native/commit/fdcacd7f76ea8ca6dafda32ac431c8adc7bdad00) by [@grabbou](https://github.com/grabbou))
13601417

1418+
## v0.64.4
1419+
1420+
🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
1421+
1422+
### Fixed
1423+
1424+
- Add an afterEvaluate to solve AGP 4.1.x configuration resolution ([667f1bd21a](https://github.com/facebook/react-native/commit/667f1bd21abfdda19e56f8bbf0520fddba3102ed) by [@cortinico](https://github.com/cortinico))
1425+
- Force dependencies resolution to minor series for 0.64 ([a6a183ad81](https://github.com/facebook/react-native/commit/a6a183ad8106d67e3befce842138e82fb1e136fd) by [@kelset](https://github.com/kelset))
1426+
13611427
## v0.64.3
13621428

13631429
### Fixed
@@ -1621,6 +1687,15 @@
16211687
- Fix crash inside RCTRedBox when trying to present same UIViewController twice ([46c77dc296](https://github.com/facebook/react-native/commit/46c77dc296dfab754356cd9346a01dae8d4869f4) by [@sammy-SC](https://github.com/sammy-SC))
16221688
- Fix outdated CocoaPods version requirement in a React.podspec ([8a6ac1fef3](https://github.com/facebook/react-native/commit/8a6ac1fef369071405a3bf14a89924c66f28d192) by [@sunnylqm](https://github.com/sunnylqm))
16231689

1690+
## v0.63.5
1691+
1692+
🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
1693+
1694+
### Fixed
1695+
1696+
- Add an afterEvaluate to solve AGP 3.x configuration resolution ([473a36099c](https://github.com/facebook/react-native/commit/473a36099c80de08591e3cb51687f7d531145ee3) by [@cortinico](https://github.com/cortinico))
1697+
- Force dependencies resolution to minor series for 0.63 ([28cc286cc4](https://github.com/facebook/react-native/commit/28cc286cc4d43b9fe5153d779ea3eecf4d72c51e) by [@cortinico](https://github.com/cortinico))
1698+
16241699
## v0.63.4
16251700

16261701
### Changed

Libraries/ActionSheetIOS/React-RCTActionSheet.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
2323
s.homepage = "https://reactnative.dev/"
2424
s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
2525
s.license = package["license"]
26-
s.author = "Facebook, Inc. and its affiliates"
26+
s.author = "Meta Platforms, Inc. and its affiliates"
2727
s.platforms = { :ios => "12.4" }
2828
s.source = source
2929
s.source_files = "*.{m}"

Libraries/AppDelegate/React-RCTAppDelegate.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
4646
s.homepage = "https://reactnative.dev/"
4747
s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
4848
s.license = package["license"]
49-
s.author = "Facebook, Inc. and its affiliates"
49+
s.author = "Meta Platforms, Inc. and its affiliates"
5050
s.platforms = { :ios => "12.4" }
5151
s.source = source
5252
s.source_files = "**/*.{c,h,m,mm,S,cpp}"

Libraries/BatchedBridge/MessageQueue.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ class MessageQueue {
381381
return (
382382
// $FlowFixMe[cannot-resolve-name]
383383
typeof DebuggerInternal !== 'undefined' &&
384+
// $FlowFixMe[cannot-resolve-name]
384385
DebuggerInternal.shouldPauseOnThrow === true
385386
);
386387
}

Libraries/Blob/React-RCTBlob.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
2525
s.summary = "An API for displaying iOS action sheets and share sheets."
2626
s.homepage = "https://reactnative.dev/"
2727
s.license = package["license"]
28-
s.author = "Facebook, Inc. and its affiliates"
28+
s.author = "Meta Platforms, Inc. and its affiliates"
2929
s.platforms = { :ios => "12.4" }
3030
s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness'
3131
s.source = source

Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import dismissKeyboard from '../../Utilities/dismissKeyboard';
2121
import Platform from '../../Utilities/Platform';
2222
import StatusBar from '../StatusBar/StatusBar';
2323
import View from '../View/View';
24+
import type {AccessibilityRole} from '../../Components/View/ViewAccessibility';
2425
import AndroidDrawerLayoutNativeComponent, {
2526
Commands,
2627
} from './AndroidDrawerLayoutNativeComponent';
@@ -36,6 +37,8 @@ type DrawerSlideEvent = $ReadOnly<{|
3637
|}>;
3738

3839
type Props = $ReadOnly<{|
40+
accessibilityRole?: ?AccessibilityRole,
41+
3942
/**
4043
* Determines whether the keyboard gets dismissed in response to a drag.
4144
* - 'none' (the default), drags do not dismiss the keyboard.

Libraries/Components/TextInput/TextInput.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,6 +1602,7 @@ const ExportedForwardRef: React.AbstractComponent<
16021602
enterKeyHint,
16031603
returnKeyType,
16041604
inputMode,
1605+
showSoftInputOnFocus,
16051606
keyboardType,
16061607
...restProps
16071608
},
@@ -1628,6 +1629,9 @@ const ExportedForwardRef: React.AbstractComponent<
16281629
keyboardType={
16291630
inputMode ? inputModeToKeyboardTypeMap[inputMode] : keyboardType
16301631
}
1632+
showSoftInputOnFocus={
1633+
inputMode == null ? showSoftInputOnFocus : inputMode !== 'none'
1634+
}
16311635
autoComplete={
16321636
Platform.OS === 'android'
16331637
? // $FlowFixMe

Libraries/Components/View/ViewAccessibility.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import type {SyntheticEvent} from '../../Types/CoreEventTypes';
1616
export type AccessibilityRole =
1717
| 'none'
1818
| 'button'
19+
| 'dropdownlist'
1920
| 'togglebutton'
2021
| 'link'
2122
| 'cardinal'
@@ -58,7 +59,15 @@ export type AccessibilityRole =
5859
| 'timer'
5960
| 'list'
6061
| 'toolbar'
61-
| 'grid';
62+
| 'grid'
63+
| 'pager'
64+
| 'scrollview'
65+
| 'horizontalscrollview'
66+
| 'viewgroup'
67+
| 'webview'
68+
| 'drawerlayout'
69+
| 'slidingdrawer'
70+
| 'iconmenu';
6271

6372
// Role types for web
6473
export type Role =

Libraries/Core/Timers/JSTimers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ const JSTimers = {
379379

380380
callIdleCallbacks: function (frameTime: number) {
381381
if (
382-
FRAME_DURATION - (global.performance.now() - frameTime) <
382+
FRAME_DURATION - (Date.now() - frameTime) <
383383
IDLE_CALLBACK_FRAME_DEADLINE
384384
) {
385385
return;
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @flow strict
8+
* @format
9+
*/
10+
11+
import NativeDevToolsSettingsManager from './NativeDevToolsSettingsManager';
12+
13+
module.exports = NativeDevToolsSettingsManager;

0 commit comments

Comments
 (0)