@fluentui-react-native/apple-theme 0.16.1 → 0.16.3

package/src/appleColors.ios.ts

@@ -212,8 +212,8 @@ function getFluentUIAppleDarkPalette(): ApplePalette {
 }
 
 /** Creates a palette of colors for the apple theme, using the appropriate FluentUI Apple Palette based on appearance */
-export function paletteFromAppleColors(isDark: boolean): ThemeColorDefinition {
-  const fluentApple = isDark ? getFluentUIAppleDarkPalette() : getFluentUIAppleLightPalette();
+export function paletteFromAppleColors(isLightMode: boolean): ThemeColorDefinition {
+  const fluentApple = isLightMode ? getFluentUIAppleLightPalette() : getFluentUIAppleDarkPalette();
 
   return {
     /* PaletteBackgroundColors & PaletteTextColors */

package/src/appleTheme.ios.ts

@@ -131,20 +131,13 @@ const appleComponents = {
   },
 };
 
-export const BaseAppleLightThemeIOS: Theme = {
-  colors: paletteFromAppleColors(false),
-  typography: appleTypography(),
-  shadows: iOSShadows(),
-  spacing: appleSpacing(),
-  components: appleComponents,
-  host: { appearance: 'light' },
-};
-
-export const BaseAppleDarkThemeIOS: Theme = {
-  colors: paletteFromAppleColors(true),
-  typography: appleTypography(),
-  shadows: iOSShadows(),
-  spacing: appleSpacing(),
-  components: appleComponents,
-  host: { appearance: 'dark' },
-};
+export function getBaseAppleThemeIOS(isLightMode: boolean): Theme {
+  return {
+    colors: paletteFromAppleColors(isLightMode),
+    typography: appleTypography(),
+    shadows: iOSShadows(),
+    spacing: appleSpacing(),
+    components: appleComponents,
+    host: { appearance: isLightMode ? 'light' : 'dark' },
+  };
+}

package/src/createAppleTheme.ios.ts

@@ -1,15 +1,13 @@
 import { ThemeReference } from '@fluentui-react-native/theme';
 import { Theme } from '@fluentui-react-native/theme-types';
 import { Appearance } from 'react-native';
-import { BaseAppleDarkThemeIOS, BaseAppleLightThemeIOS } from './appleTheme.ios';
+import { getBaseAppleThemeIOS } from './appleTheme.ios';
 
 export function createAppleTheme(): ThemeReference {
-  const baseAppleTheme = () => {
-    const current = Appearance.getColorScheme();
-    return current === 'light' ? BaseAppleLightThemeIOS : BaseAppleDarkThemeIOS;
-  };
-
-  const appleThemeReference = new ThemeReference({} as Theme, baseAppleTheme);
+  const appleThemeReference = new ThemeReference({} as Theme, () => {
+    const isLightMode = Appearance.getColorScheme() === 'light';
+    return getBaseAppleThemeIOS(isLightMode);
+  });
 
   Appearance.addChangeListener(() => {
     appleThemeReference.invalidate();