Skip to content

fix(settings): Update layoutfluid on config change (@fehmer) #6462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Miodec merged 1 commit into from
Apr 17, 2025
Merged

fix(settings): Update layoutfluid on config change (@fehmer) #6462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 35 additions & 23 deletions frontend/src/ts/pages/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ import {
import { getActiveFunboxNames } from "../test/funbox/list";
import { SnapshotPreset } from "../constants/default-snapshot";
import { LayoutsList } from "../constants/layouts";
import { DataArrayPartial } from "slim-select/store";

type SettingsGroups<T extends ConfigValue> = Record<string, SettingsGroup<T>>;

let customLayoutFluidSelect: SlimSelect | undefined;

export const groups: SettingsGroups<ConfigValue> = {};

async function initGroups(): Promise<void> {
Expand Down Expand Up @@ -684,34 +687,24 @@ async function fillSettingsPage(): Promise<void> {
Config.keymapSize
);

$(".pageSettings .section[data-config-name='customLayoutfluid'] input").val(
Config.customLayoutfluid.replace(/#/g, " ")
);

const customLayoutfluidActive = Config.customLayoutfluid.split("#");
const customLayoutfluidElement = document.querySelector(
".pageSettings .section[data-config-name='customLayoutfluid'] select"
) as Element;

new SlimSelect({
select: customLayoutfluidElement,
data: [
...customLayoutfluidActive,
...LayoutsList.filter((it) => !customLayoutfluidActive.includes(it)),
].map((layout) => ({
text: layout.replace(/_/g, " "),
value: layout,
selected: customLayoutfluidActive.includes(layout),
})),
settings: { keepOrder: true },
events: {
afterChange: (newVal): void => {
void UpdateConfig.setCustomLayoutfluid(
newVal.map((it) => it.value).join("#")
);
if (customLayoutFluidSelect === undefined) {
customLayoutFluidSelect = new SlimSelect({
select: customLayoutfluidElement,
settings: { keepOrder: true },
events: {
afterChange: (newVal): void => {
const customLayoutfluid = newVal.map((it) => it.value).join("#");
if (customLayoutfluid !== Config.customLayoutfluid) {
void UpdateConfig.setCustomLayoutfluid(customLayoutfluid);
}
},
},
},
});
});
}

$(".pageSettings .section[data-config-name='tapeMargin'] input").val(
Config.tapeMargin
Expand Down Expand Up @@ -911,6 +904,13 @@ export async function update(groupUpdate = true): Promise<void> {
$(".pageSettings .tip").html(`
tip: You can also change all these settings quickly using the
command line (<key>${commandKey}</key> or <key>${modifierKey}</key> + <key>shift</key> + <key>p</key>)`);

if (
customLayoutFluidSelect !== undefined &&
customLayoutFluidSelect.getSelected().join("#") !== Config.customLayoutfluid
) {
customLayoutFluidSelect.setData(getLayoutfluidDropdownData());
}
}
function toggleSettingsGroup(groupName: string): void {
const groupEl = $(`.pageSettings .settingsGroup.${groupName}`);
Expand Down Expand Up @@ -1359,6 +1359,18 @@ export function setEventDisabled(value: boolean): void {
configEventDisabled = value;
}

function getLayoutfluidDropdownData(): DataArrayPartial {
const customLayoutfluidActive = Config.customLayoutfluid.split("#");
return [
...customLayoutfluidActive,
...LayoutsList.filter((it) => !customLayoutfluidActive.includes(it)),
].map((layout) => ({
text: layout.replace(/_/g, " "),
value: layout,
selected: customLayoutfluidActive.includes(layout),
}));
}

ConfigEvent.subscribe((eventKey, eventValue) => {
if (eventKey === "fullConfigChange") setEventDisabled(true);
if (eventKey === "fullConfigChangeFinished") setEventDisabled(false);
Expand Down