Skip to content

Commit 4870fa0

Browse files
Made menu option id optional
1 parent 7f91092 commit 4870fa0

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

src/canvas-extensions/edges-style-canvas-extension.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export default class EdgesStyleCanvasExtension {
5353
return
5454

5555
const nestedMenuOptions = STYLES.map((style) => ({
56-
id: '',
5756
label: style.menuName,
5857
icon: style.icon,
5958
callback: () => this.setStyleForSelection(canvas, selectedEdges, style)

src/canvas-extensions/shapes-canvas-extension.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export default class ShapesCanvasExtension {
7777
return
7878

7979
const nestedMenuOptions = SHAPES.map((shape) => ({
80-
id: '',
8180
label: shape.menuName,
8281
icon: shape.icon,
8382
callback: () => this.setShapeForSelection(canvas, shape)

src/utils/canvas-helper.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ export function canvasCommand(plugin: AdvancedCanvasPlugin, check: (canvas: Canv
1414
}
1515

1616
export interface MenuOption {
17-
id: string
17+
id?: string
1818
label: string
1919
icon: string
2020
callback?: () => void
2121
}
2222

2323
export function createQuickSettingsButton(menuOption: MenuOption): HTMLElement {
2424
const quickSetting = document.createElement('div')
25-
quickSetting.id = menuOption.id
25+
if (menuOption.id) quickSetting.id = menuOption.id
2626
quickSetting.classList.add('canvas-control-item')
2727
setIcon(quickSetting, menuOption.icon)
2828
setTooltip(quickSetting, menuOption.label, { placement: 'left' })
@@ -32,13 +32,13 @@ export function createQuickSettingsButton(menuOption: MenuOption): HTMLElement {
3232
}
3333

3434
export function addQuickSettingsButton(controlGroup: HTMLElement, element: HTMLElement) {
35-
controlGroup.querySelector(`#${element.id}`)?.remove()
35+
if (element.id) controlGroup.querySelector(`#${element.id}`)?.remove()
3636
controlGroup.appendChild(element)
3737
}
3838

3939
export function createCardMenuOption(canvas: Canvas, menuOption: MenuOption, previewNodeSize: () => Size, onPlaced: (canvas: Canvas, pos: Position) => void): HTMLElement {
4040
const menuOptionElement = document.createElement('div')
41-
menuOptionElement.id = menuOption.id
41+
if (menuOption.id) menuOptionElement.id = menuOption.id
4242
menuOptionElement.classList.add('canvas-card-menu-button')
4343
menuOptionElement.classList.add('mod-draggable')
4444
setIcon(menuOptionElement, menuOption.icon)
@@ -59,13 +59,13 @@ export function createCardMenuOption(canvas: Canvas, menuOption: MenuOption, pre
5959
}
6060

6161
export function addCardMenuOption(canvas: Canvas, element: HTMLElement) {
62-
canvas?.cardMenuEl.querySelector(`#${element.id}`)?.remove()
62+
if (element.id) canvas?.cardMenuEl.querySelector(`#${element.id}`)?.remove()
6363
canvas?.cardMenuEl.appendChild(element)
6464
}
6565

6666
export function createPopupMenuOption(menuOption: MenuOption): HTMLElement {
6767
const menuOptionElement = document.createElement('button')
68-
menuOptionElement.id = menuOption.id
68+
if (menuOption.id) menuOptionElement.id = menuOption.id
6969
menuOptionElement.classList.add('clickable-icon')
7070
setIcon(menuOptionElement, menuOption.icon)
7171
setTooltip(menuOptionElement, menuOption.label, { placement: 'top' })
@@ -76,7 +76,7 @@ export function createPopupMenuOption(menuOption: MenuOption): HTMLElement {
7676

7777
export function createExpandablePopupMenuOption(menuOption: MenuOption, subMenuOptions: MenuOption[]): HTMLElement {
7878
const menuOptionContainer = document.createElement('div')
79-
menuOptionContainer.id = menuOption.id
79+
if (menuOption.id) menuOptionContainer.id = menuOption.id
8080
menuOptionContainer.classList.add('expandable-menu-option')
8181

8282
const menuOptionElement = createPopupMenuOption({
@@ -105,7 +105,7 @@ export function addPopupMenuOption(canvas: Canvas, element: HTMLElement) {
105105
const popupMenuEl = canvas?.menu?.menuEl
106106
if (!popupMenuEl) return
107107

108-
popupMenuEl.querySelector(`#${element.id}`)?.remove()
108+
if (element.id) popupMenuEl.querySelector(`#${element.id}`)?.remove()
109109
popupMenuEl.appendChild(element)
110110
}
111111

0 commit comments

Comments
 (0)