self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Desktop: Dev fix: Better handling of command props

Browse Source
This commit is contained in:
Laurent Cozic
2020-07-04 10:41:55 +01:00
parent 7035b1f9f6
commit ee3f4beeaf
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ReactNativeClient/lib/services/CommandService.ts
View File

@@ -112,7 +112,14 @@ export default class CommandService extends BaseService {
for (const name in this.commands_) { for (const name in this.commands_) {
const command = this.commands_[name]; const command = this.commands_[name];
if (!command.runtime || !command.runtime.mapStateToProps) continue;
if (!command.runtime) continue;
if (!command.runtime.mapStateToProps) {
command.runtime.props = {};
continue;
}
const newProps = command.runtime.mapStateToProps(state); const newProps = command.runtime.mapStateToProps(state);
const haveChanged = this.propsHaveChanged(command.runtime.props, newProps); const haveChanged = this.propsHaveChanged(command.runtime.props, newProps);
@@ -226,13 +233,14 @@ export default class CommandService extends BaseService {
isEnabled(commandName:string):boolean { isEnabled(commandName:string):boolean {
const command = this.commandByName(commandName); const command = this.commandByName(commandName);
if (!command || !command.runtime) return false; if (!command || !command.runtime) return false;
return command.runtime.props ? command.runtime.isEnabled(command.runtime.props ? command.runtime.props : {}) : true; if (!command.runtime.props) return false;
return command.runtime.isEnabled(command.runtime.props);
} }
title(commandName:string):string { title(commandName:string):string {
const command = this.commandByName(commandName); const command = this.commandByName(commandName);
if (!command || !command.runtime) return null; if (!command || !command.runtime || !command.runtime.props) return null;
return command.runtime.title(command.runtime.props ? command.runtime.props : {}); return command.runtime.title(command.runtime.props);
} }
private extractExecuteArgs(command:Command, executeArgs:any) { private extractExecuteArgs(command:Command, executeArgs:any) {