Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Fix: inline links selecting radio button (#9543)
Browse files Browse the repository at this point in the history
* fix: inline link selecting radio button
  • Loading branch information
hanadi92 authored Nov 14, 2022
1 parent 7c33fc6 commit 212233c
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { logger } from "matrix-js-sdk/src/logger";

import { _t } from "../../../../../languageHandler";
import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
import AccessibleButton from "../../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton";
import Notifier from "../../../../../Notifier";
import SettingsStore from '../../../../../settings/SettingsStore';
import { SettingLevel } from "../../../../../settings/SettingLevel";
Expand Down Expand Up @@ -163,7 +163,9 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
this.forceUpdate();
};

private onOpenSettingsClick = () => {
private onOpenSettingsClick = (event: ButtonEvent) => {
// avoid selecting the radio button
event.preventDefault();
this.props.closeSettingsFn();
defaultDispatcher.dispatch({
action: Action.ViewUserSettings,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
Copyright 2022 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import React from "react";
import { render, RenderResult } from "@testing-library/react";
import { MatrixClient } from "matrix-js-sdk/src/client";
import userEvent from "@testing-library/user-event";

import NotificationSettingsTab from "../../../../../../src/components/views/settings/tabs/room/NotificationSettingsTab";
import { mkStubRoom, stubClient } from "../../../../../test-utils";
import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
import { EchoChamber } from "../../../../../../src/stores/local-echo/EchoChamber";
import { RoomEchoChamber } from "../../../../../../src/stores/local-echo/RoomEchoChamber";

describe("NotificatinSettingsTab", () => {
const roomId = "!room:example.com";
let cli: MatrixClient;
let roomProps: RoomEchoChamber;

const renderTab = (): RenderResult => {
return render(<NotificationSettingsTab roomId={roomId} closeSettingsFn={() => { }} />);
};

beforeEach(() => {
stubClient();
cli = MatrixClientPeg.get();
const room = mkStubRoom(roomId, "test room", cli);
roomProps = EchoChamber.forRoom(room);

NotificationSettingsTab.contextType = React.createContext(cli);
});

it("should prevent »Settings« link click from bubbling up to radio buttons", async () => {
const tab = renderTab();

// settings link of mentions_only volume
const settingsLink = tab.container.querySelector(
"label.mx_NotificationSettingsTab_mentionsKeywordsEntry div.mx_AccessibleButton");
if (!settingsLink) throw new Error("settings link does not exist.");

await userEvent.click(settingsLink);

expect(roomProps.notificationVolume).not.toBe("mentions_only");
});
});

0 comments on commit 212233c

Please sign in to comment.