Skip to content

Commit

Permalink
[maps] fix Maps don't display darktheme when user has dark theme enab…
Browse files Browse the repository at this point in the history
…led in profile (elastic#158219)

Fixes elastic#158050

PR updates `getIsDarkMode` to read value from theme$ instead of
UiSettings, since UiSettings does not contain profile theming. Part of
elastic#158201

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
  • Loading branch information
2 people authored and delanni committed May 25, 2023
1 parent 945ce77 commit 973f577
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion x-pack/plugins/maps/public/kibana_services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
import type { MapsConfigType } from '../config';
import type { MapsPluginStartDependencies } from './plugin';

let isDarkMode = false;
let coreStart: CoreStart;
let pluginsStart: MapsPluginStartDependencies;
let mapsEms: MapsEmsPluginPublicStart;
Expand All @@ -20,6 +21,10 @@ export function setStartServices(core: CoreStart, plugins: MapsPluginStartDepend
pluginsStart = plugins;
mapsEms = plugins.mapsEms;
emsSettings = mapsEms.createEMSSettings();

core.theme.theme$.subscribe(({ darkMode }) => {
isDarkMode = darkMode;
});
}

let isCloudEnabled = false;
Expand All @@ -35,7 +40,7 @@ export const getAutocompleteService = () => pluginsStart.unifiedSearch.autocompl
export const getInspector = () => pluginsStart.inspector;
export const getFileUpload = () => pluginsStart.fileUpload;
export const getUiSettings = () => coreStart.uiSettings;
export const getIsDarkMode = () => getUiSettings().get('theme:darkMode', false);
export const getIsDarkMode = () => isDarkMode;
export const getIndexPatternSelectComponent = () =>
pluginsStart.unifiedSearch.ui.IndexPatternSelect;
export const getSearchBar = () => pluginsStart.unifiedSearch.ui.SearchBar;
Expand Down

0 comments on commit 973f577

Please sign in to comment.