3 files changed, 12 insertions, 6 deletions
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index bd71115db..90edab3a7 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -743,6 +743,12 @@ export class DocumentViewInternal extends DocComponent<DocumentViewProps & Field
     widgetOverlayFunc = () => (this.widgetDecorations ? this.widgetOverlay : null);
     viewingAiEditor = () => (this._props.showAIEditor && this._componentView?.componentAIView?.() !== undefined ? this.aiEditor : null);
     @observable _contentsRef: DocumentContentsView | undefined = undefined;
+    screenToContentsXf = () =>
+        this.viewingAiEditor()
+            ? this.layoutDoc.layout_reflowHorizontal
+                ? this._props.ScreenToLocalTransform().scale(Math.min(this.aiContentsWidth() / this._props.PanelWidth(), this.aiContentsHeight() / this._props.PanelHeight()))
+                : this._props.ScreenToLocalTransform().translate((this._props.PanelWidth() - this.aiContentsWidth()) / 2, 0)
+            : this._props.ScreenToLocalTransform();
     @computed get viewBoxContents() {
         TraceMobx();
         const isInk = this.layoutDoc._layout_isSvg && !this._props.LayoutTemplateString;
@@ -762,6 +768,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewProps & Field
                         layoutFieldKey={StrCast(this.Document.layout_fieldKey, 'layout')}
                         pointerEvents={this.contentPointerEvents}
                         setContentViewBox={this.setContentView}
+                        ScreenToLocalTransform={this.screenToContentsXf}
                         childFilters={this.childFilters}
                         PanelWidth={this.viewingAiEditor() ? this.aiContentsWidth : this._props.PanelWidth}
                         PanelHeight={this.viewingAiEditor() ? this.aiContentsHeight : this.panelHeight}
diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx
index fb2346bd1..617a09ed5 100644
--- a/src/client/views/nodes/ImageBox.tsx
+++ b/src/client/views/nodes/ImageBox.tsx
@@ -99,7 +99,6 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
 
     // variables for AI Image Editor
     @observable private _regenInput = '';
-    @observable private _canInteract = true;
     @observable private _regenerateLoading = false;
 
     // Add these observable properties to the ImageBox class
@@ -716,7 +715,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
 
     @computed get nativeSize() {
         TraceMobx();
-        if (this.paths.length && this.paths[0].includes(DefaultPath)) return { nativeWidth: NumCast(this.layoutDoc._width), nativeHeight: NumCast(this.layoutDoc._height), nativeOrientation: 0 };
+        if (this.paths[0]?.includes(DefaultPath) && this.layoutDoc._height) return { nativeWidth: NumCast(this.layoutDoc._width), nativeHeight: NumCast(this.layoutDoc._height), nativeOrientation: 0 };
         const { nativeWidth, nativeHeight } = this.imgNativeSize;
         const nativeOrientation = NumCast(this.dataDoc[this.fieldKey + '_nativeOrientation'], 1);
         return { nativeWidth, nativeHeight, nativeOrientation };
@@ -902,7 +901,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
                         aria-label="Edit instructions input"
                         type="text"
                         value={this._regenInput || StrCast(this.Document.title)}
-                        onChange={action(e => this._canInteract && (this._regenInput = e.target.value))}
+                        onChange={action(e => (this._regenInput = e.target.value))}
                         placeholder={this._regenInput || StrCast(this.Document.title)}
                     />
                     <div className="imageBox-aiView-regenerate-createBtn">
@@ -936,7 +935,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
                             number={this._fireflyRefStrength}
                             size={Size.XXSMALL}
                             setNumber={undoable(
-                                action(val => this._canInteract && (this._fireflyRefStrength = val as number)),
+                                action(val => (this._fireflyRefStrength = val as number)),
                                 `${this.Document.title} button set from list`
                             )}
                             fillWidth
diff --git a/src/client/views/nodes/imageEditor/ImageEditor.tsx b/src/client/views/nodes/imageEditor/ImageEditor.tsx
index 198b8e713..abe235ad5 100644
--- a/src/client/views/nodes/imageEditor/ImageEditor.tsx
+++ b/src/client/views/nodes/imageEditor/ImageEditor.tsx
@@ -286,8 +286,8 @@ const ImageEditor = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addDoc
             const maskBlob = await ImageUtility.canvasToBlob(canvasMask);
             const imgBlob = await ImageUtility.canvasToBlob(canvasOriginalImg);
             const res = await ImageUtility.getEdit(imgBlob, maskBlob, input || 'Fill in the image in the same style', 2);
-            if ((res as any).status == 'error') {
-                alert((res as any).message);
+            if (res.status == 'error') {
+                alert(res.message);
             }
 
             // create first image