Skip to content

Commit 6771fde

Browse files
M-i-k-e-lM-i-k-e-l
committed
Merge branch 'master' into v8
2 parents 98f49e5 + d3a3e0e commit 6771fde

File tree

11 files changed

+64
-23
lines changed

11 files changed

+64
-23
lines changed

‎.github/workflows/deployDocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- release
78

89
jobs:
910
build-and-deploy:

‎demo/scripts/releaseDemo.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ const VERSION_INC = 'patch';
1717

1818
function run() {
1919
if (!validateEnv()) {
20+
console.log('Do not release demo');
2021
return;
2122
}
23+
24+
console.log('Release demo');
2225
createNpmRc();
2326
versionTagAndPublish();
2427
}
@@ -27,7 +30,11 @@ function validateEnv() {
2730
if (!process.env.CI) {
2831
throw new Error('releasing is only available from CI');
2932
}
30-
return true;
33+
return (
34+
process.env.BUILDKITE_BRANCH === 'master' ||
35+
process.env.BUILDKITE_BRANCH === 'release' ||
36+
process.env.BUILDKITE_MESSAGE === 'snapshot'
37+
);
3138
}
3239

3340
function createNpmRc() {

‎docuilib/scripts/releaseDocs.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ const p = require('path');
33

44
function run() {
55
if (!validateEnv()) {
6+
console.log('Do not release docs');
67
return;
78
}
89

10+
console.log('Release docs');
911
const currentPublished = findCurrentPublishedVersion();
1012
const packageJson = require('../package.json');
1113
const newVersion = packageJson.version;
@@ -20,7 +22,7 @@ function validateEnv() {
2022
if (!process.env.CI) {
2123
throw new Error('releasing is only available from CI');
2224
}
23-
return true;
25+
return process.env.BUILDKITE_BRANCH === 'master';
2426
}
2527

2628
function createNpmRc() {

‎docuilib/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4040,12 +4040,12 @@ __metadata:
40404040
linkType: hard
40414041

40424042
"brace-expansion@npm:^1.1.7":
4043-
version: 1.1.11
4044-
resolution: "brace-expansion@npm:1.1.11"
4043+
version: 1.1.12
4044+
resolution: "brace-expansion@npm:1.1.12"
40454045
dependencies:
40464046
balanced-match: ^1.0.0
40474047
concat-map: 0.0.1
4048-
checksum: faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07
4048+
checksum: 12cb6d6310629e3048cadb003e1aca4d8c9bb5c67c3c321bafdd7e7a50155de081f78ea3e0ed92ecc75a9015e784f301efc8132383132f4f7904ad1ac529c562
40494049
languageName: node
40504050
linkType: hard
40514051

@@ -4821,13 +4821,13 @@ __metadata:
48214821
linkType: hard
48224822

48234823
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3":
4824-
version: 7.0.3
4825-
resolution: "cross-spawn@npm:7.0.3"
4824+
version: 7.0.6
4825+
resolution: "cross-spawn@npm:7.0.6"
48264826
dependencies:
48274827
path-key: ^3.1.0
48284828
shebang-command: ^2.0.0
48294829
which: ^2.0.1
4830-
checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
4830+
checksum: 8d306efacaf6f3f60e0224c287664093fa9185680b2d195852ba9a863f85d02dcc737094c6e512175f8ee0161f9b87c73c6826034c2422e39de7d6569cf4503b
48314831
languageName: node
48324832
linkType: hard
48334833

@@ -5918,11 +5918,11 @@ __metadata:
59185918
linkType: hard
59195919

59205920
"estree-util-value-to-estree@npm:^3.0.1":
5921-
version: 3.1.2
5922-
resolution: "estree-util-value-to-estree@npm:3.1.2"
5921+
version: 3.3.3
5922+
resolution: "estree-util-value-to-estree@npm:3.3.3"
59235923
dependencies:
59245924
"@types/estree": ^1.0.0
5925-
checksum: 31c4b9f3a2e64119b994a86d70070325b6ec238a21842669e79b0d6a7190150293616c8f38fee1c369c18bbef405064d883aa38c05311db5d0a211a30e9924d6
5925+
checksum: 73851f26715300046228cf8a36986c101d6741d7a2b024f684675e75d1191bc07b0dc069926876729efd5650343d23bffe76104221b7dc862965632302b05524
59265926
languageName: node
59275927
linkType: hard
59285928

‎eslint-rules/scripts/releaseEslint.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ const p = require('path');
33

44
function run() {
55
if (!validateEnv()) {
6+
console.log('Do not release eslint');
67
return;
78
}
89

10+
console.log('Release eslint');
911
const currentPublished = findCurrentPublishedVersion();
1012
const packageJson = require('../package.json');
1113
const newVersion = packageJson.version;
@@ -20,7 +22,7 @@ function validateEnv() {
2022
if (!process.env.CI) {
2123
throw new Error('releasing is only available from CI');
2224
}
23-
return true;
25+
return process.env.BUILDKITE_BRANCH === 'master';
2426
}
2527

2628
function createNpmRc() {

‎lib/scripts/releaseNative.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ const VERSION_TAG = IS_SNAPSHOT ? 'snapshot' : 'latest';
88

99
function run() {
1010
if (!validateEnv()) {
11+
console.log('Do not release native');
1112
return;
1213
}
1314

15+
console.log('Release native');
1416
const packageJsonVersion = require('../package.json').version;
1517
const currentPublished = findCurrentPublishedVersion();
1618
const newVersion = IS_SNAPSHOT
@@ -27,7 +29,7 @@ function validateEnv() {
2729
if (!process.env.CI) {
2830
throw new Error('releasing is only available from CI');
2931
}
30-
return true;
32+
return process.env.BUILDKITE_BRANCH === 'master' || process.env.BUILDKITE_MESSAGE === 'snapshot';
3133
}
3234

3335
function createNpmRc() {

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"@babel/plugin-transform-modules-commonjs": "^7.17.9",
6767
"@babel/preset-env": "^7.20.0",
6868
"@babel/preset-react": "^7.10.1",
69-
"@babel/runtime": "^7.20.0",
69+
"@babel/runtime": "^7.26.10",
7070
"@formatjs/intl-datetimeformat": "^6.0.3",
7171
"@formatjs/intl-getcanonicallocales": "^2.0.2",
7272
"@formatjs/intl-locale": "^3.0.3",

‎scripts/release/release.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ const VERSION_TAG = isRelease ? 'latest' : 'snapshot';
1818
const VERSION_INC = 'patch';
1919
function run() {
2020
if (!validateEnv()) {
21+
console.log('Do not release');
2122
return;
2223
}
24+
25+
console.log('Release');
2326
setupGit();
2427
createNpmRc();
2528
versionTagAndPublish();
@@ -29,7 +32,11 @@ function validateEnv() {
2932
if (!process.env.CI) {
3033
throw new Error('releasing is only available from CI');
3134
}
32-
return true;
35+
return (
36+
process.env.BUILDKITE_BRANCH === 'master' ||
37+
process.env.BUILDKITE_BRANCH === 'release' ||
38+
process.env.BUILDKITE_MESSAGE === 'snapshot'
39+
);
3340
}
3441

3542
function setupGit() {
@@ -79,7 +86,6 @@ function tryPublishAndTag(version) {
7986
}
8087
}
8188

82-
8389
function tagAndPublish(newVersion) {
8490
console.log(`trying to publish ${newVersion}...`);
8591
exec.execSync(`npm --no-git-tag-version version ${newVersion}`);

‎src/commons/Constants.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,24 @@ export function updateConstants(dimensions: any) {
6767
}
6868

6969
const accessibility = {
70+
isReduceMotionEnabled: false,
7071
isScreenReaderEnabled: false
7172
};
7273

74+
function handleReduceMotionChanged(isReduceMotionEnabled: AccessibilityChangeEvent) {
75+
accessibility.isReduceMotionEnabled = isReduceMotionEnabled as boolean;
76+
}
77+
7378
function handleScreenReaderChanged(isScreenReaderEnabled: AccessibilityChangeEvent) {
7479
accessibility.isScreenReaderEnabled = isScreenReaderEnabled as boolean;
7580
}
7681

82+
AccessibilityInfo.addEventListener('reduceMotionChanged', handleReduceMotionChanged);
7783
AccessibilityInfo.addEventListener('screenReaderChanged', handleScreenReaderChanged);
7884

79-
function setAccessibility() {
80-
AccessibilityInfo.isScreenReaderEnabled().then(isScreenReaderEnabled => {
81-
accessibility.isScreenReaderEnabled = isScreenReaderEnabled;
82-
});
85+
async function setAccessibility() {
86+
accessibility.isReduceMotionEnabled = await AccessibilityInfo.isReduceMotionEnabled();
87+
accessibility.isScreenReaderEnabled = await AccessibilityInfo.isScreenReaderEnabled();
8388
}
8489

8590
setAccessibility();

‎src/components/dialog/index.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,14 @@ const Dialog = (props: DialogProps, ref: ForwardedRef<DialogImperativeMethods>)
212212

213213
const renderDialog = () => (
214214
<GestureDetector gesture={panGesture}>
215-
<View {...containerProps} reanimated style={style} onLayout={onLayout} ref={setRef} testID={testID}>
215+
<View
216+
{...containerProps}
217+
reanimated={!Constants.accessibility.isReduceMotionEnabled}
218+
style={style}
219+
onLayout={onLayout}
220+
ref={setRef}
221+
testID={testID}
222+
>
216223
{renderDialogContent()}
217224
</View>
218225
</GestureDetector>

‎yarn.lock

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,7 +1858,7 @@ __metadata:
18581858
languageName: node
18591859
linkType: hard
18601860

1861-
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.8.4":
1861+
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.8.4":
18621862
version: 7.25.6
18631863
resolution: "@babel/runtime@npm:7.25.6"
18641864
dependencies:
@@ -1867,6 +1867,15 @@ __metadata:
18671867
languageName: node
18681868
linkType: hard
18691869

1870+
"@babel/runtime@npm:^7.26.10":
1871+
version: 7.27.0
1872+
resolution: "@babel/runtime@npm:7.27.0"
1873+
dependencies:
1874+
regenerator-runtime: ^0.14.0
1875+
checksum: 3e73d9e65f76fad8f99802b5364c941f4a60c693b3eca66147bb0bfa54cf0fbe017232155e16e3fd83c0a049b51b8d7239efbd73626534abe8b54a6dd57dcb1b
1876+
languageName: node
1877+
linkType: hard
1878+
18701879
"@babel/template@npm:^7.0.0, @babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0, @babel/template@npm:^7.3.3":
18711880
version: 7.25.0
18721881
resolution: "@babel/template@npm:7.25.0"
@@ -10594,7 +10603,7 @@ __metadata:
1059410603
"@babel/plugin-transform-modules-commonjs": ^7.17.9
1059510604
"@babel/preset-env": ^7.20.0
1059610605
"@babel/preset-react": ^7.10.1
10597-
"@babel/runtime": ^7.20.0
10606+
"@babel/runtime": ^7.26.10
1059810607
"@formatjs/intl-datetimeformat": ^6.0.3
1059910608
"@formatjs/intl-getcanonicallocales": ^2.0.2
1060010609
"@formatjs/intl-locale": ^3.0.3

0 commit comments

Comments
 (0)