mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Appearance: Migrate to ESM Named Exports (#46119)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/46119 Straightforward migration of the `Appearance` module to use ESM named exports. Changelog: [Internal] Reviewed By: TheSavior Differential Revision: D61567882 fbshipit-source-id: a4a5a9771de001bd41cb0e23ba066f150267a55d
This commit is contained in:
1 parent
387560a9af
commit
a7fbe8117f
5 files changed
+57
-61
No files matched your search
+46
-48
@@ -51,57 +51,55 @@ if (NativeAppearance) {
|
||||
);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* Note: Although color scheme is available immediately, it may change at any
|
||||
* time. Any rendering logic or styles that depend on this should try to call
|
||||
* this function on every render, rather than caching the value (for example,
|
||||
* using inline styles rather than setting a value in a `StyleSheet`).
|
||||
*
|
||||
* Example: `const colorScheme = Appearance.getColorScheme();`
|
||||
*
|
||||
* @returns {?ColorSchemeName} Value for the color scheme preference.
|
||||
*/
|
||||
getColorScheme(): ?ColorSchemeName {
|
||||
if (__DEV__) {
|
||||
if (isAsyncDebugging) {
|
||||
// Hard code light theme when using the async debugger as
|
||||
// sync calls aren't supported
|
||||
return 'light';
|
||||
}
|
||||
/**
|
||||
* Note: Although color scheme is available immediately, it may change at any
|
||||
* time. Any rendering logic or styles that depend on this should try to call
|
||||
* this function on every render, rather than caching the value (for example,
|
||||
* using inline styles rather than setting a value in a `StyleSheet`).
|
||||
*
|
||||
* Example: `const colorScheme = Appearance.getColorScheme();`
|
||||
*
|
||||
* @returns {?ColorSchemeName} Value for the color scheme preference.
|
||||
*/
|
||||
export function getColorScheme(): ?ColorSchemeName {
|
||||
if (__DEV__) {
|
||||
if (isAsyncDebugging) {
|
||||
// Hard code light theme when using the async debugger as
|
||||
// sync calls aren't supported
|
||||
return 'light';
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: (hramos) T52919652 Use ?ColorSchemeName once codegen supports union
|
||||
const nativeColorScheme: ?string =
|
||||
NativeAppearance == null
|
||||
? null
|
||||
: NativeAppearance.getColorScheme() || null;
|
||||
invariant(
|
||||
nativeColorScheme === 'dark' ||
|
||||
nativeColorScheme === 'light' ||
|
||||
nativeColorScheme == null,
|
||||
"Unrecognized color scheme. Did you mean 'dark' or 'light'?",
|
||||
);
|
||||
return nativeColorScheme;
|
||||
},
|
||||
// TODO: (hramos) T52919652 Use ?ColorSchemeName once codegen supports union
|
||||
const nativeColorScheme: ?string =
|
||||
NativeAppearance == null ? null : NativeAppearance.getColorScheme() || null;
|
||||
invariant(
|
||||
nativeColorScheme === 'dark' ||
|
||||
nativeColorScheme === 'light' ||
|
||||
nativeColorScheme == null,
|
||||
"Unrecognized color scheme. Did you mean 'dark' or 'light'?",
|
||||
);
|
||||
return nativeColorScheme;
|
||||
}
|
||||
|
||||
setColorScheme(colorScheme: ?ColorSchemeName): void {
|
||||
const nativeColorScheme = colorScheme == null ? 'unspecified' : colorScheme;
|
||||
export function setColorScheme(colorScheme: ?ColorSchemeName): void {
|
||||
const nativeColorScheme = colorScheme == null ? 'unspecified' : colorScheme;
|
||||
|
||||
invariant(
|
||||
colorScheme === 'dark' || colorScheme === 'light' || colorScheme == null,
|
||||
"Unrecognized color scheme. Did you mean 'dark', 'light' or null?",
|
||||
);
|
||||
invariant(
|
||||
colorScheme === 'dark' || colorScheme === 'light' || colorScheme == null,
|
||||
"Unrecognized color scheme. Did you mean 'dark', 'light' or null?",
|
||||
);
|
||||
|
||||
if (NativeAppearance != null && NativeAppearance.setColorScheme != null) {
|
||||
NativeAppearance.setColorScheme(nativeColorScheme);
|
||||
}
|
||||
},
|
||||
if (NativeAppearance != null && NativeAppearance.setColorScheme != null) {
|
||||
NativeAppearance.setColorScheme(nativeColorScheme);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an event handler that is fired when appearance preferences change.
|
||||
*/
|
||||
addChangeListener(listener: AppearanceListener): EventSubscription {
|
||||
return eventEmitter.addListener('change', listener);
|
||||
},
|
||||
};
|
||||
/**
|
||||
* Add an event handler that is fired when appearance preferences change.
|
||||
*/
|
||||
export function addChangeListener(
|
||||
listener: AppearanceListener,
|
||||
): EventSubscription {
|
||||
return eventEmitter.addListener('change', listener);
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
import processColor from '../StyleSheet/processColor';
|
||||
import Appearance from './Appearance';
|
||||
import {getColorScheme} from './Appearance';
|
||||
import NativeDevLoadingView from './NativeDevLoadingView';
|
||||
|
||||
const COLOR_SCHEME = {
|
||||
@@ -39,9 +39,7 @@ module.exports = {
|
||||
showMessage(message: string, type: 'load' | 'refresh') {
|
||||
if (NativeDevLoadingView) {
|
||||
const colorScheme =
|
||||
Appearance.getColorScheme() === 'dark'
|
||||
? COLOR_SCHEME.dark
|
||||
: COLOR_SCHEME.default;
|
||||
getColorScheme() === 'dark' ? COLOR_SCHEME.dark : COLOR_SCHEME.default;
|
||||
|
||||
const colorSet = colorScheme[type];
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
import type {ColorSchemeName} from './NativeAppearance';
|
||||
|
||||
import Appearance from './Appearance';
|
||||
import {addChangeListener, getColorScheme} from './Appearance';
|
||||
import {useSyncExternalStore} from 'react';
|
||||
|
||||
const subscribe = (onStoreChange: () => void) => {
|
||||
const appearanceSubscription = Appearance.addChangeListener(onStoreChange);
|
||||
const appearanceSubscription = addChangeListener(onStoreChange);
|
||||
return () => appearanceSubscription.remove();
|
||||
};
|
||||
|
||||
export default function useColorScheme(): ?ColorSchemeName {
|
||||
return useSyncExternalStore(subscribe, Appearance.getColorScheme);
|
||||
return useSyncExternalStore(subscribe, getColorScheme);
|
||||
}
|
||||
@@ -9156,11 +9156,11 @@ declare export default typeof UTFSequence;
|
||||
|
||||
exports[`public API should not change unintentionally Libraries/Utilities/Appearance.js 1`] = `
|
||||
"type AppearanceListener = (preferences: AppearancePreferences) => void;
|
||||
declare module.exports: {
|
||||
getColorScheme(): ?ColorSchemeName,
|
||||
setColorScheme(colorScheme: ?ColorSchemeName): void,
|
||||
addChangeListener(listener: AppearanceListener): EventSubscription,
|
||||
};
|
||||
declare export function getColorScheme(): ?ColorSchemeName;
|
||||
declare export function setColorScheme(colorScheme: ?ColorSchemeName): void;
|
||||
declare export function addChangeListener(
|
||||
listener: AppearanceListener
|
||||
): EventSubscription;
|
||||
"
|
||||
`;
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -82,7 +82,7 @@ import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
|
||||
import typeof Text from './Libraries/Text/Text';
|
||||
import typeof * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
|
||||
import typeof UTFSequence from './Libraries/UTFSequence';
|
||||
import typeof Appearance from './Libraries/Utilities/Appearance';
|
||||
import typeof * as Appearance from './Libraries/Utilities/Appearance';
|
||||
import typeof BackHandler from './Libraries/Utilities/BackHandler';
|
||||
import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
|
||||
import typeof DevSettings from './Libraries/Utilities/DevSettings';
|
||||
|
||||
Reference in new issue
Block a user