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

Icons: fix iconRoot url (#33243)

Browse Source
This commit is contained in:
Ryan McKinley 2021-04-23 00:06:19 -07:00 committed by GitHub
parent cf64adf156
commit 7499efeef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jest.config.js
View File

@ -15,7 +15,10 @@ module.exports = {
setupFiles: ['jest-canvas-mock', './public/test/jest-shim.ts', './public/test/jest-setup.ts'], setupFiles: ['jest-canvas-mock', './public/test/jest-shim.ts', './public/test/jest-setup.ts'],
setupFilesAfterEnv: ['./public/test/setupTests.ts'], setupFilesAfterEnv: ['./public/test/setupTests.ts'],
snapshotSerializers: ['enzyme-to-json/serializer'], snapshotSerializers: ['enzyme-to-json/serializer'],
globals: { 'ts-jest': { isolatedModules: true } }, globals: {
'ts-jest': { isolatedModules: true },
__webpack_public_path__: '', // empty string
},
moduleNameMapper: { moduleNameMapper: {
'\\.svg': '<rootDir>/public/test/mocks/svg.ts', '\\.svg': '<rootDir>/public/test/mocks/svg.ts',
'\\.css': '<rootDir>/public/test/mocks/style.ts', '\\.css': '<rootDir>/public/test/mocks/style.ts',

18
packages/grafana-ui/src/components/Icon/Icon.tsx
View File

@ -6,7 +6,10 @@ import { useTheme } from '../../themes/ThemeContext';
import { IconName, IconType, IconSize } from '../../types/icon'; import { IconName, IconType, IconSize } from '../../types/icon';
import SVG from '@leeoniya/react-inlinesvg'; import SVG from '@leeoniya/react-inlinesvg';
const iconRoot = '/public/img/icons/'; declare let __webpack_public_path__: string;
// Lazy load the root url
let iconRoot: string | undefined = undefined;
const alwaysMonoIcons: IconName[] = ['grafana', 'favorite', 'heart-break', 'heart', 'panel-add', 'reusable-panel']; const alwaysMonoIcons: IconName[] = ['grafana', 'favorite', 'heart-break', 'heart', 'panel-add', 'reusable-panel'];
export interface IconProps extends React.HTMLAttributes<HTMLDivElement> { export interface IconProps extends React.HTMLAttributes<HTMLDivElement> {
@ -56,6 +59,19 @@ export const Icon = React.forwardRef<HTMLDivElement, IconProps>(
size = 'xl'; size = 'xl';
} }
// Lazy load -- this will give time the the CDN path to be injected on app init
if (!iconRoot) {
if (__webpack_public_path__) {
const publicpath = // __webpack_public_path__ includes the 'build/' suffix
__webpack_public_path__.substring(0, __webpack_public_path__.lastIndexOf('build/')) ||
__webpack_public_path__;
iconRoot = publicpath + 'img/icons/';
} else {
iconRoot = '/public/img/icons/'; // will only happen for non-grafana builds
}
}
const styles = getIconStyles(theme); const styles = getIconStyles(theme);
const svgSize = getSvgSize(size); const svgSize = getSvgSize(size);
const svgHgt = svgSize; const svgHgt = svgSize;