@colijnit/homedecorator 262.1.3 → 262.1.5

package/index.d.ts

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { OnDestroy, OnInit, TemplateRef, ChangeDetectorRef, PipeTransform, ElementRef, AfterViewInit, EventEmitter, OnChanges, SimpleChanges, Injector } from '@angular/core';
+import { OnDestroy, OnInit, TemplateRef, ChangeDetectorRef, Injector, PipeTransform, ElementRef, AfterViewInit, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
 import * as i7 from '@angular/material/icon';
 import { MatIconRegistry } from '@angular/material/icon';
 import { SafeHtml, EventManager, DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
@@ -31,10 +31,10 @@ import { ExternalSource } from '@colijnit/articleapi/build/model/external-source
 import { ArticleFullObject } from '@colijnit/articleapi/build/model/article-full-object';
 import { ArticleCategory } from '@colijnit/configuratorapi/build/model/article-category';
 import { ArticleFlat } from '@colijnit/articleapi/build/model/article-flat.bo';
-import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
 import { ExternalSourceArticleAddInterface } from '@colijnit/articleapi/build/interface/external-source-article-add.interface';
 import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
 import { ObjectConfiguration } from '@colijnit/ioneconnector/build/model/object-configuration';
+import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
 import { SelectorStructure } from '@colijnit/configuratorapi/build/model/selector-structure.bo';
 import * as i7$2 from '@colijnit/catalog';
 import { CatalogExternalSourcesService, FilterOrder, CatalogService, ExternalSourceViewmodel } from '@colijnit/catalog';
@@ -704,7 +704,7 @@ declare class HomedecoratorAppEventService {
     hideOutline: Subject<void>;
     objectMovingOrRotating: Subject<void>;
     addToCart: Subject<{
-        article: string | ArticleExtended;
+        article: string | ArticleFullObject;
         quantity: number;
     }>;
     addExternalSourceToCart: Subject<ExternalSourceArticleAddInterface>;
@@ -773,6 +773,7 @@ declare class HomedecoratorConnectorAdapterService implements OnDestroy {
     getDecosAsync(): Promise<DecoNode[]>;
     getAnswerPrices(): Promise<AnswerPrice[]>;
     getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: string, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
+    prepareArticleForCart(goodId: number, quantity?: number, shouldGetArticleTree?: boolean, showLoader?: boolean, instanceId?: string): Promise<ArticleFullObject | string>;
     setInstanceToConfigure(id: string): Promise<DataServiceResponseData>;
     selectAnswer(answer: Answer, userInput?: string): Promise<DataServiceResponseData>;
     cancelAnswer(getAnswersAndQuestion?: boolean): Promise<DataServiceResponseData>;
@@ -1229,7 +1230,7 @@ declare class HomedecoratorConnectorService implements OnDestroy {
     getInternalParameter(param: InternalParam): Promise<string>;
     getDefaultLanguage(upId: number): Promise<string>;
     googleTranslateEnabled(): Promise<boolean>;
-    getJsonConfiguredArticles(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: string, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<any>;
+    prepareArticleForCart(goodId: number, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: string): Promise<ArticleFullObject | string>;
     setInstance(id: string): Promise<DataServiceResponseData>;
     copyInstanceAndSaveOriginalConfiguration(instanceId: string, result: CustomFloorGroupResult): Promise<string>;
     copyInstanceAndLoseOriginalConfiguration(instanceId: string, result: CustomFloorGroupResult): Promise<string>;
@@ -1261,7 +1262,7 @@ declare class HomedecoratorConnectorService implements OnDestroy {
     private _isAllSelectionPublished;
     private _isAnswerPublished;
     private _preloadCachedImages;
-    addToCart(goodId: number, goodType: string, quantity: number, instanceId: string, externalSource: boolean): Promise<string>;
+    addToCart(goodId: number, goodType: string, quantity: number, instanceId: string, externalSource: boolean): Promise<ArticleFullObject | string>;
     handleAnswersReceived(): void;
     getGoogleTranslation(sourceLang: string, targetLang: string, list: string[]): Promise<string>;
     getExternalSourceFromId(externalSourceId: number): ExternalSource;
@@ -2960,6 +2961,7 @@ declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _sceneService;
     private _webWorkerService;
     private _configurationPresetLoadService;
+    private _injector;
     generalFilterOrders: FilterOrder[];
     purchaseFilterOrders: FilterOrder[];
     logisticsFilterOrders: FilterOrder[];
@@ -2982,7 +2984,7 @@ declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _settings;
     private _eventService;
     constructor(appService: HomedecoratorAppService, // don't remove this, needs to be created on a high level
-    controllerService: HomedecoratorConnectorService, appState: AppStateService, presetsService: PresetsService, screenAnalysis: ScreenSizeAnalysisService, _iconRegistry: MatIconRegistry, _domSanitizer: DomSanitizer, _messageService: MessageBusService, _homedecoratorService: HomedecoratorService, _parentEventService: HomedecoratorAppEventService, _ownEventService: HomedecoratorAppEventService, _integrationService: IntegrationService, _sceneService: SceneService, _webWorkerService: WebWorkerService, _configurationPresetLoadService: ConfigurationPresetLoadService);
+    controllerService: HomedecoratorConnectorService, appState: AppStateService, presetsService: PresetsService, screenAnalysis: ScreenSizeAnalysisService, _iconRegistry: MatIconRegistry, _domSanitizer: DomSanitizer, _messageService: MessageBusService, _homedecoratorService: HomedecoratorService, _parentEventService: HomedecoratorAppEventService, _ownEventService: HomedecoratorAppEventService, _integrationService: IntegrationService, _sceneService: SceneService, _webWorkerService: WebWorkerService, _configurationPresetLoadService: ConfigurationPresetLoadService, _injector: Injector);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     registerCustomIcons(): void;
@@ -2994,7 +2996,7 @@ declare class HomedecoratorComponent implements OnInit, OnDestroy {
     private _startWithPreset;
     private _setCommunication;
     private _initConnection;
-    static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorComponent, [null, null, null, null, null, null, null, null, null, { optional: true; skipSelf: true; }, { optional: true; self: true; }, null, null, null, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorComponent, [null, null, null, null, null, null, null, null, null, { optional: true; skipSelf: true; }, { optional: true; self: true; }, null, null, null, null, null]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<HomedecoratorComponent, "co-homedecorator", never, { "generalFilterOrders": { "alias": "generalFilterOrders"; "required": false; }; "purchaseFilterOrders": { "alias": "purchaseFilterOrders"; "required": false; }; "logisticsFilterOrders": { "alias": "logisticsFilterOrders"; "required": false; }; "initCommunication": { "alias": "initCommunication"; "required": false; }; "projectToLoad": { "alias": "projectToLoad"; "required": false; }; "shareButton": { "alias": "shareButton"; "required": false; }; "loadWithConfigurationPreset": { "alias": "loadWithConfigurationPreset"; "required": false; }; "settings": { "alias": "settings"; "required": false; }; }, {}, never, never, false, never>;
 }
 
@@ -4123,6 +4125,8 @@ declare class WallService implements OnDestroy {
     getAllInWallItems(): InWallItem[];
     getClosestWall(itemX: number, itemZ: number, ignoreVisible?: boolean): Wall;
     splitWall(wall: Wall, corner: Corner): void;
+    /** Picks the wall whose closest point (clamped to the segment) is nearest to (x, z). */
+    private _closestWallForPoint;
     updatePrevWall(wallId: string, prevWallId: string): void;
     updateNextWall(wallId: string, nextWallId: string): void;
     createNewWall(start: Corner, end: Corner, height: number, thickness: number, frontColor?: ColorRepresentation, backColor?: ColorRepresentation, frontTexture?: Texture, backTexture?: Texture): Wall;
@@ -4130,6 +4134,10 @@ declare class WallService implements OnDestroy {
     addCornersForIntersections(): void;
     mergeWithIntersected(corner: Corner): boolean;
     removeWall(wall: Wall): void;
+    /** Merges two collinear walls around a degree-2 corner into a single wall. */
+    joinCollinearWallsAt(corner: Corner): void;
+    /** True when the two walls are in line through 'corner' (angle ~180°). */
+    private _areCollinearThroughCorner;
     updateWallHeights(newHeight: number): void;
     resetRoomWalls(): void;
     updateWalls(): void;
@@ -6207,7 +6215,7 @@ declare class RenderService implements OnDestroy {
     private _appEventService;
     private _dictionaryService;
     renderImageChanged: BehaviorSubject<string>;
-    renderImageError: BehaviorSubject<string>;
+    renderImageError: Subject<string>;
     blenderRenderStarted: Subject<boolean>;
     renderUpdateImageChanged: BehaviorSubject<{
         image: string;
@@ -6552,6 +6560,7 @@ declare class FloorplanRenderService implements OnDestroy {
     removeTempWall(): void;
     private _clear;
     private _drawGrid;
+    private _drawBackground;
     private _drawRooms;
     private _pickDrawRoomId;
     private _drawWallsWithNoRoom;
@@ -6660,15 +6669,6 @@ declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     private _subs;
     private _selectedFloor;
     private _modeBeforeRightMouseMove;
-    private _diagramBackground;
-    private _diagramBackgroundScale;
-    private _diagramBackgroundCurrentScale;
-    private _diagramBackgroundHeight;
-    private _diagramBackgroundWidth;
-    private _diagramBackgroundActiveZoom;
-    private _diagramBackgroundAlpha;
-    private _showDiagramBackground;
-    private _diagramScale;
     private _cameraZoom;
     private _lastTouchPoint;
     private _readyToDraw;
@@ -6683,6 +6683,7 @@ declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     handleDecimalsChoice(decimals: number): void;
     draw(): void;
     private _requestDraw;
+    private _clearBackground;
     showStartMessage(): void;
     resizeView(): void;
     reset(): void;
@@ -6713,9 +6714,7 @@ declare class FloorplannerComponent implements AfterViewInit, OnDestroy {
     private _checkMoveWallOrCorner;
     private _moveSelectedCorner;
     private _moveSelectedWall;
-    private _drawBackground;
     private _handleWindowResize;
-    private _clear;
     private _updateWallPosition;
     private _scale;
     private _draw;
@@ -8046,8 +8045,6 @@ declare class UploadModelDialogComponent implements AfterViewInit {
 }
 
 declare class ModelUploaderComponent {
-    settingsService: HomedecoratorSettingsService;
-    private _messageService;
     fileUploadInput: ElementRef;
     fileUploaded: EventEmitter<UploadFileData>;
     file: File | null;
@@ -8056,7 +8053,6 @@ declare class ModelUploaderComponent {
     uploadError: string;
     private _maxFileSize;
     private _allowedFiles;
-    constructor(settingsService: HomedecoratorSettingsService, _messageService: MessageBusService);
     onChange(event: any): void;
     upload(fileExtension: string): Promise<void>;
     fileToArrayBuffer(file: File): Promise<ArrayBuffer>;
@@ -8782,8 +8778,8 @@ declare class DrawDialogComponent implements OnDestroy, OnInit, AfterViewInit {
     handleMouseMove(event: MouseEvent): void;
     handleMouseUp(event: MouseEvent): void;
     handleMouseLeave(event: MouseEvent): void;
-    clickingZoom(option: string): void;
     handleMouseWheel(event: WheelEvent): void;
+    handleContextMenu(event: MouseEvent): boolean;
     getEventLocation(e: any): {
         x: any;
         y: any;
@@ -9408,8 +9404,6 @@ declare class DialogModule {
 }
 
 declare class HomedecoratorModule {
-    private _injector;
-    constructor(_injector: Injector);
     static ɵfac: i0.ɵɵFactoryDeclaration<HomedecoratorModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<HomedecoratorModule, [typeof HomedecoratorComponent], [typeof i3.CommonModule, typeof ProgressBarModule, typeof LoadingOverlayModule, typeof HdLoaderModule, typeof ExportDialogModule, typeof InfoDialogModule, typeof PluginsModule, typeof DialogModule, typeof i10$2.A11yModule, typeof i25.ProductConfiguratorModule, typeof i6.CoreComponentsTranslationModule, typeof i25.LiteSelectorModule], [typeof HomedecoratorComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<HomedecoratorModule>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/homedecorator",
-  "version": "262.1.3",
+  "version": "262.1.5",
   "description": "Homedecorator application based on 262 version of iOne backend",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -10,14 +10,19 @@
     "@angular/common": ">=20.0.0",
     "@angular/core": ">=20.0.0",
     "@colijnit/catalog": ">=262.1.0",
-    "@colijnit/articleapi": ">=262.1.0",
+    "@colijnit/articleapi": ">=262.1.4",
     "@colijnit/configurator": ">=262.1.0",
     "@colijnit/configuratorapi": ">=262.1.0",
     "@colijnit/corecomponents_v12": ">=262.1.0",
     "@colijnit/ioneconnector": ">=262.1.3",
     "@colijnit/mainapi": ">=262.1.1",
     "@colijnit/relationapi": ">=262.1.0",
-    "@colijnit/transactionapi": ">=262.1.0"
+    "@colijnit/transactionapi": ">=262.1.0",
+    "@types/three": "0.178.1",
+    "three": "0.178.0",
+    "three-bvh-csg": "0.0.17",
+    "three-gpu-pathtracer": "0.0.22",
+    "three-mesh-bvh": "^0.9.9"
   },
   "dependencies": {
     "@tweenjs/tween.js": "^25.0.0",
@@ -34,10 +39,6 @@
     "polygon-tools": "^0.4.8",
     "postprocessing": "^6.36.1",
     "textdiff-patch": "^1.0.5",
-    "three": "^0.178.0",
-    "three-bvh-csg": "0.0.17",
-    "three-gpu-pathtracer": "0.0.22",
-    "three-mesh-bvh": "^0.9.9",
     "tslib": "^2.3.0"
   },
   "module": "fesm2022/colijnit-homedecorator.mjs",