@vertexvis/viewer 0.15.2-testing.4 → 0.15.2

package/dist/esm/vertex-viewer-measurement-precise.entry.js

@@ -1,21 +1,22 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { r as registerInstance, h, H as Host } from './index-26dfb2d0.js';
-import { s as scene_view_api_pb } from './mapper-941ff03c.js';
+import { s as scene_view_api_pb } from './mapper-dd937684.js';
 import { g as grpcWebClient_umd } from './grpc-web-client.umd-5409853c.js';
-import { p as parseConfig } from './config-6cdeb6ca.js';
-import { a as MeasurementEntity, M as MeasurementController } from './entities-6f3c5437.js';
-import './streamAttributes-24bd7b3a.js';
-import { M as MeasurementModel } from './model-fa9af61a.js';
-import { M as MeasurementOverlayManager } from './overlays-cc3efc30.js';
-import { p as point } from './bundle.esm-ce2c7ad3.js';
-import { a as measurementWithArrowCursor } from './cursors-a8d4b3f4.js';
-import { g as getMouseClientPosition } from './dom-5b164305.js';
+import { p as parseConfig } from './config-25384fe6.js';
+import { a as MeasurementEntity, M as MeasurementController } from './entities-0e325765.js';
+import './streamAttributes-23270e27.js';
+import { M as MeasurementModel } from './model-3cd8cd47.js';
+import { M as MeasurementOverlayManager } from './overlays-8f195eb3.js';
+import { p as point } from './bundle.esm-92e615bf.js';
+import { a as measurementWithArrowCursor } from './cursors-127a3bb7.js';
+import { g as getMouseClientPosition } from './dom-e436f0c0.js';
 import { E as ElementRectObserver } from './elementRectObserver-39cf7b95.js';
 import { E as EntityType } from './entities-ce81dd7f.js';
 import './_commonjsHelpers-11ca3be1.js';
-import './browser.esm-ae4ca1f1.js';
+import './browser.esm-07e7db8f.js';
+import './bundle.esm-91404853.js';
 
 // package: vertexvis.protobuf.sceneview.v1
 // file: sceneview/protos/scene_view_api.proto

package/dist/esm/vertex-viewer-pin-group.entry.js

@@ -1,18 +1,19 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { h, F as Fragment, r as registerInstance } from './index-26dfb2d0.js';
-import { p as point, m as matrix4, v as vector3 } from './bundle.esm-ce2c7ad3.js';
-import './cursors-a8d4b3f4.js';
-import './mapper-941ff03c.js';
+import { p as point, m as matrix4, v as vector3 } from './bundle.esm-92e615bf.js';
+import './cursors-127a3bb7.js';
+import './mapper-dd937684.js';
 import './grpc-web-client.umd-5409853c.js';
-import './streamAttributes-24bd7b3a.js';
+import './streamAttributes-23270e27.js';
 import './entities-ce81dd7f.js';
-import { V as Viewport } from './viewport-e39e2eba.js';
-import { g as getPinColors, i as isIconPin, b as isTextPin, P as PinModel, a as PinController, c as translatePointToScreen } from './model-40bd1711.js';
+import { V as Viewport } from './viewport-f19fc583.js';
+import { g as getPinColors, i as isIconPin, b as isTextPin, P as PinModel, a as PinController, c as translatePointToScreen } from './model-bfe1c4d8.js';
 import { c as classnames } from './index-e841d91b.js';
-import './browser.esm-ae4ca1f1.js';
+import './browser.esm-07e7db8f.js';
 import './_commonjsHelpers-11ca3be1.js';
