@itwin/editor-frontend 4.0.0-dev.4 → 4.0.0-dev.41

package/lib/cjs/SolidPrimitiveTools.js

@@ -29,10 +29,9 @@ class SolidPrimitiveTool extends CreateElementTool_1.CreateElementWithDynamicsTo
         return EditTool_1.EditTools.startCommand({ commandId: editor_common_1.editorBuiltInCmdIds.cmdBasicManipulation, iModelKey: this.iModel.key });
     }
     getPlacementProps() {
-        var _a;
         if (undefined === this.current)
             return undefined;
-        const localToWorld = ("solid" === this.current.geometryCategory ? this.current.getConstructiveFrame() : core_geometry_1.FrameBuilder.createRightHandedFrame((_a = this.baseRotation) === null || _a === void 0 ? void 0 : _a.getColumn(2), this.current));
+        const localToWorld = ("solid" === this.current.geometryCategory ? this.current.getConstructiveFrame() : core_geometry_1.FrameBuilder.createRightHandedFrame(this.baseRotation?.getColumn(2), this.current));
         if (undefined === localToWorld)
             return undefined;
         const origin = localToWorld.getOrigin();
@@ -475,7 +474,6 @@ class CreateConeTool extends SolidPrimitiveTool {
         return (CreateConePhase.AcceptResult === this.createPhase);
     }
     async updateElementData(ev, isDynamics) {
-        var _a;
         const vp = this.targetView;
         if (undefined === vp)
             return;
@@ -546,7 +544,7 @@ class CreateConeTool extends SolidPrimitiveTool {
                 break;
             }
             case CreateConePhase.AcceptTopRadius: {
-                const cone = ("solid" === ((_a = this.current) === null || _a === void 0 ? void 0 : _a.geometryCategory) ? this.current : undefined);
+                const cone = ("solid" === this.current?.geometryCategory ? this.current : undefined);
                 if (undefined === cone)
                     break;
                 const vector0 = core_geometry_1.Vector3d.createStartEnd(cone.getCenterB(), pt2);
@@ -1161,14 +1159,13 @@ class ExtrudeCurveTool extends ModifyCurveTools_1.ModifyCurveTool {
         }
     }
     modifyCurve(ev, isAccept) {
-        var _a;
         if (undefined === ev.viewport || undefined === this.anchorPoint)
             return undefined;
-        const geom = (_a = this.curveData) === null || _a === void 0 ? void 0 : _a.geom;
+        const geom = this.curveData?.geom;
         if (undefined === geom)
             return undefined;
         const matrix = core_frontend_1.AccuDrawHintBuilder.getCurrentRotation(ev.viewport, true, true);
-        const localToWorld = core_geometry_1.FrameBuilder.createRightHandedFrame(matrix === null || matrix === void 0 ? void 0 : matrix.getColumn(2), geom);
+        const localToWorld = core_geometry_1.FrameBuilder.createRightHandedFrame(matrix?.getColumn(2), geom);
         if (undefined === localToWorld)
             return undefined;
         const spacePoint = this.orthogonal ? core_frontend_1.AccuDrawHintBuilder.projectPointToLineInView(ev.point, this.anchorPoint, localToWorld.matrix.getColumn(2), ev.viewport, true) : ev.point;
@@ -1192,15 +1189,14 @@ class ExtrudeCurveTool extends ModifyCurveTools_1.ModifyCurveTool {
         return !this.keepProfile;
     }
     setupAccuDraw() {
-        var _a;
         const hints = new core_frontend_1.AccuDrawHintBuilder();
         if (this.agenda.isEmpty) {
             hints.enableSmartRotation = true;
         }
         else if (undefined !== this.anchorPoint && undefined !== this.targetView) {
-            const geom = (_a = this.curveData) === null || _a === void 0 ? void 0 : _a.geom;
+            const geom = this.curveData?.geom;
             const matrix = core_frontend_1.AccuDrawHintBuilder.getCurrentRotation(this.targetView, true, true);
-            const localToWorld = core_geometry_1.FrameBuilder.createRightHandedFrame(matrix === null || matrix === void 0 ? void 0 : matrix.getColumn(2), geom);
+            const localToWorld = core_geometry_1.FrameBuilder.createRightHandedFrame(matrix?.getColumn(2), geom);
             hints.setModeRectangular();
             hints.setOrigin(this.anchorPoint);
             hints.setOriginFixed = true;
@@ -1281,10 +1277,9 @@ class RevolveCurveTool extends ModifyCurveTools_1.ModifyCurveTool {
         }
     }
     modifyCurve(ev, isAccept) {
-        var _a;
         if (undefined === ev.viewport || this.points.length < (isAccept ? 2 : 1))
             return undefined;
-        const geom = (_a = this.curveData) === null || _a === void 0 ? void 0 : _a.geom;
+        const geom = this.curveData?.geom;
         if (undefined === geom)
             return undefined;
         const direction = core_geometry_1.Vector3d.createStartEnd(this.points[0], isAccept ? this.points[1] : ev.point);
@@ -1295,13 +1290,13 @@ class RevolveCurveTool extends ModifyCurveTools_1.ModifyCurveTool {
         const contour = (geom instanceof core_geometry_1.CurvePrimitive) ? core_geometry_1.Path.create(geom) : geom;
         const sweep = core_geometry_1.RotationalSweep.create(contour, axis, angle, this.capped && contour.isAnyRegionType);
         // Detect a self-intersection...contour should not intersect axis of revolution...
-        const localToWorld = sweep === null || sweep === void 0 ? void 0 : sweep.getConstructiveFrame();
+        const localToWorld = sweep?.getConstructiveFrame();
         if (undefined === localToWorld)
             return undefined;
         const xVec = localToWorld.matrix.columnX(); // NOTE: Not always towards contour...
         const xAxis = core_geometry_1.Ray3d.create(localToWorld.getOrigin(), xVec);
         // Check parameter range of radial axis ray, if low is negative and high is positive reject result...
-        const paramRange = sweep === null || sweep === void 0 ? void 0 : sweep.getCurves().projectedParameterRange(xAxis);
+        const paramRange = sweep?.getCurves().projectedParameterRange(xAxis);
         if (undefined === paramRange || (paramRange.low < -core_geometry_1.Geometry.smallMetricDistanceSquared && paramRange.high > core_geometry_1.Geometry.smallMetricDistanceSquared))
             return undefined;
         return sweep;
@@ -1329,7 +1324,6 @@ class RevolveCurveTool extends ModifyCurveTools_1.ModifyCurveTool {
         return super.gatherInput(ev);
     }
     setupAccuDraw() {
-        var _a;
         const hints = new core_frontend_1.AccuDrawHintBuilder();
         if (this.agenda.isEmpty) {
             hints.enableSmartRotation = true;
@@ -1340,15 +1334,15 @@ class RevolveCurveTool extends ModifyCurveTools_1.ModifyCurveTool {
             hints.setLockZ = true;
         }
         else if (undefined !== this.anchorPoint && undefined !== this.targetView) {
-            const geom = (_a = this.curveData) === null || _a === void 0 ? void 0 : _a.geom;
-            const closeDetail = (geom instanceof core_geometry_1.CurvePrimitive) ? geom.closestPoint(this.anchorPoint, false) : geom === null || geom === void 0 ? void 0 : geom.closestPoint(this.anchorPoint);
-            if (undefined === (closeDetail === null || closeDetail === void 0 ? void 0 : closeDetail.curve))
+            const geom = this.curveData?.geom;
+            const closeDetail = (geom instanceof core_geometry_1.CurvePrimitive) ? geom.closestPoint(this.anchorPoint, false) : geom?.closestPoint(this.anchorPoint);
+            if (undefined === closeDetail?.curve)
                 return;
             const unitX = closeDetail.curve.fractionToPointAndUnitTangent(closeDetail.fraction).direction;
             if (undefined === unitX)
                 return;
             const matrix = core_frontend_1.AccuDrawHintBuilder.getCurrentRotation(this.targetView, true, true);
-            const localToWorld = core_geometry_1.FrameBuilder.createRightHandedFrame(matrix === null || matrix === void 0 ? void 0 : matrix.getColumn(2), geom);
+            const localToWorld = core_geometry_1.FrameBuilder.createRightHandedFrame(matrix?.getColumn(2), geom);
             if (undefined === localToWorld)
                 return;
             const unitZ = localToWorld.matrix.getColumn(2);