@collabdt/core 0.3.1 → 0.3.3

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/commentMarkerConfig.d.ts

@@ -0,0 +1,33 @@
+import type { BimMarkerConfig } from "../../../../../shared/markers/types";
+/** A BIM comment enriched with author display fields, shaped for the marker layer. */
+export interface CommentItem {
+    id: number;
+    x: number;
+    y: number;
+    z: number;
+    /** Omitted on the pending (being-created) placeholder — never read before a comment is real. */
+    authorId?: number;
+    authorName: string;
+    imageFileId: number | null;
+    image: number | string | null;
+    text: string;
+    createdAt: string | Date;
+    buildingId?: number | null;
+    isPending?: boolean;
+}
+interface CommentMarkerDeps {
+    currentUserId: string | null;
+    onRemove: (id: number) => void;
+    /** Reply is comment-only — the generic marker `ctx` has no reply handler, so the wrapper injects it. */
+    onReply: (id: number) => void;
+    /** Building context closed over for the pending placeholder item. */
+    buildingId: number;
+}
+/**
+ * Builds the comment-specific `BimMarkerConfig` consumed by `useMarkerLayerBim`. A factory
+ * (not a plain object) because `isAuthor`, `onRemove`, `onReply` and the pending placeholder's
+ * `buildingId` all need runtime values supplied by the `useCommentMarkers` wrapper.
+ */
+export declare function makeCommentMarkerConfig(deps: CommentMarkerDeps): BimMarkerConfig<CommentItem>;
+export {};
+//# sourceMappingURL=commentMarkerConfig.d.ts.map

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/commentMarkerConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commentMarkerConfig.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/commentMarkerConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAE1E,sFAAsF;AACtF,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,gGAAgG;IAChG,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,UAAU,iBAAiB;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,wGAAwG;IACxG,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7B,qEAAqE;IACrE,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,iBAAiB,GAAG,eAAe,CAAC,WAAW,CAAC,CAkE7F"}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/commentMarkerConfig.js

@@ -0,0 +1,90 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { BimMarkerCluster } from "../../../../../shared/markers/BimMarkerCluster";
+import BimComment from "./BimComment";
+function makeCommentMarkerConfig(deps) {
+  const { currentUserId, onRemove, onReply, buildingId } = deps;
+  return {
+    markerIdKey: "commentId",
+    sphereColor: "white",
+    focusDistance: 8,
+    component: BimComment,
+    clusterComponent: BimMarkerCluster,
+    // Exact reproduction of the pre-refactor `makeCommentPropsMapper`. Any user can select/focus/
+    // reply to any comment (showActions/onSelect/onFocus/onReply are NOT author-gated) — only
+    // canEdit/canDelete/onEdit/onRemove are, matching the original conditional structure.
+    propsMapper: (comment, ctx) => {
+      var _a, _b;
+      const base = {
+        userName: comment.authorName,
+        userImageFileId: (_a = comment.imageFileId) != null ? _a : null,
+        userImage: (_b = comment.imageFileId) != null ? _b : null,
+        buildingId: comment.buildingId,
+        timestamp: new Date(comment.createdAt),
+        text: comment.text,
+        isPending: comment.isPending || false,
+        highlight: ctx.highlight,
+        focused: ctx.focused
+      };
+      if (comment.isPending) return base;
+      return __spreadProps(__spreadValues({}, base), {
+        showActions: true,
+        canEdit: ctx.isAuthor,
+        canDelete: ctx.isAuthor,
+        onSelect: ctx.onSelect,
+        onFocus: ctx.onFocus,
+        onReply: () => onReply(comment.id),
+        onEdit: ctx.isAuthor ? ctx.onEdit : void 0,
+        onRemove: ctx.isAuthor ? ctx.onRemove : void 0
+      });
+    },
+    clusterMemberMapper: (c) => {
+      var _a;
+      return {
+        id: c.id,
+        userName: c.authorName,
+        imageFileId: (_a = c.imageFileId) != null ? _a : null
+      };
+    },
+    dataHashPart: (c) => {
+      var _a;
+      return `${c.id}:${(_a = c.text) != null ? _a : ""}:${c.isPending ? 1 : 0}`;
+    },
+    isAuthor: (c) => currentUserId != null && String(c.authorId) === currentUserId,
+    onRemove,
+    makePendingItem: (id, pos) => ({
+      id,
+      x: pos.x,
+      y: pos.y,
+      z: pos.z,
+      authorName: "Loading...",
+      imageFileId: null,
+      image: "",
+      text: "Creating comment...",
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      buildingId,
+      isPending: true
+    })
+  };
+}
+export {
+  makeCommentMarkerConfig
+};
+//# sourceMappingURL=commentMarkerConfig.js.map

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/commentMarkerConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/commentMarkerConfig.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\nimport { BimMarkerCluster } from \"../../../../../shared/markers/BimMarkerCluster\"\r\n\r\nimport BimComment from \"./BimComment\"\r\n\r\nimport type { BimMarkerConfig } from \"../../../../../shared/markers/types\"\r\n\r\n/** A BIM comment enriched with author display fields, shaped for the marker layer. */\r\nexport interface CommentItem {\r\n  id: number\r\n  x: number\r\n  y: number\r\n  z: number\r\n  /** Omitted on the pending (being-created) placeholder — never read before a comment is real. */\r\n  authorId?: number\r\n  authorName: string\r\n  imageFileId: number | null\r\n  image: number | string | null\r\n  text: string\r\n  createdAt: string | Date\r\n  buildingId?: number | null\r\n  isPending?: boolean\r\n}\r\n\r\ninterface CommentMarkerDeps {\r\n  currentUserId: string | null\r\n  onRemove: (id: number) => void\r\n  /** Reply is comment-only — the generic marker `ctx` has no reply handler, so the wrapper injects it. */\r\n  onReply: (id: number) => void\r\n  /** Building context closed over for the pending placeholder item. */\r\n  buildingId: number\r\n}\r\n\r\n/**\r\n * Builds the comment-specific `BimMarkerConfig` consumed by `useMarkerLayerBim`. A factory\r\n * (not a plain object) because `isAuthor`, `onRemove`, `onReply` and the pending placeholder's\r\n * `buildingId` all need runtime values supplied by the `useCommentMarkers` wrapper.\r\n */\r\nexport function makeCommentMarkerConfig(deps: CommentMarkerDeps): BimMarkerConfig<CommentItem> {\r\n  const { currentUserId, onRemove, onReply, buildingId } = deps\r\n\r\n  return {\r\n    markerIdKey: \"commentId\",\r\n    sphereColor: \"white\",\r\n    focusDistance: 8,\r\n    component: BimComment,\r\n    clusterComponent: BimMarkerCluster,\r\n\r\n    // Exact reproduction of the pre-refactor `makeCommentPropsMapper`. Any user can select/focus/\r\n    // reply to any comment (showActions/onSelect/onFocus/onReply are NOT author-gated) — only\r\n    // canEdit/canDelete/onEdit/onRemove are, matching the original conditional structure.\r\n    propsMapper: (comment, ctx) => {\r\n      const base = {\r\n        userName: comment.authorName,\r\n        userImageFileId: comment.imageFileId ?? null,\r\n        userImage: comment.imageFileId ?? null,\r\n        buildingId: comment.buildingId,\r\n        timestamp: new Date(comment.createdAt),\r\n        text: comment.text,\r\n        isPending: comment.isPending || false,\r\n        highlight: ctx.highlight,\r\n        focused: ctx.focused,\r\n      }\r\n      if (comment.isPending) return base\r\n\r\n      return {\r\n        ...base,\r\n        showActions: true,\r\n        canEdit: ctx.isAuthor,\r\n        canDelete: ctx.isAuthor,\r\n        onSelect: ctx.onSelect,\r\n        onFocus: ctx.onFocus,\r\n        onReply: () => onReply(comment.id),\r\n        onEdit: ctx.isAuthor ? ctx.onEdit : undefined,\r\n        onRemove: ctx.isAuthor ? ctx.onRemove : undefined,\r\n      }\r\n    },\r\n\r\n    clusterMemberMapper: (c) => ({\r\n      id: c.id,\r\n      userName: c.authorName,\r\n      imageFileId: c.imageFileId ?? null,\r\n    }),\r\n\r\n    dataHashPart: (c) => `${c.id}:${c.text ?? \"\"}:${c.isPending ? 1 : 0}`,\r\n\r\n    isAuthor: (c) => currentUserId != null && String(c.authorId) === currentUserId,\r\n\r\n    onRemove,\r\n\r\n    makePendingItem: (id, pos) => ({\r\n      id,\r\n      x: pos.x,\r\n      y: pos.y,\r\n      z: pos.z,\r\n      authorName: \"Loading...\",\r\n      imageFileId: null,\r\n      image: \"\",\r\n      text: \"Creating comment...\",\r\n      createdAt: new Date().toISOString(),\r\n      buildingId,\r\n      isPending: true,\r\n    }),\r\n  }\r\n}\r\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAGA,SAAS,wBAAwB;AAEjC,OAAO,gBAAgB;AAmChB,SAAS,wBAAwB,MAAuD;AAC7F,QAAM,EAAE,eAAe,UAAU,SAAS,WAAW,IAAI;AAEzD,SAAO;AAAA,IACL,aAAa;AAAA,IACb,aAAa;AAAA,IACb,eAAe;AAAA,IACf,WAAW;AAAA,IACX,kBAAkB;AAAA;AAAA;AAAA;AAAA,IAKlB,aAAa,CAAC,SAAS,QAAQ;AArDnC;AAsDM,YAAM,OAAO;AAAA,QACX,UAAU,QAAQ;AAAA,QAClB,kBAAiB,aAAQ,gBAAR,YAAuB;AAAA,QACxC,YAAW,aAAQ,gBAAR,YAAuB;AAAA,QAClC,YAAY,QAAQ;AAAA,QACpB,WAAW,IAAI,KAAK,QAAQ,SAAS;AAAA,QACrC,MAAM,QAAQ;AAAA,QACd,WAAW,QAAQ,aAAa;AAAA,QAChC,WAAW,IAAI;AAAA,QACf,SAAS,IAAI;AAAA,MACf;AACA,UAAI,QAAQ,UAAW,QAAO;AAE9B,aAAO,iCACF,OADE;AAAA,QAEL,aAAa;AAAA,QACb,SAAS,IAAI;AAAA,QACb,WAAW,IAAI;AAAA,QACf,UAAU,IAAI;AAAA,QACd,SAAS,IAAI;AAAA,QACb,SAAS,MAAM,QAAQ,QAAQ,EAAE;AAAA,QACjC,QAAQ,IAAI,WAAW,IAAI,SAAS;AAAA,QACpC,UAAU,IAAI,WAAW,IAAI,WAAW;AAAA,MAC1C;AAAA,IACF;AAAA,IAEA,qBAAqB,CAAC,MAAG;AAhF7B;AAgFiC;AAAA,QAC3B,IAAI,EAAE;AAAA,QACN,UAAU,EAAE;AAAA,QACZ,cAAa,OAAE,gBAAF,YAAiB;AAAA,MAChC;AAAA;AAAA,IAEA,cAAc,CAAC,MAAG;AAtFtB;AAsFyB,gBAAG,EAAE,EAAE,KAAI,OAAE,SAAF,YAAU,EAAE,IAAI,EAAE,YAAY,IAAI,CAAC;AAAA;AAAA,IAEnE,UAAU,CAAC,MAAM,iBAAiB,QAAQ,OAAO,EAAE,QAAQ,MAAM;AAAA,IAEjE;AAAA,IAEA,iBAAiB,CAAC,IAAI,SAAS;AAAA,MAC7B;AAAA,MACA,GAAG,IAAI;AAAA,MACP,GAAG,IAAI;AAAA,MACP,GAAG,IAAI;AAAA,MACP,YAAY;AAAA,MACZ,aAAa;AAAA,MACb,OAAO;AAAA,MACP,MAAM;AAAA,MACN,YAAW,oBAAI,KAAK,GAAE,YAAY;AAAA,MAClC;AAAA,MACA,WAAW;AAAA,IACb;AAAA,EACF;AACF;","names":[]}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderCSS2DMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AAErE,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAE7E,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAA;IAClB,WAAW,EAAE,WAAW,CAAA;CACzB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,KAAK,EAAE,CAAC,EAAE,CAAA;IACV,WAAW,EAAE,WAAW,GAAG,UAAU,CAAA;IACrC,+FAA+F;IAC/F,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IACxD,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IACnC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7C,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,iBAAiB,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;CACpC;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAClH,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,IAAI,CA2FN"}
+{"version":3,"file":"renderCSS2DMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AAErE,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAE7E,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAA;IAClB,WAAW,EAAE,WAAW,CAAA;CACzB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,KAAK,EAAE,CAAC,EAAE,CAAA;IACV,WAAW,EAAE,WAAW,GAAG,UAAU,CAAA;IACrC,+FAA+F;IAC/F,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IACxD,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IACnC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7C,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,iBAAiB,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;CACpC;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAClH,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,IAAI,CA6FN"}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.js

