Remove custom font size input

Author: florianduros

src/components/views/settings/FontScalingPanel.tsx

@@ -14,21 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// import React, { ChangeEvent } from "react";
 import React from "react";
 
 import EventTilePreview from "../elements/EventTilePreview";
-// import Field from "../elements/Field";
-// import SettingsFlag from "../elements/SettingsFlag";
 import SettingsStore from "../../../settings/SettingsStore";
 import Slider from "../elements/Slider";
 import { FontWatcher } from "../../../settings/watchers/FontWatcher";
-// import { IValidationResult, IFieldState } from "../elements/Validation";
 import { Layout } from "../../../settings/enums/Layout";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import { _t } from "../../../languageHandler";
-// import { clamp } from "../../../utils/numbers";
 import SettingsSubsection from "./shared/SettingsSubsection";
 
 interface IProps {}
@@ -96,27 +91,6 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
         await SettingsStore.setValue("baseFontSizeV3", null, SettingLevel.DEVICE, delta);
     };
 
-    // private onValidateFontSize = async ({ value }: Pick<IFieldState, "value">): Promise<IValidationResult> => {
-    //     const parsedSize = parseFloat(value!);
-    //     const min = FontWatcher.MIN_SIZE;
-    //     const max = FontWatcher.MAX_SIZE;
-    //
-    //     if (isNaN(parsedSize)) {
-    //         return { valid: false, feedback: _t("settings|appearance|font_size_nan") };
-    //     }
-    //
-    //     if (!(min <= parsedSize && parsedSize <= max)) {
-    //         return {
-    //             valid: false,
-    //             feedback: _t("settings|appearance|font_size_limit", { min, max }),
-    //         };
-    //     }
-    //
-    //     SettingsStore.setValue("baseFontSizeV2", null, SettingLevel.DEVICE, parseInt(value!, 10));
-    //
-    //     return { valid: true, feedback: _t("settings|appearance|font_size_valid", { min, max }) };
-    // };
-
     public render(): React.ReactNode {
         return (
             <SettingsSubsection
@@ -146,35 +120,6 @@ export default class FontScalingPanel extends React.Component<IProps, IState> {
                     />
                     <div className="mx_FontScalingPanel_fontSlider_largeText">Aa</div>
                 </div>
-
-                {/*<SettingsFlag*/}
-                {/*    name="useCustomFontSize"*/}
-                {/*    level={SettingLevel.ACCOUNT}*/}
-                {/*    onChange={(checked) => {*/}
-                {/*        this.setState({ useCustomFontSize: checked });*/}
-                {/*        if (!checked) {*/}
-                {/*            const size = parseInt(this.state.fontSize, 10);*/}
-                {/*            const clamped = clamp(size, FontWatcher.MIN_SIZE, FontWatcher.MAX_SIZE);*/}
-                {/*            if (clamped !== size) {*/}
-                {/*                this.onFontSizeChanged(clamped);*/}
-                {/*            }*/}
-                {/*        }*/}
-                {/*    }}*/}
-                {/*    useCheckbox={true}*/}
-                {/*/>*/}
-
-                {/*<Field*/}
-                {/*    type="number"*/}
-                {/*    label={_t("settings|appearance|font_size")}*/}
-                {/*    autoComplete="off"*/}
-                {/*    placeholder={this.state.fontSize.toString()}*/}
-                {/*    value={this.state.fontSize.toString()}*/}
-                {/*    id="font_size_field"*/}
-                {/*    onValidate={this.onValidateFontSize}*/}
-                {/*    onChange={(value: ChangeEvent<HTMLInputElement>) => this.setState({ fontSize: value.target.value })}*/}
-                {/*    disabled={!this.state.useCustomFontSize}*/}
-                {/*    className="mx_AppearanceUserSettingsTab_checkboxControlledField"*/}
-                {/*/>*/}
             </SettingsSubsection>
         );
     }

test/components/views/settings/FontScalingPanel-test.tsx

@@ -15,31 +15,15 @@ limitations under the License.
 */
 
 import React from "react";
-import { fireEvent, render, waitFor } from "@testing-library/react";
+import { render } from "@testing-library/react";
 
 import * as TestUtils from "../../../test-utils";
 import FontScalingPanel from "../../../../src/components/views/settings/FontScalingPanel";
-import SettingsStore from "../../../../src/settings/SettingsStore";
 
 describe("FontScalingPanel", () => {
     it("renders the font scaling UI", () => {
         TestUtils.stubClient();
         const { asFragment } = render(<FontScalingPanel />);
         expect(asFragment()).toMatchSnapshot();
     });
-
-    it("should clamp custom font size when disabling it", async () => {
-        jest.spyOn(SettingsStore, "setValue").mockResolvedValue(undefined);
-        TestUtils.stubClient();
-        const { container, getByText } = render(<FontScalingPanel />);
-        fireEvent.click(getByText("Use custom size"));
-        await waitFor(() => {
-            expect(container.querySelector("input[checked]")).toBeDefined();
-        });
-        fireEvent.change(container.querySelector("#font_size_field")!, { target: { value: "25" } });
-        fireEvent.click(getByText("Use custom size"));
-        await waitFor(() => {
-            expect(container.querySelector("#font_size_field")).toHaveValue(21);
-        });
-    });
 });