@collabdt/core 0.3.2 → 0.3.3

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

@@ -1 +1 @@
-{"version":3,"file":"BimSensor.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACvF,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAA;AAEnC,UAAU,WAAW;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,gBAAgB,CAAA;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,WAAW,EAAE,KAAK,CAAC,MAAM,CAAA;IACzB,WAAW,EAAE,KAAK,CAAC,OAAO,CAAA;IAC1B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,IAAI,CAAA;IACf,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAA;IACtB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,UAAU,EACV,UAAU,EACV,IAAI,EACJ,OAAO,EACP,UAAU,EACV,eAAe,EACf,QAAQ,EACR,MAAM,EACN,OAAO,EACP,UAAU,EACV,SAAS,EACT,MAAM,EACN,SAAiB,GAClB,EAAE,WAAW,GAAG,KAAK,CAAC,YAAY,CAwBlC"}
+{"version":3,"file":"BimSensor.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAA;AAEnC,UAAU,WAAW;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,gBAAgB,CAAA;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,WAAW,EAAE,KAAK,CAAC,MAAM,CAAA;IACzB,WAAW,EAAE,KAAK,CAAC,OAAO,CAAA;IAC1B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,IAAI,CAAA;IACf,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAA;IACtB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,mBAAmB,CAAA;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,UAAU,EACV,UAAU,EACV,IAAI,EACJ,OAAO,EACP,UAAU,EACV,eAAe,EACf,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,UAAU,EACV,SAAS,EACT,SAAiB,EACjB,QAAQ,EACR,WAAmB,EACnB,OAAc,EACd,SAAgB,EAChB,YAAY,GACb,EAAE,WAAW,GAAG,KAAK,CAAC,YAAY,CA+BlC"}

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