+import './bundle.esm-91404853.js';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const PinRenderer = ({ pin, selected, }) => {
@@ -76,10 +77,14 @@ const ViewerPinGroup = class {
     };
   }
   componentDidLoad() {
+    var _a;
     this.setLabelObserver();
     if (this.pinController == null) {
       this.pinController = new PinController(this.pinModel);
     }
+    if (this.selected) {
+      (_a = this.labelEl) === null || _a === void 0 ? void 0 : _a.setFocus();
+    }
   }
   disconnectedCallback() {
     var _a, _b;

package/dist/esm/vertex-viewer-pin-label_2.entry.js

@@ -1,14 +1,14 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { r as registerInstance, c as createEvent, h, H as Host, g as getElement } from './index-26dfb2d0.js';
-import { p as point } from './bundle.esm-ce2c7ad3.js';
+import { p as point } from './bundle.esm-92e615bf.js';
 import { c as classnames } from './index-e841d91b.js';
-import { g as getMouseClientPosition } from './dom-5b164305.js';
-import { t as translatePointToRelative, c as translatePointToScreen, a as PinController, P as PinModel, g as getPinColors, b as isTextPin } from './model-40bd1711.js';
+import { g as getMouseClientPosition } from './dom-e436f0c0.js';
+import { t as translatePointToRelative, c as translatePointToScreen, a as PinController, P as PinModel, g as getPinColors, b as isTextPin } from './model-bfe1c4d8.js';
 import { r as readDOM } from './stencil-bfbf099f.js';
 import './_commonjsHelpers-11ca3be1.js';
-import './browser.esm-ae4ca1f1.js';
+import './browser.esm-07e7db8f.js';
 
 function getComputedStyle(el) {
   return window.getComputedStyle(el);
@@ -36,12 +36,15 @@ const VertexPinLabel = class {
       });
     };
     this.handleInputKeyDown = (event) => {
-      if (event.key === 'Enter' && (event.ctrlKey || event.metaKey)) {
-        event.preventDefault();
-        this.submit();
+      event.stopPropagation();
+      if (event.key === 'Enter' &&
+        (event.ctrlKey || event.metaKey || event.shiftKey)) {
+        this.textareaRows += 1;
+        this.value += '\n';
       }
       else if (event.key === 'Enter') {
-        this.textareaRows += 1;
+        event.preventDefault();
+        this.submit();
       }
     };
     this.handlePointerDown = (event) => {
@@ -60,6 +63,8 @@ const VertexPinLabel = class {
       if (this.elementBounds != null &&
         this.relativePointerDownPosition &&
         this.pinPointerDownPosition != null) {
+        // Prevent selection of any text while interacting with the label
+        event.preventDefault();
         const point$1 = getMouseClientPosition(event, this.elementBounds);
         const relative = translatePointToRelative(point$1, this.elementBounds);
         const relativeDelta = point.subtract(relative, this.relativePointerDownPosition);
@@ -104,12 +109,9 @@ const VertexPinLabel = class {
     var _a, _b, _c;
     // HTMLInputElement.focus() doesn't exist in tests.
     if (typeof ((_a = this.inputEl) === null || _a === void 0 ? void 0 : _a.focus) === 'function') {
-      if (this.focused) {
-        (_b = this.inputEl) === null || _b === void 0 ? void 0 : _b.focus();
-      }
-      else {
-        (_c = this.inputEl) === null || _c === void 0 ? void 0 : _c.blur();
-      }
+      this.focused = true;
+      this.labelFocused.emit((_b = this.pin) === null || _b === void 0 ? void 0 : _b.id);
+      (_c = this.inputEl) === null || _c === void 0 ? void 0 : _c.focus();
     }
   }
   watchFocusChange() {
@@ -186,7 +188,7 @@ const VertexPinLabel = class {
   }
   computeMinWidth() {
     if (this.contentElBounds != null) {
-      const expected = `${this.contentElBounds.width + 16}px`;
+      const expected = `${this.contentElBounds.width + 8}px`;
       return `min(${expected}, ${this.computeMaxWidth()})`;
     }
     else {

package/dist/esm/vertex-viewer-pin-tool.entry.js

@@ -1,18 +1,18 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { r as registerInstance, h, H as Host, g as getElement } from './index-26dfb2d0.js';
-import { t as translatePointToRelative, P as PinModel, a as PinController } from './model-40bd1711.js';
-import { p as point } from './bundle.esm-ce2c7ad3.js';
-import { b as uuid } from './browser.esm-ae4ca1f1.js';
-import { l as labelPinCursor, p as pinCursor } from './cursors-a8d4b3f4.js';
-import { g as getMouseClientPosition } from './dom-5b164305.js';
+import { t as translatePointToRelative, P as PinModel, a as PinController } from './model-bfe1c4d8.js';
+import { p as point } from './bundle.esm-92e615bf.js';
+import { b as uuid } from './browser.esm-07e7db8f.js';
+import { l as labelPinCursor, p as pinCursor } from './cursors-127a3bb7.js';
+import { g as getMouseClientPosition } from './dom-e436f0c0.js';
 import { E as ElementRectObserver } from './elementRectObserver-39cf7b95.js';
 import { E as EntityType } from './entities-ce81dd7f.js';
 import { g as getMarkupBoundingClientRect } from './dom-be140992.js';
 
 class PinsInteractionHandler {
-  constructor(controller) {
+  constructor(controller, xOffset, yOffset) {
     this.rectObserver = new ElementRectObserver();
     this.droppableSurfaces = [
       EntityType.PRECISE_SURFACE,
@@ -28,7 +28,7 @@ class PinsInteractionHandler {
       if (this.controller.getDraggable() == null &&
         this.controller.getToolMode() === 'edit' &&
         isDroppableSurface) {
-        this.addCursor(this.getCusorType());
+        this.addCursor(this.getCursorType());
       }
       else {
         this.clearCursor();
@@ -82,6 +82,8 @@ class PinsInteractionHandler {
       }
     };
     this.controller = controller;
+    this.xOffset = xOffset;
+    this.yOffset = yOffset;
   }
   get elementRect() {
     return this.rectObserver.rect;
@@ -115,7 +117,6 @@ class PinsInteractionHandler {
       var _a, _b, _c, _d, _e, _f;
       const [hit] = await api.hitItems(pt);
       if ((hit === null || hit === void 0 ? void 0 : hit.hitPoint) != null && this.elementRect != null) {
-        const relativePoint = translatePointToRelative(pt, this.elementRect);
         if ((hit === null || hit === void 0 ? void 0 : hit.hitPoint) != null &&
           (hit === null || hit === void 0 ? void 0 : hit.hitPoint.x) != null &&
           (hit === null || hit === void 0 ? void 0 : hit.hitPoint.y) != null &&
@@ -141,6 +142,8 @@ class PinsInteractionHandler {
               });
               break;
             case 'pin-text':
+              const isNewPin = existingPin == null;
+              const relativePoint = translatePointToRelative(pt, this.elementRect, isNewPin, this.xOffset, this.yOffset);
               this.controller.setPin({
                 type: 'text',
                 id: pinId,
@@ -155,6 +158,7 @@ class PinsInteractionHandler {
                 },
                 attributes,
               });
+              this.controller.setSelectedPinId(pinId);
               break;
           }
         }
@@ -164,7 +168,7 @@ class PinsInteractionHandler {
       }
     });
   }
-  getCusorType() {
+  getCursorType() {
     switch (this.controller.getToolType()) {
       case 'pin-icon':
         return pinCursor;
@@ -197,7 +201,7 @@ class PinsInteractionHandler {
   }
 }
 
-const viewerPinToolCss = ":host{position:absolute;top:0;bottom:0;left:0;right:0;overflow:hidden;pointer-events:none}";
+const viewerPinToolCss = ":host{position:absolute;top:0;bottom:0;left:0;right:0;overflow:hidden;pointer-events:none;--viewer-pin-tool-initial-label-offset-x:20;--viewer-pin-tool-initial-label-offset-y:20}";
 
 const ViewerPinTool = class {
   constructor(hostRef) {
@@ -321,10 +325,17 @@ const ViewerPinTool = class {
   }
   setupInteractionHandler() {
     var _a;
+    const hostStyles = window.getComputedStyle(this.hostEl);
+    const xOffset = hostStyles
+      .getPropertyValue('--viewer-pin-tool-initial-label-offset-x')
+      .trim();
+    const yOffset = hostStyles
+      .getPropertyValue('--viewer-pin-tool-initial-label-offset-y')
+      .trim();
     this.clearInteractionHandler();
     if (this.pinController != null) {
       this.registeredInteractionHandler =
-        (_a = this.viewer) === null || _a === void 0 ? void 0 : _a.registerInteractionHandler(new PinsInteractionHandler(this.pinController));
+        (_a = this.viewer) === null || _a === void 0 ? void 0 : _a.registerInteractionHandler(new PinsInteractionHandler(this.pinController, parseInt(xOffset), parseInt(yOffset)));
     }
   }
   clearModelListeners() {

package/dist/esm/vertex-viewer-spinner.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { r as registerInstance, h } from './index-26dfb2d0.js';
 import { c as classnames } from './index-e841d91b.js';

package/dist/esm/vertex-viewer-transform-widget.entry.js

@@ -1,15 +1,16 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { r as registerInstance, c as createEvent, h, H as Host, g as getElement } from './index-26dfb2d0.js';
-import { m as matrix4, p as point, v as vector3, r as ray, j as plane, q as quaternion, i as rectangle, h as angle, b as boundingBox } from './bundle.esm-ce2c7ad3.js';
+import { m as matrix4, p as point, v as vector3, r as ray, f as plane, q as quaternion, e as rectangle, c as angle, b as boundingBox } from './bundle.esm-92e615bf.js';
 import { c as classnames } from './index-e841d91b.js';
 import { w as writeDOM, r as readDOM } from './stencil-bfbf099f.js';
-import { c as color, E as EventDispatcher } from './browser.esm-ae4ca1f1.js';
+import { c as color, E as EventDispatcher } from './browser.esm-07e7db8f.js';
 import { c as createCommonjsModule, a as commonjsGlobal, g as getAugmentedNamespace, b as getDefaultExportFromCjs } from './_commonjsHelpers-11ca3be1.js';
-import './streamAttributes-24bd7b3a.js';
+import './streamAttributes-23270e27.js';
 import './entities-ce81dd7f.js';
-import { V as Viewport } from './viewport-e39e2eba.js';
+import { V as Viewport } from './viewport-f19fc583.js';
+import './bundle.esm-91404853.js';
 
 class TransformController {
   constructor(stream) {
@@ -12494,7 +12495,7 @@ function computeDrawable2dBounds(viewport, ...elements) {
   let max = point.create();
   elements
     .filter((m) => m.points.valid)
-    .map((m) => {
+    .forEach((m) => {
     m.points
       .toArray()
       .map((pt) => viewport.transformNdcPointToViewport(pt))
@@ -13127,6 +13128,7 @@ const ViewerTransformWidget = class {
       });
       if (this.position != null) {
         this.currentTransform = matrix4.makeTranslation(this.position);
+        this.startingTransform = this.currentTransform;
         this.widget.updateTransform(this.currentTransform);
       }
       if (((_b = this.viewer) === null || _b === void 0 ? void 0 : _b.frame) != null) {
@@ -13231,7 +13233,7 @@ const ViewerTransformWidget = class {
     var _a, _b;
     this.currentTransform = this.getTransform(oldPosition, newPosition);
     this.startingTransform = this.currentTransform;
-    console.debug(`Updating widget position [previous=${JSON.stringify(newPosition)}, current=${JSON.stringify(oldPosition)}]`);
+    console.debug(`Updating widget position [previous=${JSON.stringify(oldPosition)}, current=${JSON.stringify(newPosition)}]`);
     (_a = this.widget) === null || _a === void 0 ? void 0 : _a.updateTransform(this.currentTransform);
     if (newPosition == null) {
       (_b = this.controller) === null || _b === void 0 ? void 0 : _b.clearTransform();

package/dist/esm/vertex-viewer-view-cube.entry.js

@@ -1,13 +1,14 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { h, F as Fragment, r as registerInstance, H as Host } from './index-26dfb2d0.js';
-import { v as vector3, q as quaternion, u as euler } from './bundle.esm-ce2c7ad3.js';
+import { v as vector3, q as quaternion, u as euler } from './bundle.esm-92e615bf.js';
 import { r as readDOM } from './stencil-bfbf099f.js';
-import { O as Orientation, e as FramePerspectiveCamera, G as StandardView } from './streamAttributes-24bd7b3a.js';
+import { O as Orientation, e as FramePerspectiveCamera, S as StandardView } from './streamAttributes-23270e27.js';
 import './entities-ce81dd7f.js';
 import { c as classnames } from './index-e841d91b.js';
-import './browser.esm-ae4ca1f1.js';
+import './bundle.esm-91404853.js';
+import './browser.esm-07e7db8f.js';
 import './_commonjsHelpers-11ca3be1.js';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -101,11 +102,11 @@ const ViewerViewCube = class {
     /**
      * The label for the side of the cube on the positive x-axis.
      */
-    this.xPositiveLabel = 'Left';
+    this.xPositiveLabel = 'Right';
     /**
      * The label for the side of the cube on the negative x-axis.
      */
-    this.xNegativeLabel = 'Right';
+    this.xNegativeLabel = 'Left';
     /**
      * The label for the side of the cube on the positive y-axis.
      */

package/dist/esm/vertex-viewer.entry.js

@@ -1,17 +1,19 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 import { r as registerInstance, c as createEvent, h, H as Host, g as getElement } from './index-26dfb2d0.js';
-import { p as point, v as vector3, h as angle, j as plane, r as ray, b as boundingBox, s as matrix2, d as dimensions } from './bundle.esm-ce2c7ad3.js';
-import { l as fromPbStencilBufferOrThrow, m as decodePng, n as DepthBuffer, t as toProtoDuration, g as toProtobuf, p as protoToDate, o as toPbStreamAttributes, q as toPbRGBi, S as StreamApi, r as StreamRequestError, s as fromPbFrameOrThrow, u as fromPbStartStreamResponseOrThrow, x as fromPbReconnectResponseOrThrow, y as fromPbSyncTimeResponseOrThrow, z as currentDateAsProtoTimestamp, B as fromPbRefreshTokenResponseOrThrow, W as WebSocketClientImpl, C as toOrthographic, E as toPerspective } from './streamAttributes-24bd7b3a.js';
-import { E as EventDispatcher, m as mapper, c as color, o as objects, u as uri, a as async, b as uuid } from './browser.esm-ae4ca1f1.js';
+import { p as point, v as vector3, c as angle, f as plane, r as ray, b as boundingBox, s as matrix2, d as dimensions } from './bundle.esm-92e615bf.js';
+import { t as toProtoDuration, p as protoToDate, S as StreamApi, a as StreamRequestError, c as currentDateAsProtoTimestamp, W as WebSocketClientImpl } from './bundle.esm-91404853.js';
+import { E as EventDispatcher, m as mapper, c as color, o as objects, u as uri, a as async, b as uuid } from './browser.esm-07e7db8f.js';
 import { c as classnames } from './index-e841d91b.js';
-import { p as parseConfig } from './config-6cdeb6ca.js';
-import { C as CursorManager } from './cursors-a8d4b3f4.js';
-import { g as getMouseClientPosition, c as cssCursor } from './dom-5b164305.js';
-import { I as ImageLoadError, f as fromUrn, C as CustomError, W as WebsocketConnectionError, a as SynchronizedClock, b as SceneRenderError, d as defaultSelectionMaterial, V as ViewerInitializationError, e as InteractionHandlerError, g as ComponentInitializationError, h as IllegalStateError, i as fromHex, S as Scene } from './scene-970f5000.js';
+import { p as parseConfig } from './config-25384fe6.js';
+import { C as CursorManager } from './cursors-127a3bb7.js';
+import { g as getMouseClientPosition, c as cssCursor } from './dom-e436f0c0.js';
+import { c as ImageLoadError, C as CustomError, W as WebsocketConnectionError, S as SceneRenderError, V as ViewerInitializationError, d as InteractionHandlerError, e as ComponentInitializationError, f as IllegalStateError } from './errors-a4cc9caa.js';
+import { k as fromPbStencilBufferOrThrow, l as decodePng, m as DepthBuffer, t as toProtobuf, n as toPbStreamAttributes, o as toPbRGBi, p as fromPbFrameOrThrow, q as fromPbStartStreamResponseOrThrow, r as fromPbReconnectResponseOrThrow, s as fromPbSyncTimeResponseOrThrow, u as fromPbRefreshTokenResponseOrThrow, x as toOrthographic, y as toPerspective } from './streamAttributes-23270e27.js';
 import { E as EntityType } from './entities-ce81dd7f.js';
-import { V as Viewport } from './viewport-e39e2eba.js';
+import { V as Viewport } from './viewport-f19fc583.js';
+import { f as fromUrn, a as SynchronizedClock, d as defaultSelectionMaterial, b as fromHex, S as Scene } from './scene-2543b3bd.js';
 import './_commonjsHelpers-11ca3be1.js';
 
 /**
@@ -1021,9 +1023,11 @@ class BaseInteractionHandler {
     switch (type) {
       case 'rotate':
         this.primaryInteraction = this.rotateInteraction;
+        this.lastPrimaryRotateInteraction = this.rotateInteraction;
         break;
       case 'rotate-point':
         this.primaryInteraction = this.rotatePointInteraction;
+        this.lastPrimaryRotateInteraction = this.rotatePointInteraction;
         break;
       case 'zoom':
         this.primaryInteraction = this.zoomInteraction;
@@ -1098,9 +1102,13 @@ class BaseInteractionHandler {
     }
   }
   beginDrag(event) {
+    var _a;
     if (this.keyboardControls && event.metaKey && event.shiftKey) {
       this.currentInteraction = this.rotatePointInteraction;
     }
+    else if (this.keyboardControls && event.shiftKey && event.altKey) {
+      this.currentInteraction = this.twistInteraction;
+    }
     else if (this.keyboardControls && event.shiftKey) {
       this.currentInteraction = this.zoomInteraction;
     }
@@ -1110,13 +1118,17 @@ class BaseInteractionHandler {
     else if (this.keyboardControls && event.altKey) {
       this.currentInteraction = this.rotateInteraction;
     }
-    if (event.buttons === 1 || event.buttons === 4) {
+    if (event.buttons === 1) {
       this.draggingInteraction =
         this.currentInteraction || this.primaryInteraction;
     }
     else if (event.buttons === 2) {
       this.draggingInteraction = this.panInteraction;
     }
+    else if (event.buttons === 4) {
+      this.draggingInteraction =
+        (_a = this.lastPrimaryRotateInteraction) !== null && _a !== void 0 ? _a : this.rotateInteraction;
+    }
     if (this.draggingInteraction != null &&
       this.interactionApi != null &&
       this.element != null) {
@@ -1385,12 +1397,13 @@ class TwistInteraction extends MouseInteraction {
     super(...arguments);
     this.type = 'twist';
   }
-  beginDrag(event, canvasPosition, api) {
-    this.currentPosition = point.create(event.clientX, event.clientY);
+  beginDrag(event, canvasPosition, api, element) {
+    this.currentPosition = point.create(event.offsetX, event.offsetY);
+    this.canvasRect = element.getBoundingClientRect();
     api.beginInteraction();
   }
   drag(event, api) {
-    const position = point.create(event.clientX, event.clientY);
+    const position = getMouseClientPosition(event, this.canvasRect);
     this.currentPosition = position;
     api.twistCamera(position);
   }
@@ -2156,21 +2169,27 @@ class ViewerStream extends StreamApi {
     }
   }
   async loadIfConnectingOrConnected(urn, state) {
-    const { resource: pResource, queries: pQueries } = state.resource;
+    var _a;
+    const { resource: pResource, subResource: pSubResource } = state.resource;
     const resource = fromUrn(urn);
     const hasResourceChanged = !objects.isEqual(pResource, resource.resource);
-    const hasQueryChanged = !objects.isEqual(pQueries, resource.queries);
-    const hasQuery = resource.queries[0] != null;
+    const hasSubResourceChanged = !objects.isEqual(pSubResource, resource.subResource);
     const isConnecting = state.type === 'connecting' || state.type === 'reconnecting';
     const isConnected = state.type === 'connected';
-    if (hasResourceChanged || (isConnecting && hasQueryChanged)) {
+    const suppliedIdQuery = resource.queries.find((q) => q.type === 'supplied-id');
+    if (hasResourceChanged || (isConnecting && hasSubResourceChanged)) {
       this.disconnect();
       return this.loadIfDisconnected(urn);
     }
-    else if (isConnected && hasQuery && hasQueryChanged) {
-      await this.loadSceneViewState({
-        sceneViewStateId: { hex: resource.queries[0].id },
-      });
+    else if (isConnected &&
+      hasSubResourceChanged &&
+      ((_a = resource.subResource) === null || _a === void 0 ? void 0 : _a.type) === 'scene-view-state') {
+      const payload = Object.assign(Object.assign({}, (resource.subResource.id != null
+        ? { sceneViewStateId: { hex: resource.subResource.id } }
+        : {})), (suppliedIdQuery != null
+        ? { sceneViewStateSuppliedId: { value: suppliedIdQuery.id } }
+        : {}));
+      await this.loadSceneViewState(payload);
       this.updateState(Object.assign(Object.assign({}, state), { resource }));
     }
   }
@@ -2281,14 +2300,20 @@ class ViewerStream extends StreamApi {
     });
   }
   async requestNewStream(resource) {
-    var _a;
+    var _a, _b;
+    const suppliedIdQuery = resource.queries.find((q) => q.type === 'supplied-id');
     const res = fromPbStartStreamResponseOrThrow(await this.startStream({
       streamKey: { value: resource.resource.id },
       dimensions: this.dimensions,
       frameBackgroundColor: toPbColorOrThrow(this.frameBgColor),
       streamAttributes: toPbStreamAttributesOrThrow(this.streamAttributes),
-      sceneViewStateId: ((_a = resource.queries[0]) === null || _a === void 0 ? void 0 : _a.type) === 'scene-view-state'
-        ? { hex: resource.queries[0].id }
+      sceneViewStateId: ((_a = resource.subResource) === null || _a === void 0 ? void 0 : _a.type) === 'scene-view-state' &&
+        resource.subResource.id != null
+        ? { hex: resource.subResource.id }
+        : undefined,
+      sceneViewStateSuppliedId: ((_b = resource.subResource) === null || _b === void 0 ? void 0 : _b.type) === 'scene-view-state' &&
+        suppliedIdQuery != null
+        ? { value: suppliedIdQuery.id }
         : undefined,
     }));
     return {
@@ -2599,13 +2624,9 @@ const Viewer = class {
       (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.observe(this.containerElement);
     }
     if (this.src != null) {
-      try {
-        this.load(this.src);
-      }
-      catch (e) {
-        // Consumer cannot handle this error. Just log it.
+      this.load(this.src).catch((e) => {
         console.error('Error loading scene', e);
-      }
+      });
     }
     this.initializeDefaultInteractionHandlers();
     this.injectViewerApi();
@@ -2925,7 +2946,7 @@ const Viewer = class {
     this.connectionChange.emit(status);
   }
   handleElementResize(entries) {
-    const dimensionsHaveChanged = entries.length >= 0 &&
+    const dimensionsHaveChanged = entries.length > 0 &&
       this.dimensions != null &&
       !dimensions.isEqual(entries[0].contentRect, this.viewport);
     if (dimensionsHaveChanged) {
@@ -3104,6 +3125,7 @@ const Viewer = class {
   async initializeDefaultInteractionHandlers() {
     var _a;
     await this.initializeDefaultCameraInteractionHandlers();
+    await this.initializeDefaultTapInteractionHandler();
     this.initializeDefaultKeyboardInteractionHandlers();
     if (this.rotateAroundTapPoint) {
       (_a = this.baseInteractionHandler) === null || _a === void 0 ? void 0 : _a.setPrimaryInteractionType('rotate-point');
@@ -3126,32 +3148,25 @@ const Viewer = class {
     var _a, _b;
     this.clearDefaultCameraInteractionHandlers();
     if (this.cameraControls) {
-      // default to pointer events if allowed by browser.
       if (window.PointerEvent != null) {
-        const tapInteractionHandler = new TapInteractionHandler('pointerdown', 'pointerup', 'pointermove', () => this.getResolvedConfig());
         this.baseInteractionHandler =
           (_a = this.baseInteractionHandler) !== null && _a !== void 0 ? _a : new PointerInteractionHandler(() => this.getResolvedConfig());
         const baseDisposable = await this.registerInteractionHandler(this.baseInteractionHandler);
         const multiPointerDisposable = await this.registerInteractionHandler(new MultiPointerInteractionHandler());
-        const tapDisposable = await this.registerInteractionHandler(tapInteractionHandler);
         this.defaultInteractionHandlerDisposables = [
           baseDisposable,
           multiPointerDisposable,
-          tapDisposable,
         ];
       }
       else {
-        const tapInteractionHandler = new TapInteractionHandler('mousedown', 'mouseup', 'mousemove', () => this.getResolvedConfig());
         // fallback to touch events and mouse events as a default
         this.baseInteractionHandler =
           (_b = this.baseInteractionHandler) !== null && _b !== void 0 ? _b : new MouseInteractionHandler(() => this.getResolvedConfig());
         const baseDisposable = await this.registerInteractionHandler(this.baseInteractionHandler);
         const touchDisposable = await this.registerInteractionHandler(new TouchInteractionHandler());
-        const tapDisposable = await this.registerInteractionHandler(tapInteractionHandler);
         this.defaultInteractionHandlerDisposables = [
           baseDisposable,
           touchDisposable,
-          tapDisposable,
         ];
       }
     }
@@ -3168,6 +3183,18 @@ const Viewer = class {
       this.defaultTapKeyInteractions = [flyToPart, flyToPosition];
     }
   }
+  async initializeDefaultTapInteractionHandler() {
+    if (this.tapHandlerDisposable == null) {
+      if (window.PointerEvent != null) {
+        const tapInteractionHandler = new TapInteractionHandler('pointerdown', 'pointerup', 'pointermove', () => this.getResolvedConfig());
+        this.tapHandlerDisposable = await this.registerInteractionHandler(tapInteractionHandler);
+      }
+      else {
+        const tapInteractionHandler = new TapInteractionHandler('mousedown', 'mouseup', 'mousemove', () => this.getResolvedConfig());
+        this.tapHandlerDisposable = await this.registerInteractionHandler(tapInteractionHandler);
+      }
+    }
+  }
   initializeInteractionHandler(handler) {
     if (this.stateMap.interactionTarget == null) {
       throw new InteractionHandlerError('Cannot initialize interaction handler. Interaction target is undefined.');