label interactivity

2gis · Apr 17, 2024 · 809b946 · 809b946
1 parent 67cd315
commit 809b946
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/demo/mocks.ts b/demo/mocks.ts
@@ -45,6 +45,7 @@ export const REALTY_SCENE: BuildingOptions[] = [
                         elevation: 5,
                         fontSize: 12,
                         fontColor: '#3a3a3a',
+                        interactive: true,
                         labels: [
                             {
                                 coordinates: [47.245048150280994, 56.134470449142164],
@@ -75,6 +76,7 @@ export const REALTY_SCENE: BuildingOptions[] = [
                         elevation: 5,
                         fontSize: 12,
                         fontColor: '#3a3a3a',
+                        interactive: true,
                         labels: [
                             {
                                 coordinates: [47.245350349632965, 56.134414208205776],
@@ -125,6 +127,7 @@ export const REALTY_SCENE: BuildingOptions[] = [
                         elevation: 35,
                         fontSize: 12,
                         fontColor: '#fff',
+                        interactive: true,
                         labels: [
                             {
                                 coordinates: [47.245048150280994, 56.134470449142164],
@@ -204,6 +207,7 @@ export const REALTY_SCENE: BuildingOptions[] = [
                         elevation: 7,
                         fontSize: 12,
                         fontColor: '#3a3a3a',
+                        interactive: true,
                         labels: [
                             {
                                 coordinates: [47.24452417991248, 56.13469284843933],
@@ -275,6 +279,7 @@ export const REALTY_SCENE: BuildingOptions[] = [
                         elevation: 53,
                         fontSize: 12,
                         fontColor: '#fff',
+                        interactive: true,
                         labels: [
                             {
                                 coordinates: [47.24452417991248, 56.13469284843933],

diff --git a/src/labelGroups.ts b/src/labelGroups.ts
@@ -4,6 +4,7 @@ import type { GltfPlugin } from './plugin';
 import { pluginEvents } from './constants';
 import { createLabelEvenData } from './utils/events';
 
+const DEFAULT_INTERACTIVE = false;
 export const DEFAULT_FONT_SIZE = 14;
 export const DEFAULT_FONT_COLOR = '#000000';
 export const DEFAULT_IMAGE: LabelImage = {
@@ -39,11 +40,12 @@ export class LabelGroups {
             fontColor,
             fontSize,
             elevation: groupElevation,
+            interactive: groupInteractive,
         } = groupOptions;
         const { labelGroupDefaults, zIndex } = this.options;
 
         const labels = groupOptions.labels.map((labelOptions) => {
-            const { coordinates, text, userData, elevation } = labelOptions;
+            const { coordinates, text, userData, elevation, interactive } = labelOptions;
             const label = new mapgl.Label(this.map, {
                 coordinates: [...coordinates, elevation ?? groupElevation],
                 text,
@@ -55,7 +57,7 @@ export class LabelGroups {
                 fontSize: fontSize ?? labelGroupDefaults.fontSize ?? DEFAULT_FONT_SIZE,
                 relativeAnchor: [0.5, 1],
                 zIndex: zIndex + 0.00001, // чтобы были выше моделей
-                interactive: true,
+                interactive: interactive ?? groupInteractive ?? DEFAULT_INTERACTIVE,
                 labeling: { type: 'pointLabelsOnly' },
             });
 

diff --git a/src/types/plugin.ts b/src/types/plugin.ts
@@ -154,7 +154,7 @@ export interface ModelOptions {
      */
     userData?: any;
     /**
-     * Interactivity of model. All models are interactive by default.
+     * Interactivity of a model. The model isn't interactive by default.
      */
     interactive?: boolean;
 }
@@ -179,6 +179,10 @@ export interface LabelOptions {
      * User specific data.
      */
     userData?: any;
+    /**
+     * Interactivity of a label. The label isn't interactive by default.
+     */
+    interactive?: boolean;
 }
 
 /**
@@ -217,6 +221,10 @@ export interface LabelGroupOptions {
      * Image settings for labels' text background.
      */
     image?: LabelImage | 'default';
+    /**
+     * Interactivity of a label group. The label group isn't interactive by default.
+     */
+    interactive?: boolean;
 }
 
 /**