@@ -11,11 +11,16 @@ function BimSensor({
   updateFrequency,
   onRemove,
   onEdit,
+  onExpand,
   onClose,
   buildingId,
   timestamp,
-  sphere,
-  highlight = false
+  highlight = false,
+  timeZone,
+  showActions = false,
+  canEdit = true,
+  canDelete = true,
+  actionLabels
 }) {
   return /* @__PURE__ */ jsx(
     "div",
@@ -34,11 +39,18 @@ function BimSensor({
           updateFrequency,
           createdAt: timestamp,
           onRemove,
+          onEdit,
+          onExpand,
           onClose,
+          showActions,
+          canEdit,
+          canDelete,
+          actionLabels,
           enableCollapse: true,
           defaultCollapsed: true,
           size: "sm",
-          highlight
+          highlight,
+          timeZone
         }
       )
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.tsx"],"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 Sensor from '../../../../../../ui/Sensors/Sensor'\r\n\r\nimport { markerStyle, markerStyleHighlight } from './markerUtils'\r\n\r\nimport type { SensorDataFormat, SensorType } from '../../../../../../../types/dbTypes';\r\nimport type * as THREE from 'three'\r\n\r\ninterface SensorProps {\r\n  sensorName: string\r\n  sensorType: SensorType\r\n  dataUrl: string\r\n  dataFormat: SensorDataFormat\r\n  updateFrequency: number\r\n  tags?: string[]\r\n  worldCamera: THREE.Camera\r\n  targetPoint: THREE.Vector3\r\n  onRemove?: () => void\r\n  onEdit?: () => void\r\n  onClose: () => void\r\n  buildingId?: number\r\n  timestamp: Date\r\n  sphere: THREE.Object3D\r\n  highlight?: boolean\r\n}\r\n\r\nexport default function BimSensor({\r\n  sensorName,\r\n  sensorType,\r\n  tags,\r\n  dataUrl,\r\n  dataFormat,\r\n  updateFrequency,\r\n  onRemove,\r\n  onEdit,\r\n  onClose,\r\n  buildingId,\r\n  timestamp,\r\n  sphere,\r\n  highlight = false,\r\n}: SensorProps): React.ReactElement {\r\n  return (\r\n    <div\r\n      className={highlight ? markerStyleHighlight : markerStyle}\r\n    >\r\n      <Sensor\r\n        buildingId={buildingId}\r\n        sensorName={sensorName}\r\n        sensorType={sensorType}\r\n        tags={tags}\r\n        tagsVariant=\"read-only\"\r\n        dataUrl={dataUrl}\r\n        dataFormat={dataFormat}\r\n        updateFrequency={updateFrequency}\r\n        createdAt={timestamp}\r\n        onRemove={onRemove}\r\n        onClose={onClose}\r\n        enableCollapse\r\n        defaultCollapsed\r\n        size=\"sm\"\r\n        highlight={highlight}\r\n      />\r\n    </div>\r\n  )\r\n}"],"mappings":";AAmDM;AA5CN,OAAO,YAAY;AAEnB,SAAS,aAAa,4BAA4B;AAuBnC,SAAR,UAA2B;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,YAAY;AACd,GAAoC;AAClC,SACE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,YAAY,uBAAuB;AAAA,MAE9C;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,aAAY;AAAA,UACZ;AAAA,UACA;AAAA,UACA;AAAA,UACA,WAAW;AAAA,UACX;AAAA,UACA;AAAA,UACA,gBAAc;AAAA,UACd,kBAAgB;AAAA,UAChB,MAAK;AAAA,UACL;AAAA;AAAA,MACF;AAAA;AAAA,EACF;AAEJ;","names":[]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.tsx"],"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 Sensor from '../../../../../../ui/Sensors/Sensor'\r\n\r\nimport { markerStyle, markerStyleHighlight } from './markerUtils'\r\n\r\nimport type { SensorDataFormat, SensorType } from '../../../../../../../types/dbTypes';\r\nimport type { CommentActionLabels } from '../../../../../../ui/Comments/CommentActionButtons';\r\nimport type * as THREE from 'three'\r\n\r\ninterface SensorProps {\r\n  sensorName: string\r\n  sensorType: SensorType\r\n  dataUrl: string\r\n  dataFormat: SensorDataFormat\r\n  updateFrequency: number\r\n  tags?: string[]\r\n  worldCamera: THREE.Camera\r\n  targetPoint: THREE.Vector3\r\n  onRemove?: () => void\r\n  onEdit?: () => void\r\n  onExpand?: () => void\r\n  onClose: () => void\r\n  buildingId?: number\r\n  timestamp: Date\r\n  sphere: THREE.Object3D\r\n  highlight?: boolean\r\n  timeZone?: string\r\n  showActions?: boolean\r\n  canEdit?: boolean\r\n  canDelete?: boolean\r\n  actionLabels?: CommentActionLabels\r\n}\r\n\r\nexport default function BimSensor({\r\n  sensorName,\r\n  sensorType,\r\n  tags,\r\n  dataUrl,\r\n  dataFormat,\r\n  updateFrequency,\r\n  onRemove,\r\n  onEdit,\r\n  onExpand,\r\n  onClose,\r\n  buildingId,\r\n  timestamp,\r\n  highlight = false,\r\n  timeZone,\r\n  showActions = false,\r\n  canEdit = true,\r\n  canDelete = true,\r\n  actionLabels,\r\n}: SensorProps): React.ReactElement {\r\n  return (\r\n    <div\r\n      className={highlight ? markerStyleHighlight : markerStyle}\r\n    >\r\n      <Sensor\r\n        buildingId={buildingId}\r\n        sensorName={sensorName}\r\n        sensorType={sensorType}\r\n        tags={tags}\r\n        tagsVariant=\"read-only\"\r\n        dataUrl={dataUrl}\r\n        dataFormat={dataFormat}\r\n        updateFrequency={updateFrequency}\r\n        createdAt={timestamp}\r\n        onRemove={onRemove}\r\n        onEdit={onEdit}\r\n        onExpand={onExpand}\r\n        onClose={onClose}\r\n        showActions={showActions}\r\n        canEdit={canEdit}\r\n        canDelete={canDelete}\r\n        actionLabels={actionLabels}\r\n        enableCollapse\r\n        defaultCollapsed\r\n        size=\"sm\"\r\n        highlight={highlight}\r\n        timeZone={timeZone}\r\n      />\r\n    </div>\r\n  )\r\n}\r\n"],"mappings":";AA+DM;AAxDN,OAAO,YAAY;AAEnB,SAAS,aAAa,4BAA4B;AA8BnC,SAAR,UAA2B;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,YAAY;AAAA,EACZ;AAAA,EACA,cAAc;AAAA,EACd,UAAU;AAAA,EACV,YAAY;AAAA,EACZ;AACF,GAAoC;AAClC,SACE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,YAAY,uBAAuB;AAAA,MAE9C;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,aAAY;AAAA,UACZ;AAAA,UACA;AAAA,UACA;AAAA,UACA,WAAW;AAAA,UACX;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,gBAAc;AAAA,UACd,kBAAgB;AAAA,UAChB,MAAK;AAAA,UACL;AAAA,UACA;AAAA;AAAA,MACF;AAAA;AAAA,EACF;AAEJ;","names":[]}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/clusterMarkersByScreenSpace.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\n// Copyright (C) 2025 Collab Digital Twins\n\nimport * as THREE from 'three'\n\n/**\n * Screen-space clustering for 3D (BIM) comment markers.\n *\n * The BIM viewer renders each comment as an independent CSS2DObject at a world\n * position, so markers that are close together (or aligned along the camera\n * axis) overlap on screen. This groups markers whose projected screen positions\n * fall within `threshold` pixels of each other so the caller can draw a single\n * numbered cluster bubble instead of a pile of overlapping avatars.\n *\n * Pure and side-effect free (no scene mutation) so it can be unit tested.\n */\n\nexport interface HasWorldPosition {\n  id: number\n  x?: number | null\n  y?: number | null\n  z?: number | null\n}\n\nexport interface ScreenCluster<T> {\n  /** Stable key derived from member ids (sorted) — used for registry diffing. */\n  key: string\n  screenX: number\n  screenY: number\n  worldCenter: { x: number; y: number; z: number }\n  members: T[]\n}\n\nexport interface ClusterResult<T> {\n  clusters: ScreenCluster<T>[]\n  singles: T[]\n}\n\nexport interface ProjectedPoint {\n  screenX: number\n  screenY: number\n  /** false when the point is behind the camera. */\n  onScreen: boolean\n}\n\n/** Project a world point to pixel coordinates for the given camera/viewport. */\nexport function projectPoint(\n  x: number,\n  y: number,\n  z: number,\n  camera: THREE.Camera,\n  width: number,\n  height: number,\n): ProjectedPoint {\n  const pos = new THREE.Vector3(x, y, z)\n  // Camera-space z is positive when the point is behind the camera (it looks down -z).\n  const cameraSpace = pos.clone().applyMatrix4(camera.matrixWorldInverse)\n  const behind = cameraSpace.z >= 0\n\n  const ndc = pos.project(camera)\n  return {\n    screenX: (ndc.x * 0.5 + 0.5) * width,\n    screenY: (-ndc.y * 0.5 + 0.5) * height,\n    onScreen: !behind,\n  }\n}\n\nfunction average(values: number[]): number {\n  if (values.length === 0) return 0\n  return values.reduce((sum, v) => sum + v, 0) / values.length\n}\n\nexport function clusterMarkersByScreenSpace<T extends HasWorldPosition>(\n  items: T[],\n  camera: THREE.Camera,\n  width: number,\n  height: number,\n  threshold = 44,\n): ClusterResult<T> {\n  const projected = items\n    .filter((it): it is T & { x: number; y: number; z: number } =>\n      it.x != null && it.y != null && it.z != null,\n    )\n    .map((item) => ({ item, ...projectPoint(item.x, item.y, item.z, camera, width, height) }))\n\n  const onScreen = projected.filter((p) => p.onScreen)\n  const clusters: ScreenCluster<T>[] = []\n  // Points behind the camera are never clustered; they fall through as singles.\n  const singles: T[] = projected.filter((p) => !p.onScreen).map((p) => p.item)\n\n  const used = new Array(onScreen.length).fill(false)\n\n  for (let i = 0; i < onScreen.length; i++) {\n    if (used[i]) continue\n    used[i] = true\n    const group = [onScreen[i]]\n\n    for (let j = i + 1; j < onScreen.length; j++) {\n      if (used[j]) continue\n      const dx = onScreen[i].screenX - onScreen[j].screenX\n      const dy = onScreen[i].screenY - onScreen[j].screenY\n      if (Math.hypot(dx, dy) <= threshold) {\n        used[j] = true\n        group.push(onScreen[j])\n      }\n    }\n\n    if (group.length === 1) {\n      singles.push(group[0].item)\n      continue\n    }\n\n    const members = group.map((g) => g.item)\n    clusters.push({\n      key: members.map((m) => m.id).sort((a, b) => a - b).join('-'),\n      screenX: average(group.map((g) => g.screenX)),\n      screenY: average(group.map((g) => g.screenY)),\n      worldCenter: {\n        x: average(members.map((m) => m.x as number)),\n        y: average(members.map((m) => m.y as number)),\n        z: average(members.map((m) => m.z as number)),\n      },\n      members,\n    })\n  }\n\n  return { clusters, singles }\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAGA,YAAY,WAAW;AA2ChB,SAAS,aACd,GACA,GACA,GACA,QACA,OACA,QACgB;AAChB,QAAM,MAAM,IAAI,MAAM,QAAQ,GAAG,GAAG,CAAC;AAErC,QAAM,cAAc,IAAI,MAAM,EAAE,aAAa,OAAO,kBAAkB;AACtE,QAAM,SAAS,YAAY,KAAK;AAEhC,QAAM,MAAM,IAAI,QAAQ,MAAM;AAC9B,SAAO;AAAA,IACL,UAAU,IAAI,IAAI,MAAM,OAAO;AAAA,IAC/B,UAAU,CAAC,IAAI,IAAI,MAAM,OAAO;AAAA,IAChC,UAAU,CAAC;AAAA,EACb;AACF;AAEA,SAAS,QAAQ,QAA0B;AACzC,MAAI,OAAO,WAAW,EAAG,QAAO;AAChC,SAAO,OAAO,OAAO,CAAC,KAAK,MAAM,MAAM,GAAG,CAAC,IAAI,OAAO;AACxD;AAEO,SAAS,4BACd,OACA,QACA,OACA,QACA,YAAY,IACM;AAClB,QAAM,YAAY,MACf;AAAA,IAAO,CAAC,OACP,GAAG,KAAK,QAAQ,GAAG,KAAK,QAAQ,GAAG,KAAK;AAAA,EAC1C,EACC,IAAI,CAAC,SAAU,iBAAE,QAAS,aAAa,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,QAAQ,OAAO,MAAM,EAAI;AAE3F,QAAM,WAAW,UAAU,OAAO,CAAC,MAAM,EAAE,QAAQ;AACnD,QAAM,WAA+B,CAAC;AAEtC,QAAM,UAAe,UAAU,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI;AAE3E,QAAM,OAAO,IAAI,MAAM,SAAS,MAAM,EAAE,KAAK,KAAK;AAElD,WAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AACxC,QAAI,KAAK,CAAC,EAAG;AACb,SAAK,CAAC,IAAI;AACV,UAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;AAE1B,aAAS,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AAC5C,UAAI,KAAK,CAAC,EAAG;AACb,YAAM,KAAK,SAAS,CAAC,EAAE,UAAU,SAAS,CAAC,EAAE;AAC7C,YAAM,KAAK,SAAS,CAAC,EAAE,UAAU,SAAS,CAAC,EAAE;AAC7C,UAAI,KAAK,MAAM,IAAI,EAAE,KAAK,WAAW;AACnC,aAAK,CAAC,IAAI;AACV,cAAM,KAAK,SAAS,CAAC,CAAC;AAAA,MACxB;AAAA,IACF;AAEA,QAAI,MAAM,WAAW,GAAG;AACtB,cAAQ,KAAK,MAAM,CAAC,EAAE,IAAI;AAC1B;AAAA,IACF;AAEA,UAAM,UAAU,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI;AACvC,aAAS,KAAK;AAAA,MACZ,KAAK,QAAQ,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,KAAK,GAAG;AAAA,MAC5D,SAAS,QAAQ,MAAM,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;AAAA,MAC5C,SAAS,QAAQ,MAAM,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;AAAA,MAC5C,aAAa;AAAA,QACX,GAAG,QAAQ,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAW,CAAC;AAAA,QAC5C,GAAG,QAAQ,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAW,CAAC;AAAA,QAC5C,GAAG,QAAQ,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAW,CAAC;AAAA,MAC9C;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,UAAU,QAAQ;AAC7B;","names":[]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/clusterMarkersByScreenSpace.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\nimport * as THREE from 'three'\r\n\r\n/**\r\n * Screen-space clustering for 3D (BIM) comment markers.\r\n *\r\n * The BIM viewer renders each comment as an independent CSS2DObject at a world\r\n * position, so markers that are close together (or aligned along the camera\r\n * axis) overlap on screen. This groups markers whose projected screen positions\r\n * fall within `threshold` pixels of each other so the caller can draw a single\r\n * numbered cluster bubble instead of a pile of overlapping avatars.\r\n *\r\n * Pure and side-effect free (no scene mutation) so it can be unit tested.\r\n */\r\n\r\nexport interface HasWorldPosition {\r\n  id: number\r\n  x?: number | null\r\n  y?: number | null\r\n  z?: number | null\r\n}\r\n\r\nexport interface ScreenCluster<T> {\r\n  /** Stable key derived from member ids (sorted) — used for registry diffing. */\r\n  key: string\r\n  screenX: number\r\n  screenY: number\r\n  worldCenter: { x: number; y: number; z: number }\r\n  members: T[]\r\n}\r\n\r\nexport interface ClusterResult<T> {\r\n  clusters: ScreenCluster<T>[]\r\n  singles: T[]\r\n}\r\n\r\nexport interface ProjectedPoint {\r\n  screenX: number\r\n  screenY: number\r\n  /** false when the point is behind the camera. */\r\n  onScreen: boolean\r\n}\r\n\r\n/** Project a world point to pixel coordinates for the given camera/viewport. */\r\nexport function projectPoint(\r\n  x: number,\r\n  y: number,\r\n  z: number,\r\n  camera: THREE.Camera,\r\n  width: number,\r\n  height: number,\r\n): ProjectedPoint {\r\n  const pos = new THREE.Vector3(x, y, z)\r\n  // Camera-space z is positive when the point is behind the camera (it looks down -z).\r\n  const cameraSpace = pos.clone().applyMatrix4(camera.matrixWorldInverse)\r\n  const behind = cameraSpace.z >= 0\r\n\r\n  const ndc = pos.project(camera)\r\n  return {\r\n    screenX: (ndc.x * 0.5 + 0.5) * width,\r\n    screenY: (-ndc.y * 0.5 + 0.5) * height,\r\n    onScreen: !behind,\r\n  }\r\n}\r\n\r\nfunction average(values: number[]): number {\r\n  if (values.length === 0) return 0\r\n  return values.reduce((sum, v) => sum + v, 0) / values.length\r\n}\r\n\r\nexport function clusterMarkersByScreenSpace<T extends HasWorldPosition>(\r\n  items: T[],\r\n  camera: THREE.Camera,\r\n  width: number,\r\n  height: number,\r\n  threshold = 44,\r\n): ClusterResult<T> {\r\n  const projected = items\r\n    .filter((it): it is T & { x: number; y: number; z: number } =>\r\n      it.x != null && it.y != null && it.z != null,\r\n    )\r\n    .map((item) => ({ item, ...projectPoint(item.x, item.y, item.z, camera, width, height) }))\r\n\r\n  const onScreen = projected.filter((p) => p.onScreen)\r\n  const clusters: ScreenCluster<T>[] = []\r\n  // Points behind the camera are never clustered; they fall through as singles.\r\n  const singles: T[] = projected.filter((p) => !p.onScreen).map((p) => p.item)\r\n\r\n  const used = new Array(onScreen.length).fill(false)\r\n\r\n  for (let i = 0; i < onScreen.length; i++) {\r\n    if (used[i]) continue\r\n    used[i] = true\r\n    const group = [onScreen[i]]\r\n\r\n    for (let j = i + 1; j < onScreen.length; j++) {\r\n      if (used[j]) continue\r\n      const dx = onScreen[i].screenX - onScreen[j].screenX\r\n      const dy = onScreen[i].screenY - onScreen[j].screenY\r\n      if (Math.hypot(dx, dy) <= threshold) {\r\n        used[j] = true\r\n        group.push(onScreen[j])\r\n      }\r\n    }\r\n\r\n    if (group.length === 1) {\r\n      singles.push(group[0].item)\r\n      continue\r\n    }\r\n\r\n    const members = group.map((g) => g.item)\r\n    clusters.push({\r\n      key: members.map((m) => m.id).sort((a, b) => a - b).join('-'),\r\n      screenX: average(group.map((g) => g.screenX)),\r\n      screenY: average(group.map((g) => g.screenY)),\r\n      worldCenter: {\r\n        x: average(members.map((m) => m.x as number)),\r\n        y: average(members.map((m) => m.y as number)),\r\n        z: average(members.map((m) => m.z as number)),\r\n      },\r\n      members,\r\n    })\r\n  }\r\n\r\n  return { clusters, singles }\r\n}\r\n"],"mappings":";;;;;;;;;;;;;;;;AAGA,YAAY,WAAW;AA2ChB,SAAS,aACd,GACA,GACA,GACA,QACA,OACA,QACgB;AAChB,QAAM,MAAM,IAAI,MAAM,QAAQ,GAAG,GAAG,CAAC;AAErC,QAAM,cAAc,IAAI,MAAM,EAAE,aAAa,OAAO,kBAAkB;AACtE,QAAM,SAAS,YAAY,KAAK;AAEhC,QAAM,MAAM,IAAI,QAAQ,MAAM;AAC9B,SAAO;AAAA,IACL,UAAU,IAAI,IAAI,MAAM,OAAO;AAAA,IAC/B,UAAU,CAAC,IAAI,IAAI,MAAM,OAAO;AAAA,IAChC,UAAU,CAAC;AAAA,EACb;AACF;AAEA,SAAS,QAAQ,QAA0B;AACzC,MAAI,OAAO,WAAW,EAAG,QAAO;AAChC,SAAO,OAAO,OAAO,CAAC,KAAK,MAAM,MAAM,GAAG,CAAC,IAAI,OAAO;AACxD;AAEO,SAAS,4BACd,OACA,QACA,OACA,QACA,YAAY,IACM;AAClB,QAAM,YAAY,MACf;AAAA,IAAO,CAAC,OACP,GAAG,KAAK,QAAQ,GAAG,KAAK,QAAQ,GAAG,KAAK;AAAA,EAC1C,EACC,IAAI,CAAC,SAAU,iBAAE,QAAS,aAAa,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,QAAQ,OAAO,MAAM,EAAI;AAE3F,QAAM,WAAW,UAAU,OAAO,CAAC,MAAM,EAAE,QAAQ;AACnD,QAAM,WAA+B,CAAC;AAEtC,QAAM,UAAe,UAAU,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI;AAE3E,QAAM,OAAO,IAAI,MAAM,SAAS,MAAM,EAAE,KAAK,KAAK;AAElD,WAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AACxC,QAAI,KAAK,CAAC,EAAG;AACb,SAAK,CAAC,IAAI;AACV,UAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;AAE1B,aAAS,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AAC5C,UAAI,KAAK,CAAC,EAAG;AACb,YAAM,KAAK,SAAS,CAAC,EAAE,UAAU,SAAS,CAAC,EAAE;AAC7C,YAAM,KAAK,SAAS,CAAC,EAAE,UAAU,SAAS,CAAC,EAAE;AAC7C,UAAI,KAAK,MAAM,IAAI,EAAE,KAAK,WAAW;AACnC,aAAK,CAAC,IAAI;AACV,cAAM,KAAK,SAAS,CAAC,CAAC;AAAA,MACxB;AAAA,IACF;AAEA,QAAI,MAAM,WAAW,GAAG;AACtB,cAAQ,KAAK,MAAM,CAAC,EAAE,IAAI;AAC1B;AAAA,IACF;AAEA,UAAM,UAAU,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI;AACvC,aAAS,KAAK;AAAA,MACZ,KAAK,QAAQ,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,KAAK,GAAG;AAAA,MAC5D,SAAS,QAAQ,MAAM,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;AAAA,MAC5C,SAAS,QAAQ,MAAM,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;AAAA,MAC5C,aAAa;AAAA,QACX,GAAG,QAAQ,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAW,CAAC;AAAA,QAC5C,GAAG,QAAQ,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAW,CAAC;AAAA,QAC5C,GAAG,QAAQ,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAW,CAAC;AAAA,MAC9C;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,UAAU,QAAQ;AAC7B;","names":[]}

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

@@ -1,24 +1,3 @@
-/** Minimal 3D vector shape so this helper stays free of a three.js import (easy to unit test). */
-export interface Vec3 {
-    x: number;
-    y: number;
-    z: number;
-}
-/** Camera pose in the shape `camera-controls` `setLookAt` expects. */
-export interface LookAt {
-    camX: number;
-    camY: number;
-    camZ: number;
-    tarX: number;
-    tarY: number;
-    tarZ: number;
-}
-/**
- * Frame a comment without changing the current view direction: keep looking along
- * the same axis the user already has, but re-target the comment and pull the camera
- * to `distance` away from it. Used for double-click "zoom to comment".
- *
- * Pure and three.js-free so it can be unit tested with plain objects.
- */
-export declare function computeCommentLookAt(camPos: Vec3, target: Vec3, commentPoint: Vec3, distance?: number): LookAt;
+export type { Vec3, LookAt } from "../../../../../shared/markers/computeMarkerLookAt";
+export { computeMarkerLookAt as computeCommentLookAt } from "../../../../../shared/markers/computeMarkerLookAt";
 //# sourceMappingURL=commentCameraUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commentCameraUtils.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/commentCameraUtils.ts"],"names":[],"mappings":"AAGA,kGAAkG;AAClG,MAAM,WAAW,IAAI;IACnB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,sEAAsE;AACtE,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb;AAID;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,IAAI,EAClB,QAAQ,SAAI,GACX,MAAM,CAyBR"}
+{"version":3,"file":"commentCameraUtils.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/commentCameraUtils.ts"],"names":[],"mappings":"AAIA,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAAmD,CAAA;AACrF,OAAO,EAAE,mBAAmB,IAAI,oBAAoB,EAAE,MAAM,mDAAmD,CAAA"}

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

@@ -1,27 +1,5 @@
-const DEFAULT_DIRECTION = { x: 1, y: 1, z: 1 };
-function computeCommentLookAt(camPos, target, commentPoint, distance = 8) {
-  let dx = camPos.x - target.x;
-  let dy = camPos.y - target.y;
-  let dz = camPos.z - target.z;
-  let length = Math.hypot(dx, dy, dz);
-  if (length < 1e-6) {
-    dx = DEFAULT_DIRECTION.x;
-    dy = DEFAULT_DIRECTION.y;
-    dz = DEFAULT_DIRECTION.z;
-    length = Math.hypot(dx, dy, dz);
-  }
-  const safeDistance = distance > 0 ? distance : 8;
-  const scale = safeDistance / length;
-  return {
-    camX: commentPoint.x + dx * scale,
-    camY: commentPoint.y + dy * scale,
-    camZ: commentPoint.z + dz * scale,
-    tarX: commentPoint.x,
-    tarY: commentPoint.y,
-    tarZ: commentPoint.z
-  };
-}
+import { computeMarkerLookAt } from "../../../../../shared/markers/computeMarkerLookAt";
 export {
-  computeCommentLookAt
+  computeMarkerLookAt as computeCommentLookAt
 };
 //# sourceMappingURL=commentCameraUtils.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/commentCameraUtils.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\n// Copyright (C) 2025 Collab Digital Twins\n\n/** Minimal 3D vector shape so this helper stays free of a three.js import (easy to unit test). */\nexport interface Vec3 {\n  x: number\n  y: number\n  z: number\n}\n\n/** Camera pose in the shape `camera-controls` `setLookAt` expects. */\nexport interface LookAt {\n  camX: number\n  camY: number\n  camZ: number\n  tarX: number\n  tarY: number\n  tarZ: number\n}\n\nconst DEFAULT_DIRECTION: Vec3 = { x: 1, y: 1, z: 1 }\n\n/**\n * Frame a comment without changing the current view direction: keep looking along\n * the same axis the user already has, but re-target the comment and pull the camera\n * to `distance` away from it. Used for double-click \"zoom to comment\".\n *\n * Pure and three.js-free so it can be unit tested with plain objects.\n */\nexport function computeCommentLookAt(\n  camPos: Vec3,\n  target: Vec3,\n  commentPoint: Vec3,\n  distance = 8,\n): LookAt {\n  let dx = camPos.x - target.x\n  let dy = camPos.y - target.y\n  let dz = camPos.z - target.z\n  let length = Math.hypot(dx, dy, dz)\n\n  // Degenerate pose (camera sitting on its target): fall back to a sensible angle.\n  if (length < 1e-6) {\n    dx = DEFAULT_DIRECTION.x\n    dy = DEFAULT_DIRECTION.y\n    dz = DEFAULT_DIRECTION.z\n    length = Math.hypot(dx, dy, dz)\n  }\n\n  const safeDistance = distance > 0 ? distance : 8\n  const scale = safeDistance / length\n\n  return {\n    camX: commentPoint.x + dx * scale,\n    camY: commentPoint.y + dy * scale,\n    camZ: commentPoint.z + dz * scale,\n    tarX: commentPoint.x,\n    tarY: commentPoint.y,\n    tarZ: commentPoint.z,\n  }\n}\n"],"mappings":"AAoBA,MAAM,oBAA0B,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE;AAS5C,SAAS,qBACd,QACA,QACA,cACA,WAAW,GACH;AACR,MAAI,KAAK,OAAO,IAAI,OAAO;AAC3B,MAAI,KAAK,OAAO,IAAI,OAAO;AAC3B,MAAI,KAAK,OAAO,IAAI,OAAO;AAC3B,MAAI,SAAS,KAAK,MAAM,IAAI,IAAI,EAAE;AAGlC,MAAI,SAAS,MAAM;AACjB,SAAK,kBAAkB;AACvB,SAAK,kBAAkB;AACvB,SAAK,kBAAkB;AACvB,aAAS,KAAK,MAAM,IAAI,IAAI,EAAE;AAAA,EAChC;AAEA,QAAM,eAAe,WAAW,IAAI,WAAW;AAC/C,QAAM,QAAQ,eAAe;AAE7B,SAAO;AAAA,IACL,MAAM,aAAa,IAAI,KAAK;AAAA,IAC5B,MAAM,aAAa,IAAI,KAAK;AAAA,IAC5B,MAAM,aAAa,IAAI,KAAK;AAAA,IAC5B,MAAM,aAAa;AAAA,IACnB,MAAM,aAAa;AAAA,IACnB,MAAM,aAAa;AAAA,EACrB;AACF;","names":[]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/commentCameraUtils.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\r\n// Copyright (C) 2025 Collab Digital Twins\r\n\r\n// Re-export shim: logic moved to the shared marker framework.\r\nexport type { Vec3, LookAt } from \"../../../../../shared/markers/computeMarkerLookAt\"\r\nexport { computeMarkerLookAt as computeCommentLookAt } from \"../../../../../shared/markers/computeMarkerLookAt\"\r\n"],"mappings":"AAKA,SAAgC,2BAA4B;","names":[]}

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/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":"AAkNA,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM;kCAsEP;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;+BAMtC,MAAM;;EAgF3D"}
+{"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

@@ -20,163 +20,17 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { useSession } from "next-auth/react";
 import * as React from "react";
-import { createRoot } from "react-dom/client";
-import * as THREE from "three";
-import { CSS2DObject } from "three/addons/renderers/CSS2DRenderer.js";
 import { useComments, useDeleteComments } from "../../../../../../../hooks/comments/comments";
-import { HooksCtx, useCoreHooks } from "../../../../../../../hooks/provider";
+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 BimCommentCluster from "./BimCommentCluster";
-import { clusterMarkersByScreenSpace } from "./clusterMarkersByScreenSpace";
-import { computeCommentLookAt } from "./commentCameraUtils";
-import { renderCSS2DMarkers } from "./renderCSS2DMarkers";
-function makeCommentPropsMapper(state) {
-  const { currentCommentId, focusedCommentId, currentUserId, onSelect, onFocus, onEdit, onReply, onRemove } = state;
-  return (comment) => {
-    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: currentCommentId === comment.id,
-      focused: focusedCommentId === comment.id
-    };
-    if (comment.isPending) return base;
-    const isAuthor = currentUserId != null && String(comment.authorId) === currentUserId;
-    return __spreadProps(__spreadValues({}, base), {
-      showActions: true,
-      canEdit: isAuthor,
-      canDelete: isAuthor,
-      onSelect: () => onSelect(comment.id),
-      onFocus: () => onFocus(comment.id),
-      onReply: () => onReply(comment.id),
-      onEdit: isAuthor ? () => onEdit(comment.id) : void 0,
-      onRemove: isAuthor ? () => onRemove(comment.id) : void 0
-    });
-  };
-}
-function clearSingles(world, registry) {
-  renderCSS2DMarkers(world, {
-    items: [],
-    markerIdKey: "commentId",
-    registry,
-    component: BimComment,
-    propsMapper: () => ({}),
-    sphereColor: "white",
-    isVisible: false,
-    onRemove: () => {
-    }
-  });
-}
-function clearClusters(world, registry) {
-  registry.current.forEach(({ root, css2dObject }) => {
-    world.scene.three.remove(css2dObject);
-    const el = css2dObject.element;
-    el == null ? void 0 : el.remove();
-    root.unmount();
-  });
-  registry.current.clear();
-}
-function renderMarkers(state, singleRegistry, clusterRegistry, lastSignatureRef) {
-  var _a, _b, _c;
-  const { world, items, pending, isVisible, currentCommentId, focusedCommentId, coreHooks, onRemove, onSelect, onFocus } = state;
-  if (!world) return;
-  if (!isVisible) {
-    if (lastSignatureRef.current === "hidden") return;
-    clearSingles(world, singleRegistry);
-    clearClusters(world, clusterRegistry);
-    lastSignatureRef.current = "hidden";
-    return;
-  }
-  const camera = (_a = world.camera) == null ? void 0 : _a.three;
-  const dom = (_c = (_b = world.renderer) == null ? void 0 : _b.three) == null ? void 0 : _c.domElement;
-  if (!camera || !dom) return;
-  const width = dom.clientWidth || dom.width || 0;
-  const height = dom.clientHeight || dom.height || 0;
-  if (!width || !height) return;
-  const { clusters, singles } = clusterMarkersByScreenSpace(items, camera, width, height, 44);
-  const singleItems = [...singles, ...pending];
-  const clusterKeys = clusters.map((c) => c.key);
-  const dataHash = [...items, ...pending].map((c) => {
-    var _a2;
-    return `${c.id}:${(_a2 = c.text) != null ? _a2 : ""}:${c.isPending ? 1 : 0}`;
-  }).join(";");
-  const signature = `v2|${currentCommentId}|${focusedCommentId}|C:${clusterKeys.join(",")}|S:${singleItems.map((s) => s.id).join(",")}|D:${dataHash}`;
-  if (signature === lastSignatureRef.current) return;
-  lastSignatureRef.current = signature;
-  renderCSS2DMarkers(world, {
-    items: singleItems,
-    markerIdKey: "commentId",
-    registry: singleRegistry,
-    component: BimComment,
-    hooksContextValue: coreHooks,
-    propsMapper: makeCommentPropsMapper(state),
-    sphereColor: "white",
-    isVisible: true,
-    onRemove
-  });
-  singleRegistry.current.forEach((ref, id) => {
-    const nid = Number(id);
-    ref.css2dObject.renderOrder = nid === currentCommentId || nid === focusedCommentId ? 1 : 0;
-  });
-  const reg = clusterRegistry.current;
-  const wanted = new Set(clusterKeys);
-  for (const [key, ref] of reg) {
-    if (!wanted.has(key)) {
-      world.scene.three.remove(ref.css2dObject);
-      const el = ref.css2dObject.element;
-      el == null ? void 0 : el.remove();
-      ref.root.unmount();
-      reg.delete(key);
-    }
-  }
-  for (const cluster of clusters) {
-    const members = cluster.members.map((m) => {
-      var _a2;
-      return {
-        id: m.id,
-        userName: m.authorName,
-        imageFileId: (_a2 = m.imageFileId) != null ? _a2 : null
-      };
-    });
-    const highlight = currentCommentId != null && members.some((m) => m.id === currentCommentId);
-    const element = React.createElement(BimCommentCluster, { members, highlight, onSelect, onFocus });
-    const wrapped = coreHooks ? React.createElement(HooksCtx.Provider, { value: coreHooks }, element) : element;
-    const existing = reg.get(cluster.key);
-    if (existing) {
-      existing.root.render(wrapped);
-      existing.css2dObject.position.set(cluster.worldCenter.x, cluster.worldCenter.y + 0.2, cluster.worldCenter.z);
-      existing.css2dObject.renderOrder = highlight ? 1 : 0;
-      continue;
-    }
-    const labelDiv = document.createElement("div");
-    labelDiv.style.pointerEvents = "auto";
-    const root = createRoot(labelDiv);
-    root.render(wrapped);
-    const css2dObject = new CSS2DObject(labelDiv);
-    css2dObject.position.set(cluster.worldCenter.x, cluster.worldCenter.y + 0.2, cluster.worldCenter.z);
-    css2dObject.element.style.pointerEvents = "auto";
-    css2dObject.renderOrder = highlight ? 1 : 0;
-    world.scene.three.add(css2dObject);
-    reg.set(cluster.key, { root, css2dObject });
-  }
-}
+import { useMarkerLayerBim } from "../../../../../shared/markers/useMarkerLayerBim";
+import { makeCommentMarkerConfig } from "./commentMarkerConfig";
 function useCommentMarkers(world, buildingId) {
   var _a, _b, _c, _d;
   const { state: menusState, dispatch: menusDispatch, setIsSidebarOpen } = React.useContext(MenusContext);
   const { commentsVisibleInViewer, currentCommentId, focusedCommentId, focusRequestId } = menusState.menus;
-  const singleRegistry = React.useRef(/* @__PURE__ */ new Map());
-  const clusterRegistry = React.useRef(/* @__PURE__ */ new Map());
-  const lastSignatureRef = React.useRef("");
-  const stateRef = React.useRef(null);
-  const commentsRef = React.useRef([]);
   const { comments } = useComments();
   const { users } = useUsers();
   const coreHooks = useCoreHooks();
@@ -197,105 +51,47 @@ function useCommentMarkers(world, buildingId) {
       image: (_c2 = user == null ? void 0 : user.imageFileId) != null ? _c2 : null
     });
   });
