Fix platform settings race condition and make auto-launch tri-state (#30977)
* Fix race condition with platform settings not being read correctly Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Allow Desktop app to be auto-started minimised or focused Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Use onChange prop Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Add tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update res/css/views/elements/_SettingsDropdown.pcss Co-authored-by: Florian Duros <florianduros@element.io> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: Florian Duros <florianduros@element.io>
This commit is contained in:
committed by
GitHub
parent
3098eba4f2
commit
bc7b50f97c
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
Copyright 2025 New Vector Ltd.
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
import React from "react";
|
||||
import { render, screen } from "jest-matrix-react";
|
||||
|
||||
import { SettingLevel } from "../../../../../src/settings/SettingLevel.ts";
|
||||
import SettingsDropdown from "../../../../../src/components/views/elements/SettingsDropdown.tsx";
|
||||
|
||||
describe("<SettingsDropdown />", () => {
|
||||
it("should render a disabled setting", async () => {
|
||||
const { asFragment } = render(
|
||||
<SettingsDropdown settingKey="Electron.autoLaunch" level={SettingLevel.PLATFORM} />,
|
||||
);
|
||||
expect(asFragment()).toMatchSnapshot();
|
||||
|
||||
const trigger = screen.getByRole("button");
|
||||
expect(trigger).toHaveTextContent("No");
|
||||
expect(trigger).toHaveAttribute("aria-disabled", "true");
|
||||
});
|
||||
|
||||
it("should not render a disabled setting if hideIfCannotSet=true", async () => {
|
||||
const { container } = render(
|
||||
<SettingsDropdown settingKey="Electron.autoLaunch" level={SettingLevel.PLATFORM} hideIfCannotSet />,
|
||||
);
|
||||
expect(container).toBeEmptyDOMElement();
|
||||
});
|
||||
|
||||
it("should not render a non-options setting", async () => {
|
||||
const { container } = render(<SettingsDropdown settingKey="systemFont" level={SettingLevel.DEVICE} />);
|
||||
expect(container).toBeEmptyDOMElement();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,48 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`<SettingsDropdown /> should render a disabled setting 1`] = `
|
||||
<DocumentFragment>
|
||||
<div
|
||||
class="mx_SettingsDropdown"
|
||||
>
|
||||
<label
|
||||
class="mx_SettingsDropdown_label"
|
||||
for="«r0»"
|
||||
>
|
||||
<span
|
||||
class="mx_SettingsDropdown_labelText"
|
||||
>
|
||||
Open %(brand)s when you log in to your computer
|
||||
</span>
|
||||
</label>
|
||||
<div
|
||||
class="mx_Dropdown mx_Dropdown_disabled"
|
||||
>
|
||||
<div
|
||||
aria-describedby="«r0»_value"
|
||||
aria-disabled="true"
|
||||
aria-expanded="false"
|
||||
aria-haspopup="listbox"
|
||||
aria-label="Open %(brand)s when you log in to your computer"
|
||||
aria-owns="«r0»_input"
|
||||
class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput mx_AccessibleButton_disabled"
|
||||
disabled=""
|
||||
role="button"
|
||||
tabindex="0"
|
||||
>
|
||||
<div
|
||||
class="mx_Dropdown_option"
|
||||
id="«r0»_value"
|
||||
>
|
||||
<div>
|
||||
No
|
||||
</div>
|
||||
</div>
|
||||
<span
|
||||
class="mx_Dropdown_arrow"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</DocumentFragment>
|
||||
`;
|
||||
Reference in New Issue
Block a user