merged with master and cleaned up outpainting a bit.

1 files changed, 5 insertions, 6 deletions

diff --git a/src/client/views/PinFuncs.ts b/src/client/views/PinFuncs.ts
index ab02c2d07..805dd9a49 100644
--- a/src/client/views/PinFuncs.ts
+++ b/src/client/views/PinFuncs.ts
@@ -1,5 +1,4 @@
 import { Doc, DocListCast, Field } from '../../fields/Doc';
-import { DocData } from '../../fields/DocSymbols';
 import { Copy, Id } from '../../fields/FieldSymbols';
 import { List } from '../../fields/List';
 import { ObjectField } from '../../fields/ObjectField';
@@ -71,14 +70,14 @@ export function PinDocView(pinDocIn: Doc, pinProps: PinProps, targetDoc: Doc) {
             pinProps.pinData.dataview ||
             pinProps.pinData.poslayoutview ||
             pinProps?.activeFrame !== undefined;
-        const fkey = Doc.LayoutFieldKey(targetDoc);
+        const fkey = Doc.LayoutDataKey(targetDoc);
         if (pinProps.pinData.dataview) {
             pinDoc.config_usePath = targetDoc[fkey + '_usePath'];
             pinDoc.config_data = Field.Copy(targetDoc[fkey]);
         }
         if (pinProps.pinData.dataannos) {
-            const fieldKey = Doc.LayoutFieldKey(targetDoc);
-            pinDoc.config_annotations = new List<Doc>(DocListCast(targetDoc[DocData][fieldKey + '_annotations']).filter(doc => !doc.layout_unrendered));
+            const fieldKey = '$' + Doc.LayoutDataKey(targetDoc) + +'_annotations';
+            pinDoc.config_annotations = new List<Doc>(DocListCast(targetDoc[fieldKey]).filter(doc => !doc.layout_unrendered));
         }
         if (pinProps.pinData.inkable) {
             pinDoc.config_fillColor = targetDoc.fillColor;
@@ -88,7 +87,7 @@ export function PinDocView(pinDocIn: Doc, pinProps: PinProps, targetDoc: Doc) {
         }
         if (pinProps.pinData.scrollable) pinDoc.config_scrollTop = targetDoc._layout_scrollTop;
         if (pinProps.pinData.clippable) {
-            const fieldKey = Doc.LayoutFieldKey(targetDoc);
+            const fieldKey = Doc.LayoutDataKey(targetDoc);
             pinDoc.config_clipWidth = targetDoc[fieldKey + '_clipWidth'];
         }
         if (pinProps.pinData.datarange) {
@@ -128,7 +127,7 @@ export function PinDocView(pinDocIn: Doc, pinProps: PinProps, targetDoc: Doc) {
         }
         if (pinProps.pinData.temporal) {
             pinDoc.config_clipStart = targetDoc._layout_currentTimecode;
-            const duration = NumCast(pinDoc[`${Doc.LayoutFieldKey(pinDoc)}_duration`], NumCast(targetDoc.config_clipStart) + 0.1);
+            const duration = NumCast(pinDoc[`${Doc.LayoutDataKey(pinDoc)}_duration`], NumCast(targetDoc.config_clipStart) + 0.1);
             pinDoc.config_clipEnd = NumCast(pinDoc.config_clipStart) + NumCast(targetDoc.clipEnd, duration);
         }
     }