IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 23:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing tests because of circular dependency

Browse Source
This commit is contained in:
Dominik Prokop 2019-02-21 11:52:47 +01:00
parent 75e9c1e8fc
commit 996588528a
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/themes/ThemeContext.tsx
View File

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import { getTheme } from './index'; import { getTheme } from './getTheme';
import { GrafanaThemeType, Themeable } from '../types/theme'; import { GrafanaThemeType, Themeable } from '../types/theme';
type Omit<T, K> = Pick<T, Exclude<keyof T, K>>; type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;

15
packages/grafana-ui/src/themes/getTheme.ts Normal file
View File

@ -0,0 +1,15 @@
import darkTheme from './dark';
import lightTheme from './light';
import { GrafanaTheme } from '../types/theme';
let themeMock: ((name?: string) => GrafanaTheme) | null;
export const getTheme = (name?: string) =>
(themeMock && themeMock(name)) || (name === 'light' ? lightTheme : darkTheme);
export const mockTheme = (mock: (name?: string) => GrafanaTheme) => {
themeMock = mock;
return () => {
themeMock = null;
};
};

17
packages/grafana-ui/src/themes/index.ts
View File

@ -1,17 +1,4 @@
import darkTheme from './dark';
import lightTheme from './light';
import { GrafanaTheme } from '../types/theme';
import { ThemeContext, withTheme } from './ThemeContext'; import { ThemeContext, withTheme } from './ThemeContext';
import { getTheme, mockTheme } from './getTheme';
let themeMock: ((name?: string) => GrafanaTheme) | null; export { ThemeContext, withTheme, mockTheme, getTheme };
export let getTheme = (name?: string) => (themeMock && themeMock(name)) || (name === 'light' ? lightTheme : darkTheme);
export const mockTheme = (mock: (name?: string) => GrafanaTheme) => {
themeMock = mock;
return () => {
themeMock = null;
};
};
export { ThemeContext, withTheme };