Merge branch 'master' into keanu-comments

2 files changed, 3 insertions, 2 deletions

diff --git a/src/client/views/pdf/Annotation.tsx b/src/client/views/pdf/Annotation.tsx
index 3bd42873c..1891cfd4c 100644
--- a/src/client/views/pdf/Annotation.tsx
+++ b/src/client/views/pdf/Annotation.tsx
@@ -13,6 +13,7 @@ import { FieldViewProps } from '../nodes/FieldView';
 import { OpenWhere } from '../nodes/OpenWhere';
 import { AnchorMenu } from './AnchorMenu';
 import './Annotation.scss';
+import { Property } from 'csstype';
 
 interface IRegionAnnotationProps {
     x: number;
@@ -45,7 +46,7 @@ interface IAnnotationProps extends FieldViewProps {
     annoDoc: Doc;
     containerDataDoc: Doc;
     fieldKey: string;
-    pointerEvents?: () => Opt<string>;
+    pointerEvents?: () => Opt<Property.PointerEvents>;
 }
 @observer
 export class Annotation extends ObservableReactComponent<IAnnotationProps> {
diff --git a/src/client/views/pdf/GPTPopup/GPTPopup.tsx b/src/client/views/pdf/GPTPopup/GPTPopup.tsx
index 0920b1bd3..a37e73e27 100644
--- a/src/client/views/pdf/GPTPopup/GPTPopup.tsx
+++ b/src/client/views/pdf/GPTPopup/GPTPopup.tsx
@@ -268,7 +268,7 @@ export class GPTPopup extends ObservableReactComponent<GPTPopupProps> {
      * Transfers the image urls to actual image docs
      */
     private transferToImage = (source: string) => {
-        const textAnchor = this.imgTargetDoc;
+        const textAnchor = this.textAnchor ?? this.imgTargetDoc;
         if (!textAnchor) return;
         const newDoc = Docs.Create.ImageDocument(source, {
             x: NumCast(textAnchor.x) + NumCast(textAnchor._width) + 10,