@colijnit/homedecorator 261.20.9 → 261.20.10

package/app/plugins/room-planner/components/floorplanner/floorplanner.component.scss

@@ -44,6 +44,8 @@ canvas {
 }
 
 .hint {
+  pointer-events: all;
+  cursor: pointer;
   position: absolute;
   bottom: 20px;
   left: 50%;

package/fesm2022/colijnit-homedecorator.mjs

@@ -23421,7 +23421,7 @@ class SceneEventService {
         this._eventService = _eventService;
         this._wallService = _wallService;
         this._configurationService = _configurationService;
-        this.intersectOffsetForWalls = 20;
+        this.intersectOffsetForWalls = 0.1;
         this.longTouchDuration = 600;
         this.rotateNoDrag = false;
         this._mousePosition = new Vector2();
@@ -23841,8 +23841,7 @@ class SceneEventService {
         const intersects = this._getIntersections(this._mousePosition, this._itemService.getObjectPlanes(), { onlyVisible: true, includeFloors: false });
         const wallIntersect = this._wallIntersection(this._mousePosition);
         // object intersection is prioritized
-        if (intersects.length > 0 &&
-            ((wallIntersect && wallIntersect.distance + this.intersectOffsetForWalls > intersects[0].distance) || !wallIntersect)) {
+        if (intersects.length > 0 && !this._behindWall(intersects[0], wallIntersect)) {
             this._toggleRotationHudIntersection(false);
             this._setIntersectedObject(intersects[0].object);
         }
@@ -23852,7 +23851,7 @@ class SceneEventService {
             if (snapperArea === null) {
                 // check if intersects with configurable floor
                 const floorIntersects = this._getIntersections(this._mousePosition, this._itemService.getObjectPlanes(), { onlyVisible: true, includeFloor: true, onlyConfigurableFloors: true });
-                if (floorIntersects.length > 0) {
+                if (floorIntersects.length > 0 && !this._behindWall(floorIntersects[0], wallIntersect)) {
                     this._toggleRotationHudIntersection(false);
                     this._setIntersectedObject(floorIntersects[0].object);
                 }
@@ -23869,6 +23868,9 @@ class SceneEventService {
             }
         }
     }
+    _behindWall(intersection, wallIntersection) {
+        return wallIntersection && intersection && wallIntersection.distance + this.intersectOffsetForWalls < intersection.distance;
+    }
     // returns the first intersection object
     _itemIntersection(vec2, item) {
         let intersections = null;
@@ -36502,7 +36504,7 @@ class FloorplannerComponent {
         this._resetDrawing();
         this._coordinatesService.resetViewScale();
         this.resizeView();
-        this._setDefaultMode();
+        this.setDefaultMode();
         this._coordinatesService.resetOrigin();
         this._requestDraw();
     }
@@ -36540,7 +36542,7 @@ class FloorplannerComponent {
         this.selectedMode = mode;
         // this.setMode(mode);
     }
-    _setDefaultMode() {
+    setDefaultMode() {
         this._resetDrawing();
         // this.setMode(this.selectedMode);
         this.modeService.resetToSelectedMode();
@@ -36563,6 +36565,7 @@ class FloorplannerComponent {
         this._mouseDownPosition.copy(RelativePositionUtils.GetClientMousePosition(event));
         const hasActive = this._activeWall || this._activeCorner || this._activeItem;
         if (event.button === 2) {
+            this.setDefaultMode();
             this._modeBeforeRightMouseMove = this.mode;
             this.mode = FloorplannerMode.CameraMoving;
             return;
@@ -36619,7 +36622,7 @@ class FloorplannerComponent {
         // detect mouseClick
         if (!this._hasMouseMoved(event)) {
             if (this._mouseClickHandled(event)) {
-                this._setDefaultMode();
+                this.setDefaultMode();
             }
         }
         // moving
@@ -36637,7 +36640,7 @@ class FloorplannerComponent {
                 this.mode = this._modeBeforeRightMouseMove;
             }
             else {
-                this._setDefaultMode();
+                this.setDefaultMode();
             }
         }
         this._requestDraw();
@@ -36664,7 +36667,7 @@ class FloorplannerComponent {
             this._handleDrawingMouseUp();
         }
         if (this.mode === FloorplannerMode.CameraMove || this.mode === FloorplannerMode.CameraMoving) {
-            this._setDefaultMode();
+            this.setDefaultMode();
         }
         this._requestDraw();
     }
@@ -36802,7 +36805,7 @@ class FloorplannerComponent {
         // end panning
         if (this.mode === FloorplannerMode.CameraMove ||
             this.mode === FloorplannerMode.CameraMoving) {
-            this._setDefaultMode();
+            this.setDefaultMode();
         }
     }
     handleTouchEnd(event) {
@@ -36813,7 +36816,7 @@ class FloorplannerComponent {
             // end panning
             if (this.mode === FloorplannerMode.CameraMove ||
                 this.mode === FloorplannerMode.CameraMoving) {
-                this._setDefaultMode();
+                this.setDefaultMode();
             }
         }
     }
@@ -36858,7 +36861,7 @@ class FloorplannerComponent {
         switch (event.keyCode) {
             case Key.Esc:
             case Key.Space:
-                this._setDefaultMode();
+                this.setDefaultMode();
                 break;
             case Key.Delete:
                 this._removeWall();
@@ -37036,7 +37039,7 @@ class FloorplannerComponent {
             else {
                 this._selectFloor(event, this._bluePrintService.overlappedFloor(this._mouseX, this._mouseY));
             }
-            this._setDefaultMode();
+            this.setDefaultMode();
             return true;
         }
         this._unselect();
@@ -37058,7 +37061,7 @@ class FloorplannerComponent {
     }
     _selectWall(event, wall) {
         this._selectedWall = wall;
-        this.selectedWallChange.next({ event: event, wall: this._selectedWall });
+        this.selectedWallChange.next({ event: event, wall: this._selectedWall, front: true });
         this._requestDraw();
     }
     _selectCorner(event, corner) {
@@ -37083,7 +37086,7 @@ class FloorplannerComponent {
         if (this._lastMouseUpTimestamp &&
             currentTimestamp < this._lastMouseUpTimestamp + doubleClickDurationMs) {
             this._lastMouseUpTimestamp = null;
-            this._setDefaultMode();
+            this.setDefaultMode();
         }
         else {
             this._lastMouseUpTimestamp = currentTimestamp;
@@ -37136,7 +37139,7 @@ class FloorplannerComponent {
         }
         const newNumRooms = this._bluePrintService.getRooms() ? this._bluePrintService.getRooms().length : 0;
         if (newNumRooms > prevNumRooms) {
-            this._setDefaultMode();
+            this.setDefaultMode();
         }
         else {
             this._lastNode = corner;
@@ -37298,7 +37301,7 @@ class FloorplannerComponent {
         </mat-button-toggle>
       </div>
       @if (mode === floorplannerMode.Drawing) {
-        <div class="hint" (click)="changeFloorplannerMode(floorplannerMode.Draw)">
+        <div class="hint" (click)="setDefaultMode()">
           {{ 'CLICK_HERE_TO_EXIT_DRAWING_MODE_OR_PRESS_THE_ESC_KEY' | localize }}
         </div>
       }
@@ -37308,7 +37311,7 @@ class FloorplannerComponent {
           {{ 'TAB_ANYWHERE_TO_START' | localize }}
         </div>
       }
-      `, isInline: true, styles: [":host{display:flex;height:100%;width:100%;background:#fff}:host.hidden{visibility:hidden}canvas{width:inherit;height:inherit}.controls-top{pointer-events:none;position:absolute;top:80px;width:100%;display:flex;align-items:center;justify-content:center}.controls-top:not(.disable-mouse)>*{pointer-events:all;margin:0 3px}.controls-top:not(.disable-mouse)>* .mdc-floating-label,.controls-top:not(.disable-mouse)>*.dimensioning-select,.controls-top:not(.disable-mouse)>*.round-select{pointer-events:all}.controls-top .mat-mdc-floating-label.mdc-floating-label{pointer-events:none!important}.controls-top .dimensioning-select,.controls-top .round-select{pointer-events:none;height:38px;width:70px;padding:5px;border:solid 1px rgba(0,0,0,.12);border-radius:3px;background:#fff}.hint{position:absolute;bottom:20px;left:50%;margin-left:-200px;padding:10px 20px;background:#74b77f;border:1px solid #cccccc;border-radius:3px;text-align:center}.mat-button-toggle-checked{color:#fff;background-color:#da9803}.mat-button-toggle-checked co-icon ::ng-deep svg{fill:#fff}.mat-button-toggle-checked co-icon ::ng-deep [fill]{fill:#fff}.mat-button-toggle ::ng-deep .mat-button-toggle-label-content{width:48px;height:48px;display:flex;align-items:center;justify-content:center;padding:0}.mat-button-toggle ::ng-deep co-icon ::ng-deep{width:24px;height:24px}\n"], dependencies: [{ kind: "directive", type: i10.MatButtonToggleGroup, selector: "mat-button-toggle-group", inputs: ["appearance", "name", "vertical", "value", "multiple", "disabled", "disabledInteractive", "hideSingleSelectionIndicator", "hideMultipleSelectionIndicator"], outputs: ["valueChange", "change"], exportAs: ["matButtonToggleGroup"] }, { kind: "component", type: i10.MatButtonToggle, selector: "mat-button-toggle", inputs: ["aria-label", "aria-labelledby", "id", "name", "value", "tabIndex", "disableRipple", "appearance", "checked", "disabled", "disabledInteractive"], outputs: ["change"], exportAs: ["matButtonToggle"] }, { kind: "component", type: i2$3.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i2$3.MatLabel, selector: "mat-label" }, { kind: "component", type: i12.MatSelect, selector: "mat-select", inputs: ["aria-describedby", "panelClass", "disabled", "disableRipple", "tabIndex", "hideSingleSelectionIndicator", "placeholder", "required", "multiple", "disableOptionCentering", "compareWith", "value", "aria-label", "aria-labelledby", "errorStateMatcher", "typeaheadDebounceInterval", "sortComparator", "id", "panelWidth", "canSelectNullableOptions"], outputs: ["openedChange", "opened", "closed", "selectionChange", "valueChange"], exportAs: ["matSelect"] }, { kind: "component", type: i12.MatOption, selector: "mat-option", inputs: ["value", "id", "disabled"], outputs: ["onSelectionChange"], exportAs: ["matOption"] }, { kind: "directive", type: i4.MatTooltip, selector: "[matTooltip]", inputs: ["matTooltipPosition", "matTooltipPositionAtOrigin", "matTooltipDisabled", "matTooltipShowDelay", "matTooltipHideDelay", "matTooltipTouchGestures", "matTooltip", "matTooltipClass"], exportAs: ["matTooltip"] }, { kind: "component", type: i5.IconComponent, selector: "co-icon", inputs: ["icon", "iconData"] }, { kind: "component", type: WallLengthInputComponent, selector: "wall-length-input" }, { kind: "pipe", type: LocalizePipe, name: "localize" }] }); }
+      `, isInline: true, styles: [":host{display:flex;height:100%;width:100%;background:#fff}:host.hidden{visibility:hidden}canvas{width:inherit;height:inherit}.controls-top{pointer-events:none;position:absolute;top:80px;width:100%;display:flex;align-items:center;justify-content:center}.controls-top:not(.disable-mouse)>*{pointer-events:all;margin:0 3px}.controls-top:not(.disable-mouse)>* .mdc-floating-label,.controls-top:not(.disable-mouse)>*.dimensioning-select,.controls-top:not(.disable-mouse)>*.round-select{pointer-events:all}.controls-top .mat-mdc-floating-label.mdc-floating-label{pointer-events:none!important}.controls-top .dimensioning-select,.controls-top .round-select{pointer-events:none;height:38px;width:70px;padding:5px;border:solid 1px rgba(0,0,0,.12);border-radius:3px;background:#fff}.hint{pointer-events:all;cursor:pointer;position:absolute;bottom:20px;left:50%;margin-left:-200px;padding:10px 20px;background:#74b77f;border:1px solid #cccccc;border-radius:3px;text-align:center}.mat-button-toggle-checked{color:#fff;background-color:#da9803}.mat-button-toggle-checked co-icon ::ng-deep svg{fill:#fff}.mat-button-toggle-checked co-icon ::ng-deep [fill]{fill:#fff}.mat-button-toggle ::ng-deep .mat-button-toggle-label-content{width:48px;height:48px;display:flex;align-items:center;justify-content:center;padding:0}.mat-button-toggle ::ng-deep co-icon ::ng-deep{width:24px;height:24px}\n"], dependencies: [{ kind: "directive", type: i10.MatButtonToggleGroup, selector: "mat-button-toggle-group", inputs: ["appearance", "name", "vertical", "value", "multiple", "disabled", "disabledInteractive", "hideSingleSelectionIndicator", "hideMultipleSelectionIndicator"], outputs: ["valueChange", "change"], exportAs: ["matButtonToggleGroup"] }, { kind: "component", type: i10.MatButtonToggle, selector: "mat-button-toggle", inputs: ["aria-label", "aria-labelledby", "id", "name", "value", "tabIndex", "disableRipple", "appearance", "checked", "disabled", "disabledInteractive"], outputs: ["change"], exportAs: ["matButtonToggle"] }, { kind: "component", type: i2$3.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i2$3.MatLabel, selector: "mat-label" }, { kind: "component", type: i12.MatSelect, selector: "mat-select", inputs: ["aria-describedby", "panelClass", "disabled", "disableRipple", "tabIndex", "hideSingleSelectionIndicator", "placeholder", "required", "multiple", "disableOptionCentering", "compareWith", "value", "aria-label", "aria-labelledby", "errorStateMatcher", "typeaheadDebounceInterval", "sortComparator", "id", "panelWidth", "canSelectNullableOptions"], outputs: ["openedChange", "opened", "closed", "selectionChange", "valueChange"], exportAs: ["matSelect"] }, { kind: "component", type: i12.MatOption, selector: "mat-option", inputs: ["value", "id", "disabled"], outputs: ["onSelectionChange"], exportAs: ["matOption"] }, { kind: "directive", type: i4.MatTooltip, selector: "[matTooltip]", inputs: ["matTooltipPosition", "matTooltipPositionAtOrigin", "matTooltipDisabled", "matTooltipShowDelay", "matTooltipHideDelay", "matTooltipTouchGestures", "matTooltip", "matTooltipClass"], exportAs: ["matTooltip"] }, { kind: "component", type: i5.IconComponent, selector: "co-icon", inputs: ["icon", "iconData"] }, { kind: "component", type: WallLengthInputComponent, selector: "wall-length-input" }, { kind: "pipe", type: LocalizePipe, name: "localize" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: FloorplannerComponent, decorators: [{
             type: Component,
@@ -37371,7 +37374,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         </mat-button-toggle>
       </div>
       @if (mode === floorplannerMode.Drawing) {
-        <div class="hint" (click)="changeFloorplannerMode(floorplannerMode.Draw)">
+        <div class="hint" (click)="setDefaultMode()">
           {{ 'CLICK_HERE_TO_EXIT_DRAWING_MODE_OR_PRESS_THE_ESC_KEY' | localize }}
         </div>
       }
@@ -37381,7 +37384,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           {{ 'TAB_ANYWHERE_TO_START' | localize }}
         </div>
       }
-      `, standalone: false, styles: [":host{display:flex;height:100%;width:100%;background:#fff}:host.hidden{visibility:hidden}canvas{width:inherit;height:inherit}.controls-top{pointer-events:none;position:absolute;top:80px;width:100%;display:flex;align-items:center;justify-content:center}.controls-top:not(.disable-mouse)>*{pointer-events:all;margin:0 3px}.controls-top:not(.disable-mouse)>* .mdc-floating-label,.controls-top:not(.disable-mouse)>*.dimensioning-select,.controls-top:not(.disable-mouse)>*.round-select{pointer-events:all}.controls-top .mat-mdc-floating-label.mdc-floating-label{pointer-events:none!important}.controls-top .dimensioning-select,.controls-top .round-select{pointer-events:none;height:38px;width:70px;padding:5px;border:solid 1px rgba(0,0,0,.12);border-radius:3px;background:#fff}.hint{position:absolute;bottom:20px;left:50%;margin-left:-200px;padding:10px 20px;background:#74b77f;border:1px solid #cccccc;border-radius:3px;text-align:center}.mat-button-toggle-checked{color:#fff;background-color:#da9803}.mat-button-toggle-checked co-icon ::ng-deep svg{fill:#fff}.mat-button-toggle-checked co-icon ::ng-deep [fill]{fill:#fff}.mat-button-toggle ::ng-deep .mat-button-toggle-label-content{width:48px;height:48px;display:flex;align-items:center;justify-content:center;padding:0}.mat-button-toggle ::ng-deep co-icon ::ng-deep{width:24px;height:24px}\n"] }]
+      `, standalone: false, styles: [":host{display:flex;height:100%;width:100%;background:#fff}:host.hidden{visibility:hidden}canvas{width:inherit;height:inherit}.controls-top{pointer-events:none;position:absolute;top:80px;width:100%;display:flex;align-items:center;justify-content:center}.controls-top:not(.disable-mouse)>*{pointer-events:all;margin:0 3px}.controls-top:not(.disable-mouse)>* .mdc-floating-label,.controls-top:not(.disable-mouse)>*.dimensioning-select,.controls-top:not(.disable-mouse)>*.round-select{pointer-events:all}.controls-top .mat-mdc-floating-label.mdc-floating-label{pointer-events:none!important}.controls-top .dimensioning-select,.controls-top .round-select{pointer-events:none;height:38px;width:70px;padding:5px;border:solid 1px rgba(0,0,0,.12);border-radius:3px;background:#fff}.hint{pointer-events:all;cursor:pointer;position:absolute;bottom:20px;left:50%;margin-left:-200px;padding:10px 20px;background:#74b77f;border:1px solid #cccccc;border-radius:3px;text-align:center}.mat-button-toggle-checked{color:#fff;background-color:#da9803}.mat-button-toggle-checked co-icon ::ng-deep svg{fill:#fff}.mat-button-toggle-checked co-icon ::ng-deep [fill]{fill:#fff}.mat-button-toggle ::ng-deep .mat-button-toggle-label-content{width:48px;height:48px;display:flex;align-items:center;justify-content:center;padding:0}.mat-button-toggle ::ng-deep co-icon ::ng-deep{width:24px;height:24px}\n"] }]
         }], ctorParameters: () => [{ type: HomedecoratorIconCacheService }, { type: FloorplanModeService }, { type: MessageBusService }, { type: ConfigurationService }, { type: ViewModeService }, { type: BluePrintService }, { type: HomedecoratorSettingsService }, { type: FloorplanCoordinatesService }, { type: FloorplanRenderService }], propDecorators: { canvasElement: [{
                 type: ViewChild,
                 args: ['floorplannerCanvas', { read: ElementRef, static: true }]
@@ -38478,12 +38481,7 @@ class TextureEditorComponent {
     }
     async initializeTexture() {
         let texture;
-        if (this.texturePlane && this.texturePlane.getTexture() !== undefined) {
-            texture = this.texturePlane.getTexture();
-        }
-        else {
-            texture = this.plainTexture;
-        }
+        texture = this.texturePlane ? this.texturePlane : this.plainTexture;
         if (texture) {
             await this._loadTextureData(texture, false);
         }
@@ -39840,8 +39838,8 @@ class AppearanceSectionComponent {
         this.selectedTabIndex = index;
     }
     loadTexture() {
-        const texture = this.texturePlane ? this.texturePlane.getTexture() : this.plainTexture;
-        const color = this.texturePlane ? this.texturePlane.getColor() : this.color;
+        const texture = this.texturePlane ? this.texturePlane : this.plainTexture;
+        const color = this.texturePlane && this.texturePlane.color ? parseInt(this.texturePlane.color, 0) : this.color;
         this.updateColor(color, { update3d: false });
         this.updateTexture(texture, { update3d: false });
     }
@@ -39877,8 +39875,8 @@ class AppearanceSectionComponent {
             this.texture = texture;
             if (update3d) {
                 this.setTexture.emit(this.texture);
-                if (this.texturePlane) {
-                    this.color = this.texturePlane.getColor();
+                if (this.texturePlane && this.texturePlane.color) {
+                    this.color = parseInt(this.texturePlane.color, 0);
                 }
             }
         }
@@ -39889,8 +39887,8 @@ class AppearanceSectionComponent {
         this.texture = null;
         if (update3d) {
             this.setTexture.emit(this.texture);
-            if (this.texturePlane) {
-                this.color = this.texturePlane.getColor();
+            if (this.texturePlane && this.texturePlane.color) {
+                this.color = parseInt(this.texturePlane.color, 0);
             }
         }
     }