@@ -56,13 +56,13 @@ function renderCSS2DMarkers(world, config) {
   for (const item of validItems) {
     const itemId = String(item.id);
     const existing = reg.get(itemId);
-    const resolvedProps = __spreadProps(__spreadValues({}, propsMapper(item)), {
+    const resolvedProps = __spreadValues({
       worldCamera: world.camera.three,
       targetPoint: new THREE.Vector3(item.x, item.y, item.z),
       onClose: () => {
       },
       onRemove: () => onRemove(item.id)
-    });
+    }, propsMapper(item));
     if (existing) {
       const markerElement2 = React.createElement(component, __spreadProps(__spreadValues({}, resolvedProps), { sphere: existing.sphere }));
       existing.root.render(

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.tsx"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\nimport * as React from 'react'\r\nimport { createRoot } from 'react-dom/client'\r\nimport * as THREE from 'three'\r\nimport { CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js'\r\n\r\nimport { HooksCtx, type HooksBag } from '../../../../../../../hooks/provider'\r\n\r\nexport interface MarkerRef {\r\n  root: ReturnType<typeof createRoot>\r\n  sphere: THREE.Mesh\r\n  css2dObject: CSS2DObject\r\n}\r\n\r\nexport interface MarkerConfig<T> {\r\n  items: T[]\r\n  markerIdKey: 'commentId' | 'sensorId'\r\n  /** Persistent registry keyed by item id — create with React.useRef(new Map()) in the caller */\r\n  registry: React.MutableRefObject<Map<string, MarkerRef>>\r\n  component: React.ComponentType<any>\r\n  propsMapper: (item: T) => Record<string, any>\r\n  sphereColor: string\r\n  isVisible: boolean\r\n  onRemove: (id: number) => void\r\n  hooksContextValue?: HooksBag | null\r\n}\r\n\r\nexport function renderCSS2DMarkers<T extends { id: number; x?: number | null; y?: number | null; z?: number | null }>(\r\n  world: any,\r\n  config: MarkerConfig<T>\r\n): void {\r\n  if (!world) return\r\n\r\n  const { items, markerIdKey, component, propsMapper, sphereColor, isVisible, onRemove, registry, hooksContextValue } = config\r\n  const reg = registry.current\r\n\r\n  // Filter items to only include those with valid 3D coordinates\r\n  const validItems = items.filter((item): item is T & { x: number; y: number; z: number } =>\r\n    item.x != null && item.y != null && item.z != null\r\n  )\r\n\r\n  // Hide all markers if not visible — remove all from scene and clear registry\r\n  if (!isVisible) {\r\n    reg.forEach(({ sphere, css2dObject }) => {\r\n      world.scene.three.remove(sphere)\r\n      world.scene.three.remove(css2dObject)\r\n      sphere.geometry?.dispose()\r\n      if (sphere.material instanceof THREE.Material) sphere.material.dispose()\r\n    })\r\n    reg.clear()\r\n    return\r\n  }\r\n\r\n  const eligibleIds = new Set(validItems.map(item => String(item.id)))\r\n\r\n  // Remove markers for deleted/invisible items\r\n  const toDelete: string[] = []\r\n  reg.forEach(({ sphere, css2dObject }, id) => {\r\n    if (!eligibleIds.has(id)) {\r\n      world.scene.three.remove(sphere)\r\n      world.scene.three.remove(css2dObject)\r\n      sphere.geometry?.dispose()\r\n      if (sphere.material instanceof THREE.Material) sphere.material.dispose()\r\n      toDelete.push(id)\r\n    }\r\n  })\r\n  toDelete.forEach(id => reg.delete(id))\r\n\r\n  // Update or create markers\r\n  for (const item of validItems) {\r\n    const itemId = String(item.id)\r\n    const existing = reg.get(itemId)\r\n\r\n    const resolvedProps = {\r\n      ...propsMapper(item),\r\n      worldCamera: world.camera.three,\r\n      targetPoint: new THREE.Vector3(item.x, item.y, item.z),\r\n      onClose: () => {},\r\n      onRemove: () => onRemove(item.id),\r\n    }\r\n\r\n    if (existing) {\r\n      // Re-render with latest props (e.g. highlight change)\r\n      const markerElement = React.createElement(component, { ...resolvedProps, sphere: existing.sphere })\r\n      existing.root.render(\r\n        hooksContextValue\r\n          ? React.createElement(HooksCtx.Provider, { value: hooksContextValue }, markerElement)\r\n          : markerElement\r\n      )\r\n      continue\r\n    }\r\n\r\n    // Create new marker\r\n    const hitPoint = new THREE.Vector3(item.x, item.y, item.z)\r\n\r\n    const sphereGeometry = new THREE.SphereGeometry(0.04, 10, 10)\r\n    const sphereMaterial = new THREE.MeshBasicMaterial({ color: sphereColor })\r\n    const sphere = new THREE.Mesh(sphereGeometry, sphereMaterial)\r\n    sphere.position.copy(hitPoint)\r\n    sphere.userData[markerIdKey] = itemId\r\n    world.scene.three.add(sphere)\r\n\r\n    const labelDiv = document.createElement('div')\r\n    labelDiv.style.pointerEvents = 'auto'\r\n    const root = createRoot(labelDiv)\r\n    const markerElement = React.createElement(component, { ...resolvedProps, sphere })\r\n    root.render(\r\n      hooksContextValue\r\n        ? React.createElement(HooksCtx.Provider, { value: hooksContextValue }, markerElement)\r\n        : markerElement\r\n    )\r\n\r\n    const css2dObject = new CSS2DObject(labelDiv)\r\n    css2dObject.position.copy(hitPoint)\r\n    css2dObject.position.y += 0.2\r\n    css2dObject.userData[markerIdKey] = itemId\r\n    css2dObject.element.style.pointerEvents = 'auto'\r\n    world.scene.three.add(css2dObject)\r\n\r\n    reg.set(itemId, { root, sphere, css2dObject })\r\n  }\r\n}\r\n"],"mappings":"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","names":["markerElement"]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/renderCSS2DMarkers.tsx"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\nimport * as React from 'react'\r\nimport { createRoot } from 'react-dom/client'\r\nimport * as THREE from 'three'\r\nimport { CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js'\r\n\r\nimport { HooksCtx, type HooksBag } from '../../../../../../../hooks/provider'\r\n\r\nexport interface MarkerRef {\r\n  root: ReturnType<typeof createRoot>\r\n  sphere: THREE.Mesh\r\n  css2dObject: CSS2DObject\r\n}\r\n\r\nexport interface MarkerConfig<T> {\r\n  items: T[]\r\n  markerIdKey: 'commentId' | 'sensorId'\r\n  /** Persistent registry keyed by item id — create with React.useRef(new Map()) in the caller */\r\n  registry: React.MutableRefObject<Map<string, MarkerRef>>\r\n  component: React.ComponentType<any>\r\n  propsMapper: (item: T) => Record<string, any>\r\n  sphereColor: string\r\n  isVisible: boolean\r\n  onRemove: (id: number) => void\r\n  hooksContextValue?: HooksBag | null\r\n}\r\n\r\nexport function renderCSS2DMarkers<T extends { id: number; x?: number | null; y?: number | null; z?: number | null }>(\r\n  world: any,\r\n  config: MarkerConfig<T>\r\n): void {\r\n  if (!world) return\r\n\r\n  const { items, markerIdKey, component, propsMapper, sphereColor, isVisible, onRemove, registry, hooksContextValue } = config\r\n  const reg = registry.current\r\n\r\n  // Filter items to only include those with valid 3D coordinates\r\n  const validItems = items.filter((item): item is T & { x: number; y: number; z: number } =>\r\n    item.x != null && item.y != null && item.z != null\r\n  )\r\n\r\n  // Hide all markers if not visible — remove all from scene and clear registry\r\n  if (!isVisible) {\r\n    reg.forEach(({ sphere, css2dObject }) => {\r\n      world.scene.three.remove(sphere)\r\n      world.scene.three.remove(css2dObject)\r\n      sphere.geometry?.dispose()\r\n      if (sphere.material instanceof THREE.Material) sphere.material.dispose()\r\n    })\r\n    reg.clear()\r\n    return\r\n  }\r\n\r\n  const eligibleIds = new Set(validItems.map(item => String(item.id)))\r\n\r\n  // Remove markers for deleted/invisible items\r\n  const toDelete: string[] = []\r\n  reg.forEach(({ sphere, css2dObject }, id) => {\r\n    if (!eligibleIds.has(id)) {\r\n      world.scene.three.remove(sphere)\r\n      world.scene.three.remove(css2dObject)\r\n      sphere.geometry?.dispose()\r\n      if (sphere.material instanceof THREE.Material) sphere.material.dispose()\r\n      toDelete.push(id)\r\n    }\r\n  })\r\n  toDelete.forEach(id => reg.delete(id))\r\n\r\n  // Update or create markers\r\n  for (const item of validItems) {\r\n    const itemId = String(item.id)\r\n    const existing = reg.get(itemId)\r\n\r\n    const resolvedProps = {\r\n      worldCamera: world.camera.three,\r\n      targetPoint: new THREE.Vector3(item.x, item.y, item.z),\r\n      onClose: () => {},\r\n      onRemove: () => onRemove(item.id),\r\n      // propsMapper wins: it can supply richer, per-item handlers (e.g. author-gated\r\n      // delete, select/focus/edit/reply) that override these generic defaults.\r\n      ...propsMapper(item),\r\n    }\r\n\r\n    if (existing) {\r\n      // Re-render with latest props (e.g. highlight change)\r\n      const markerElement = React.createElement(component, { ...resolvedProps, sphere: existing.sphere })\r\n      existing.root.render(\r\n        hooksContextValue\r\n          ? React.createElement(HooksCtx.Provider, { value: hooksContextValue }, markerElement)\r\n          : markerElement\r\n      )\r\n      continue\r\n    }\r\n\r\n    // Create new marker\r\n    const hitPoint = new THREE.Vector3(item.x, item.y, item.z)\r\n\r\n    const sphereGeometry = new THREE.SphereGeometry(0.04, 10, 10)\r\n    const sphereMaterial = new THREE.MeshBasicMaterial({ color: sphereColor })\r\n    const sphere = new THREE.Mesh(sphereGeometry, sphereMaterial)\r\n    sphere.position.copy(hitPoint)\r\n    sphere.userData[markerIdKey] = itemId\r\n    world.scene.three.add(sphere)\r\n\r\n    const labelDiv = document.createElement('div')\r\n    labelDiv.style.pointerEvents = 'auto'\r\n    const root = createRoot(labelDiv)\r\n    const markerElement = React.createElement(component, { ...resolvedProps, sphere })\r\n    root.render(\r\n      hooksContextValue\r\n        ? React.createElement(HooksCtx.Provider, { value: hooksContextValue }, markerElement)\r\n        : markerElement\r\n    )\r\n\r\n    const css2dObject = new CSS2DObject(labelDiv)\r\n    css2dObject.position.copy(hitPoint)\r\n    css2dObject.position.y += 0.2\r\n    css2dObject.userData[markerIdKey] = itemId\r\n    css2dObject.element.style.pointerEvents = 'auto'\r\n    world.scene.three.add(css2dObject)\r\n\r\n    reg.set(itemId, { root, sphere, css2dObject })\r\n  }\r\n}\r\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAGA,YAAY,WAAW;AACvB,SAAS,kBAAkB;AAC3B,YAAY,WAAW;AACvB,SAAS,mBAAmB;AAE5B,SAAS,gBAA+B;AAqBjC,SAAS,mBACd,OACA,QACM;AACN,MAAI,CAAC,MAAO;AAEZ,QAAM,EAAE,OAAO,aAAa,WAAW,aAAa,aAAa,WAAW,UAAU,UAAU,kBAAkB,IAAI;AACtH,QAAM,MAAM,SAAS;AAGrB,QAAM,aAAa,MAAM;AAAA,IAAO,CAAC,SAC/B,KAAK,KAAK,QAAQ,KAAK,KAAK,QAAQ,KAAK,KAAK;AAAA,EAChD;AAGA,MAAI,CAAC,WAAW;AACd,QAAI,QAAQ,CAAC,EAAE,QAAQ,YAAY,MAAM;AA7C7C;AA8CM,YAAM,MAAM,MAAM,OAAO,MAAM;AAC/B,YAAM,MAAM,MAAM,OAAO,WAAW;AACpC,mBAAO,aAAP,mBAAiB;AACjB,UAAI,OAAO,oBAAoB,MAAM,SAAU,QAAO,SAAS,QAAQ;AAAA,IACzE,CAAC;AACD,QAAI,MAAM;AACV;AAAA,EACF;AAEA,QAAM,cAAc,IAAI,IAAI,WAAW,IAAI,UAAQ,OAAO,KAAK,EAAE,CAAC,CAAC;AAGnE,QAAM,WAAqB,CAAC;AAC5B,MAAI,QAAQ,CAAC,EAAE,QAAQ,YAAY,GAAG,OAAO;AA3D/C;AA4DI,QAAI,CAAC,YAAY,IAAI,EAAE,GAAG;AACxB,YAAM,MAAM,MAAM,OAAO,MAAM;AAC/B,YAAM,MAAM,MAAM,OAAO,WAAW;AACpC,mBAAO,aAAP,mBAAiB;AACjB,UAAI,OAAO,oBAAoB,MAAM,SAAU,QAAO,SAAS,QAAQ;AACvE,eAAS,KAAK,EAAE;AAAA,IAClB;AAAA,EACF,CAAC;AACD,WAAS,QAAQ,QAAM,IAAI,OAAO,EAAE,CAAC;AAGrC,aAAW,QAAQ,YAAY;AAC7B,UAAM,SAAS,OAAO,KAAK,EAAE;AAC7B,UAAM,WAAW,IAAI,IAAI,MAAM;AAE/B,UAAM,gBAAgB;AAAA,MACpB,aAAa,MAAM,OAAO;AAAA,MAC1B,aAAa,IAAI,MAAM,QAAQ,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AAAA,MACrD,SAAS,MAAM;AAAA,MAAC;AAAA,MAChB,UAAU,MAAM,SAAS,KAAK,EAAE;AAAA,OAG7B,YAAY,IAAI;AAGrB,QAAI,UAAU;AAEZ,YAAMA,iBAAgB,MAAM,cAAc,WAAW,iCAAK,gBAAL,EAAoB,QAAQ,SAAS,OAAO,EAAC;AAClG,eAAS,KAAK;AAAA,QACZ,oBACI,MAAM,cAAc,SAAS,UAAU,EAAE,OAAO,kBAAkB,GAAGA,cAAa,IAClFA;AAAA,MACN;AACA;AAAA,IACF;AAGA,UAAM,WAAW,IAAI,MAAM,QAAQ,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AAEzD,UAAM,iBAAiB,IAAI,MAAM,eAAe,MAAM,IAAI,EAAE;AAC5D,UAAM,iBAAiB,IAAI,MAAM,kBAAkB,EAAE,OAAO,YAAY,CAAC;AACzE,UAAM,SAAS,IAAI,MAAM,KAAK,gBAAgB,cAAc;AAC5D,WAAO,SAAS,KAAK,QAAQ;AAC7B,WAAO,SAAS,WAAW,IAAI;AAC/B,UAAM,MAAM,MAAM,IAAI,MAAM;AAE5B,UAAM,WAAW,SAAS,cAAc,KAAK;AAC7C,aAAS,MAAM,gBAAgB;AAC/B,UAAM,OAAO,WAAW,QAAQ;AAChC,UAAM,gBAAgB,MAAM,cAAc,WAAW,iCAAK,gBAAL,EAAoB,OAAO,EAAC;AACjF,SAAK;AAAA,MACH,oBACI,MAAM,cAAc,SAAS,UAAU,EAAE,OAAO,kBAAkB,GAAG,aAAa,IAClF;AAAA,IACN;AAEA,UAAM,cAAc,IAAI,YAAY,QAAQ;AAC5C,gBAAY,SAAS,KAAK,QAAQ;AAClC,gBAAY,SAAS,KAAK;AAC1B,gBAAY,SAAS,WAAW,IAAI;AACpC,gBAAY,QAAQ,MAAM,gBAAgB;AAC1C,UAAM,MAAM,MAAM,IAAI,WAAW;AAEjC,QAAI,IAAI,QAAQ,EAAE,MAAM,QAAQ,YAAY,CAAC;AAAA,EAC/C;AACF;","names":["markerElement"]}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.d.ts

@@ -1,5 +1,11 @@
+/**
+ * Thin wrapper over the generic `useMarkerLayerBim`: owns comment data fetching, the
+ * author-cascade delete, and the sidebar reply/edit handoff, then hands rendering off to the
+ * shared marker layer via `commentMarkerConfig`. Signature and return shape are unchanged —
+ * `AddToBim/index.tsx` consumes `{ addPendingComment, removePendingComment, commentCount }`.
+ */
 export declare function useCommentMarkers(world: any, buildingId: number): {
-    addPendingComment: (position: {
+    addPendingComment: (pos: {
         x: number;
         y: number;
         z: number;

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCommentMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.ts"],"names":[],"mappings":"AAgBA,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;kCA6CP;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;+BAMtC,MAAM;;EAoD3D"}
+{"version":3,"file":"useCommentMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.ts"],"names":[],"mappings":"AAmBA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;;;;;;;;EAmF/D"}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.js

@@ -18,23 +18,24 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { useSession } from "next-auth/react";
 import * as React from "react";
-import { useComments, useComment } from "../../../../../../../hooks/comments/comments";
+import { useComments, useDeleteComments } from "../../../../../../../hooks/comments/comments";
 import { useCoreHooks } from "../../../../../../../hooks/provider";
 import { useUsers } from "../../../../../../../hooks/users/users";
 import { MenusContext } from "../../../../../../../store";
 import { ViewerNames } from "../../../../../../../types/dbTypes";
-import BimComment from "./BimComment";
-import { renderCSS2DMarkers } from "./renderCSS2DMarkers";
+import { useMarkerLayerBim } from "../../../../../shared/markers/useMarkerLayerBim";
+import { makeCommentMarkerConfig } from "./commentMarkerConfig";
 function useCommentMarkers(world, buildingId) {
-  const { state: menusState } = React.useContext(MenusContext);
-  const { commentsVisibleInViewer, currentCommentId } = menusState.menus;
-  const registry = React.useRef(/* @__PURE__ */ new Map());
+  var _a, _b, _c, _d;
+  const { state: menusState, dispatch: menusDispatch, setIsSidebarOpen } = React.useContext(MenusContext);
+  const { commentsVisibleInViewer, currentCommentId, focusedCommentId, focusRequestId } = menusState.menus;
   const { comments } = useComments();
   const { users } = useUsers();
   const coreHooks = useCoreHooks();
-  const [commentToDelete, setCommentToDelete] = React.useState(null);
-  const { deleteComment } = useComment(commentToDelete);
+  const currentUserId = (_c = (_b = (_a = useSession().data) == null ? void 0 : _a.user) == null ? void 0 : _b.id) != null ? _c : null;
+  const { deleteComments } = useDeleteComments();
   const eligibleComments = comments.filter((comment) => {
     const { x, y, z, viewer } = comment;
     if (x == null || y == null || z == null) return false;
@@ -42,79 +43,55 @@ function useCommentMarkers(world, buildingId) {
     if (buildingId !== -1 && comment.buildingId !== buildingId) return false;
     return true;
   }).map((comment) => {
-    var _a, _b, _c;
+    var _a2, _b2, _c2;
     const user = users.find((u) => u.id === comment.authorId);
     return __spreadProps(__spreadValues({}, comment), {
-      authorName: (_a = user == null ? void 0 : user.name) != null ? _a : "Unknown User",
-      imageFileId: (_b = user == null ? void 0 : user.imageFileId) != null ? _b : null,
-      image: (_c = user == null ? void 0 : user.imageFileId) != null ? _c : null
+      authorName: (_a2 = user == null ? void 0 : user.name) != null ? _a2 : "Unknown User",
+      imageFileId: (_b2 = user == null ? void 0 : user.imageFileId) != null ? _b2 : null,
+      image: (_c2 = user == null ? void 0 : user.imageFileId) != null ? _c2 : null
     });
   });
-  React.useEffect(() => {
-    if (commentToDelete !== null) {
-      deleteComment();
-      setCommentToDelete(null);
-    }
-  }, [commentToDelete, deleteComment]);
   const handleRemoveComment = React.useCallback((commentId) => {
-    setCommentToDelete(commentId);
-  }, []);
-  const [pendingComments, setPendingComments] = React.useState([]);
-  const addPendingComment = React.useCallback((position) => {
-    const id = -Date.now();
-    setPendingComments((prev) => [...prev, __spreadValues({ id }, position)]);
-    return id;
-  }, []);
-  const removePendingComment = React.useCallback((id) => {
-    setPendingComments((prev) => prev.filter((p) => p.id !== id));
-  }, []);
-  React.useEffect(() => {
-    var _a;
-    const isVisible = (_a = commentsVisibleInViewer == null ? void 0 : commentsVisibleInViewer.includes(ViewerNames.bim)) != null ? _a : false;
-    const allComments = [
-      ...eligibleComments.map((c) => __spreadProps(__spreadValues({}, c), { isPending: false })),
-      ...pendingComments.map((p) => ({
-        id: p.id,
-        x: p.x,
-        y: p.y,
-        z: p.z,
-        authorName: "Loading...",
-        imageFileId: null,
-        image: "",
-        text: "Creating comment...",
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-        buildingId,
-        isPending: true
-      }))
-    ];
-    renderCSS2DMarkers(world, {
-      items: allComments,
-      markerIdKey: "commentId",
-      registry,
-      component: BimComment,
-      hooksContextValue: coreHooks,
-      propsMapper: (comment) => {
-        var _a2, _b;
-        return {
-          userName: comment.authorName,
-          userImageFileId: (_a2 = comment.imageFileId) != null ? _a2 : null,
-          userImage: (_b = comment.imageFileId) != null ? _b : null,
-          buildingId: comment.buildingId,
-          timestamp: new Date(comment.createdAt),
-          text: comment.text,
-          isPending: comment.isPending || false,
-          highlight: currentCommentId === comment.id
-        };
-      },
-      sphereColor: "white",
-      isVisible,
-      onRemove: handleRemoveComment
-    });
-  }, [world, eligibleComments, pendingComments, handleRemoveComment, commentsVisibleInViewer, buildingId, currentCommentId, coreHooks]);
+    const replyIds = comments.filter((c) => c.replyToId === commentId).map((c) => c.id);
+    void deleteComments({ ids: [commentId, ...replyIds] });
+  }, [comments, deleteComments]);
+  const requestSidebarAction = React.useCallback((commentId, action) => {
+    setIsSidebarOpen(true);
+    menusDispatch({ type: "SET_SIDEBAR_SELECTED_TAB", payload: { selectedTab: "communication" } });
+    menusDispatch({ type: "SET_CURRENT_COMMENT_ID", payload: { commentId } });
+    menusDispatch({ type: "REQUEST_COMMENT_ACTION", payload: { commentId, action } });
+  }, [menusDispatch, setIsSidebarOpen]);
+  const handleReplyComment = React.useCallback((commentId) => {
+    requestSidebarAction(commentId, "reply");
+  }, [requestSidebarAction]);
+  const store = {
+    currentId: currentCommentId,
+    focusedId: focusedCommentId,
+    focusRequestId,
+    setCurrentId: (id) => menusDispatch({ type: "SET_CURRENT_COMMENT_ID", payload: { commentId: id } }),
+    setFocusedId: (id) => {
+      menusDispatch({ type: "SET_CURRENT_COMMENT_ID", payload: { commentId: id } });
+      menusDispatch({ type: "SET_FOCUSED_COMMENT_ID", payload: { commentId: id } });
+    },
+    requestEdit: (id) => requestSidebarAction(id, "edit")
+  };
+  const config = makeCommentMarkerConfig({
+    currentUserId,
+    onRemove: handleRemoveComment,
+    onReply: handleReplyComment,
+    buildingId
+  });
+  const itemsForLayer = eligibleComments.map((c) => __spreadProps(__spreadValues({}, c), { isPending: false }));
+  const { addPending, removePending } = useMarkerLayerBim(world, itemsForLayer, {
+    isVisible: (_d = commentsVisibleInViewer == null ? void 0 : commentsVisibleInViewer.includes(ViewerNames.bim)) != null ? _d : false,
+    store,
+    coreHooks,
+    config
+  });
   const commentCount = comments.filter(
     (c) => c.viewer === ViewerNames.bim && (!buildingId || buildingId === -1 || c.buildingId === buildingId)
   ).length;
-  return { addPendingComment, removePendingComment, commentCount };
+  return { addPendingComment: addPending, removePendingComment: removePending, commentCount };
 }
 export {
   useCommentMarkers

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.ts"],"sourcesContent":["\"use client\"\r\n\r\n// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\nimport * as React from \"react\"\r\n\r\nimport { useComments, useComment } from \"../../../../../../../hooks/comments/comments\"\r\nimport { useCoreHooks } from \"../../../../../../../hooks/provider\"\r\nimport { useUsers } from \"../../../../../../../hooks/users/users\"\r\nimport { MenusContext } from \"../../../../../../../store\"\r\nimport { ViewerNames } from \"../../../../../../../types/dbTypes\"\r\n\r\nimport BimComment from \"./BimComment\"\r\nimport { renderCSS2DMarkers, type MarkerRef } from \"./renderCSS2DMarkers\"\r\n\r\nexport function useCommentMarkers(world: any, buildingId: number) {\r\n  const { state: menusState } = React.useContext(MenusContext)\r\n  const { commentsVisibleInViewer, currentCommentId } = menusState.menus\r\n\r\n  const registry = React.useRef<Map<string, MarkerRef>>(new Map())\r\n\r\n  const { comments } = useComments()\r\n  const { users } = useUsers()\r\n  const coreHooks = useCoreHooks()\r\n\r\n  const [commentToDelete, setCommentToDelete] = React.useState<number | null>(null)\r\n  const { deleteComment } = useComment(commentToDelete)\r\n\r\n  const eligibleComments = comments\r\n    .filter((comment) => {\r\n      const { x, y, z, viewer } = comment\r\n      if (x == null || y == null || z == null) return false\r\n      if (viewer !== ViewerNames.bim) return false\r\n      if (buildingId !== -1 && comment.buildingId !== buildingId) return false\r\n      return true\r\n    })\r\n    .map((comment) => {\r\n      const user = users.find(u => u.id === comment.authorId)\r\n      return {\r\n        ...comment,\r\n        authorName: user?.name ?? \"Unknown User\",\r\n        imageFileId: user?.imageFileId ?? null,\r\n        image: user?.imageFileId ?? null,\r\n      }\r\n    })\r\n\r\n  React.useEffect(() => {\r\n    if (commentToDelete !== null) {\r\n      deleteComment()\r\n      setCommentToDelete(null)\r\n    }\r\n  }, [commentToDelete, deleteComment])\r\n\r\n  const handleRemoveComment = React.useCallback((commentId: number) => {\r\n    setCommentToDelete(commentId)\r\n  }, [])\r\n\r\n  // Pending markers for loading indicators while comment is being created\r\n  const [pendingComments, setPendingComments] = React.useState<Array<{ id: number; x: number; y: number; z: number }>>([])\r\n\r\n  const addPendingComment = React.useCallback((position: { x: number; y: number; z: number }) => {\r\n    const id = -Date.now()\r\n    setPendingComments(prev => [...prev, { id, ...position }])\r\n    return id\r\n  }, [])\r\n\r\n  const removePendingComment = React.useCallback((id: number) => {\r\n    setPendingComments(prev => prev.filter(p => p.id !== id))\r\n  }, [])\r\n\r\n  // Render comment markers (including pending)\r\n  React.useEffect(() => {\r\n    const isVisible = commentsVisibleInViewer?.includes(ViewerNames.bim) ?? false\r\n\r\n    const allComments = [\r\n      ...eligibleComments.map(c => ({ ...c, isPending: false })),\r\n      ...pendingComments.map(p => ({\r\n        id: p.id,\r\n        x: p.x,\r\n        y: p.y,\r\n        z: p.z,\r\n        authorName: \"Loading...\",\r\n        imageFileId: null,\r\n        image: \"\",\r\n        text: \"Creating comment...\",\r\n        createdAt: new Date().toISOString(),\r\n        buildingId,\r\n        isPending: true,\r\n      })),\r\n    ]\r\n\r\n    renderCSS2DMarkers(world, {\r\n      items: allComments,\r\n      markerIdKey: \"commentId\",\r\n      registry,\r\n      component: BimComment,\r\n      hooksContextValue: coreHooks,\r\n      propsMapper: (comment) => ({\r\n        userName: comment.authorName,\r\n        userImageFileId: comment.imageFileId ?? null,\r\n        userImage: comment.imageFileId ?? null,\r\n        buildingId: comment.buildingId,\r\n        timestamp: new Date(comment.createdAt),\r\n        text: comment.text,\r\n        isPending: comment.isPending || false,\r\n        highlight: currentCommentId === comment.id,\r\n      }),\r\n      sphereColor: \"white\",\r\n      isVisible,\r\n      onRemove: handleRemoveComment,\r\n    })\r\n  }, [world, eligibleComments, pendingComments, handleRemoveComment, commentsVisibleInViewer, buildingId, currentCommentId, coreHooks])\r\n\r\n  const commentCount = comments.filter(\r\n    c => c.viewer === ViewerNames.bim && (!buildingId || buildingId === -1 || c.buildingId === buildingId)\r\n  ).length\r\n\r\n  return { addPendingComment, removePendingComment, commentCount }\r\n}\r\n"],"mappings":"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","names":["_a"]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/useCommentMarkers.ts"],"sourcesContent":["\"use client\"\r\n\r\n// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\nimport { useSession } from \"next-auth/react\"\r\nimport * as React from \"react\"\r\n\r\nimport { useComments, useDeleteComments } from \"../../../../../../../hooks/comments/comments\"\r\nimport { useCoreHooks } from \"../../../../../../../hooks/provider\"\r\nimport { useUsers } from \"../../../../../../../hooks/users/users\"\r\nimport { MenusContext } from \"../../../../../../../store\"\r\nimport { ViewerNames } from \"../../../../../../../types/dbTypes\"\r\nimport { useMarkerLayerBim } from \"../../../../../shared/markers/useMarkerLayerBim\"\r\n\r\nimport { makeCommentMarkerConfig, type CommentItem } from \"./commentMarkerConfig\"\r\n\r\nimport type { MarkerStoreAdapter } from \"../../../../../shared/markers/types\"\r\n\r\n/**\r\n * Thin wrapper over the generic `useMarkerLayerBim`: owns comment data fetching, the\r\n * author-cascade delete, and the sidebar reply/edit handoff, then hands rendering off to the\r\n * shared marker layer via `commentMarkerConfig`. Signature and return shape are unchanged —\r\n * `AddToBim/index.tsx` consumes `{ addPendingComment, removePendingComment, commentCount }`.\r\n */\r\nexport function useCommentMarkers(world: any, buildingId: number) {\r\n  const { state: menusState, dispatch: menusDispatch, setIsSidebarOpen } = React.useContext(MenusContext)\r\n  const { commentsVisibleInViewer, currentCommentId, focusedCommentId, focusRequestId } = menusState.menus\r\n\r\n  const { comments } = useComments()\r\n  const { users } = useUsers()\r\n  const coreHooks = useCoreHooks()\r\n  const currentUserId = useSession().data?.user?.id ?? null\r\n  const { deleteComments } = useDeleteComments()\r\n\r\n  const eligibleComments = comments\r\n    .filter((comment) => {\r\n      const { x, y, z, viewer } = comment\r\n      if (x == null || y == null || z == null) return false\r\n      if (viewer !== ViewerNames.bim) return false\r\n      if (buildingId !== -1 && comment.buildingId !== buildingId) return false\r\n      return true\r\n    })\r\n    .map((comment) => {\r\n      const user = users.find((u) => u.id === comment.authorId)\r\n      return {\r\n        ...comment,\r\n        authorName: user?.name ?? \"Unknown User\",\r\n        imageFileId: user?.imageFileId ?? null,\r\n        image: user?.imageFileId ?? null,\r\n      }\r\n    })\r\n\r\n  const handleRemoveComment = React.useCallback((commentId: number) => {\r\n    // Cascade: remove the comment and any replies (the DB self-relation does not cascade).\r\n    const replyIds = comments.filter((c) => c.replyToId === commentId).map((c) => c.id)\r\n    void deleteComments({ ids: [commentId, ...replyIds] })\r\n  }, [comments, deleteComments])\r\n\r\n  // Edit/reply on the 3D card open the comment's editor/reply box in the sidebar.\r\n  const requestSidebarAction = React.useCallback((commentId: number, action: 'edit' | 'reply') => {\r\n    setIsSidebarOpen(true)\r\n    menusDispatch({ type: \"SET_SIDEBAR_SELECTED_TAB\", payload: { selectedTab: 'communication' } })\r\n    menusDispatch({ type: \"SET_CURRENT_COMMENT_ID\", payload: { commentId } })\r\n    menusDispatch({ type: \"REQUEST_COMMENT_ACTION\", payload: { commentId, action } })\r\n  }, [menusDispatch, setIsSidebarOpen])\r\n\r\n  const handleReplyComment = React.useCallback((commentId: number) => {\r\n    requestSidebarAction(commentId, 'reply')\r\n  }, [requestSidebarAction])\r\n\r\n  const store: MarkerStoreAdapter = {\r\n    currentId: currentCommentId,\r\n    focusedId: focusedCommentId,\r\n    focusRequestId,\r\n    setCurrentId: (id) => menusDispatch({ type: \"SET_CURRENT_COMMENT_ID\", payload: { commentId: id } }),\r\n    setFocusedId: (id) => {\r\n      menusDispatch({ type: \"SET_CURRENT_COMMENT_ID\", payload: { commentId: id } })\r\n      menusDispatch({ type: \"SET_FOCUSED_COMMENT_ID\", payload: { commentId: id } })\r\n    },\r\n    requestEdit: (id) => requestSidebarAction(id, 'edit'),\r\n  }\r\n\r\n  const config = makeCommentMarkerConfig({\r\n    currentUserId,\r\n    onRemove: handleRemoveComment,\r\n    onReply: handleReplyComment,\r\n    buildingId,\r\n  })\r\n\r\n  // Non-pending items eligible for clustering; pending (being-created) items are synthesized by\r\n  // `config.makePendingItem` inside `useMarkerLayerBim` itself.\r\n  // Cast: `eligibleComments` is filtered above to guarantee non-null x/y/z, which `CommentItem`\r\n  // requires as plain numbers — not provable to tsc through the filter + map chain.\r\n  const itemsForLayer = eligibleComments.map((c) => ({ ...c, isPending: false })) as CommentItem[]\r\n\r\n  const { addPending, removePending } = useMarkerLayerBim(world, itemsForLayer, {\r\n    isVisible: commentsVisibleInViewer?.includes(ViewerNames.bim) ?? false,\r\n    store,\r\n    coreHooks,\r\n    config,\r\n  })\r\n\r\n  const commentCount = comments.filter(\r\n    (c) => c.viewer === ViewerNames.bim && (!buildingId || buildingId === -1 || c.buildingId === buildingId),\r\n  ).length\r\n\r\n  return { addPendingComment: addPending, removePendingComment: removePending, commentCount }\r\n}\r\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAKA,SAAS,kBAAkB;AAC3B,YAAY,WAAW;AAEvB,SAAS,aAAa,yBAAyB;AAC/C,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB;AACzB,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAC5B,SAAS,yBAAyB;AAElC,SAAS,+BAAiD;AAUnD,SAAS,kBAAkB,OAAY,YAAoB;AAzBlE;AA0BE,QAAM,EAAE,OAAO,YAAY,UAAU,eAAe,iBAAiB,IAAI,MAAM,WAAW,YAAY;AACtG,QAAM,EAAE,yBAAyB,kBAAkB,kBAAkB,eAAe,IAAI,WAAW;AAEnG,QAAM,EAAE,SAAS,IAAI,YAAY;AACjC,QAAM,EAAE,MAAM,IAAI,SAAS;AAC3B,QAAM,YAAY,aAAa;AAC/B,QAAM,iBAAgB,4BAAW,EAAE,SAAb,mBAAmB,SAAnB,mBAAyB,OAAzB,YAA+B;AACrD,QAAM,EAAE,eAAe,IAAI,kBAAkB;AAE7C,QAAM,mBAAmB,SACtB,OAAO,CAAC,YAAY;AACnB,UAAM,EAAE,GAAG,GAAG,GAAG,OAAO,IAAI;AAC5B,QAAI,KAAK,QAAQ,KAAK,QAAQ,KAAK,KAAM,QAAO;AAChD,QAAI,WAAW,YAAY,IAAK,QAAO;AACvC,QAAI,eAAe,MAAM,QAAQ,eAAe,WAAY,QAAO;AACnE,WAAO;AAAA,EACT,CAAC,EACA,IAAI,CAAC,YAAY;AA3CtB,QAAAA,KAAAC,KAAAC;AA4CM,UAAM,OAAO,MAAM,KAAK,CAAC,MAAM,EAAE,OAAO,QAAQ,QAAQ;AACxD,WAAO,iCACF,UADE;AAAA,MAEL,aAAYF,MAAA,6BAAM,SAAN,OAAAA,MAAc;AAAA,MAC1B,cAAaC,MAAA,6BAAM,gBAAN,OAAAA,MAAqB;AAAA,MAClC,QAAOC,MAAA,6BAAM,gBAAN,OAAAA,MAAqB;AAAA,IAC9B;AAAA,EACF,CAAC;AAEH,QAAM,sBAAsB,MAAM,YAAY,CAAC,cAAsB;AAEnE,UAAM,WAAW,SAAS,OAAO,CAAC,MAAM,EAAE,cAAc,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE;AAClF,SAAK,eAAe,EAAE,KAAK,CAAC,WAAW,GAAG,QAAQ,EAAE,CAAC;AAAA,EACvD,GAAG,CAAC,UAAU,cAAc,CAAC;AAG7B,QAAM,uBAAuB,MAAM,YAAY,CAAC,WAAmB,WAA6B;AAC9F,qBAAiB,IAAI;AACrB,kBAAc,EAAE,MAAM,4BAA4B,SAAS,EAAE,aAAa,gBAAgB,EAAE,CAAC;AAC7F,kBAAc,EAAE,MAAM,0BAA0B,SAAS,EAAE,UAAU,EAAE,CAAC;AACxE,kBAAc,EAAE,MAAM,0BAA0B,SAAS,EAAE,WAAW,OAAO,EAAE,CAAC;AAAA,EAClF,GAAG,CAAC,eAAe,gBAAgB,CAAC;AAEpC,QAAM,qBAAqB,MAAM,YAAY,CAAC,cAAsB;AAClE,yBAAqB,WAAW,OAAO;AAAA,EACzC,GAAG,CAAC,oBAAoB,CAAC;AAEzB,QAAM,QAA4B;AAAA,IAChC,WAAW;AAAA,IACX,WAAW;AAAA,IACX;AAAA,IACA,cAAc,CAAC,OAAO,cAAc,EAAE,MAAM,0BAA0B,SAAS,EAAE,WAAW,GAAG,EAAE,CAAC;AAAA,IAClG,cAAc,CAAC,OAAO;AACpB,oBAAc,EAAE,MAAM,0BAA0B,SAAS,EAAE,WAAW,GAAG,EAAE,CAAC;AAC5E,oBAAc,EAAE,MAAM,0BAA0B,SAAS,EAAE,WAAW,GAAG,EAAE,CAAC;AAAA,IAC9E;AAAA,IACA,aAAa,CAAC,OAAO,qBAAqB,IAAI,MAAM;AAAA,EACtD;AAEA,QAAM,SAAS,wBAAwB;AAAA,IACrC;AAAA,IACA,UAAU;AAAA,IACV,SAAS;AAAA,IACT;AAAA,EACF,CAAC;AAMD,QAAM,gBAAgB,iBAAiB,IAAI,CAAC,MAAO,iCAAK,IAAL,EAAQ,WAAW,MAAM,EAAE;AAE9E,QAAM,EAAE,YAAY,cAAc,IAAI,kBAAkB,OAAO,eAAe;AAAA,IAC5E,YAAW,wEAAyB,SAAS,YAAY,SAA9C,YAAsD;AAAA,IACjE;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,eAAe,SAAS;AAAA,IAC5B,CAAC,MAAM,EAAE,WAAW,YAAY,QAAQ,CAAC,cAAc,eAAe,MAAM,EAAE,eAAe;AAAA,EAC/F,EAAE;AAEF,SAAO,EAAE,mBAAmB,YAAY,sBAAsB,eAAe,aAAa;AAC5F;","names":["_a","_b","_c"]}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useSensorMarkers.d.ts

@@ -1,4 +1,5 @@
-export declare function useSensorMarkers(world: any, buildingId: number, minioBaseUrl?: string): {
+import { type Sensor } from "../../../../../../../types/dbTypes";
+export declare function useSensorMarkers(world: any, buildingId: number): {
     addPendingSensor: (position: {
         x: number;
         y: number;
@@ -6,5 +7,10 @@ export declare function useSensorMarkers(world: any, buildingId: number, minioBa
     }) => number;
     removePendingSensor: (id: number) => void;
     sensorCount: number;
+    detailSensor: Sensor;
+    detailSensorType: import("../../../../../../..").SensorType;
+    closeSensorDetail: () => void;
+    editSensor: Sensor;
+    closeSensorEdit: () => void;
 };
 //# sourceMappingURL=useSensorMarkers.d.ts.map

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useSensorMarkers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSensorMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/useSensorMarkers.ts"],"names":[],"mappings":"AAmBA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM;iCAoD9B;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;8BAMtC,MAAM;;EAsE1D"}
+{"version":3,"file":"useSensorMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/useSensorMarkers.ts"],"names":[],"mappings":"AAcA,OAAO,EAAe,KAAK,MAAM,EAAE,MAAM,oCAAoC,CAAA;AAM7E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;iCA0DP;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;8BAMtC,MAAM;;;;;;;EAqF1D"}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/useSensorMarkers.js

@@ -18,19 +18,29 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { useSession } from "next-auth/react";
+import { useTranslations } from "next-intl";
 import * as React from "react";
 import { useCoreHooks } from "../../../../../../../hooks/provider";
 import { useSensors, useSensor } from "../../../../../../../hooks/sensors/sensors";
 import { useSensorTypes } from "../../../../../../../hooks/sensorTypes/sensorTypes";
 import { useUsers } from "../../../../../../../hooks/users/users";
-import { MenusContext } from "../../../../../../../store";
+import { AppConfigContext, MenusContext } from "../../../../../../../store";
 import { ViewerNames } from "../../../../../../../types/dbTypes";
 import { UNTAGGED_TAG } from "../../../../../../ui/Sensors/SensorsSection";
 import BimSensor from "./BimSensor";
 import { renderCSS2DMarkers } from "./renderCSS2DMarkers";
-function useSensorMarkers(world, buildingId, minioBaseUrl) {
+function useSensorMarkers(world, buildingId) {
+  var _a;
   const { state: menusState } = React.useContext(MenusContext);
   const { currentSensorId, visibleSensorTypes, visibleSensorTags } = menusState.menus;
+  const { state: appConfigState } = React.useContext(AppConfigContext);
+  const timeZone = appConfigState.appConfig.displayTimeZone;
+  const sessionUser = (_a = useSession().data) == null ? void 0 : _a.user;
+  const tr = useTranslations("SensorsSection");
+  const actionLabels = { expand: tr("expandSensor"), edit: tr("editSensor"), delete: tr("deleteSensor") };
+  const [detailSensor, setDetailSensor] = React.useState(null);
+  const [editSensor, setEditSensor] = React.useState(null);
   const registry = React.useRef(/* @__PURE__ */ new Map());
   const { sensors } = useSensors();
   const { users } = useUsers();
@@ -45,11 +55,11 @@ function useSensorMarkers(world, buildingId, minioBaseUrl) {
     if (buildingId !== -1 && sensor.buildingId !== buildingId) return false;
     return true;
   }).map((sensor) => {
-    var _a, _b;
+    var _a2, _b;
     const user = users.find((u) => u.id === sensor.authorId);
     const sensorType = sensorTypes.find((t) => t.id === sensor.typeId);
     return __spreadProps(__spreadValues({}, sensor), {
-      authorName: (_a = user == null ? void 0 : user.name) != null ? _a : "Unknown User",
+      authorName: (_a2 = user == null ? void 0 : user.name) != null ? _a2 : "Unknown User",
       imageFileId: (_b = user == null ? void 0 : user.imageFileId) != null ? _b : "images/default-avatar.svg",
       sensorType
     });
@@ -78,9 +88,9 @@ function useSensorMarkers(world, buildingId, minioBaseUrl) {
     const typesVisible = (visibleSensorTypes == null ? void 0 : visibleSensorTypes[ViewerNames.bim]) || [];
     const tagsVisible = (visibleSensorTags == null ? void 0 : visibleSensorTags[ViewerNames.bim]) || [];
     const visibleSensors = eligibleSensorsRef.current.filter((sensor) => {
-      var _a, _b, _c;
+      var _a2, _b, _c;
       const matchesType = typesVisible.includes(sensor.typeId);
-      const hasNoTags = !((_a = sensor.tags) == null ? void 0 : _a.length);
+      const hasNoTags = !((_a2 = sensor.tags) == null ? void 0 : _a2.length);
       const matchesTag = hasNoTags ? tagsVisible.includes(UNTAGGED_TAG) : (_c = (_b = sensor.tags) == null ? void 0 : _b.some((tag) => tagsVisible.includes(tag))) != null ? _c : false;
       return matchesType || matchesTag;
     });
@@ -100,6 +110,7 @@ function useSensorMarkers(world, buildingId, minioBaseUrl) {
         createdAt: (/* @__PURE__ */ new Date()).toISOString(),
         buildingId,
         tags: [],
+        authorId: -1,
         isPending: true
       }))
     ];
@@ -110,28 +121,45 @@ function useSensorMarkers(world, buildingId, minioBaseUrl) {
       component: BimSensor,
       hooksContextValue: coreHooks,
       propsMapper: (sensor) => {
-        var _a;
+        var _a2;
         return {
           sensorName: sensor.name,
           sensorType: sensorTypes.find((t) => t.id === sensor.typeId),
           tags: sensor.tags,
-          dataUrl: ((_a = sensor.url) == null ? void 0 : _a.startsWith("http")) ? sensor.url : minioBaseUrl ? `${minioBaseUrl}/sensors/${sensor.url}` : "",
+          dataUrl: (_a2 = sensor.url) != null ? _a2 : "",
           dataFormat: sensor.dataFormat,
           updateFrequency: sensor.updateFrequency,
           buildingId: sensor.buildingId,
           timestamp: new Date(sensor.createdAt),
-          highlight: currentSensorId === sensor.id
+          highlight: currentSensorId === sensor.id,
+          timeZone,
+          showActions: true,
+          onExpand: () => setDetailSensor(sensor),
+          onEdit: () => setEditSensor(sensor),
+          actionLabels,
+          canEdit: (sessionUser == null ? void 0 : sessionUser.id) === String(sensor.authorId),
+          canDelete: (sessionUser == null ? void 0 : sessionUser.id) === String(sensor.authorId)
         };
       },
       sphereColor: "#10b981",
       isVisible: true,
       onRemove: handleRemoveSensor
     });
-  }, [world, sensors, pendingSensors, handleRemoveSensor, visibleSensorTypes, visibleSensorTags, buildingId, currentSensorId, sensorTypes, coreHooks]);
+  }, [world, sensors, pendingSensors, handleRemoveSensor, visibleSensorTypes, visibleSensorTags, buildingId, currentSensorId, sensorTypes, coreHooks, timeZone, sessionUser == null ? void 0 : sessionUser.id]);
   const sensorCount = sensors.filter(
     (s) => s.viewer === ViewerNames.bim && (!buildingId || buildingId === -1 || s.buildingId === buildingId)
   ).length;
-  return { addPendingSensor, removePendingSensor, sensorCount };
+  const detailSensorType = detailSensor ? sensorTypes.find((t) => t.id === detailSensor.typeId) : void 0;
+  return {
+    addPendingSensor,
+    removePendingSensor,
+    sensorCount,
+    detailSensor,
+    detailSensorType,
+    closeSensorDetail: () => setDetailSensor(null),
+    editSensor,
+    closeSensorEdit: () => setEditSensor(null)
+  };
 }
 export {
   useSensorMarkers