-  commentsRef.current = eligibleComments;
   const handleRemoveComment = React.useCallback((commentId) => {
     const replyIds = comments.filter((c) => c.replyToId === commentId).map((c) => c.id);
     void deleteComments({ ids: [commentId, ...replyIds] });
   }, [comments, deleteComments]);
-  const handleSelectComment = React.useCallback((commentId) => {
-    menusDispatch({ type: "SET_CURRENT_COMMENT_ID", payload: { commentId } });
-  }, [menusDispatch]);
-  const handleFocusComment = React.useCallback((commentId) => {
-    menusDispatch({ type: "SET_CURRENT_COMMENT_ID", payload: { commentId } });
-    menusDispatch({ type: "SET_FOCUSED_COMMENT_ID", payload: { commentId } });
-  }, [menusDispatch]);
   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 handleEditComment = React.useCallback((commentId) => {
-    requestSidebarAction(commentId, "edit");
-  }, [requestSidebarAction]);
   const handleReplyComment = React.useCallback((commentId) => {
     requestSidebarAction(commentId, "reply");
   }, [requestSidebarAction]);
-  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));
-  }, []);
-  const isVisible = (_d = commentsVisibleInViewer == null ? void 0 : commentsVisibleInViewer.includes(ViewerNames.bim)) != null ? _d : false;
-  stateRef.current = {
-    world,
-    items: eligibleComments.map((c) => __spreadProps(__spreadValues({}, c), { isPending: false })),
-    pending: 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
-    })),
-    isVisible,
-    currentCommentId,
-    focusedCommentId,
+  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,
-    coreHooks,
     onRemove: handleRemoveComment,
