@ray-js/robot-map 0.0.8-beta.5 → 0.0.8-beta.7

package/lib/RjsComponent/index.js

@@ -66,6 +66,15 @@ const componentOptions = {
         }
       }
     },
+    customZones: {
+      type: Object,
+      value: {},
+      observer: function (newValue, oldValue) {
+        if (!isEqual(newValue, oldValue) && this.data.initialized && this.render) {
+          this.render.onReceiveCustomZones(newValue);
+        }
+      }
+    },
     spots: {
       type: Array,
       observer: function (newValue, oldValue) {
@@ -166,6 +175,9 @@ const componentOptions = {
       if (this.data.cleanZones) {
         this.render.onReceiveCleanZones(this.data.cleanZones);
       }
+      if (this.data.customZones) {
+        this.render.onReceiveCustomZones(this.data.customZones);
+      }
       if (this.data.virtualWalls) {
         this.render.onReceiveVirtualWalls(this.data.virtualWalls);
       }

package/lib/RjsComponent/index.rjs

@@ -99,6 +99,14 @@ export default Render({
     this.mapInstance.drawCleanZones(zones)
   },
 
+  // 接收自定义区域（按类型分组）
+  onReceiveCustomZones(customZones) {
+    if (!this.mapInstance || !customZones) return
+    Object.entries(customZones).forEach(([type, zones]) => {
+      this.mapInstance.drawCustomZones(type, zones)
+    })
+  },
+
   // 接收虚拟墙
   onReceiveVirtualWalls(walls) {
     if (!this.mapInstance || !walls) return

package/lib/RjsRobotMap.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "furnitures", "config", "runtime", "onMapReady"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "customZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "furnitures", "config", "runtime", "onMapReady"];
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -11,6 +11,7 @@ import { MAP_CALLBACK_METHODS, MAP_API_METHODS } from '@ray-js/robot-map-sdk';
 import { nanoid } from 'nanoid/non-secure';
 import RjsComponent from './RjsComponent';
 import { robotMapDefaultProps } from './props';
+import { EXCLUDED_API_METHODS } from './types';
 
 // 存储待处理的请求：requestId -> { resolve, reject }
 
@@ -22,6 +23,7 @@ const RjsRobotMap = _ref => {
       forbiddenSweepZones = [],
       forbiddenMopZones = [],
       cleanZones = [],
+      customZones = {},
       virtualWalls = [],
       spots = [],
       wayPoints = [],
@@ -59,6 +61,9 @@ const RjsRobotMap = _ref => {
   // 在 TS 层创建 mapApi，每个方法返回 Promise
   const createMapApi = useCallback(() => {
     const mapApi = MAP_API_METHODS.reduce((acc, methodName) => {
+      if (EXCLUDED_API_METHODS.includes(methodName)) {
+        return acc;
+      }
       acc[methodName] = function () {
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
@@ -145,6 +150,7 @@ const RjsRobotMap = _ref => {
     forbiddenSweepZones: forbiddenSweepZones,
     forbiddenMopZones: forbiddenMopZones,
     cleanZones: cleanZones,
+    customZones: customZones,
     virtualWalls: virtualWalls,
     spots: spots,
     wayPoints: wayPoints,

package/lib/RobotMap.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RobotMapProps } from './props';
 declare const RobotMap: {
-    ({ map, path, roomProperties, forbiddenSweepZones, forbiddenMopZones, cleanZones, virtualWalls, spots, wayPoints, detectedObjects, customElements, customCarpets, furnitures, heatmap, onMapReady, config, runtime, ...callbacks }: RobotMapProps): React.JSX.Element;
+    ({ map, path, roomProperties, forbiddenSweepZones, forbiddenMopZones, cleanZones, customZones, virtualWalls, spots, wayPoints, detectedObjects, customElements, customCarpets, furnitures, heatmap, onMapReady, config, runtime, ...callbacks }: RobotMapProps): React.JSX.Element;
     defaultProps: RobotMapProps;
     displayName: string;
 };

package/lib/RobotMap.js

@@ -1,6 +1,6 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "customCarpets", "furnitures", "heatmap", "onMapReady", "config", "runtime"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "customZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "customCarpets", "furnitures", "heatmap", "onMapReady", "config", "runtime"];
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -14,6 +14,8 @@ import { isEqual } from 'lodash-es';
 import { MAP_API_METHODS, MAP_CALLBACK_METHODS } from '@ray-js/robot-map-sdk';
 import { nanoid } from 'nanoid/non-secure';
 import { robotMapDefaultProps } from './props';
+import { EXCLUDED_API_METHODS } from './types';
+
 // 回调名到事件名的映射
 const CALLBACK_TO_EVENT_MAP = _objectSpread({
   onInitialized: 'onInitialized'
@@ -29,6 +31,7 @@ const RobotMap = _ref => {
       forbiddenSweepZones,
       forbiddenMopZones,
       cleanZones,
+      customZones,
       virtualWalls,
       spots,
       wayPoints,
@@ -57,6 +60,7 @@ const RobotMap = _ref => {
     onReceiveForbiddenSweepZones: () => {},
     onReceiveForbiddenMopZones: () => {},
     onReceiveCleanZones: () => {},
+    onReceiveCustomZones: () => {},
     onReceiveVirtualWalls: () => {},
     onReceiveSpots: () => {},
     onReceiveWayPoints: () => {},
@@ -108,6 +112,7 @@ const RobotMap = _ref => {
     triggersRef.current.onReceiveForbiddenSweepZones = invoke.current.bind('onReceiveForbiddenSweepZones');
     triggersRef.current.onReceiveForbiddenMopZones = invoke.current.bind('onReceiveForbiddenMopZones');
     triggersRef.current.onReceiveCleanZones = invoke.current.bind('onReceiveCleanZones');
+    triggersRef.current.onReceiveCustomZones = invoke.current.bind('onReceiveCustomZones');
     triggersRef.current.onReceiveVirtualWalls = invoke.current.bind('onReceiveVirtualWalls');
     triggersRef.current.onReceiveSpots = invoke.current.bind('onReceiveSpots');
     triggersRef.current.onReceiveWayPoints = invoke.current.bind('onReceiveWayPoints');
@@ -124,6 +129,9 @@ const RobotMap = _ref => {
       invoke.current.define(eventName, function () {
         if (eventName === 'onInitialized') {
           const mapApi = MAP_API_METHODS.reduce((acc, methodName) => {
+            if (EXCLUDED_API_METHODS.includes(methodName)) {
+              return acc;
+            }
             acc[methodName] = invoke.current.bind(methodName);
             return acc;
           }, {});
@@ -172,6 +180,14 @@ const RobotMap = _ref => {
       triggersRef.current.onReceiveCleanZones(cleanZones);
     }
   }, [cleanZones, mapApi]);
+  useEffect(() => {
+    if (mapApi && customZones) {
+      Object.entries(customZones).forEach(_ref2 => {
+        let [type, zones] = _ref2;
+        triggersRef.current.onReceiveCustomZones(type, zones);
+      });
+    }
+  }, [customZones, mapApi]);
   useEffect(() => {
     if (mapApi && virtualWalls) {
       triggersRef.current.onReceiveVirtualWalls(virtualWalls);

package/lib/props.d.ts

@@ -49,6 +49,13 @@ export interface RobotMapProps extends MapCallbacks {
      * @description.en Defines areas where the robot performs cleaning operations.
      */
     cleanZones?: ZoneParam[];
+    /**
+     * @description.zh 自定义区域（按类型分组）
+     * @description.en Custom zones grouped by type
+     * @description.zh 通过 config.customZoneTypes 声明的自定义区域类型的数据；key 为区域类型名，value 为该类型的 ZoneParam 数组。
+     * @description.en Data for custom zone types declared via config.customZoneTypes; keyed by type name, value is an array of ZoneParam for that type.
+     */
+    customZones?: Record<string, ZoneParam[]>;
     /**
      * @description.zh 虚拟墙
      * @description.en Virtual walls

package/lib/types.d.ts

@@ -1,8 +1,17 @@
 import { MapApi as OriginalMapApi } from '@ray-js/robot-map-sdk';
+/**
+ * SDK 侧存在但不暴露给使用方的命令式 API。使用方应通过 props 与运行时配置驱动这些行为。
+ * Imperative APIs that exist on the SDK but are intentionally hidden from consumers.
+ * Consumers should drive these behaviors via props and runtime config instead.
+ */
+export declare const EXCLUDED_API_METHODS: readonly ["drawCustomZones", "clearCustomZones", "setEditingCustomZones"];
+type ExcludedApiMethod = (typeof EXCLUDED_API_METHODS)[number];
+type PublicMapApi = Omit<OriginalMapApi, ExcludedApiMethod>;
 /**
  * MapApi 类型定义（所有方法返回 Promise）
  * MapApi type definition (all methods return Promise)
  */
 export type MapApi = {
-    [K in keyof OriginalMapApi]: OriginalMapApi[K] extends (...args: infer Args) => infer Return ? (...args: Args) => Promise<Return> : OriginalMapApi[K];
+    [K in keyof PublicMapApi]: PublicMapApi[K] extends (...args: infer Args) => infer Return ? (...args: Args) => Promise<Return> : PublicMapApi[K];
 };
+export {};

package/lib/types.js

@@ -1 +1,11 @@
-export {};
+/**
+ * SDK 侧存在但不暴露给使用方的命令式 API。使用方应通过 props 与运行时配置驱动这些行为。
+ * Imperative APIs that exist on the SDK but are intentionally hidden from consumers.
+ * Consumers should drive these behaviors via props and runtime config instead.
+ */
+export const EXCLUDED_API_METHODS = ['drawCustomZones', 'clearCustomZones', 'setEditingCustomZones'];
+
+/**
+ * MapApi 类型定义（所有方法返回 Promise）
+ * MapApi type definition (all methods return Promise)
+ */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-map",
-  "version": "0.0.8-beta.5",
+  "version": "0.0.8-beta.7",
   "description": "机器人地图组件",
   "main": "lib/index",
   "files": [
@@ -33,7 +33,7 @@
     "@ray-js/ray": "^1.7.39"
   },
   "dependencies": {
-    "@ray-js/robot-map-sdk": "0.0.14-beta.5",
+    "@ray-js/robot-map-sdk": "^0.0.14",
     "clsx": "^1.2.1",
     "nanoid": "^5.1.6"
   },