Merge pull request #59 from hansu/56-add-select-in-branches-dropdown-also-for-show-all

56 add select in branches dropdown also for show all

Author: LariWa

web/contextMenu.ts

@@ -3,7 +3,7 @@ const CLASS_CONTEXT_MENU_ACTIVE = 'contextMenuActive';
 interface ContextMenuAction {
 	readonly title: string;
 	readonly visible: boolean;
-	readonly onClick: () => void;
+	readonly onClick: (e?: MouseEvent) => void;
 	readonly checked?: boolean; // Required in checked context menus
 }
 
@@ -46,15 +46,15 @@ class ContextMenu {
 	 * @param className An optional class name to add to the context menu.
 	 */
 	public show(actions: ContextMenuActions, checked: boolean, target: ContextMenuTarget | null, event: MouseEvent, frameElem: HTMLElement, onClose: (() => void) | null = null, className: string | null = null) {
-		let html = '', handlers: (() => void)[] = [], handlerId = 0;
+		let html = '', handlers: ((e?: MouseEvent) => void)[] = [], handlerId = 0;
 		this.close();
 
 		for (let i = 0; i < actions.length; i++) {
 			let groupHtml = '';
 			for (let j = 0; j < actions[i].length; j++) {
 				if (actions[i][j].visible) {
 					groupHtml += '<li class="contextMenuItem" data-index="' + handlerId++ + '">' + (checked ? '<span class="contextMenuItemCheck">' + (actions[i][j].checked ? SVG_ICONS.check : '') + '</span>' : '') + actions[i][j].title + '</li>';
-					handlers.push(actions[i][j].onClick);
+					handlers.push((e?: MouseEvent) => actions[i][j].onClick(e));
 				}
 			}
 
@@ -92,7 +92,9 @@ class ContextMenu {
 			// The user clicked on a context menu item => call the corresponding handler
 			e.stopPropagation();
 			this.close();
-			handlers[parseInt((<HTMLElement>(<Element>e.target).closest('.contextMenuItem')!).dataset.index!)]();
+			const handlerIndex = parseInt((<HTMLElement>(<Element>e.target).closest('.contextMenuItem')!).dataset.index!);
+			const handler = handlers[handlerIndex];
+			handler?.(e instanceof MouseEvent ? e : undefined);
 		});
 
 		menu.addEventListener('click', (e) => {

web/dropdown.ts

@@ -140,18 +140,26 @@ class Dropdown {
 		return false;
 	}
 
+	/**
+	 * Is Show All selected in the dropdown
+	 * @returns TRUE => Show All is selected, FALSE => Show All is not selected
+	 */
+	public isShowAllSelected() {
+		return this.optionsSelected[0];
+	}
+
 	/**
 	 * Select a specific value in the dropdown.
 	 * @param value The value to select.
 	 */
-	public selectOption(value: string) {
+	public selectOption(value: string, event: MouseEvent | undefined) {
 		const optionIndex = this.options.findIndex((option) => value === option.value);
 		if (optionIndex < 0 && (this.optionsSelected[0] || this.optionsSelected[optionIndex])) return;
-		if (this.multipleAllowed && !this.selectMultipleWithCtrl) {
+		if (this.multipleAllowed && !this.optionsSelected[0] && (!this.selectMultipleWithCtrl || (event && (event.ctrlKey || event.metaKey)))) {
 			// Select the option with the specified value
 			this.optionsSelected[optionIndex] = true;
 		} else {
-			for (let i = 1; i < this.optionsSelected.length; i++) {
+			for (let i = 0; i < this.optionsSelected.length; i++) {
 				this.optionsSelected[i] = false;
 			}
 			this.optionsSelected[optionIndex] = true;

web/main.ts

@@ -1134,8 +1134,8 @@ class GitGraphView {
 			},
 			{
 				title: 'Select in Branches Dropdown',
-				visible: visibility.selectInBranchesDropdown && !isSelectedInBranchesDropdown,
-				onClick: () => this.branchDropdown.selectOption(refName)
+				visible: visibility.selectInBranchesDropdown && (!isSelectedInBranchesDropdown || this.branchDropdown.isShowAllSelected()),
+				onClick: (e) => this.branchDropdown.selectOption(refName, e)
 			},
 			{
 				title: 'Unselect in Branches Dropdown',
@@ -1373,7 +1373,7 @@ class GitGraphView {
 			{
 				title: 'Select in Branches Dropdown',
 				visible: visibility.selectInBranchesDropdown && !isSelectedInBranchesDropdown,
-				onClick: () => this.branchDropdown.selectOption(prefixedRefName)
+				onClick: (e) => this.branchDropdown.selectOption(prefixedRefName, e)
 			},
 			{
 				title: 'Unselect in Branches Dropdown',