Merge branch 'master' into advanced-trails

1 files changed, 3 insertions, 3 deletions

diff --git a/src/client/views/InkTranscription.tsx b/src/client/views/InkTranscription.tsx
index e38474ea0..6c213f40f 100644
--- a/src/client/views/InkTranscription.tsx
+++ b/src/client/views/InkTranscription.tsx
@@ -105,7 +105,7 @@ export class InkTranscription extends React.Component {
                 : null;
         }
 
-        r.addEventListener('exported', (e: any) => this.exportInk(e, this._textRef));
+        r?.addEventListener('exported', (e: any) => this.exportInk(e, this._textRef));
 
         return (this._textRef = r);
     };
@@ -124,9 +124,9 @@ export class InkTranscription extends React.Component {
         const strokes: InkData[] = [];
         const times: number[] = [];
         validInks
-            .filter(i => Cast(i.data, InkField))
+            .filter(i => Cast(i[Doc.LayoutFieldKey(i)], InkField))
             .forEach(i => {
-                const d = Cast(i.data, InkField, null);
+                const d = Cast(i[Doc.LayoutFieldKey(i)], InkField, null);
                 const inkStroke = DocumentManager.Instance.getDocumentView(i)?.ComponentView as InkingStroke;
                 strokes.push(d.inkData.map(pd => inkStroke.ptToScreen({ X: pd.X, Y: pd.Y })));
                 times.push(DateCast(i.author_date).getDate().getTime());