@itwin/core-frontend 3.4.0-dev.8 → 3.5.0-dev.4

package/lib/esm/tools/ClipViewTool.js

@@ -32,7 +32,10 @@ export class ViewClipTool extends PrimitiveTool {
     /** @internal */
     isCompatibleViewport(vp, isSelectedViewChange) { return (super.isCompatibleViewport(vp, isSelectedViewChange) && undefined !== vp && vp.view.allow3dManipulations()); }
     /** @internal */
-    async onPostInstall() { await super.onPostInstall(); this.setupAndPromptForNextAction(); }
+    async onPostInstall() {
+        await super.onPostInstall();
+        this.setupAndPromptForNextAction();
+    }
     /** @internal */
     async onUnsuspend() { this.showPrompt(); }
     /** @internal */
@@ -42,7 +45,10 @@ export class ViewClipTool extends PrimitiveTool {
     /** @internal */
     setupAndPromptForNextAction() { this.showPrompt(); }
     /** @internal */
-    async onResetButtonUp(_ev) { await this.onReinitialize(); return EventHandled.No; }
+    async onResetButtonUp(_ev) {
+        await this.onReinitialize();
+        return EventHandled.No;
+    }
     /** @internal */
     static getPlaneInwardNormal(orientation, viewport) {
         const matrix = AccuDrawHintBuilder.getContextRotation(orientation, viewport);
@@ -602,8 +608,10 @@ export class ViewClipByShapeTool extends ViewClipTool {
         context.addDecorationFromBuilder(builderAccHid);
     }
     /** @internal */
-    async onMouseMotion(ev) { if (this._points.length > 0 && undefined !== ev.viewport)
-        ev.viewport.invalidateDecorations(); }
+    async onMouseMotion(ev) {
+        if (this._points.length > 0 && undefined !== ev.viewport)
+            ev.viewport.invalidateDecorations();
+    }
     /** @internal */
     async onDataButtonDown(ev) {
         if (undefined === this.targetView)
@@ -709,8 +717,10 @@ export class ViewClipByRangeTool extends ViewClipTool {
         context.addDecorationFromBuilder(builderAccHid);
     }
     /** @internal */
-    async onMouseMotion(ev) { if (undefined !== this._corner && undefined !== ev.viewport)
-        ev.viewport.invalidateDecorations(); }
+    async onMouseMotion(ev) {
+        if (undefined !== this._corner && undefined !== ev.viewport)
+            ev.viewport.invalidateDecorations();
+    }
     /** @internal */
     async onDataButtonDown(ev) {
         if (undefined === this.targetView)
@@ -771,8 +781,10 @@ export class ViewClipByElementTool extends ViewClipTool {
         await super.onPostInstall();
         if (undefined !== this.targetView && this.targetView.iModel.selectionSet.isActive) {
             let useSelection = true;
-            this.targetView.iModel.selectionSet.elements.forEach((val) => { if (Id64.isInvalid(val) || Id64.isTransient(val))
-                useSelection = false; });
+            this.targetView.iModel.selectionSet.elements.forEach((val) => {
+                if (Id64.isInvalid(val) || Id64.isTransient(val))
+                    useSelection = false;
+            });
             if (useSelection) {
                 await this.doClipToSelectedElements(this.targetView);
                 return;
@@ -787,21 +799,25 @@ export class ViewClipByElementTool extends ViewClipTool {
         await this.exitTool();
         return false;
     }
-    async doClipToElements(viewport, ids, alwaysUseRange = false) {
+    async doClipToElements(viewport, ids, alwaysUseRange = false, modelId) {
         try {
             const placements = await viewport.iModel.elements.getPlacements(ids, { type: viewport.view.is3d() ? "3d" : "2d" });
             if (0 === placements.length)
                 return false;
+            const displayTransform = modelId && 1 === placements.length ? viewport.view.computeDisplayTransform({ modelId, elementId: placements[0].elementId }) : undefined;
             const range = new Range3d();
             const transform = Transform.createIdentity();
             if (!alwaysUseRange && 1 === placements.length) {
                 const placement = placements[0];
                 range.setFrom(placement instanceof Placement2d ? Range3d.createRange2d(placement.bbox, 0) : placement.bbox);
                 transform.setFrom(placement.transform); // Use ElementAlignedBox for single selection...
+                displayTransform === null || displayTransform === void 0 ? void 0 : displayTransform.multiplyTransformTransform(transform, transform);
             }
             else {
                 for (const placement of placements)
                     range.extendRange(placement.calculateRange());
+                if (displayTransform)
+                    transform.setFrom(displayTransform);
             }
             if (range.isNull)
                 return false;
@@ -851,7 +867,7 @@ export class ViewClipByElementTool extends ViewClipTool {
         const hit = await IModelApp.locateManager.doLocate(new LocateResponse(), true, ev.point, ev.viewport, ev.inputSource);
         if (undefined === hit || !hit.isElementHit)
             return EventHandled.No;
-        return await this.doClipToElements(this.targetView, hit.sourceId, this._alwaysUseRange) ? EventHandled.Yes : EventHandled.No;
+        return await this.doClipToElements(this.targetView, hit.sourceId, this._alwaysUseRange, hit.modelId) ? EventHandled.Yes : EventHandled.No;
     }
 }
 ViewClipByElementTool.toolId = "ViewClip.ByElement";
@@ -1554,12 +1570,9 @@ export class ViewClipDecoration extends EditManipulator.HandleProvider {
             const transform = EditManipulator.HandleUtils.getArrowTransform(vp, anchorRay.origin, anchorRay.direction, sizeInches);
             if (undefined === transform)
                 continue;
-            const visPts = [];
-            for (const pt of shapePts)
-                visPts.push(pt.clone()); // deep copy because we're using a builder transform w/addLineString...
-            const hidPts = [];
-            for (const pt of shapePts)
-                hidPts.push(pt.clone());
+            // deep copy beecause we're using a builder transform w/addLineString...
+            const visPts = shapePts.map((pt) => pt.clone());
+            const hidPts = shapePts.map((pt) => pt.clone());
             const arrowVisBuilder = context.createGraphicBuilder(GraphicType.WorldOverlay, transform, this._controlIds[iFace]);
             const arrowHidBuilder = context.createGraphicBuilder(GraphicType.WorldDecoration, transform);
             const isSelected = this.iModel.selectionSet.has(this._controlIds[iFace]);