@sequent-org/ifc-viewer 1.2.4-ci.53.0 → 1.2.4-ci.55.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sequent-org/ifc-viewer",
   "private": false,
-  "version": "1.2.4-ci.53.0",
+  "version": "1.2.4-ci.55.0",
   "type": "module",
   "description": "IFC 3D model viewer component for web applications - fully self-contained with local IFCLoader",
   "main": "src/index.js",

package/src/IfcViewer.js

@@ -22,7 +22,7 @@ import { TdsModelLoader } from "./model-loading/loaders/TdsModelLoader.js";
 import { StlModelLoader } from "./model-loading/loaders/StlModelLoader.js";
 import { DaeModelLoader } from "./model-loading/loaders/DaeModelLoader.js";
 import { ThreeDmModelLoader } from "./model-loading/loaders/ThreeDmModelLoader.js";
-import { CardPlacementController } from "./ui/CardPlacementController.js";
+import { LabelPlacementController } from "./ui/LabelPlacementController.js";
 import './style.css';
 
 
@@ -83,6 +83,7 @@ export class IfcViewer {
     this.viewer = null;
     this.ifcService = null;
     this.ifcTreeView = null;
+    this.labelPlacement = null;
     this.cardPlacement = null;
     /** @type {ModelLoaderRegistry|null} */
     this.modelLoaders = null;
@@ -311,10 +312,11 @@ export class IfcViewer {
       this.ifcService = null;
     }
 
-    if (this.cardPlacement) {
-      try { this.cardPlacement.dispose(); } catch (_) {}
-      this.cardPlacement = null;
+    if (this.labelPlacement) {
+      try { this.labelPlacement.dispose(); } catch (_) {}
+      this.labelPlacement = null;
     }
+    this.cardPlacement = null;
     
     if (this.viewer) {
       this.viewer.dispose();
@@ -361,21 +363,46 @@ export class IfcViewer {
   }
 
   /**
-   * Устанавливает метки карточек извне.
+   * Устанавливает метки извне.
    * @param {Array<{id: (number|string), localPoint: {x:number,y:number,z:number}, sceneState: object}>} items
    */
-  setCardMarkers(items) {
-    if (!this.cardPlacement) return;
-    this.cardPlacement.setCardMarkers(items);
+  setLabelMarkers(items) {
+    if (!this.labelPlacement) return;
+    this.labelPlacement.setLabelMarkers(items);
   }
 
   /**
-   * Возвращает текущие метки карточек.
+   * Возвращает текущие метки.
    * @returns {Array<{id: (number|string), localPoint: {x:number,y:number,z:number}, sceneState: object}>}
    */
+  getLabelMarkers() {
+    if (!this.labelPlacement) return [];
+    return this.labelPlacement.getLabelMarkers();
+  }
+
+  /**
+   * Программно выбирает метку по id.
+   * @param {number|string|null} id
+   */
+  selectLabel(id) {
+    if (!this.labelPlacement) return;
+    this.labelPlacement.selectLabel(id);
+  }
+
+  /**
+   * @deprecated используйте setLabelMarkers
+   */
+  setCardMarkers(items) {
+    if (!this.labelPlacement) return;
+    this.labelPlacement.setCardMarkers(items);
+  }
+
+  /**
+   * @deprecated используйте getLabelMarkers
+   */
   getCardMarkers() {
-    if (!this.cardPlacement) return [];
-    return this.cardPlacement.getCardMarkers();
+    if (!this.labelPlacement) return [];
+    return this.labelPlacement.getCardMarkers();
   }
 
   /**
@@ -534,12 +561,14 @@ export class IfcViewer {
     this.viewer = new Viewer(this.elements.viewerContainer);
     this.viewer.init();
 
-    // В пакете включаем UI "карточек" по умолчанию:
-    // кнопка "+ Добавить карточку" + режим постановки меток + сохранение/восстановление состояния.
+    // В пакете включаем UI "меток" по умолчанию:
+    // кнопка "+ Добавить метку" + режим постановки меток + сохранение/восстановление состояния.
     try {
-      this.cardPlacement = new CardPlacementController({ viewer: this.viewer, container: this.elements.viewerContainer, logger: console });
+      this.labelPlacement = new LabelPlacementController({ viewer: this.viewer, container: this.elements.viewerContainer, logger: console });
+      this.cardPlacement = this.labelPlacement;
     } catch (e) {
-      console.warn('IfcViewer: CardPlacementController init failed', e);
+      console.warn('IfcViewer: LabelPlacementController init failed', e);
+      this.labelPlacement = null;
       this.cardPlacement = null;
     }
   }

package/src/main.js

@@ -3,7 +3,7 @@ import { Viewer } from "./viewer/Viewer.js";
 import { IfcService } from "./ifc/IfcService.js";
 import { IfcTreeView } from "./ifc/IfcTreeView.js";
 import { ModelLoaderRegistry } from "./model-loading/ModelLoaderRegistry.js";
-import { CardPlacementController } from "./ui/CardPlacementController.js";
+import { LabelPlacementController } from "./ui/LabelPlacementController.js";
 import { IfcModelLoader } from "./model-loading/loaders/IfcModelLoader.js";
 import { FbxModelLoader } from "./model-loading/loaders/FbxModelLoader.js";
 import { GltfModelLoader } from "./model-loading/loaders/GltfModelLoader.js";
@@ -19,8 +19,8 @@ if (app) {
   const viewer = new Viewer(app);
   viewer.init();
 
-  // UI: режим постановки "карточек" (меток) по клику на модель
-  const cardPlacement = new CardPlacementController({ viewer, container: app, logger: console });
+  // UI: режим постановки меток по клику на модель
+  const labelPlacement = new LabelPlacementController({ viewer, container: app, logger: console });
 
   // ===== Диагностика (включается через query-параметры) =====
   // ?debugViewer=1  -> window.__viewer = viewer
@@ -680,7 +680,7 @@ if (app) {
     import.meta.hot.dispose(() => {
       ifc.dispose();
       viewer.dispose();
-      try { cardPlacement.dispose(); } catch (_) {}
+      try { labelPlacement.dispose(); } catch (_) {}
     });
   }
 }

package/src/styles-local.css

@@ -110,7 +110,8 @@
 .duration-300 { transition-duration: 300ms; }
 .pointer-events-none { pointer-events: none; }
 
-/* === IFC CARD MARKERS (UI overlay) === */
+/* === IFC LABEL MARKERS (UI overlay) === */
+.ifc-label-add-btn,
 .ifc-card-add-btn {
   position: absolute;
   left: 12px;
@@ -130,10 +131,13 @@
   backdrop-filter: blur(6px);
 }
 
+.ifc-label-add-btn:hover,
 .ifc-card-add-btn:hover {
   background: rgba(255, 255, 255, 0.98);
 }
 
+.ifc-label-ghost,
+.ifc-label-marker,
 .ifc-card-ghost,
 .ifc-card-marker {
   position: absolute;
@@ -144,10 +148,12 @@
   will-change: transform;
 }
 
+.ifc-label-ghost,
 .ifc-card-ghost {
   display: none;
 }
 
+.ifc-label-dot,
 .ifc-card-dot {
   width: 18px;
   height: 18px;
@@ -157,6 +163,7 @@
   box-shadow: 0 6px 18px rgba(0, 0, 0, 0.18);
 }
 
+.ifc-label-num,
 .ifc-card-num {
   position: absolute;
   left: 0;
@@ -172,6 +179,7 @@
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.35);
 }
 
+.ifc-label-marker,
 .ifc-card-marker {
   width: 18px;
   height: 18px;
@@ -180,11 +188,50 @@
 }
 
 /* Клик ловим на контейнере метки, дочерние элементы пусть не перехватывают */
+.ifc-label-marker .ifc-label-dot,
+.ifc-label-marker .ifc-label-num,
 .ifc-card-marker .ifc-card-dot,
 .ifc-card-marker .ifc-card-num {
   pointer-events: none;
 }
 
+.ifc-label-marker--active .ifc-label-dot,
+.ifc-card-marker--active .ifc-card-dot {
+  box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.95), 0 0 0 4px rgba(37, 99, 235, 0.95);
+}
+
+/* === LABEL CONTEXT MENU === */
+.ifc-label-menu {
+  position: absolute;
+  z-index: 10000;
+  display: block;
+  min-width: 140px;
+  padding: 6px;
+  background: rgba(255, 255, 255, 0.98);
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 10px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.18);
+  backdrop-filter: blur(6px);
+}
+
+.ifc-label-menu-item {
+  width: 100%;
+  display: block;
+  text-align: left;
+  border: none;
+  background: transparent;
+  color: #1f2937;
+  font-size: 12px;
+  font-weight: 600;
+  padding: 6px 8px;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.ifc-label-menu-item:hover {
+  background: rgba(37, 99, 235, 0.12);
+}
+
 /* === NAVBAR COMPONENT === */
 .navbar {
   display: flex;