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

21
src/components/views/settings/FontScalingPanel.tsx
View file

@ -1,5 +1,5 @@
/*
Copyright 2021 The Matrix.org Foundation C.I.C.
Copyright 2021 - 2023 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -54,7 +54,7 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
super(props);
this.state = {
fontSize: (SettingsStore.getValue("baseFontSize", null) + FontWatcher.SIZE_DIFF).toString(),
fontSize: SettingsStore.getValue("baseFontSizeV2", null).toString(),
useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
layout: SettingsStore.getValue("layout"),
};
@ -80,13 +80,13 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
private onFontSizeChanged = (size: number): void => {
this.setState({ fontSize: size.toString() });
SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, size - FontWatcher.SIZE_DIFF);
SettingsStore.setValue("baseFontSizeV2", null, SettingLevel.DEVICE, size);
};
private onValidateFontSize = async ({ value }: Pick<IFieldState, "value">): Promise<IValidationResult> => {
const parsedSize = parseFloat(value!);
const min = FontWatcher.MIN_SIZE + FontWatcher.SIZE_DIFF;
const max = FontWatcher.MAX_SIZE + FontWatcher.SIZE_DIFF;
const min = FontWatcher.MIN_SIZE;
const max = FontWatcher.MAX_SIZE;
if (isNaN(parsedSize)) {
return { valid: false, feedback: _t("Size must be a number") };
@ -99,15 +99,12 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
};
}
SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, parseInt(value!, 10) - FontWatcher.SIZE_DIFF);
SettingsStore.setValue("baseFontSizeV2", null, SettingLevel.DEVICE, parseInt(value!, 10));
return { valid: true, feedback: _t("Use between %(min)s pt and %(max)s pt", { min, max }) };
};
public render(): React.ReactNode {
const min = 13;
const max = 18;
return (
<SettingsSubsection heading={_t("Font size")} stretchContent data-testid="mx_FontScalingPanel">
<EventTilePreview
@ -121,8 +118,8 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
<div className="mx_FontScalingPanel_fontSlider">
<div className="mx_FontScalingPanel_fontSlider_smallText">Aa</div>
<Slider
min={min}
max={max}
min={FontWatcher.MIN_SIZE}
max={FontWatcher.MAX_SIZE}
step={1}
value={parseInt(this.state.fontSize, 10)}
onChange={this.onFontSizeChanged}
@ -140,7 +137,7 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
this.setState({ useCustomFontSize: checked });
if (!checked) {
const size = parseInt(this.state.fontSize, 10);
const clamped = clamp(size, min, max);
const clamped = clamp(size, FontWatcher.MIN_SIZE, FontWatcher.MAX_SIZE);
if (clamped !== size) {
this.onFontSizeChanged(clamped);
}

4
src/components/views/settings/IntegrationManager.tsx
View file

@ -89,7 +89,7 @@ export default class IntegrationManager extends React.Component<IProps, IState>
if (this.props.loading) {
return (
<div className="mx_IntegrationManager_loading">
<Heading size="h3">{_t("Connecting to integration manager…")}</Heading>
<Heading size="3">{_t("Connecting to integration manager…")}</Heading>
<Spinner />
</div>
);
@ -98,7 +98,7 @@ export default class IntegrationManager extends React.Component<IProps, IState>
if (!this.props.connected || this.state.errored) {
return (
<div className="mx_IntegrationManager_error">
<Heading size="h3">{_t("Cannot connect to integration manager")}</Heading>
<Heading size="3">{_t("Cannot connect to integration manager")}</Heading>
<p>{_t("The integration manager is offline or it cannot reach your homeserver.")}</p>
</div>
);

4
src/components/views/settings/SetIntegrationManager.tsx
View file

@ -79,8 +79,8 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
>
<div className="mx_SettingsFlag">
<div className="mx_SetIntegrationManager_heading_manager">
<Heading size="h2">{_t("Manage integrations")}</Heading>
<Heading size="h3">{managerName}</Heading>
<Heading size="2">{_t("Manage integrations")}</Heading>
<Heading size="3">{managerName}</Heading>
</div>
<ToggleSwitch
id="toggle_integration"

2
src/components/views/settings/devices/DeviceDetailHeading.tsx
View file

@ -134,7 +134,7 @@ export const DeviceDetailHeading: React.FC<Props> = ({ device, saveDeviceName })
<DeviceNameEditor device={device} saveDeviceName={saveDeviceName} stopEditing={() => setIsEditing(false)} />
) : (
<div className="mx_DeviceDetailHeading" data-testid="device-detail-heading">
<Heading size="h4">{device.display_name || device.device_id}</Heading>
<Heading size="4">{device.display_name || device.device_id}</Heading>
<AccessibleButton
kind="link_inline"
onClick={() => setIsEditing(true)}

2
src/components/views/settings/devices/DeviceTile.tsx
View file

@ -30,7 +30,7 @@ export interface DeviceTileProps {
}
const DeviceTileName: React.FC<{ device: ExtendedDevice }> = ({ device }) => {
return <Heading size="h4">{device.display_name || device.device_id}</Heading>;
return <Heading size="4">{device.display_name || device.device_id}</Heading>;
};
const DeviceTile: React.FC<DeviceTileProps> = ({ device, children, isSelected, onClick }) => {

2
src/components/views/settings/shared/SettingsSection.tsx
View file

@ -42,7 +42,7 @@ export interface SettingsSectionProps extends HTMLAttributes<HTMLDivElement> {
*/
export const SettingsSection: React.FC<SettingsSectionProps> = ({ heading, children, ...rest }) => (
<div {...rest} className="mx_SettingsSection">
{typeof heading === "string" ? <Heading size="h2">{heading}</Heading> : <>{heading}</>}
{typeof heading === "string" ? <Heading size="2">{heading}</Heading> : <>{heading}</>}
<div className="mx_SettingsSection_subSections">{children}</div>
</div>
);

2
src/components/views/settings/shared/SettingsSubsectionHeading.tsx
View file

@ -25,7 +25,7 @@ export interface SettingsSubsectionHeadingProps extends HTMLAttributes<HTMLDivEl
export const SettingsSubsectionHeading: React.FC<SettingsSubsectionHeadingProps> = ({ heading, children, ...rest }) => (
<div {...rest} className="mx_SettingsSubsectionHeading">
<Heading className="mx_SettingsSubsectionHeading_heading" size="h3">
<Heading className="mx_SettingsSubsectionHeading_heading" size="4" as="h3">
{heading}
</Heading>
{children}

2
src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
View file

@ -274,7 +274,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
</AccessibleButton>
</div>
<div>
<h4>{_t("Set a new custom sound")}</h4>
<h4 className="mx_Heading_h4">{_t("Set a new custom sound")}</h4>
<div className="mx_SettingsFlag">
<form autoComplete="off" noValidate={true}>
<input

2
src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
View file

@ -541,7 +541,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
/>
) : null;
const heading = (
<Heading size="h2">
<Heading size="2">
{discoWarning}
{_t("Discovery")}
</Heading>