Skip to content

Commit 4c047f5

Browse files
fix ci failure
1 parent fe140bc commit 4c047f5

3 files changed

Lines changed: 25 additions & 6 deletions

File tree

‎packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/__tests__/ReactNativeAttributePayload-itest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
1212

1313
import type {AttributeConfiguration} from '../../../Renderer/shims/ReactNativeTypes';
1414

15-
const {create, diff} = require('../ReactNativeAttributePayload');
1615
const ReactNativeStyleAttributes =
1716
require('../../../Components/View/ReactNativeStyleAttributes').default;
17+
const {create, diff} = require('../ReactNativeAttributePayload');
1818

1919
describe('ReactNativeAttributePayload.create', () => {
2020
it('should work with simple example', () => {

‎packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#import <mutex>
1111

12-
#import <React/RCTAppearance.h>
1312
#import <React/RCTAssert.h>
1413
#import <React/RCTConstants.h>
1514
#import <React/RCTConversions.h>
@@ -140,7 +139,9 @@ - (void)stop
140139
- (void)updateColorSchemeWithTraitCollection:(UITraitCollection *)traitCollection
141140
{
142141
RCTAssertMainQueue();
143-
BOOL isDark = [RCTColorSchemePreference(traitCollection) isEqualToString:@"dark"];
142+
UITraitCollection *effectiveTraitCollection =
143+
traitCollection ?: UITraitCollection.currentTraitCollection;
144+
BOOL isDark = effectiveTraitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
144145
_surfaceHandler->setColorScheme(isDark ? ColorScheme::Dark : ColorScheme::Light);
145146
}
146147

‎packages/rn-tester/js/examples/MediaQueries/MediaQueriesExample.js‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
1212

1313
import RNTesterText from '../../components/RNTesterText';
1414
import * as React from 'react';
15-
import {StyleSheet, View} from 'react-native';
15+
import {Appearance, Button, StyleSheet, View} from 'react-native';
1616

1717
const styles = StyleSheet.create({
1818
container: {
1919
padding: 10,
2020
gap: 10,
2121
},
22+
buttonRow: {
23+
flexDirection: 'row',
24+
gap: 8,
25+
},
2226
colorSchemeBox: {
2327
width: 160,
2428
height: 60,
@@ -56,15 +60,29 @@ exports.examples = [
5660
title: 'prefers-color-scheme',
5761
name: 'media-query-color-scheme',
5862
description:
59-
'Toggle the system appearance: the colors update natively without a ' +
60-
'React render.',
63+
'Toggle the appearance with the buttons (Appearance.setColorScheme) or ' +
64+
'change it system-wide: the colors update natively without a React render.',
6165
render(): React.Node {
6266
return (
6367
<View style={styles.container}>
6468
<View
6569
testID="media-query-color-scheme"
6670
style={styles.colorSchemeBox}
6771
/>
72+
<View style={styles.buttonRow}>
73+
<Button
74+
title="Light"
75+
onPress={() => Appearance.setColorScheme('light')}
76+
/>
77+
<Button
78+
title="Dark"
79+
onPress={() => Appearance.setColorScheme('dark')}
80+
/>
81+
<Button
82+
title="System"
83+
onPress={() => Appearance.setColorScheme('unspecified')}
84+
/>
85+
</View>
6886
</View>
6987
);
7088
},

0 commit comments

Comments
 (0)