Skip to content

Commit 709612e

Browse files
chiaramooneychiaramooney
authored
Merge branch 'main' into dependabot/npm_and_yarn/types/react-19.1.2
2 parents 657e8c0 + ba87750 commit 709612e

38 files changed

+1106
-211
lines changed

‎change/react-native-windows-eed821fc-4d11-4ca3-a820-682d1aba1977.json renamed to ‎change/react-native-windows-38ddfc46-37fc-42ff-90d8-d3f72a15f8a2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"type": "prerelease",
3-
"comment": "Implement body in Image Source",
3+
"comment": "Implement scrollEventThrottle for ScrollView in Fabric",
44
"packageName": "react-native-windows",
55
"email": "54227869+anupriya13@users.noreply.github.com",
66
"dependentChangeType": "patch"

‎change/react-native-windows-7291aa87-457c-43d8-8f82-b2fedf913592.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎packages/@react-native-windows/automation-channel/CHANGELOG.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
{
22
"name": "@react-native-windows/automation-channel",
33
"entries": [
4+
{
5+
"date": "Sun, 20 Apr 2025 05:22:31 GMT",
6+
"version": "0.12.283",
7+
"tag": "@react-native-windows/automation-channel_v0.12.283",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@react-native-windows/automation-channel",
13+
"comment": "Bump react-native-windows to v0.0.0-canary.943",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"date": "Fri, 18 Apr 2025 05:22:18 GMT",
21+
"version": "0.12.282",
22+
"tag": "@react-native-windows/automation-channel_v0.12.282",
23+
"comments": {
24+
"patch": [
25+
{
26+
"author": "beachball",
27+
"package": "@react-native-windows/automation-channel",
28+
"comment": "Bump react-native-windows to v0.0.0-canary.942",
29+
"commit": "not available"
30+
}
31+
]
32+
}
33+
},
434
{
535
"date": "Wed, 16 Apr 2025 05:25:01 GMT",
636
"version": "0.12.281",

‎packages/@react-native-windows/automation-channel/CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11
# Change Log - @react-native-windows/automation-channel
22

3-
<!-- This log was last generated on Wed, 16 Apr 2025 05:25:01 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sun, 20 Apr 2025 05:22:31 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.12.283
8+
9+
Sun, 20 Apr 2025 05:22:31 GMT
10+
11+
### Patches
12+
13+
- Bump react-native-windows to v0.0.0-canary.943
14+
15+
## 0.12.282
16+
17+
Fri, 18 Apr 2025 05:22:18 GMT
18+
19+
### Patches
20+
21+
- Bump react-native-windows to v0.0.0-canary.942
22+
723
## 0.12.281
824

925
Wed, 16 Apr 2025 05:25:01 GMT

‎packages/@react-native-windows/automation-channel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/automation-channel",
3-
"version": "0.12.281",
3+
"version": "0.12.283",
44
"license": "MIT",
55
"repository": {
66
"type": "git",
@@ -33,7 +33,7 @@
3333
"prettier": "2.8.8",
3434
"react": "19.0.0",
3535
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
36-
"react-native-windows": "^0.0.0-canary.941",
36+
"react-native-windows": "^0.0.0-canary.943",
3737
"typescript": "5.0.4"
3838
},
3939
"files": [

‎packages/@react-native-windows/automation-commands/CHANGELOG.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
{
22
"name": "@react-native-windows/automation-commands",
33
"entries": [
4+
{
5+
"date": "Sun, 20 Apr 2025 05:22:31 GMT",
6+
"version": "0.1.386",
7+
"tag": "@react-native-windows/automation-commands_v0.1.386",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@react-native-windows/automation-commands",
13+
"comment": "Bump @react-native-windows/automation-channel to v0.12.283",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"date": "Fri, 18 Apr 2025 05:22:18 GMT",
21+
"version": "0.1.385",
22+
"tag": "@react-native-windows/automation-commands_v0.1.385",
23+
"comments": {
24+
"patch": [
25+
{
26+
"author": "beachball",
27+
"package": "@react-native-windows/automation-commands",
28+
"comment": "Bump @react-native-windows/automation-channel to v0.12.282",
29+
"commit": "not available"
30+
}
31+
]
32+
}
33+
},
434
{
535
"date": "Wed, 16 Apr 2025 05:25:01 GMT",
636
"version": "0.1.384",

‎packages/@react-native-windows/automation-commands/CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11
# Change Log - @react-native-windows/automation-commands
22

3-
<!-- This log was last generated on Wed, 16 Apr 2025 05:25:01 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sun, 20 Apr 2025 05:22:31 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.1.386
8+
9+
Sun, 20 Apr 2025 05:22:31 GMT
10+
11+
### Patches
12+
13+
- Bump @react-native-windows/automation-channel to v0.12.283
14+
15+
## 0.1.385
16+
17+
Fri, 18 Apr 2025 05:22:18 GMT
18+
19+
### Patches
20+
21+
- Bump @react-native-windows/automation-channel to v0.12.282
22+
723
## 0.1.384
824

925
Wed, 16 Apr 2025 05:25:01 GMT

‎packages/@react-native-windows/automation-commands/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/automation-commands",
3-
"version": "0.1.384",
3+
"version": "0.1.386",
44
"description": "Allows controlling your react-native-windows application",
55
"main": "lib-commonjs/index.js",
66
"license": "MIT",
@@ -18,7 +18,7 @@
1818
"watch": "rnw-scripts watch"
1919
},
2020
"dependencies": {
21-
"@react-native-windows/automation-channel": "^0.12.281",
21+
"@react-native-windows/automation-channel": "^0.12.283",
2222
"@typescript-eslint/eslint-plugin": "^7.1.1",
2323
"@typescript-eslint/parser": "^7.1.1"
2424
},

‎packages/@react-native-windows/automation/CHANGELOG.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
{
22
"name": "@react-native-windows/automation",
33
"entries": [
4+
{
5+
"date": "Sun, 20 Apr 2025 05:22:31 GMT",
6+
"version": "0.3.365",
7+
"tag": "@react-native-windows/automation_v0.3.365",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@react-native-windows/automation",
13+
"comment": "Bump @react-native-windows/automation-channel to v0.12.283",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"date": "Fri, 18 Apr 2025 05:22:18 GMT",
21+
"version": "0.3.364",
22+
"tag": "@react-native-windows/automation_v0.3.364",
23+
"comments": {
24+
"patch": [
25+
{
26+
"author": "beachball",
27+
"package": "@react-native-windows/automation",
28+
"comment": "Bump @react-native-windows/automation-channel to v0.12.282",
29+
"commit": "not available"
30+
}
31+
]
32+
}
33+
},
434
{
535
"date": "Wed, 16 Apr 2025 05:25:01 GMT",
636
"version": "0.3.363",

‎packages/@react-native-windows/automation/CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11
# Change Log - @react-native-windows/automation
22

3-
<!-- This log was last generated on Wed, 16 Apr 2025 05:25:01 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sun, 20 Apr 2025 05:22:31 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.3.365
8+
9+
Sun, 20 Apr 2025 05:22:31 GMT
10+
11+
### Patches
12+
13+
- Bump @react-native-windows/automation-channel to v0.12.283
14+
15+
## 0.3.364
16+
17+
Fri, 18 Apr 2025 05:22:18 GMT
18+
19+
### Patches
20+
21+
- Bump @react-native-windows/automation-channel to v0.12.282
22+
723
## 0.3.363
824

925
Wed, 16 Apr 2025 05:25:01 GMT

‎packages/@react-native-windows/automation/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/automation",
3-
"version": "0.3.363",
3+
"version": "0.3.365",
44
"description": "UI Automation Suite for React Native Windows Applications",
55
"main": "lib-commonjs/index.js",
66
"repository": {
@@ -18,7 +18,7 @@
1818
"watch": "rnw-scripts watch"
1919
},
2020
"dependencies": {
21-
"@react-native-windows/automation-channel": "^0.12.281",
21+
"@react-native-windows/automation-channel": "^0.12.283",
2222
"@react-native-windows/fs": "^0.0.0-canary.62",
2323
"@typescript-eslint/eslint-plugin": "^7.1.1",
2424
"@typescript-eslint/parser": "^7.1.1",

‎packages/@react-native-windows/tester/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@react-native-picker/picker": "2.4.10",
2121
"react": "19.0.0",
2222
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
23-
"react-native-windows": "^0.0.0-canary.941",
23+
"react-native-windows": "^0.0.0-canary.943",
2424
"react-native-xaml": "^0.0.78"
2525
},
2626
"devDependencies": {
@@ -34,7 +34,7 @@
3434
"just-scripts": "^1.3.3",
3535
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
3636
"react-native-platform-override": "^1.9.52",
37-
"react-native-windows": "^0.0.0-canary.941",
37+
"react-native-windows": "^0.0.0-canary.943",
3838
"typescript": "5.0.4"
3939
},
4040
"engines": {

‎packages/@react-native-windows/tester/src/js/examples/Text/TextExample.windows.js

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1926,6 +1926,76 @@ const examples = [
19261926
);
19271927
},
19281928
},
1929+
{
1930+
title: 'AdjustFontSize according to the Width, Height and LinesCount',
1931+
name: 'adjustFontSizeToFit',
1932+
render: function (): React.Node {
1933+
return (
1934+
<View>
1935+
<RNTesterText
1936+
style={{
1937+
width: 500,
1938+
height: 100,
1939+
fontSize: 20,
1940+
backgroundColor: 'lightcoral',
1941+
padding: 10,
1942+
marginBottom: 10,
1943+
}}
1944+
testID="text-adjustfontsizetofit-default-a">
1945+
{`Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore Ut enim ad minim veniam.With AdjustFontSize width: 800, height: 100, fontSize: 20`}
1946+
</RNTesterText>
1947+
<RNTesterText
1948+
adjustsFontSizeToFit
1949+
style={{
1950+
width: 500,
1951+
height: 100,
1952+
fontSize: 20,
1953+
backgroundColor: 'lightcoral',
1954+
padding: 10,
1955+
marginBottom: 10,
1956+
}}
1957+
testID="text-adjustfontsizetofit-default-b">
1958+
{`Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore Ut enim ad minim veniam.With AdjustFontSize width: 800, height: 100, fontSize: 20`}
1959+
</RNTesterText>
1960+
{[
1961+
{width: 500, height: 80, lineCount: 3},
1962+
{width: 475, height: 120, lineCount: 5},
1963+
{width: 450, height: 160, lineCount: 0},
1964+
].map((item, index) => (
1965+
<React.Fragment key={index}>
1966+
<RNTesterText
1967+
testID={`text-adjustfontsizetofit-${index}-a`}
1968+
numberOfLines={item.lineCount}
1969+
adjustsFontSizeToFit
1970+
style={{
1971+
width: item.width,
1972+
height: item.height,
1973+
fontSize: 40,
1974+
backgroundColor: '#A0C782',
1975+
padding: 10,
1976+
marginBottom: 10,
1977+
}}>
1978+
{`Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore. With AdjustFontSize height:${item.height},width:${item.width},lineCount:${item.lineCount},fontSize:40`}
1979+
</RNTesterText>
1980+
<RNTesterText
1981+
testID={`text-adjustfontsizetofit-${index}-b`}
1982+
numberOfLines={item.lineCount}
1983+
style={{
1984+
width: item.width,
1985+
height: item.height,
1986+
fontSize: 40,
1987+
backgroundColor: 'lightblue',
1988+
padding: 10,
1989+
marginBottom: 10,
1990+
}}>
1991+
{`Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore. Without AdjustFontSize height:${item.height},width:${item.width},lineCount:${item.lineCount},fontSize:40`}
1992+
</RNTesterText>
1993+
</React.Fragment>
1994+
))}
1995+
</View>
1996+
);
1997+
},
1998+
},
19291999
];
19302000

19312001
const styles = StyleSheet.create({

‎packages/debug-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lint:fix": "rnw-scripts lint:fix"
99
},
1010
"devDependencies": {
11-
"@react-native-windows/automation": "^0.3.363",
11+
"@react-native-windows/automation": "^0.3.365",
1212
"@react-native-windows/fs": "^0.0.0-canary.62",
1313
"@rnw-scripts/eslint-config": "1.2.33",
1414
"@rnw-scripts/ts-config": "2.0.5",

‎packages/e2e-test-app-fabric/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"bundle:debug": "npx @react-native-community/cli bundle --entry-file index.js --bundle-output ./windows/x64/Debug/RNTesterApp-Fabric/Bundle/index.windows.bundle --assets-dest ./windows/x64/Debug/RNTesterApp-Fabric/Bundle --platform windows"
1515
},
1616
"dependencies": {
17-
"@react-native-windows/automation-channel": "^0.12.281",
17+
"@react-native-windows/automation-channel": "^0.12.283",
1818
"@react-native-windows/tester": "0.0.1",
1919
"@types/react": "^19.0.0",
2020
"@typescript-eslint/eslint-plugin": "^7.1.1",
2121
"@typescript-eslint/parser": "^7.1.1",
2222
"react": "^19.0.0",
2323
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
24-
"react-native-windows": "^0.0.0-canary.941"
24+
"react-native-windows": "^0.0.0-canary.943"
2525
},
2626
"devDependencies": {
2727
"@babel/core": "^7.25.2",
@@ -30,8 +30,8 @@
3030
"@babel/preset-typescript": "^7.8.3",
3131
"@babel/runtime": "^7.20.0",
3232
"@react-native-community/cli": "15.0.0-alpha.2",
33-
"@react-native-windows/automation": "^0.3.363",
34-
"@react-native-windows/automation-commands": "^0.1.384",
33+
"@react-native-windows/automation": "^0.3.365",
34+
"@react-native-windows/automation-commands": "^0.1.386",
3535
"@react-native/metro-config": "0.78.0-nightly-20250113-d4407d6f7",
3636
"@rnw-scripts/babel-node-config": "2.3.2",
3737
"@rnw-scripts/babel-react-native-config": "0.0.0",

0 commit comments

Comments
 (0)