-    onSelect: handleSelectComment,
-    onFocus: handleFocusComment,
-    onEdit: handleEditComment,
-    onReply: handleReplyComment
-  };
-  React.useEffect(() => {
-    if (!world) return;
-    let raf = 0;
-    let frame = 0;
-    const loop = () => {
-      if ((frame++ & 1) === 0 && stateRef.current) {
-        renderMarkers(stateRef.current, singleRegistry, clusterRegistry, lastSignatureRef);
-      }
-      raf = requestAnimationFrame(loop);
-    };
-    raf = requestAnimationFrame(loop);
-    return () => {
-      cancelAnimationFrame(raf);
-      clearClusters(world, clusterRegistry);
-      clearSingles(world, singleRegistry);
-      lastSignatureRef.current = "";
-    };
-  }, [world]);
-  React.useEffect(() => {
-    var _a2;
-    if (focusedCommentId == null || !world) return;
-    const target = commentsRef.current.find((c) => c.id === focusedCommentId);
-    if (!target || target.x == null || target.y == null || target.z == null) return;
-    const controls = (_a2 = world.camera) == null ? void 0 : _a2.controls;
-    if (!controls) return;
-    const camPos = controls.getPosition(new THREE.Vector3());
-    const camTarget = controls.getTarget(new THREE.Vector3());
-    const lookAt = computeCommentLookAt(
-      { x: camPos.x, y: camPos.y, z: camPos.z },
-      { x: camTarget.x, y: camTarget.y, z: camTarget.z },
-      { x: target.x, y: target.y, z: target.z }
-    );
-    void controls.setLookAt(lookAt.camX, lookAt.camY, lookAt.camZ, lookAt.tarX, lookAt.tarY, lookAt.tarZ, true);
-  }, [focusRequestId, world]);
+    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