mvvm-mobx 1.1.1 → 1.3.0

package/README.md

@@ -115,8 +115,8 @@ const interactionObject: InteractionRequest = {
             title: 'Confirmation',
             content: 'Are you sure you want to delete?',
             actions: [
-                CommonInteractionActions.yes.action
-                CommonInteractionActions.no.action
+                CommonInteractionActions.yes.response
+                CommonInteractionActions.no.response
                 ]
         };
  

package/dist/commands/Command.d.ts

@@ -0,0 +1,6 @@
+import { CounterFlag } from "../core";
+export interface Command<T = void> {
+    canExecute(parameter: T): boolean;
+    execute(parameter: T): void;
+    workingFlag?: CounterFlag;
+}

package/dist/commands/Command.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/commands/RelayCommand.d.ts

@@ -1,5 +1,6 @@
 import { CounterFlag } from '../core/CounterFlag';
-export declare class RelayCommand<T = void> {
+import { Command } from './Command';
+export declare class RelayCommand<T = void> implements Command<T> {
     private readonly executeFunc;
     private readonly canExecuteFunc?;
     readonly workingFlag: CounterFlag;

package/dist/commands/prop-helpers.d.ts

@@ -1,5 +1,8 @@
-import { RelayCommand } from './RelayCommand';
-export declare function bindCommand<T>(command: RelayCommand<T>, parameter?: any, disabledPropName?: string): {
-    [disabledPropName]: boolean;
-    onClick: () => Promise<void>;
+import { Command } from './Command';
+export declare function bindCommand<T>(command: Command<T>, parameter?: any, config?: {
+    disabledPropName?: string;
+    loadingPropName?: string;
+}): {
+    [x: string]: boolean | (() => void) | undefined;
+    onClick: () => void;
 } | null;

package/dist/commands/prop-helpers.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bindCommand = bindCommand;
-function bindCommand(command, parameter = null, disabledPropName = 'disabled') {
+function bindCommand(command, parameter = null, config) {
     if (!command) {
         return null;
     }
     const isDisabled = !command.canExecute(parameter);
+    const disabledPropName = config?.disabledPropName || 'disabled';
+    const loadingPropName = config?.loadingPropName || 'loading';
     return {
         onClick: () => command.execute(parameter),
         [disabledPropName]: isDisabled,
+        [loadingPropName]: command.workingFlag?.isActive,
     };
 }

package/dist/interaction/Interact.d.ts

@@ -1,6 +1,6 @@
 import { InteractionResponse } from "./InteractionResponse";
 import { InteractionManager } from "./InteractionManager";
-import { RelayCommand } from "../commands/RelayCommand";
+import { Command } from "../commands/Command";
 import { ReportInteractionOperationFinished } from "./ReportInteractionOperationFinished";
 /** A syntactic-sugar util for working with interactions. */
 export declare class Interact {
@@ -28,7 +28,7 @@ export declare class Interact {
      * @param okCommand The comment to execute when the OK action is selected.
      * @returns true if @constant CommonInteractionResponses.Ok.id was selected, or false if @constant CommonInteractionResponses.Cancel.id was selected.
      */
-    static withOkCommand(interactionManager: InteractionManager, title: string | any, content: ReportInteractionOperationFinished, okCommand: RelayCommand): Promise<boolean>;
+    static withOkCommand(interactionManager: InteractionManager, title: string | any, content: ReportInteractionOperationFinished, okCommand: Command): Promise<boolean>;
     /**
      * Interact with the user with default Yes and No responses.
      * @param interactionManager In interaction manager to use.

package/dist/interaction/Interact.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Interact = void 0;
 const InteractionResponse_1 = require("./InteractionResponse");
-const RelayCommand_1 = require("../commands/RelayCommand");
 const CommonInteractionResponses_1 = require("./CommonInteractionResponses");
+const commands_1 = require("../commands");
 /** A syntactic-sugar util for working with interactions. */
 class Interact {
     /**
@@ -77,7 +77,7 @@ class Interact {
                 action,
                 new InteractionResponse_1.InteractionResponse(CommonInteractionResponses_1.CommonInteractionResponses.cancel.id, CommonInteractionResponses_1.CommonInteractionResponses.cancel.response.title, 
                 // A Cancel action that becomes disabled when the OK command (if exists) is active:
-                new RelayCommand_1.RelayCommand(() => content?.onOperationFinished?.call(CommonInteractionResponses_1.CommonInteractionResponses.cancel.id), () => action.command?.workingFlag?.isActive !== true)),
+                new commands_1.RelayCommand(() => content?.onOperationFinished?.call(CommonInteractionResponses_1.CommonInteractionResponses.cancel.id), () => action.command?.workingFlag?.isActive !== true)),
             ],
             defaultActionId: action.id,
             cancelActionId: CommonInteractionResponses_1.CommonInteractionResponses.cancel.id,

package/dist/interaction/InteractionResponse.d.ts

@@ -1,10 +1,10 @@
-import { RelayCommand } from "../commands/RelayCommand";
+import { Command } from "../commands/Command";
 /** Represents an action for the user to respond on an interaction request. */
 export declare class InteractionResponse {
     /** The ID of the response. */
     readonly id: string;
     /** An optional command to invoke as the user responds. */
-    readonly command?: RelayCommand<void> | undefined;
+    readonly command?: Command<void> | undefined;
     /** An optional icon. */
     readonly icon?: string | undefined;
     /** The title of the response. */
@@ -15,7 +15,7 @@ export declare class InteractionResponse {
     /** The title of the response. */
     title: string, 
     /** An optional command to invoke as the user responds. */
-    command?: RelayCommand<void> | undefined, 
+    command?: Command<void> | undefined, 
     /** An optional icon. */
     icon?: string | undefined);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mvvm-mobx",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "description": "MVVM pattern implementation with MobX for reactive state management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",