@xeokit/xeokit-sdk 2.4.0-alpha-14 → 2.4.0-alpha-16

package/dist/xeokit-sdk.cjs.js

@@ -327,6 +327,7 @@ class ContextMenu {
      * @param {Object} [cfg.context] The context, which is passed into the item callbacks. This can also be dynamically set on {@link ContextMenu#context}. This must be set before calling {@link ContextMenu#show}.
      * @param {Boolean} [cfg.enabled=true] Whether this ````ContextMenu```` is initially enabled. {@link ContextMenu#show} does nothing while this is ````false````.
      * @param {Boolean} [cfg.hideOnMouseDown=true] Whether this ````ContextMenu```` automatically hides whenever we mouse-down or tap anywhere in the page.
+     * @param {Boolean} [cfg.hideOnAction=true] Whether this ````ContextMenu```` automatically hides after we select a menu item. Se false if we want the menu to remain shown and show any updates to its item titles, after we've selected an item.
      */
     constructor(cfg = {}) {
 
@@ -365,6 +366,8 @@ class ContextMenu {
             this.items = cfg.items;
         }
 
+        this._hideOnAction = (cfg.hideOnAction !== false);
+
         this.context = cfg.context;
         this.enabled = cfg.enabled !== false;
         this.hide();
@@ -793,7 +796,6 @@ class ContextMenu {
 
                             item.itemElement.addEventListener("click", (event) => {
                                 event.preventDefault();
-                                self.hide();
                                 if (!self._context) {
                                     return;
                                 }
@@ -803,9 +805,13 @@ class ContextMenu {
                                 if (item.doAction) {
                                     item.doAction(self._context);
                                 }
+                                if (this._hideOnAction) {
+                                    self.hide();
+                                } else {
+                                    self._updateItemsTitles();
+                                    self._updateItemsEnabledStatus();
+                                }
                             });
-
-
                             item.itemElement.addEventListener("mouseenter", (event) => {
                                 event.preventDefault();
                                 if (item.enabled === false) {
@@ -11519,12 +11525,12 @@ class Annotation extends Marker {
         const canvasPos = this.canvasPos;
         this._marker.style.left = (Math.floor(left + canvasPos[0]) - 12) + "px";
         this._marker.style.top = (Math.floor(top + canvasPos[1]) - 12) + "px";
-        this._marker.style["z-index"] = cfg._markerZIndex;
+        this._marker.style["z-index"] = 90005 + Math.floor(this._viewPos[2]) + 1;
         const offsetX = 20;
         const offsetY = -17;
         this._label.style.left = 20 + Math.floor(left + canvasPos[0] + offsetX) + "px";
         this._label.style.top = Math.floor(top + canvasPos[1] + offsetY) + "px";
-        this._label.style["z-index"] = cfg._labelZIndex;
+        this._label.style["z-index"] = 90005 + Math.floor(this._viewPos[2]) + 1;
     }
 
     /**
@@ -12061,8 +12067,6 @@ class AnnotationsPlugin extends Plugin {
      * @param {String} [cfg.id="Annotations"] Optional ID for this plugin, so that we can find it within {@link Viewer#plugins}.
      * @param {String} [cfg.markerHTML] HTML text template for Annotation markers. Defaults to ````<div></div>````. Ignored on {@link Annotation}s configured with a ````markerElementId````.
      * @param {String} [cfg.labelHTML] HTML text template for Annotation labels. Defaults to ````<div></div>````.  Ignored on {@link Annotation}s configured with a ````labelElementId````.
-     * @param {Number} [cfg.markerZIndex] Custom value for Annotation markers z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
-     * @param {Number} [cfg.labelZIndex] Custom value for Annotation labels z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
      * @param {HTMLElement} [cfg.container] Container DOM element for markers and labels. Defaults to ````document.body````.
      * @param {{String:(String|Number)}} [cfg.values={}] Map of default values to insert into the HTML templates for the marker and label.
      * @param {Number}  [cfg.surfaceOffset=0.3] The amount by which each {@link Annotation} is offset from the surface of
@@ -12071,12 +12075,10 @@ class AnnotationsPlugin extends Plugin {
     constructor(viewer, cfg) {
 
         super("Annotations", viewer);
-        const randomZIndex = 90005 + Math.floor(this._viewPos[2]) + 1;
+
         this._labelHTML = cfg.labelHTML || "<div></div>";
         this._markerHTML = cfg.markerHTML || "<div></div>";
         this._container = cfg.container || document.body;
-        this._markerZIndex = cfg.markerZIndex || randomZIndex;
-        this._labelZIndex = cfg.labelZIndex || randomZIndex;
         this._values = cfg.values || {};
 
         /**
@@ -12152,8 +12154,6 @@ class AnnotationsPlugin extends Plugin {
      * @param {Number[]} [params.look] Optional World-space position for {@link Camera#look}, used when this Annotation is associated with a {@link Camera} position.
      * @param {Number[]} [params.up] Optional World-space position for {@link Camera#up}, used when this Annotation is associated with a {@link Camera} position.
      * @param {String} [params.projection] Optional projection type for {@link Camera#projection}, used when this Annotation is associated with a {@link Camera} position.
-     * @param {Number} [cfg.markerZIndex] Custom value for Annotation markers z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
-     * @param {Number} [cfg.labelZIndex] Custom value for Annotation labels z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
      * @returns {Annotation} The new {@link Annotation}.
      */
     createAnnotation(params) {
@@ -12205,9 +12205,7 @@ class AnnotationsPlugin extends Plugin {
             markerElement: markerElement,
             labelElement: labelElement,
             markerHTML: params.markerHTML || this._markerHTML,
-            markerZIndex : params.markerZIndex || this._markerZIndex,
             labelHTML: params.labelHTML || this._labelHTML,
-            labelZIndex : params.labelZIndex || this._labelZIndex,
             occludable: params.occludable,
             values: utils.apply(params.values, utils.apply(this._values, {})),
             markerShown: params.markerShown,

package/dist/xeokit-sdk.es.js

@@ -323,6 +323,7 @@ class ContextMenu {
      * @param {Object} [cfg.context] The context, which is passed into the item callbacks. This can also be dynamically set on {@link ContextMenu#context}. This must be set before calling {@link ContextMenu#show}.
      * @param {Boolean} [cfg.enabled=true] Whether this ````ContextMenu```` is initially enabled. {@link ContextMenu#show} does nothing while this is ````false````.
      * @param {Boolean} [cfg.hideOnMouseDown=true] Whether this ````ContextMenu```` automatically hides whenever we mouse-down or tap anywhere in the page.
+     * @param {Boolean} [cfg.hideOnAction=true] Whether this ````ContextMenu```` automatically hides after we select a menu item. Se false if we want the menu to remain shown and show any updates to its item titles, after we've selected an item.
      */
     constructor(cfg = {}) {
 
@@ -361,6 +362,8 @@ class ContextMenu {
             this.items = cfg.items;
         }
 
+        this._hideOnAction = (cfg.hideOnAction !== false);
+
         this.context = cfg.context;
         this.enabled = cfg.enabled !== false;
         this.hide();
@@ -789,7 +792,6 @@ class ContextMenu {
 
                             item.itemElement.addEventListener("click", (event) => {
                                 event.preventDefault();
-                                self.hide();
                                 if (!self._context) {
                                     return;
                                 }
@@ -799,9 +801,13 @@ class ContextMenu {
                                 if (item.doAction) {
                                     item.doAction(self._context);
                                 }
+                                if (this._hideOnAction) {
+                                    self.hide();
+                                } else {
+                                    self._updateItemsTitles();
+                                    self._updateItemsEnabledStatus();
+                                }
                             });
-
-
                             item.itemElement.addEventListener("mouseenter", (event) => {
                                 event.preventDefault();
                                 if (item.enabled === false) {
@@ -11515,12 +11521,12 @@ class Annotation extends Marker {
         const canvasPos = this.canvasPos;
         this._marker.style.left = (Math.floor(left + canvasPos[0]) - 12) + "px";
         this._marker.style.top = (Math.floor(top + canvasPos[1]) - 12) + "px";
-        this._marker.style["z-index"] = cfg._markerZIndex;
+        this._marker.style["z-index"] = 90005 + Math.floor(this._viewPos[2]) + 1;
         const offsetX = 20;
         const offsetY = -17;
         this._label.style.left = 20 + Math.floor(left + canvasPos[0] + offsetX) + "px";
         this._label.style.top = Math.floor(top + canvasPos[1] + offsetY) + "px";
-        this._label.style["z-index"] = cfg._labelZIndex;
+        this._label.style["z-index"] = 90005 + Math.floor(this._viewPos[2]) + 1;
     }
 
     /**
@@ -12057,8 +12063,6 @@ class AnnotationsPlugin extends Plugin {
      * @param {String} [cfg.id="Annotations"] Optional ID for this plugin, so that we can find it within {@link Viewer#plugins}.
      * @param {String} [cfg.markerHTML] HTML text template for Annotation markers. Defaults to ````<div></div>````. Ignored on {@link Annotation}s configured with a ````markerElementId````.
      * @param {String} [cfg.labelHTML] HTML text template for Annotation labels. Defaults to ````<div></div>````.  Ignored on {@link Annotation}s configured with a ````labelElementId````.
-     * @param {Number} [cfg.markerZIndex] Custom value for Annotation markers z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
-     * @param {Number} [cfg.labelZIndex] Custom value for Annotation labels z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
      * @param {HTMLElement} [cfg.container] Container DOM element for markers and labels. Defaults to ````document.body````.
      * @param {{String:(String|Number)}} [cfg.values={}] Map of default values to insert into the HTML templates for the marker and label.
      * @param {Number}  [cfg.surfaceOffset=0.3] The amount by which each {@link Annotation} is offset from the surface of
@@ -12067,12 +12071,10 @@ class AnnotationsPlugin extends Plugin {
     constructor(viewer, cfg) {
 
         super("Annotations", viewer);
-        const randomZIndex = 90005 + Math.floor(this._viewPos[2]) + 1;
+
         this._labelHTML = cfg.labelHTML || "<div></div>";
         this._markerHTML = cfg.markerHTML || "<div></div>";
         this._container = cfg.container || document.body;
-        this._markerZIndex = cfg.markerZIndex || randomZIndex;
-        this._labelZIndex = cfg.labelZIndex || randomZIndex;
         this._values = cfg.values || {};
 
         /**
@@ -12148,8 +12150,6 @@ class AnnotationsPlugin extends Plugin {
      * @param {Number[]} [params.look] Optional World-space position for {@link Camera#look}, used when this Annotation is associated with a {@link Camera} position.
      * @param {Number[]} [params.up] Optional World-space position for {@link Camera#up}, used when this Annotation is associated with a {@link Camera} position.
      * @param {String} [params.projection] Optional projection type for {@link Camera#projection}, used when this Annotation is associated with a {@link Camera} position.
-     * @param {Number} [cfg.markerZIndex] Custom value for Annotation markers z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
-     * @param {Number} [cfg.labelZIndex] Custom value for Annotation labels z-index. Defaults to ````90005 + Math.floor(this._viewPos[2]) + 1````.
      * @returns {Annotation} The new {@link Annotation}.
      */
     createAnnotation(params) {
@@ -12201,9 +12201,7 @@ class AnnotationsPlugin extends Plugin {
             markerElement: markerElement,
             labelElement: labelElement,
             markerHTML: params.markerHTML || this._markerHTML,
-            markerZIndex : params.markerZIndex || this._markerZIndex,
             labelHTML: params.labelHTML || this._labelHTML,
-            labelZIndex : params.labelZIndex || this._labelZIndex,
             occludable: params.occludable,
             values: utils.apply(params.values, utils.apply(this._values, {})),
             markerShown: params.markerShown,