From d3958f80fa068909fdb58e958930a6283bdae003 Mon Sep 17 00:00:00 2001
From: Keavon Chambers <keavon@keavon.com>
Date: Sat, 31 Jul 2021 18:20:51 -0700
Subject: [PATCH] Add checkbox to MenuBarInput widget

---
 client/web/src/components/panels/Document.vue |  4 +--
 .../widgets/floating-menus/MenuList.vue       | 32 +++++++++++++++----
 .../widgets/inputs/CheckboxInput.vue          | 30 ++++++++++++++++-
 .../widgets/inputs/MenuBarInput.vue           |  2 +-
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/client/web/src/components/panels/Document.vue b/client/web/src/components/panels/Document.vue
index e2ddfe89c..46cdf9dda 100644
--- a/client/web/src/components/panels/Document.vue
+++ b/client/web/src/components/panels/Document.vue
@@ -308,8 +308,8 @@ export default defineComponent({
 			const { reset_colors } = await wasm;
 			reset_colors();
 		},
-		download(filename: string, svgData: string) {
-			const svgBlob = new Blob([svgData], { type: "image/svg+xml;charset=utf-8" });
+		download(filename: string, fileData: string) {
+			const svgBlob = new Blob([fileData], { type: "image/svg+xml;charset=utf-8" });
 			const svgUrl = URL.createObjectURL(svgBlob);
 			const element = document.createElement("a");
 
diff --git a/client/web/src/components/widgets/floating-menus/MenuList.vue b/client/web/src/components/widgets/floating-menus/MenuList.vue
index 9fa40245a..cb1e5857e 100644
--- a/client/web/src/components/widgets/floating-menus/MenuList.vue
+++ b/client/web/src/components/widgets/floating-menus/MenuList.vue
@@ -12,13 +12,18 @@
 				@mouseleave="handleEntryMouseLeave(entry)"
 				:data-hover-menu-spawner-extend="entry.children && []"
 			>
-				<IconLabel :icon="entry.icon" v-if="entry.icon && drawIcon" />
-				<div class="no-icon" v-else-if="drawIcon" />
+				<CheckboxInput v-if="entry.checkbox" v-model:checked="entry.checked" :outlineStyle="true" :class="'entry-checkbox'" />
+				<IconLabel v-else-if="entry.icon && drawIcon" :icon="entry.icon" :class="'entry-icon'" />
+				<div v-else-if="drawIcon" class="no-icon" />
+
 				<span class="entry-label">{{ entry.label }}</span>
-				<IconLabel :icon="'Info'" v-if="entry.shortcutRequiresLock && !fullscreen.keyboardLocked" :title="keyboardLockInfoMessage" />
+
+				<IconLabel v-if="entry.shortcutRequiresLock && !fullscreen.keyboardLocked" :icon="'Info'" :title="keyboardLockInfoMessage" />
 				<UserInputLabel v-else-if="entry.shortcut && entry.shortcut.length" :inputKeys="[entry.shortcut]" />
+
 				<div class="submenu-arrow" v-if="entry.children && entry.children.length"></div>
 				<div class="no-submenu-arrow" v-else></div>
+
 				<MenuList
 					v-if="entry.children"
 					:direction="MenuDirection.TopRight"
@@ -50,7 +55,7 @@
 				flex: 0 0 auto;
 			}
 
-			.icon-label svg {
+			.entry-icon svg {
 				fill: var(--color-e-nearwhite);
 			}
 
@@ -63,7 +68,8 @@
 				margin-left: 8px;
 			}
 
-			.icon-label,
+			.entry-checkbox,
+			.entry-icon,
 			.no-icon {
 				margin: 0 4px;
 
@@ -112,6 +118,14 @@
 					color: var(--color-f-white);
 				}
 			}
+
+			&:hover .entry-checkbox label .checkbox-box {
+				border: 1px solid var(--color-f-white);
+
+				svg {
+					fill: var(--color-f-white);
+				}
+			}
 		}
 	}
 }
@@ -125,6 +139,7 @@ import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets"
 import FloatingMenu, { MenuDirection, MenuType } from "@/components/widgets/floating-menus/FloatingMenu.vue";
 import Separator from "@/components/widgets/separators/Separator.vue";
 import IconLabel from "@/components/widgets/labels/IconLabel.vue";
