Commit f68a830
committed
Merge remote-tracking branch 'origin/main' into feat/graduate-background-size-position-repeat
Conflict was limited to the generated `ReactNativeApi.d.ts` (SignedSource and
per-export content hashes). Resolved by regenerating with `yarn build-types`
from the merged sources rather than hand-merging hashes.431 files changed
Lines changed: 4405 additions & 1917 deletions
File tree
- .github
- workflow-scripts
- workflows
- flow-typed
- environment
- npm
- @react-native-community
- packages
- babel-plugin-codegen
- community-cli-plugin
- src
- commands
- bundle
- __tests__
- start
- dev-server
- utils
- debugger-frontend
- debugger-shell
- __tests__
- src
- electron
- node
- dev-middleware
- src
- __tests__
- inspector-proxy
- middleware
- utils
- eslint-plugin-specs
- with-babel-register
- jest-preset
- jest
- metro-config/src
- react-native-babel-preset/src
- __tests__
- react-native-babel-transformer/src
- __tests__
- react-native-codegen
- e2e
- deep_imports/__tests__
- components
- modules
- namespaced/__tests__/components
- scripts
- src
- cli
- combine
- generators
- parser
- generators
- __tests__
- modules
- GenerateModuleObjCpp
- __tests__/__snapshots__
- parsers
- flow
- components/__tests__
- modules/__tests__
- typescript
- components/__tests__
- modules/__tests__
- react-native-compatibility-check/src/__tests__/utilities
- react-native
- Libraries
- Components
- TextInput
- __tests__
- View/__tests__
- Core
- __tests__
- ReactAndroid
- api
- src
- main
- java/com/facebook/react
- interfaces/exceptionmanager
- modules/i18nmanager
- uimanager
- style
- views
- scroll
- textinput
- text
- view
- jni
- first-party/yogajni/jni
- react/runtime/jni
- res/views/uimanager/values-zu
- test/java/com/facebook/react
- uimanager
- style
- views
- text
- view
- ReactCommon
- jsinspector-modern
- tracing
- react
- nativemodule
- core
- iostests
- platform/ios/ReactCommon
- dom
- idlecallbacks
- renderer
- animated
- mounting/tests
- textlayoutmanager/platform/ios/react/renderer/textlayoutmanager
- yoga/yoga/algorithm
- ReactCxxPlatform/react/threading
- React
- Base
- CoreModules
- Fabric/Mounting/ComponentViews
- TextInput
- View
- I18n/strings
- ar.lproj
- cs.lproj
- da.lproj
- de.lproj
- el.lproj
- en-GB.lproj
- es-ES.lproj
- es.lproj
- fi.lproj
- fr.lproj
- he.lproj
- hi.lproj
- hr.lproj
- hu.lproj
- id.lproj
- it.lproj
- ja.lproj
- ko.lproj
- ms.lproj
- nb.lproj
- nl.lproj
- pl.lproj
- pt-PT.lproj
- pt.lproj
- ro.lproj
- ru.lproj
- sk.lproj
- sv.lproj
- th.lproj
- tr.lproj
- uk.lproj
- vi.lproj
- zh-Hans.lproj
- zh-Hant-HK.lproj
- zh-Hant.lproj
- zu.lproj
- flow
- scripts
- cocoapods
- codegen
- __tests__
- generate-artifacts-executor
- featureflags
- hermes
- __tests__
- ios-prebuild
- __tests__
- spm
- __tests__
- swiftpm
- __tests__
- xcode
- sdks/hermes-engine
- src/private
- animated
- __tests__
- setup
- webapis
- dom
- abort-api
- events
- nodes
- __tests__
- performance
- internals
- specs
- third-party-podspecs
- rn-tester
- RNTesterUnitTests
- RNTester
- js/examples/WebSocket
- scripts
- virtualized-lists/Lists/__tests__
- private
- core-cli-utils/src/private
- eslint-plugin-monorepo/__tests__
- helloworld
- ios
- HelloWorld.xcodeproj
- HelloWorld
- lib
- scripts
- react-native-codegen-typescript-test
- scripts
- src/__tests__
- react-native-fantom
- config
- repl
- runner
- executables
- global-setup
- llvm
- scripts
- build
- cxx-api
- api-snapshots
- manual_test
- parser
- tests/snapshots
- debugger-frontend
- debugger-shell
- e2e
- utils
- js-api
- build-types
- resolution
- transforms/typescript
- __tests__
- utils
- __tests__
- diff-api-snapshot
- monorepo-tests/__tests__
- release-testing
- utils
- releases-ci
- __tests__
- releases
- __tests__
- __snapshots__
- ios-prebuild
- utils
- __tests__
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
69 | 73 | | |
70 | 74 | | |
71 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | | - | |
| 92 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | | - | |
39 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
136 | | - | |
| 136 | + | |
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
| |||
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
203 | | - | |
| 203 | + | |
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
| |||
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
249 | | - | |
| 249 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
3 | 33 | | |
4 | 34 | | |
5 | 35 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
753 | 753 | | |
754 | 754 | | |
755 | 755 | | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
| 795 | + | |
756 | 796 | | |
757 | 797 | | |
758 | 798 | | |
| |||
5874 | 5914 | | |
5875 | 5915 | | |
5876 | 5916 | | |
| 5917 | + | |
| 5918 | + | |
| 5919 | + | |
| 5920 | + | |
| 5921 | + | |
5877 | 5922 | | |
5878 | 5923 | | |
5879 | 5924 | | |
| |||
5884 | 5929 | | |
5885 | 5930 | | |
5886 | 5931 | | |
| 5932 | + | |
| 5933 | + | |
| 5934 | + | |
| 5935 | + | |
| 5936 | + | |
5887 | 5937 | | |
5888 | 5938 | | |
5889 | 5939 | | |
5890 | 5940 | | |
5891 | 5941 | | |
| 5942 | + | |
| 5943 | + | |
| 5944 | + | |
| 5945 | + | |
| 5946 | + | |
5892 | 5947 | | |
5893 | 5948 | | |
5894 | 5949 | | |
5895 | 5950 | | |
5896 | 5951 | | |
| 5952 | + | |
| 5953 | + | |
| 5954 | + | |
| 5955 | + | |
| 5956 | + | |
5897 | 5957 | | |
5898 | 5958 | | |
5899 | 5959 | | |
| |||
5909 | 5969 | | |
5910 | 5970 | | |
5911 | 5971 | | |
| 5972 | + | |
| 5973 | + | |
| 5974 | + | |
| 5975 | + | |
| 5976 | + | |
| 5977 | + | |
| 5978 | + | |
| 5979 | + | |
| 5980 | + | |
| 5981 | + | |
| 5982 | + | |
| 5983 | + | |
| 5984 | + | |
| 5985 | + | |
| 5986 | + | |
| 5987 | + | |
| 5988 | + | |
| 5989 | + | |
| 5990 | + | |
| 5991 | + | |
| 5992 | + | |
| 5993 | + | |
| 5994 | + | |
| 5995 | + | |
| 5996 | + | |
5912 | 5997 | | |
5913 | 5998 | | |
5914 | 5999 | | |
| |||
5929 | 6014 | | |
5930 | 6015 | | |
5931 | 6016 | | |
| 6017 | + | |
| 6018 | + | |
| 6019 | + | |
| 6020 | + | |
| 6021 | + | |
| 6022 | + | |
| 6023 | + | |
| 6024 | + | |
| 6025 | + | |
| 6026 | + | |
| 6027 | + | |
| 6028 | + | |
| 6029 | + | |
| 6030 | + | |
| 6031 | + | |
| 6032 | + | |
| 6033 | + | |
| 6034 | + | |
| 6035 | + | |
| 6036 | + | |
| 6037 | + | |
| 6038 | + | |
| 6039 | + | |
| 6040 | + | |
| 6041 | + | |
| 6042 | + | |
| 6043 | + | |
| 6044 | + | |
| 6045 | + | |
| 6046 | + | |
5932 | 6047 | | |
5933 | 6048 | | |
5934 | 6049 | | |
| |||
5939 | 6054 | | |
5940 | 6055 | | |
5941 | 6056 | | |
| 6057 | + | |
| 6058 | + | |
| 6059 | + | |
| 6060 | + | |
| 6061 | + | |
| 6062 | + | |
| 6063 | + | |
| 6064 | + | |
| 6065 | + | |
| 6066 | + | |
5942 | 6067 | | |
5943 | 6068 | | |
5944 | 6069 | | |
| |||
5953 | 6078 | | |
5954 | 6079 | | |
5955 | 6080 | | |
| 6081 | + | |
| 6082 | + | |
| 6083 | + | |
| 6084 | + | |
| 6085 | + | |
5956 | 6086 | | |
5957 | 6087 | | |
5958 | 6088 | | |
5959 | 6089 | | |
| 6090 | + | |
| 6091 | + | |
| 6092 | + | |
| 6093 | + | |
| 6094 | + | |
Lines changed: 0 additions & 44 deletions
This file was deleted.
0 commit comments