diff --git a/packages/react-native/Libraries/Utilities/Appearance.js b/packages/react-native/Libraries/Utilities/Appearance.js index 2d11088f1301..0624f3689301 100644 --- a/packages/react-native/Libraries/Utilities/Appearance.js +++ b/packages/react-native/Libraries/Utilities/Appearance.js @@ -66,6 +66,9 @@ function getState(): NonNullable { new NativeEventEmitter<{ appearanceChanged: [NativeAppearancePreferences], }>(NativeAppearance).addListener('appearanceChanged', newAppearance => { + if (state.appearance?.colorScheme === newAppearance.colorScheme) { + return; + } state.appearance = { colorScheme: newAppearance.colorScheme, }; @@ -114,6 +117,7 @@ export function setColorScheme(colorScheme: ColorSchemeOverride): void { const state = getState(); const {NativeAppearance} = state; if (NativeAppearance != null) { + const prevColorScheme = getColorScheme(); NativeAppearance.setColorScheme(colorScheme); state.appearance = { colorScheme: @@ -121,6 +125,9 @@ export function setColorScheme(colorScheme: ColorSchemeOverride): void { ? NativeAppearance.getColorScheme() : colorScheme, }; + if (state.appearance.colorScheme !== prevColorScheme) { + state.eventEmitter.emit('change', state.appearance); + } } } diff --git a/packages/react-native/Libraries/Utilities/__tests__/Appearance-itest.js b/packages/react-native/Libraries/Utilities/__tests__/Appearance-itest.js new file mode 100644 index 000000000000..5ae198aa3a6e --- /dev/null +++ b/packages/react-native/Libraries/Utilities/__tests__/Appearance-itest.js @@ -0,0 +1,78 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow strict-local + * @format + */ + +import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment'; + +import View from '../../Components/View/View'; +import * as Appearance from '../Appearance'; +import useColorScheme from '../useColorScheme'; +import * as Fantom from '@react-native/fantom'; +import * as React from 'react'; +import {DeviceEventEmitter} from 'react-native'; + +const NativeAppearance = require('../NativeAppearance'); + +// Fantom has no native Appearance module, so a fake one is installed before +// `Appearance` lazily reads it. +// $FlowFixMe[cannot-write] +NativeAppearance.default = { + getColorScheme: () => 'dark', + setColorScheme: jest.fn(), + addListener: jest.fn(), + removeListeners: jest.fn(), +}; + +describe('Appearance', () => { + it('notifies change listeners when setColorScheme changes the scheme', () => { + expect(Appearance.getColorScheme()).toBe('dark'); + + const listener = jest.fn(); + const subscription = Appearance.addChangeListener(listener); + + Appearance.setColorScheme('light'); + + expect(listener).toHaveBeenCalledTimes(1); + expect(listener).toHaveBeenCalledWith({colorScheme: 'light'}); + + DeviceEventEmitter.emit('appearanceChanged', {colorScheme: 'light'}); + Appearance.setColorScheme('light'); + + expect(listener).toHaveBeenCalledTimes(1); + + DeviceEventEmitter.emit('appearanceChanged', {colorScheme: 'dark'}); + + expect(listener).toHaveBeenCalledTimes(2); + expect(listener).toHaveBeenLastCalledWith({colorScheme: 'dark'}); + expect(Appearance.getColorScheme()).toBe('dark'); + + subscription.remove(); + }); + + it('updates useColorScheme in the same task as setColorScheme', () => { + let observed; + function TestComponent() { + observed = useColorScheme(); + return ; + } + + const root = Fantom.createRoot(); + Fantom.runTask(() => { + root.render(); + }); + + expect(observed).toBe('dark'); + + Fantom.runTask(() => { + Appearance.setColorScheme('light'); + }); + + expect(observed).toBe('light'); + }); +});