Skip to content

Fix: Commander Ribbon Elements Reordering on Changes #138

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

Open
datenwurm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Commander Ribbon Elements Reordering on Changes #138

Show file tree
Hide file tree
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
43 changes: 25 additions & 18 deletions src/manager/commands/leftRibbonManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@ export default class LeftRibbonManager extends CommandManagerBase {
this.plugin.settings.leftRibbon.push(pair);
await this.plugin.saveSettings();
}
if (isModeActive(pair.mode)) {
this.plugin.addRibbonIcon(pair.icon, pair.name, () =>
app.commands.executeCommandById(pair.id)
);
this.plugin.addRibbonIcon(pair.icon, pair.name, () =>
app.commands.executeCommandById(pair.id)
);
// @ts-expect-error
const nativeAction = app.workspace.leftRibbon.items.find((i, index) => {
const pairId = `${this.plugin.manifest.id}:${pair.name}`;
return i.id === pairId;
});
if (nativeAction) {
nativeAction.hidden = !isModeActive(pair.mode);
// @ts-expect-error
const nativeAction = app.workspace.leftRibbon.items.find(
// @ts-expect-error
(i) => i.icon === pair.icon && i.name === i.name
);
if (nativeAction) {
nativeAction.buttonEl.style.color =
pair.color === "#000000" || pair.color === undefined
? "inherit"
: pair.color;
}
nativeAction.buttonEl.style.color =
pair.color === "#000000" || pair.color === undefined
? "inherit"
: pair.color;
this.plugin.register(() => this.removeCommand(pair, false));
}
}
Expand All @@ -60,10 +60,10 @@ export default class LeftRibbonManager extends CommandManagerBase {
await this.plugin.saveSettings();
}
// @ts-expect-error
const nativeAction = app.workspace.leftRibbon.items.find(
// @ts-expect-error
(i) => i.icon === pair.icon && i.name === i.name
);
const nativeAction = app.workspace.leftRibbon.items.find((i, index) => {
const pairId = `${this.plugin.manifest.id}:${pair.name}`;
return i.id === pairId;
});
if (nativeAction) {
nativeAction.buttonEl.remove();
}
Expand All @@ -78,4 +78,11 @@ export default class LeftRibbonManager extends CommandManagerBase {
this.addCommand(pair, false);
});
}

public update(): void {
this.plugin.settings.leftRibbon.forEach((pair) => {
this.addCommand(pair, false);
});
}

}
12 changes: 6 additions & 6 deletions src/ui/components/commandViewerComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ export default function CommandViewer({
handleRename={async (
name
): Promise<void> => {
cmd.name = name;
manager.removeCommand(cmd);
await plugin.saveSettings();
manager.reorder();
cmd.name = name;
manager.addCommand(cmd);
this.forceUpdate();
}}
handleNewIcon={async (): Promise<void> => {
Expand All @@ -84,7 +85,7 @@ export default function CommandViewer({
if (newIcon && newIcon !== cmd.icon) {
cmd.icon = newIcon;
await plugin.saveSettings();
manager.reorder();
manager.update();
this.forceUpdate();
}
dispatchEvent(
Expand All @@ -109,15 +110,15 @@ export default function CommandViewer({
cmd.mode =
mode || modes[currentIdx + 1];
await plugin.saveSettings();
manager.reorder();
manager.update();
this.forceUpdate();
}}
handleColorChange={async (
color?: string
): Promise<void> => {
cmd.color = color;
await plugin.saveSettings();
manager.reorder();
manager.update();
}}
/>
);
Expand Down Expand Up @@ -146,7 +147,6 @@ export default function CommandViewer({
onClick={async (): Promise<void> => {
const pair = await chooseNewCommand(plugin);
await manager.addCommand(pair);
manager.reorder();
this.forceUpdate();
}}
>
Expand Down