Skip to content
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

Fix: fonts.css template doesn't correctly parse the style or weight options #1399

Merged
merged 2 commits into from
Dec 8, 2024
Merged

Fix: fonts.css template doesn't correctly parse the style or weight options #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae4b8d5
Fix font style and font weight output using ternaries instead of null…
LewisDaleUK Nov 28, 2024
27583c1
test: add tests for font.css.template changes
LewisDaleUK Dec 1, 2024
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
5 changes: 5 additions & 0 deletions .changeset/two-islands-dance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'style-dictionary': patch
---

Fix font-style and font-weight logic for fonts.css.template.js
35 changes: 35 additions & 0 deletions __tests__/formats/__snapshots__/fontsCSS.test.snap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/* @web/test-runner snapshot v1 */
export const snapshots = {};

snapshots["formats fonts/css should produce a valid css font-face declaration without weight or style defined"] =
`@font-face {
font-family: "font";
src: url('../font.ttf') format('truetype');
}`;
/* end snapshot formats fonts/css should produce a valid css font-face declaration without weight or style defined */

snapshots["formats fonts/css should produce a valid css font-face declaration with a weight defined"] =
`@font-face {
font-family: "font";
src: url('../font.ttf') format('truetype');
font-weight: 400;
}`;
/* end snapshot formats fonts/css should produce a valid css font-face declaration with a weight defined */

snapshots["formats fonts/css should produce a valid css font-face declaration with a style defined"] =
`@font-face {
font-family: "font";
src: url('../font.ttf') format('truetype');
font-style: normal;
}`;
/* end snapshot formats fonts/css should produce a valid css font-face declaration with a style defined */

snapshots["formats fonts/css should produce a valid css font-face declaration with both style and weight defined"] =
`@font-face {
font-family: "font";
src: url('../font.ttf') format('truetype');
font-style: normal;
font-weight: 400;
}`;
/* end snapshot formats fonts/css should produce a valid css font-face declaration with both style and weight defined */

102 changes: 102 additions & 0 deletions __tests__/formats/fontsCSS.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import { expect } from 'chai';
import cssFontsTemplate from '../../lib/common/templates/css/fonts.css.template.js';

describe('formats', () => {
describe('fonts/css', () => {
it('should produce a valid css font-face declaration without weight or style defined', async () => {
const tokens = {
asset: {
font: {
myFont: {
name: {
value: 'font',
type: 'fontFamily',
},
ttf: {
value: 'font.ttf',
type: 'asset',
},
},
},
},
};
const output = cssFontsTemplate(tokens);
await expect(output).to.matchSnapshot();
});

it('should produce a valid css font-face declaration with a weight defined', async () => {
const tokens = {
asset: {
font: {
myFont: {
name: {
value: 'font',
type: 'fontFamily',
},
ttf: {
value: 'font.ttf',
type: 'asset',
},
weight: {
value: 400,
},
},
},
},
};
const output = cssFontsTemplate(tokens);
await expect(output).to.matchSnapshot();
});

it('should produce a valid css font-face declaration with a style defined', async () => {
const tokens = {
asset: {
font: {
myFont: {
name: {
value: 'font',
type: 'fontFamily',
},
ttf: {
value: 'font.ttf',
type: 'asset',
},
style: {
value: 'normal',
},
},
},
},
};
const output = cssFontsTemplate(tokens);
await expect(output).to.matchSnapshot();
});

it('should produce a valid css font-face declaration with both style and weight defined', async () => {
const tokens = {
asset: {
font: {
myFont: {
name: {
value: 'font',
type: 'fontFamily',
},
ttf: {
value: 'font.ttf',
type: 'asset',
},
style: {
value: 'normal',
},
weight: {
value: 400,
},
},
},
},
};
const output = cssFontsTemplate(tokens);
await expect(output).to.matchSnapshot();
});
});
});
4 changes: 2 additions & 2 deletions lib/common/templates/css/fonts.css.template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default (tokens) =>
return `@font-face {
font-family: "${font.name.value}";
src: ${fileFormatArr.join(',\n\t\t')};
${font.style ?? `\n font-style: ${font.style.value};`}${
font.weight ?? `\n font-weight: ${font.weight.value};`
${font.style ? ` font-style: ${font.style.value};\n` : ''}${
font.weight ? ` font-weight: ${font.weight.value};\n` : ''
}}`;
})}`;
Loading