@etsoo/materialui 1.2.76 → 1.2.77

package/lib/pages/ViewPage.d.ts

@@ -91,7 +91,10 @@ export interface ViewPageProps<T extends DataTypes.StringRecord> extends Omit<Co
     /**
      * Operation message handler
      */
-    operationMessageHandler?: OperationMessageHandler | string[];
+    operationMessageHandler?: [
+        id: number | undefined,
+        handler: OperationMessageHandler | string[]
+    ];
 }
 /**
  * View page

package/lib/pages/ViewPage.js

@@ -120,15 +120,18 @@ export function ViewPage(props) {
         const handler = (user, isSelf, message) => {
             if (operationMessageHandler == null)
                 return;
-            if (Array.isArray(operationMessageHandler)) {
-                if (!operationMessageHandler.includes(message.operationType))
-                    return;
-            }
-            else {
-                if (operationMessageHandler(user, isSelf, message) === false)
-                    return;
+            const [id, handler] = operationMessageHandler;
+            if ((id == null && message.id == null) || id === message.id) {
+                if (Array.isArray(handler)) {
+                    if (!handler.includes(message.operationType))
+                        return;
+                }
+                else {
+                    if (handler(user, isSelf, message) === false)
+                        return;
+                }
+                refresh();
             }
-            refresh();
         };
         MessageUtils.onOperationMessage(handler);
         const refreshHandler = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.76",
+  "version": "1.2.77",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/pages/ViewPage.tsx

@@ -165,7 +165,10 @@ export interface ViewPageProps<T extends DataTypes.StringRecord>
   /**
    * Operation message handler
    */
-  operationMessageHandler?: OperationMessageHandler | string[];
+  operationMessageHandler?: [
+    id: number | undefined,
+    handler: OperationMessageHandler | string[]
+  ];
 }
 
 function formatItemData(fieldData: unknown): string | undefined {
@@ -288,12 +291,16 @@ export function ViewPage<T extends DataTypes.StringRecord>(
   React.useEffect(() => {
     const handler: OperationMessageHandler = (user, isSelf, message) => {
       if (operationMessageHandler == null) return;
-      if (Array.isArray(operationMessageHandler)) {
-        if (!operationMessageHandler.includes(message.operationType)) return;
-      } else {
-        if (operationMessageHandler(user, isSelf, message) === false) return;
+
+      const [id, handler] = operationMessageHandler;
+      if ((id == null && message.id == null) || id === message.id) {
+        if (Array.isArray(handler)) {
+          if (!handler.includes(message.operationType)) return;
+        } else {
+          if (handler(user, isSelf, message) === false) return;
+        }
+        refresh();
       }
-      refresh();
     };
     MessageUtils.onOperationMessage(handler);