+import CheckboxInput from "@/components/widgets/inputs/CheckboxInput.vue";
 import UserInputLabel from "@/components/widgets/labels/UserInputLabel.vue";
 
 export type MenuListEntries = Array<MenuListEntry>;
@@ -134,14 +149,14 @@ interface MenuListEntryData {
 	value?: string;
 	label?: string;
 	icon?: string;
-	// TODO: Add `checkbox` (which overrides any `icon`)
+	checkbox?: boolean;
 	shortcut?: Array<string>;
 	shortcutRequiresLock?: boolean;
 	action?: Function;
 	children?: SectionsOfMenuListEntries;
 }
 
-export type MenuListEntry = MenuListEntryData & { ref?: typeof FloatingMenu | typeof MenuList };
+export type MenuListEntry = MenuListEntryData & { ref?: typeof FloatingMenu | typeof MenuList; checked?: boolean };
 
 const KEYBOARD_LOCK_USE_FULLSCREEN = "This hotkey is reserved by the browser, but becomes available in fullscreen mode";
 const KEYBOARD_LOCK_SWITCH_BROWSER = "This hotkey is reserved by the browser, but becomes available in Chrome, Edge, and Opera which support the Keyboard.lock() API";
@@ -164,6 +179,8 @@ const MenuList = defineComponent({
 		handleEntryClick(menuEntry: MenuListEntry) {
 			(this.$refs.floatingMenu as typeof FloatingMenu).setClosed();
 
+			if (menuEntry.checkbox) menuEntry.checked = !menuEntry.checked;
+
 			if (menuEntry.action) menuEntry.action();
 			else if (this.defaultAction) this.defaultAction();
 			else this.$emit("update:activeEntry", menuEntry);
@@ -259,6 +276,7 @@ const MenuList = defineComponent({
 		FloatingMenu,
 		Separator,
 		IconLabel,
+		CheckboxInput,
 		UserInputLabel,
 	},
 });
diff --git a/client/web/src/components/widgets/inputs/CheckboxInput.vue b/client/web/src/components/widgets/inputs/CheckboxInput.vue
index b5224f9d4..2fb9871fb 100644
--- a/client/web/src/components/widgets/inputs/CheckboxInput.vue
+++ b/client/web/src/components/widgets/inputs/CheckboxInput.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="checkbox-input">
+	<div class="checkbox-input" :class="{ 'outline-style': outlineStyle }">
 		<input type="checkbox" :id="`checkbox-input-${id}`" :checked="checked" @input="(e) => $emit('update:checked', e.target.checked)" />
 		<label :for="`checkbox-input-${id}`">
 			<div class="checkbox-box">
@@ -49,6 +49,33 @@
 			background: var(--color-accent-hover);
 		}
 	}
+
+	&.outline-style label {
+		.checkbox-box {
+			border: 1px solid var(--color-e-nearwhite);
+			padding: 1px;
+			background: none;
+
+			svg {
+				display: none;
+			}
+		}
+
+		&:hover .checkbox-box {
+			border: 1px solid var(--color-f-white);
+		}
+	}
+
+	&.outline-style input:checked + label {
+		.checkbox-box {
+			background: none;
+
+			svg {
+				display: block;
+				fill: var(--color-e-nearwhite);
+			}
+		}
+	}
 }
 </style>
 
@@ -70,6 +97,7 @@ export default defineComponent({
 	props: {
 		checked: { type: Boolean, required: true },
 		icon: { type: String, default: "Checkmark" },
+		outlineStyle: { type: Boolean, default: false },
 	},
 	components: { IconLabel },
 });
diff --git a/client/web/src/components/widgets/inputs/MenuBarInput.vue b/client/web/src/components/widgets/inputs/MenuBarInput.vue
index 43129a097..319cd3570 100644
--- a/client/web/src/components/widgets/inputs/MenuBarInput.vue
+++ b/client/web/src/components/widgets/inputs/MenuBarInput.vue
@@ -93,7 +93,7 @@ const menuEntries: MenuListEntries = [
 				{ label: "Save", shortcut: ["Ctrl", "S"] },
 				{ label: "Save As…", shortcut: ["Ctrl", "⇧", "S"] },
 				{ label: "Save All", shortcut: ["Ctrl", "Alt", "S"] },
-				{ label: "Auto-Save", shortcut: undefined },
+				{ label: "Auto-Save", checkbox: true, checked: true },
 			],
 			[
 				{ label: "Import…", shortcut: ["Ctrl", "I"] },