Skip to content

Commit 49d83d2

Browse files
committed
feat: use the configured font on the help page
1 parent fdd870a commit 49d83d2

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

package-lock.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/page-help/lib/HelpPage.test.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { test } from "node:test";
22
import { FakeIntlProvider } from "@keybr/intl";
3+
import { FakeSettingsContext } from "@keybr/settings";
34
import { render } from "@testing-library/react";
45
import { assert } from "chai";
56
import { MemoryRouter } from "react-router";
@@ -9,7 +10,9 @@ test("render", () => {
910
const r = render(
1011
<FakeIntlProvider>
1112
<MemoryRouter>
12-
<HelpPage />
13+
<FakeSettingsContext>
14+
<HelpPage />
15+
</FakeSettingsContext>
1316
</MemoryRouter>
1417
</FakeIntlProvider>,
1518
);

packages/page-help/lib/HelpPage.tsx

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Layout, loadKeyboard } from "@keybr/keyboard";
22
import { KeyLayer, VirtualKeyboard, ZonesLayer } from "@keybr/keyboard-ui";
33
import { KeyLegendList } from "@keybr/lesson-ui";
4-
import { singleLine } from "@keybr/textinput";
4+
import { useSettings } from "@keybr/settings";
5+
import { singleLine, toTextDisplaySettings } from "@keybr/textinput";
56
import { StaticText } from "@keybr/textinput-ui";
67
import { Article, Figure } from "@keybr/widget";
78
import { FormattedMessage } from "react-intl";
@@ -12,6 +13,8 @@ import * as styles from "./HelpApp.module.less";
1213

1314
export function HelpPage() {
1415
const keyboard = loadKeyboard(Layout.EN_US);
16+
const { settings } = useSettings();
17+
const textDisplaySettings = toTextDisplaySettings(settings);
1518

1619
return (
1720
<Article>
@@ -64,6 +67,7 @@ export function HelpPage() {
6467

6568
<div className={styles.example}>
6669
<StaticText
70+
settings={textDisplaySettings}
6771
lines={singleLine(
6872
"teen nien neer nient relier ine neerine elerine neer",
6973
)}
@@ -91,6 +95,7 @@ export function HelpPage() {
9195

9296
<div className={styles.example}>
9397
<StaticText
98+
settings={textDisplaySettings}
9499
lines={singleLine(
95100
"entin entle intell letter rittle ritin tete titient",
96101
)}
@@ -118,6 +123,7 @@ export function HelpPage() {
118123

119124
<div className={styles.example}>
120125
<StaticText
126+
settings={textDisplaySettings}
121127
lines={singleLine(
122128
"less les list res rise ins test tes listree listree",
123129
)}
@@ -145,6 +151,7 @@ export function HelpPage() {
145151

146152
<div className={styles.example}>
147153
<StaticText
154+
settings={textDisplaySettings}
148155
lines={singleLine(
149156
"res ress risin its seen rise ensiste liste its estine",
150157
)}
@@ -174,6 +181,7 @@ export function HelpPage() {
174181

175182
<div className={styles.example}>
176183
<StaticText
184+
settings={textDisplaySettings}
177185
lines={singleLine("a list of words with all the letters")}
178186
/>
179187
</div>

packages/page-help/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"@keybr/lesson-ui": "*",
1414
"@keybr/pages-shared": "*",
1515
"@keybr/phonetic-model": "*",
16+
"@keybr/settings": "*",
1617
"@keybr/textinput": "*",
1718
"@keybr/textinput-ui": "*",
1819
"@keybr/widget": "*"

0 commit comments

Comments
 (0)