imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compound Typography pass (#11103)

Browse source 
* Integrate compound design tokens

The icons should not be included in this repo, and should live in the compound design token repo, but for simplicity sake at this phase of the integration they will be added here

* Delete unused or incorrect - sass variables

* Typography pass

* Deprecate _font-weights.pcss and use Compound instead

* lint fix

* Fix snapshot

* Fix typography pass feedback

* Remove unwanted e2e test

cypress tests should test functionality not visual output. And we should not test visual output by inspecting CSS properties

* lintfix

* Migration script for baseFontSize

* Updates after design review

* Update font scaling panel to use min/max size

* Fix custom font

* Fix font slider e2e test

* Update custom font

* Update new baseFontSizeV2

* Disambiguate heading props

* Fix appearance test

* change max font size

* fix e2ee test

* fix tests

* test baseFontSize migration code

* typescript strict

* Migrate baseFontSize account setting

* Change assertion for font size

* Fix font size controller test
This commit is contained in:
Germain 2023-06-29 11:30:25 +01:00 • committed by GitHub
parent ce479c5774
commit 9c7d935aae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
199 changed files with 606 additions and 608 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/settings/controllers/FontSizeController-test.ts
View file

@ -19,7 +19,7 @@ import dis from "../../../src/dispatcher/dispatcher";
import FontSizeController from "../../../src/settings/controllers/FontSizeController";
import { SettingLevel } from "../../../src/settings/SettingLevel";
const dispatchSpy = jest.spyOn(dis, "dispatch");
const dispatchSpy = jest.spyOn(dis, "fire");
describe("FontSizeController", () => {
it("dispatches a font size action on change", () => {
@ -27,9 +27,6 @@ describe("FontSizeController", () => {
controller.onChange(SettingLevel.ACCOUNT, "$room:server", 12);
expect(dispatchSpy).toHaveBeenCalledWith({
action: Action.UpdateFontSize,
size: 12,
});
expect(dispatchSpy).toHaveBeenCalledWith(Action.MigrateBaseFontSize);
});
});

55
test/settings/watchers/FontWatcher-test.tsx
View file

@ -31,37 +31,41 @@ async function setSystemFont(font: string): Promise<void> {
await sleep(1); // await the FontWatcher doing its action
}
const getFontFamily = () => {
return document.body.style.getPropertyValue(FontWatcher.FONT_FAMILY_CUSTOM_PROPERTY);
};
describe("FontWatcher", function () {
it("should load font on start()", async () => {
const watcher = new FontWatcher();
await setSystemFont("Font Name");
expect(document.body.style.fontFamily).toBe("");
watcher.start();
expect(document.body.style.fontFamily).toBe('"Font Name"');
expect(getFontFamily()).toBe("");
await watcher.start();
expect(getFontFamily()).toBe('"Font Name"');
});
it("should load font on Action.OnLoggedIn", async () => {
await setSystemFont("Font Name");
new FontWatcher().start();
document.body.style.fontFamily = ""; // clear the fontFamily which was set by start which we tested already
await new FontWatcher().start();
document.body.style.removeProperty(FontWatcher.FONT_FAMILY_CUSTOM_PROPERTY); // clear the fontFamily which was by start which we tested already
defaultDispatcher.fire(Action.OnLoggedIn, true);
expect(document.body.style.fontFamily).toBe('"Font Name"');
expect(getFontFamily()).toBe('"Font Name"');
});
it("should reset font on Action.OnLoggedOut", async () => {
await setSystemFont("Font Name");
const watcher = new FontWatcher();
watcher.start();
expect(document.body.style.fontFamily).toBe('"Font Name"');
await watcher.start();
expect(getFontFamily()).toBe('"Font Name"');
defaultDispatcher.fire(Action.OnLoggedOut, true);
expect(document.body.style.fontFamily).toBe("");
expect(getFontFamily()).toBe("");
});
describe("Sets font as expected", () => {
let fontWatcher: FontWatcher;
beforeEach(() => {
beforeEach(async () => {
fontWatcher = new FontWatcher();
fontWatcher.start();
await fontWatcher.start();
});
afterEach(() => {
fontWatcher.stop();
@ -69,15 +73,38 @@ describe("FontWatcher", function () {
it("encloses the fonts by double quotes and sets them as the system font", async () => {
await setSystemFont("Fira Sans Thin, Commodore 64");
expect(document.body.style.fontFamily).toBe(`"Fira Sans Thin","Commodore 64"`);
expect(getFontFamily()).toBe(`"Fira Sans Thin","Commodore 64"`);
});
it("does not add double quotes if already present and sets the font as the system font", async () => {
await setSystemFont(`"Commodore 64"`);
expect(document.body.style.fontFamily).toBe(`"Commodore 64"`);
expect(getFontFamily()).toBe(`"Commodore 64"`);
});
it("trims whitespace, encloses the fonts by double quotes, and sets them as the system font", async () => {
await setSystemFont(` Fira Code , "Commodore 64" `);
expect(document.body.style.fontFamily).toBe(`"Fira Code","Commodore 64"`);
expect(getFontFamily()).toBe(`"Fira Code","Commodore 64"`);
});
});
describe("Migrates baseFontSize", () => {
let watcher: FontWatcher | undefined;
beforeEach(() => {
watcher = new FontWatcher();
});
afterEach(() => {
watcher!.stop();
});
it("should not run the migration", async () => {
await watcher!.start();
expect(SettingsStore.getValue("baseFontSizeV2")).toBe(16);
});
it("should migrate to default font size", async () => {
await SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, 13);
await watcher!.start();
expect(SettingsStore.getValue("baseFontSizeV2")).toBe(19);
});
});
});