@colijnit/inphoto 300.1.8 → 300.1.9

package/index.d.ts

@@ -22,9 +22,9 @@ import { ExternalSourceArticleClickInterface } from '@colijnit/articleapi/build/
 import { SafeHtml, DomSanitizer } from '@angular/platform-browser';
 import { Font } from 'three/examples/jsm/loaders/FontLoader.js';
 import * as i2 from '@colijnit/corecomponents_v12';
-import * as i2$1 from '@angular/forms';
+import * as i4 from '@angular/forms';
 import * as i7 from '@angular/cdk/drag-drop';
-import * as i4 from '@angular/common';
+import * as i4$1 from '@angular/common';
 import * as i5 from '@colijnit/utilities';
 
 declare class InphotoDictionaryService {
@@ -792,7 +792,7 @@ declare class EditCanvasComponent implements AfterViewInit {
 
 declare class EditCanvasModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<EditCanvasModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<EditCanvasModule, [typeof EditCanvasComponent], [typeof i2$1.FormsModule, typeof i2.IconModule, typeof i2.ButtonModule, typeof i2.InputTextModule], [typeof EditCanvasComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<EditCanvasModule, [typeof EditCanvasComponent], [typeof i2.IconModule], [typeof EditCanvasComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<EditCanvasModule>;
 }
 
@@ -818,18 +818,15 @@ interface MaskImageColorInterface {
     color: ColorPalette;
 }
 
-declare class PromptWithImages extends Prompt {
-    imageData: ImageData[];
-}
-
 declare class ImageEnhancer {
     iconService: InphotoIconCacheService;
     dataService: InphotoDataService;
     private _appEventService;
     readonly icons: typeof Icon;
     showClass(): boolean;
-    selectedStyle: EventEmitter<EnhanceStyle>;
-    createPromptWithImages: EventEmitter<PromptWithImages>;
+    canvasImage: string;
+    generateStarted: EventEmitter<void>;
+    imageGenerated: EventEmitter<string>;
     backButtonClicked: EventEmitter<void>;
     changeMarkerColor: EventEmitter<MaskImageColorInterface>;
     prompt: string;
@@ -838,14 +835,14 @@ declare class ImageEnhancer {
     collapsed: boolean;
     constructor(iconService: InphotoIconCacheService, dataService: InphotoDataService, _appEventService: InphotoEventService);
     setTab(index: number): void;
-    handlePromptWithImages(event: PromptWithImages): void;
-    handleStylePrompt(event: EnhanceStyle): void;
+    handleGenerateStarted(): void;
+    handleImageGenerated(image: string): void;
     handleBackClicked(): void;
     handleChangeMarkerColor(data: MaskImageColorInterface): void;
     closeDialog(): void;
     openDialog(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ImageEnhancer, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ImageEnhancer, "co-image-enhancer", never, {}, { "selectedStyle": "selectedStyle"; "createPromptWithImages": "createPromptWithImages"; "backButtonClicked": "backButtonClicked"; "changeMarkerColor": "changeMarkerColor"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ImageEnhancer, "co-image-enhancer", never, { "canvasImage": { "alias": "canvasImage"; "required": false; }; }, { "generateStarted": "generateStarted"; "imageGenerated": "imageGenerated"; "backButtonClicked": "backButtonClicked"; "changeMarkerColor": "changeMarkerColor"; }, never, never, false, never>;
 }
 
 declare enum FileTypes {
@@ -902,9 +899,14 @@ declare class ImageEnhancerStyleComponent implements OnInit {
     connectorService: InPhotoConnectorService;
     iconCacheService: InphotoIconCacheService;
     private _changeDetection;
+    private _eventService;
     readonly icons: typeof Icon;
     get showClass(): boolean;
-    prompt: EventEmitter<EnhanceStyle>;
+    canvasImage: string;
+    showInstructionTexts: boolean;
+    showResetButton: boolean;
+    generateStarted: EventEmitter<void>;
+    imageGenerated: EventEmitter<string>;
     backButtonClicked: EventEmitter<void>;
     customPrompt: string;
     customPromptMode: PromptStyle;
@@ -917,15 +919,16 @@ declare class ImageEnhancerStyleComponent implements OnInit {
     modeCollection: DecorationStyle[];
     selectedDecorationStyle: DecorationStyle;
     decorationStyleCollection: DecorationStyle[];
-    constructor(connectorService: InPhotoConnectorService, iconCacheService: InphotoIconCacheService, _changeDetection: ChangeDetectorRef);
+    constructor(connectorService: InPhotoConnectorService, iconCacheService: InphotoIconCacheService, _changeDetection: ChangeDetectorRef, _eventService: InphotoEventService);
     ngOnInit(): Promise<void>;
     handleChangeRoomType(event: DecorationStyle): void;
     handleChangeMode(event: DecorationStyle): void;
     handleChangeStyle(event: DecorationStyle): void;
     handleGenerateClicked(): void;
+    handleStyleSelection(event: EnhanceStyle): void;
     handleBackClicked(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ImageEnhancerStyleComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ImageEnhancerStyleComponent, "co-image-enhancer-style", never, {}, { "prompt": "prompt"; "backButtonClicked": "backButtonClicked"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ImageEnhancerStyleComponent, "co-image-enhancer-style", never, { "canvasImage": { "alias": "canvasImage"; "required": false; }; "showInstructionTexts": { "alias": "showInstructionTexts"; "required": false; }; "showResetButton": { "alias": "showResetButton"; "required": false; }; }, { "generateStarted": "generateStarted"; "imageGenerated": "imageGenerated"; "backButtonClicked": "backButtonClicked"; }, never, never, false, never>;
 }
 
 declare class AiPromptComponent {
@@ -950,7 +953,7 @@ declare class AiPromptComponent {
 
 declare class AiPromptModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AiPromptModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AiPromptModule, [typeof AiPromptComponent], [typeof i2.InputTextareaModule, typeof PipeModule, typeof i2$1.FormsModule], [typeof AiPromptComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AiPromptModule, [typeof AiPromptComponent], [typeof i2.InputTextareaModule, typeof PipeModule, typeof i4.FormsModule], [typeof AiPromptComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AiPromptModule>;
 }
 
@@ -960,13 +963,20 @@ declare class ImageEnhancerStyleModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<ImageEnhancerStyleModule>;
 }
 
+declare class PromptWithImages extends Prompt {
+    imageData: ImageData[];
+}
+
 declare class ImageEnhancerUploadComponent {
     dataService: InphotoDataService;
     iconCacheService: InphotoIconCacheService;
+    private _connectorService;
     readonly FileTypes: typeof FileTypes;
     readonly icons: typeof Icon;
     multiUpload: boolean;
-    prompt: EventEmitter<PromptWithImages>;
+    canvasImage: string;
+    generateStarted: EventEmitter<void>;
+    imageGenerated: EventEmitter<string>;
     backButtonClicked: EventEmitter<void>;
     changeMarkerColor: EventEmitter<MaskImageColorInterface>;
     showClass(): boolean;
@@ -974,15 +984,16 @@ declare class ImageEnhancerUploadComponent {
     customPrompt: string;
     customPromptMode: PromptStyle;
     showInputError: boolean;
-    constructor(dataService: InphotoDataService, iconCacheService: InphotoIconCacheService);
+    constructor(dataService: InphotoDataService, iconCacheService: InphotoIconCacheService, _connectorService: InPhotoConnectorService);
     handleImageUpload(event: File[]): void;
     handleGenerateClicked(): void;
+    handleCreatePromptWithImages(event: PromptWithImages): void;
     handleBackClicked(): void;
     handleDeleteImage(image: ImageData): void;
     handleDeleteMask(data: ImageData): void;
     handleChangeMarkerColor(color: ColorPalette, data: ImageData): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ImageEnhancerUploadComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ImageEnhancerUploadComponent, "co-image-enhancer-upload", never, { "multiUpload": { "alias": "multiUpload"; "required": false; }; }, { "prompt": "prompt"; "backButtonClicked": "backButtonClicked"; "changeMarkerColor": "changeMarkerColor"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ImageEnhancerUploadComponent, "co-image-enhancer-upload", never, { "multiUpload": { "alias": "multiUpload"; "required": false; }; "canvasImage": { "alias": "canvasImage"; "required": false; }; }, { "generateStarted": "generateStarted"; "imageGenerated": "imageGenerated"; "backButtonClicked": "backButtonClicked"; "changeMarkerColor": "changeMarkerColor"; }, never, never, false, never>;
 }
 
 declare class ImageTileComponent {
@@ -1162,6 +1173,7 @@ declare class PhotoEditorComponent implements OnDestroy {
     showClass(): boolean;
     set image(value: string);
     get image(): string;
+    get canvasImage(): string;
     resetButtonClicked: EventEmitter<void>;
     handleStart3D: EventEmitter<SceneBuildObject>;
     startSegmentation: EventEmitter<string>;
@@ -1180,8 +1192,8 @@ declare class PhotoEditorComponent implements OnDestroy {
     toggleEraseMode(state: boolean): void;
     toggleDragMode(value: boolean): void;
     handleChangeBrushSize(size: number): void;
-    handleCreatePromptWithImages(event: PromptWithImages): void;
-    handleStyleSelection(event: EnhanceStyle): void;
+    handleGenerateStarted(): void;
+    handleImageGenerated(image: string): void;
     handleSetImageFromHistory(event: string): void;
     handleEditIn3DFromHistory(image: string): void;
     handleRemoveObjectsFromHistory(image: string): void;
@@ -1226,7 +1238,7 @@ declare class ProcessLoaderComponent implements OnDestroy {
 
 declare class ProcessLoaderModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<ProcessLoaderModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<ProcessLoaderModule, [typeof ProcessLoaderComponent], [typeof i2.LoaderModule, typeof PipeModule, typeof i4.DecimalPipe, typeof i5.UtilitiesPipesModule, typeof i2.IconModule], [typeof ProcessLoaderComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<ProcessLoaderModule, [typeof ProcessLoaderComponent], [typeof i2.LoaderModule, typeof PipeModule, typeof i4$1.DecimalPipe, typeof i5.UtilitiesPipesModule, typeof i2.IconModule], [typeof ProcessLoaderComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<ProcessLoaderModule>;
 }
 
@@ -1252,6 +1264,14 @@ declare class CanvasToolBarComponent {
     changeEraseMode: EventEmitter<boolean>;
     changeDragMode: EventEmitter<boolean>;
     changeBrushSize: EventEmitter<number>;
+    changeZoomIn: EventEmitter<void>;
+    changeZoomOut: EventEmitter<void>;
+    changeZoomInput: EventEmitter<Event>;
+    zoomPercent: number;
+    minZoomPercent: number;
+    maxZoomPercent: number;
+    canZoomIn: boolean;
+    canZoomOut: boolean;
     showBrushSize: boolean;
     private _canvasInpaintMode;
     private _canvasEraseMode;
@@ -1262,13 +1282,16 @@ declare class CanvasToolBarComponent {
     selectEraser(): void;
     toggleDragMode(): void;
     onBrushSizeChange(event: Event): void;
+    zoomIn(): void;
+    zoomOut(): void;
+    onZoomInput(event: Event): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<CanvasToolBarComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<CanvasToolBarComponent, "co-canvas-tool-bar", never, { "canvasInpaintMode": { "alias": "canvasInpaintMode"; "required": false; }; "canvasEraseMode": { "alias": "canvasEraseMode"; "required": false; }; "canvasDragMode": { "alias": "canvasDragMode"; "required": false; }; "brushSize": { "alias": "brushSize"; "required": false; }; "title": { "alias": "title"; "required": false; }; "dragBoundary": { "alias": "dragBoundary"; "required": false; }; "minBrushSize": { "alias": "minBrushSize"; "required": false; }; "maxBrushSize": { "alias": "maxBrushSize"; "required": false; }; "brushSizeStep": { "alias": "brushSizeStep"; "required": false; }; }, { "changeEraseMode": "changeEraseMode"; "changeDragMode": "changeDragMode"; "changeBrushSize": "changeBrushSize"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<CanvasToolBarComponent, "co-canvas-tool-bar", never, { "canvasInpaintMode": { "alias": "canvasInpaintMode"; "required": false; }; "canvasEraseMode": { "alias": "canvasEraseMode"; "required": false; }; "canvasDragMode": { "alias": "canvasDragMode"; "required": false; }; "brushSize": { "alias": "brushSize"; "required": false; }; "title": { "alias": "title"; "required": false; }; "dragBoundary": { "alias": "dragBoundary"; "required": false; }; "minBrushSize": { "alias": "minBrushSize"; "required": false; }; "maxBrushSize": { "alias": "maxBrushSize"; "required": false; }; "brushSizeStep": { "alias": "brushSizeStep"; "required": false; }; "zoomPercent": { "alias": "zoomPercent"; "required": false; }; "minZoomPercent": { "alias": "minZoomPercent"; "required": false; }; "maxZoomPercent": { "alias": "maxZoomPercent"; "required": false; }; "canZoomIn": { "alias": "canZoomIn"; "required": false; }; "canZoomOut": { "alias": "canZoomOut"; "required": false; }; }, { "changeEraseMode": "changeEraseMode"; "changeDragMode": "changeDragMode"; "changeBrushSize": "changeBrushSize"; "changeZoomIn": "changeZoomIn"; "changeZoomOut": "changeZoomOut"; "changeZoomInput": "changeZoomInput"; }, never, never, false, never>;
 }
 
 declare class CanvasToolBarModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<CanvasToolBarModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CanvasToolBarModule, [typeof CanvasToolBarComponent], [typeof i2.ButtonModule, typeof i2.IconModule, typeof PipeModule, typeof i7.CdkDrag, typeof i7.CdkDragHandle], [typeof CanvasToolBarComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<CanvasToolBarModule, [typeof CanvasToolBarComponent], [typeof i2.ButtonModule, typeof i2.IconModule, typeof i2.InputTextModule, typeof PipeModule, typeof i7.CdkDrag, typeof i7.CdkDragHandle, typeof i4.FormsModule], [typeof CanvasToolBarComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<CanvasToolBarModule>;
 }
 
@@ -1520,7 +1543,7 @@ declare class ConfigurationSideBarMenuComponent implements OnDestroy {
 
 declare class ConfigurationSideBarMenuModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<ConfigurationSideBarMenuModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<ConfigurationSideBarMenuModule, [typeof ConfigurationSideBarMenuComponent], [typeof i2$1.FormsModule, typeof PipeModule, typeof i2.IconModule, typeof i2.ButtonModule, typeof i4.NgClass], [typeof ConfigurationSideBarMenuComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<ConfigurationSideBarMenuModule, [typeof ConfigurationSideBarMenuComponent], [typeof i4.FormsModule, typeof PipeModule, typeof i2.IconModule, typeof i2.ButtonModule, typeof i4$1.NgClass], [typeof ConfigurationSideBarMenuComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<ConfigurationSideBarMenuModule>;
 }
 
@@ -1770,4 +1793,4 @@ declare class InPhotoModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<InPhotoModule>;
 }
 
-export { EditCanvasComponent, EditCanvasModule, ErrorDialogComponent, ErrorDialogModule, ImageEnhancer, ImageEnhancerModule, ImageEnhancerStyleComponent, ImageEnhancerStyleModule, ImageEnhancerUploadComponent, ImageEnhancerUploadModule, ImageHistoryComponent, ImageHistoryModule, ImageHistoryTileComponent, ImageHistoryTileModule, ImageUpload, ImageUploadModule, InPhotoComponent, InPhotoModule, InphotoCatalogComponent, InphotoCatalogModule, InphotoThreedSceneComponent, InphotoThreedsceneModule, PhotoEditorComponent, PhotoEditorModule, PrepareStartingImageComponent, PrepareStartingImageModule, ProcessLoaderComponent, ProcessLoaderModule, UploadStartingImageComponent, UploadStartingImageModule };
+export { EditCanvasComponent, EditCanvasModule, ErrorDialogComponent, ErrorDialogModule, ImageEnhancer, ImageEnhancerModule, ImageEnhancerStyleComponent, ImageEnhancerStyleModule, ImageEnhancerUploadComponent, ImageEnhancerUploadModule, ImageHistoryComponent, ImageHistoryModule, ImageHistoryTileComponent, ImageHistoryTileModule, ImageUpload, ImageUploadModule, InPhotoComponent, InPhotoConnectorService, InPhotoModule, InphotoCatalogComponent, InphotoCatalogModule, InphotoSettingsService, InphotoThreedSceneComponent, InphotoThreedsceneModule, PhotoEditorComponent, PhotoEditorModule, PrepareStartingImageComponent, PrepareStartingImageModule, ProcessLoaderComponent, ProcessLoaderModule, UploadStartingImageComponent, UploadStartingImageModule };

package/lib/component/canvas-tool-bar/style/_layout.scss

@@ -58,6 +58,14 @@
           cursor: pointer;
         }
       }
+
+      .canvas-zoom-control {
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+        margin: var(--co-inphoto-canvas-tool-bar-section-margin);
+        position: relative;
+      }
     }
   }
 }

package/lib/component/canvas-tool-bar/style/_material-definition.scss

@@ -34,4 +34,7 @@
   --co-inphoto-canvas-tool-bar-cancel-button-background: transparent;
   --co-inphoto-canvas-tool-bar-cancel-button-font-weight: 500;
   --co-inphoto-canvas-tool-bar-label-spacing: 10px;
+
+  --co-inphoto-canvas-tool-bar-zoom-zero: 0;
+  --co-inphoto-canvas-tool-bar-zoom-button-height: 40px;
 }

package/lib/component/canvas-tool-bar/style/_theme.scss

@@ -103,6 +103,36 @@
           }
         }
       }
+
+      .canvas-zoom-control {
+        .zoom-input-wrapper {
+          .co-input-text {
+            @include cfg.text();
+          }
+          .co-input-text:not(.no-style) {
+            input {
+              text-align: center;
+              align-self: center;
+              padding: var(--co-inphoto-canvas-tool-bar-zoom-zero);
+            }
+          }
+        }
+
+        .co-button {
+          @include cfg.action-button(
+                  var(--co-inphoto-button-background),
+                  var(--co-inphoto-button-background),
+                  var(--co-inphoto-button-color),
+                  var(--co-inphoto-icon-size-small),
+                  var(--co-inphoto-button-icon-size),
+                  var(--co-inphoto-button-icon-color),
+                  var(--co-inphoto-button-border),
+                  var(--co-inphoto-button-radius),
+                  var(--co-inphoto-canvas-tool-bar-zoom-zero));
+
+          height: var(--co-inphoto-canvas-tool-bar-zoom-button-height);
+        }
+      }
     }
   }
 }

package/lib/component/edit-canvas/style/_layout.scss

@@ -63,17 +63,6 @@
         z-index: var(--co-inphoto-edit-canvas-label-z-index);
       }
 
-      // Zoom
-      .canvas-zoom-control {
-        position: var(--co-inphoto-edit-canvas-position-absolute);
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        bottom: var(--co-inphoto-edit-canvas-zoom-control-bottom);
-        left: var(--co-inphoto-edit-canvas-zoom-control-left);
-      }
-
-
       &.canvas-disabled {
         cursor: not-allowed;
         canvas {

package/lib/component/edit-canvas/style/_material-definition.scss

@@ -18,8 +18,4 @@
   --co-inphoto-edit-canvas-label-radius: 4px;
   --co-inphoto-edit-canvas-label-font-size: 12px;
   --co-inphoto-edit-canvas-label-z-index: 10;
-  --co-inphoto-edit-canvas-zoom-control-bottom: 25px;
-  --co-inphoto-edit-canvas-zoom-control-left: 100px;
-  --co-inphoto-edit-canvas-zoom-control-padding: 8px;
-  --co-inphoto-edit-canvas-zoom-button-height: 40px;
 }

package/lib/component/edit-canvas/style/_theme.scss

@@ -22,40 +22,5 @@
       font-size: var(--co-inphoto-edit-canvas-label-font-size);
     }
 
-    // Zoom
-    .canvas-zoom-control {
-      padding: var(--co-inphoto-edit-canvas-zoom-control-padding);
-      border-radius: var(--co-inphoto-border-radius);
-      background: var(--co-inphoto-dialog-background-color);
-
-      .zoom-input-wrapper {
-        .co-input-text {
-          @include cfg.text();
-
-        }
-        .co-input-text:not(.no-style) {
-          input {
-            text-align: center;
-            align-self: center;
-            padding: var(--co-inphoto-edit-canvas-zero);
-          }
-        }
-      }
-
-      .co-button {
-        @include cfg.action-button(
-                var(--co-inphoto-button-background),
-                var(--co-inphoto-button-background),
-                var(--co-inphoto-button-color),
-                var(--co-inphoto-icon-size-small),
-                var(--co-inphoto-button-icon-size),
-                var(--co-inphoto-button-icon-color),
-                var(--co-inphoto-button-border),
-                var(--co-inphoto-button-radius),
-                var(--co-inphoto-edit-canvas-zero));
-
-        height: var(--co-inphoto-edit-canvas-zoom-button-height);
-      }
-    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/inphoto",
-  "version": "300.1.8",
+  "version": "300.1.9",
   "description": "Colijn IT inphoto module for Angular 20",
   "repository": "npm/npm",
   "author": "Colijn IT",