@mappedin/viewer 0.59.4 → 0.59.5-051027e.0

package/dist/types/src/stores/map-store/controllers/labels.d.ts

@@ -1,6 +1,6 @@
 import type MapStore from '..';
 import type RootStore from '../../root-store';
-import { Place, Label, Area, Floor, Facade } from '../../../lib/sdk';
+import { Place, Annotation, Label, Area, Floor, Facade } from '../../../lib/sdk';
 import { FloorStack } from '@mappedin/mappedin-js';
 declare class LabelsController {
     private rootStore;
@@ -18,6 +18,14 @@ declare class LabelsController {
     floorStackLabelsOnFloor: Map<Floor, Label>;
     floorStackByLabelId: Record<string, FloorStack>;
     placeByLabelId: Record<string, Place>;
+    annotationLabelByPlaceId: Map<string, Label>;
+    /** The annotation whose name is currently shown by `AnnotationHoverLabel`. */
+    hoveredAnnotation: Annotation | null;
+    /** Container-relative pixel position of the hovered annotation's pin. */
+    hoveredAnnotationPosition: {
+        x: number;
+        y: number;
+    } | null;
     constructor({ rootStore, mapStore }: {
         rootStore: RootStore;
         mapStore: MapStore;
@@ -28,6 +36,7 @@ declare class LabelsController {
     private initialize;
     private getLabelColor;
     private getDefaultLabelRank;
+    private getLabelOptionsForAnnotation;
     private getLabelOptionsForFloorStack;
     private getLabelOptionsForPlace;
     private labelPlace;
@@ -36,6 +45,25 @@ declare class LabelsController {
     private labelPlaces;
     private labelFloorStacks;
     private getVisibilityForPlaceLabel;
+    /**
+     * Show the hovered annotation's name and hide the previous one's.
+     *
+     * The name is drawn as DOM rather than label text so that showing it never disturbs the
+     * collision layout. The screen position is projected once here: the label is cleared while
+     * the camera moves, so the snapshot never has to be kept in sync.
+     * @param annotation - The hovered annotation, or null when nothing is hovered
+     */
+    setHoveredAnnotation(annotation: Annotation | null): void;
+    /**
+     * Push the current rank, appearance, and visibility for one annotation's label.
+     * @param annotation - The annotation whose label should be synced
+     */
+    private updateAnnotationLabel;
+    /**
+     * Keep annotation label rank, size, and visibility in sync with safety mode, selection,
+     * and directions. The label is disabled while a DOM marker represents the annotation.
+     */
+    private updateAnnotationLabels;
     private updateLabelsInAreas;
     private updateFloorStackLabels;
     private updateAllLabels;

package/dist/types/src/stores/map-store/controllers/markers.d.ts

@@ -6,7 +6,12 @@ type TMarker = {
     key: string;
     type: string;
     text?: string;
-    elementFn: () => ReactNode | Promise<ReactNode>;
+    elementFn?: () => ReactNode | Promise<ReactNode>;
+    /**
+     * Prebuilt HTML string, or async factory. When set, skips React renderToString.
+     * Prefer this for hot paths (e.g. annotations) — SDK Markers.add only accepts a string.
+     */
+    html?: string | (() => string | Promise<string>);
     onPointerDown?: () => void;
     onClick?: () => void;
     onWheel?: (e: WheelEvent) => void;
@@ -21,11 +26,17 @@ declare class MarkersController {
     private reactionDisposers;
     private markersVisible;
     private sdkMarkersByKey;
+    private annotationRootByContentEl;
     placeByMarkerId: Record<string, Place>;
     constructor({ rootStore, mapStore }: {
         rootStore: RootStore;
         mapStore: MapStore;
     });
+    /**
+     * DOM markers only for selected annotations. At-rest annotations are GPU labels;
+     * `LabelsController` disables the matching label while this marker exists, since
+     * collision can't hide it (see `getVisibilityForPlaceLabel`).
+     */
     private get annotationMarkers();
     private get areaMarkers();
     private get youAreHereMarkers();
@@ -39,6 +50,13 @@ declare class MarkersController {
     private getMarkerColor;
     private getAnnotationRank;
     private getAreaRank;
+    /**
+     * Resolve (and memoize) the annotation marker root inside an SDK marker's content element.
+     * Cached because it is hit for every annotation marker on every selection change.
+     * @param marker - The SDK marker to look inside
+     * @returns The annotation root element, or undefined if this marker has none
+     */
+    private getAnnotationRoot;
     private forEachMarker;
     private handleZoomChange;
     private zoomOnWheel;

package/dist/types/src/stores/ui-store/index.d.ts

@@ -153,7 +153,7 @@ declare class UIStore {
     get shareButtonVisible(): boolean;
     get mainUIVisible(): boolean;
     get mainUIMaxHeight(): number;
-    get appPadding(): 0 | 10 | 20 | 15;
+    get appPadding(): 0 | 20 | 10 | 15;
     get makerPopUpVisible(): boolean;
     get metadataCardVisible(): boolean;
     get availableDepartureModes(): E_DEPARTURE_MODE[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mappedin/viewer",
-  "version": "0.59.4",
+  "version": "0.59.5-051027e.0",
   "type": "module",
   "browser": "./dist/index.js",
   "license": "UNLICENSED",
@@ -18,9 +18,9 @@
   },
   "devDependencies": {
     "@ladle/react": "^5.0.3",
-    "@mappedin/blue-dot": "6.17.0-v6-13d60ac3.0",
-    "@mappedin/dynamic-focus": "6.17.0-v6-13d60ac3.0",
-    "@mappedin/mappedin-js": "6.17.1-v6-13d60ac3.0",
+    "@mappedin/blue-dot": "6.23.0-pr-1669-sdk-room-1-99f56e05.0",
+    "@mappedin/dynamic-focus": "6.23.0-pr-1669-sdk-room-1-99f56e05.0",
+    "@mappedin/mappedin-js": "6.23.1-pr-1669-sdk-room-1-99f56e05.0",
     "@mappedin/mvf": "3.0.0-69b7308.0",
     "@mappedin/self-serve-icons": "1.105.0-alpha.SRV-2719-add-bleed-kit-annotation.1754600609",
     "@napi-rs/canvas": "^0.1.89",
@@ -31,6 +31,7 @@
     "@turf/difference": "^7.2.0",
     "@turf/geojson-rbush": "^7.2.0",
     "@turf/helpers": "^7.2.0",
+    "@types/escape-html": "1.0.4",
     "@types/geojson": "^7946.0.16",
     "@types/lodash.isequal": "^4.5.8",
     "@types/lodash.merge": "^4.6.9",
@@ -46,6 +47,7 @@
     "@vitest/coverage-istanbul": "^3.2.6",
     "dompurify": "^3.4.11",
     "dotenv": "^16.4.5",
+    "escape-html": "1.0.3",
     "escape-string-regexp": "^5.0.0",
     "eslint": "^8.45.0",
     "eslint-plugin-react-hooks": "^4.6.0",

package/dist/types/src/lib/sdk/load-annotations.d.ts

@@ -1,2 +0,0 @@
-import { Annotation } from './mappedin-js';
-export declare const loadAnnotationAsset: (annotation: Annotation) => string | undefined;