Skip to content

changed WebFont in loadFonts #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sabato-galasso wants to merge 1 commit into from
Closed

changed WebFont in loadFonts #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@
"ts-jest": "^26.5.6",
"tsdx": "^0.14.1",
"tslib": "^2.4.0",
"typeface-lora": "^1.1.13",
"typeface-roboto-mono": "^1.1.13",
"typescript": "^4.8.2",
"webpack": "^5.74.0"
},
Expand Down
24 changes: 3 additions & 21 deletions src/FontLoader/FontLoader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect } from 'react';
import { loadFonts } from 'bootstrap-italia'

export interface FontLoaderProps {
/**
Expand All @@ -8,27 +8,9 @@ export interface FontLoaderProps {
fonts?: string[];
}

const defaultFonts = [
'Titillium Web:300,400,600,700:latin-ext',
'Lora:400,700:latin-ext',
'Roboto Mono:400,700:latin-ext'
];

export function useFontLoader({ fonts }: FontLoaderProps) {
useEffect(() => {
if (typeof window !== 'undefined') {
const WebFont = require('webfontloader');
WebFont.load({
custom: {
families: [...defaultFonts, ...(fonts || [])]
}
});
}
}, [fonts]);
}

export const FontLoader = (props: FontLoaderProps) => {
useFontLoader(props);

export const FontLoader = () => {
loadFonts('/bootstrap-italia/dist/fonts')
return null;
};
2 changes: 1 addition & 1 deletion src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export { ThumbNav } from './ThumbNav/ThumbNav';
export { ThumbNavItem } from './ThumbNav/ThumbNavItem';
export { Chip } from './Chips/Chip';
export { ChipLabel } from './Chips/ChipLabel';
export { FontLoader, useFontLoader } from './FontLoader/FontLoader';
export { FontLoader } from './FontLoader/FontLoader';
export { Dimmer } from './Dimmer/Dimmer';
export { DimmerButtons } from './Dimmer/DimmerButtons';
export { Timeline } from './Timeline/TimelineWrapper';
Expand Down
10 changes: 0 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15617,16 +15617,6 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

typeface-lora@^1.1.13:
version "1.1.13"
resolved "https://registry.yarnpkg.com/typeface-lora/-/typeface-lora-1.1.13.tgz#eb462416dd060fb90e51455bbdb9fea1c3e8db63"
integrity sha512-Y02iTW9l8PzGWkEVPqFJ4lVfckZHbYB+CZLKb5WsVRWjkKn/wo1X5OwlOwdKr8Tt+HzcgkOzwbdqY6CMgVO0tw==

typeface-roboto-mono@^1.1.13:
version "1.1.13"
resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94"
integrity sha512-pnzDc70b7ywJHin/BUFL7HZX8DyOTBLT2qxlJ92eH1UJOFcENIBXa9IZrxsJX/gEKjbEDKhW5vz/TKRBNk/ufQ==

typescript@^3.7.3:
version "3.9.10"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
Expand Down