Desktop: Regression: Context menu in sidebar could point to wrong item

laurent22 · laurent22 · commit 80a70a664997 · 2020-10-11T19:37:12.000+01:00
diff --git a/ReactNativeClient/lib/services/CommandService.ts b/ReactNativeClient/lib/services/CommandService.ts
@@ -25,7 +25,6 @@ export interface CommandRuntime {
 
 	// Used for the (optional) toolbar button title
 	title?(props:any):string,
-	// props?:any
 }
 
 export interface CommandDeclaration {
diff --git a/ReactNativeClient/lib/services/commands/MenuUtils.ts b/ReactNativeClient/lib/services/commands/MenuUtils.ts
@@ -88,10 +88,9 @@ export default class MenuUtils {
 	}
 
 	public commandToStatefulMenuItem(commandName:string, props:any = null):MenuItem {
-		const output = this.commandsToMenuItems([commandName], () => {
+		return this.commandToMenuItem(commandName, () => {
 			return this.service.execute(commandName, props ? props : {});
 		});
-		return output[commandName];
 	}
 
 	public commandsToMenuItems(commandNames:string[], onClick:Function):MenuItems {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ export interface CommandRuntime {`
`25`	`25`
`26`	`26`	`// Used for the (optional) toolbar button title`
`27`	`27`	`title?(props:any):string,`
`28`		`- // props?:any`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`export interface CommandDeclaration {`
Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,9 @@ export default class MenuUtils {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public commandToStatefulMenuItem(commandName:string, props:any = null):MenuItem {`
`91`		`- const output = this.commandsToMenuItems([commandName], () => {`
	`91`	`+ return this.commandToMenuItem(commandName, () => {`
`92`	`92`	`return this.service.execute(commandName, props ? props : {});`
`93`	`93`	`});`
`94`		`- return output[commandName];`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`public commandsToMenuItems(commandNames:string[], onClick:Function):MenuItems {`