from last

9 files changed, 17 insertions, 18 deletions

diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 13f6f6920..b0170a192 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -383,8 +383,8 @@ export namespace DocUtils {
                     const newDoc = DocUtils.copyDragFactory(dragDoc);
                     if (newDoc) {
                         newDoc._author = ClientUtils.CurrentUserEmail();
-                        newDoc._x = x;
-                        newDoc._y = y;
+                        newDoc.x = x;
+                        newDoc.y = y;
                         newDoc.$backgroundColor = Doc.UserDoc().textBackgroundColor;
                         DocumentView.SetSelectOnLoad(newDoc);
                         if (pivotField) {
diff --git a/src/client/util/CalendarManager.tsx b/src/client/util/CalendarManager.tsx
index a0db4e32e..3357e5d59 100644
--- a/src/client/util/CalendarManager.tsx
+++ b/src/client/util/CalendarManager.tsx
@@ -17,6 +17,7 @@ import { TaskCompletionBox } from '../views/nodes/TaskCompletedBox';
 import './CalendarManager.scss';
 import { SnappingManager } from './SnappingManager';
 import { CalendarDate, DateValue } from '@internationalized/date';
+import { DocData } from '../../fields/DocSymbols';
 // import 'react-date-range/dist/styles.css';
 // import 'react-date-range/dist/theme/default.css';
 
@@ -118,7 +119,7 @@ export class CalendarManager extends ObservableReactComponent<object> {
     // TODO: Make undoable
     private addToCalendar = () => {
         const docs = DocumentView.Selected().length < 2 ? [this.targetDoc] : DocumentView.Selected().map(docView => docView.Document);
-        const targetDoc = docs[0]; // doc to add to calendar
+        const targetDoc = docs[0]?.[DocData];
 
         if (targetDoc) {
             let calendar: Doc;
@@ -229,7 +230,7 @@ export class CalendarManager extends ObservableReactComponent<object> {
     @computed
     get calendarInterface() {
         const docs = DocumentView.Selected().length < 2 ? [this.targetDoc] : DocumentView.Selected().map(docView => docView.Document);
-        const targetDoc = docs[0];
+        const targetDoc = docs[0]?.[DocData];
 
         return (
             <div
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 924041552..537c703b4 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -325,7 +325,7 @@ export class CurrentUserUtils {
             slide.$text  = rtfield;
             slide.$layout_textPainted = `<CollectionView {...props} fieldKey={'text'}/>`;
             slide.$type_collection = CollectionViewType.Freeform;
-            slide._onPaint = ScriptField.MakeScript(`toggleDetail(documentView, "textPainted")`, {documentView:"any"});
+            slide.onPaint = ScriptField.MakeScript(`toggleDetail(documentView, "textPainted")`, {documentView:"any"});
             return slide; 
         }
         const mermaidsApi = () => {
@@ -376,7 +376,7 @@ pie title Minerals in my tap water
             slide.$text  = rtfield;
             slide.$layout_textPainted = `<CollectionView {...props} fieldKey={'text'}/>`;
             slide.$_type_collection = CollectionViewType.Freeform;
-            slide._onPaint = ScriptField.MakeScript(`toggleDetail(documentView, "textPainted")`, {documentView:"any"});
+            slide.onPaint = ScriptField.MakeScript(`toggleDetail(documentView, "textPainted")`, {documentView:"any"});
             return slide; 
         }
         plotlyApi(); mermaidsApi();
diff --git a/src/client/views/DocComponent.tsx b/src/client/views/DocComponent.tsx
index 064906530..79a0cc602 100644
--- a/src/client/views/DocComponent.tsx
+++ b/src/client/views/DocComponent.tsx
@@ -42,7 +42,7 @@ export function DocComponent<P extends DocComponentProps>() {
          * This is the document being rendered.  It may be a template so it may or may no inherit from the data doc.
          */
         @computed get layoutDoc() {
-            return this._props.LayoutTemplateString ? this.Document : Doc.Layout(this._props.Document, this._props.LayoutTemplate?.());
+            return this._props.LayoutTemplateString ? this._props.Document : Doc.Layout(this._props.Document, this._props.LayoutTemplate?.());
         }
 
         /**
diff --git a/src/client/views/PinFuncs.ts b/src/client/views/PinFuncs.ts
index 1ab8575a8..d756830da 100644
--- a/src/client/views/PinFuncs.ts
+++ b/src/client/views/PinFuncs.ts
@@ -76,8 +76,8 @@ export function PinDocView(pinDocIn: Doc, pinProps: PinProps, targetDoc: Doc) {
             pinDoc.config_data = Field.Copy(targetDoc[fkey]);
         }
         if (pinProps.pinData.dataannos) {
-            const fieldKey = Doc.LayoutFieldKey(targetDoc);
-            pinDoc.config_annotations = new List<Doc>(DocListCast(targetDoc['$' + fieldKey + '_annotations']).filter(doc => !doc.layout_unrendered));
+            const fieldKey = '$' + Doc.LayoutFieldKey(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;
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 2b4fe478e..a1e8fe7ba 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -131,7 +131,7 @@ export class PropertiesButtons extends React.Component {
             on => `${on ? 'Flashcard enabled' : 'Flashcard disabled'} `,
             () => <MdTouchApp />,
             (dv, doc) => {
-                const on = !!doc.onPaint;
+                const on = !!doc.$onPaint;
                 doc.$onPaint = on ? undefined : ScriptField.MakeScript(`toggleDetail(documentView, "textPainted")`, { documentView: 'any' });
                 doc.$layout_textPainted = on ? undefined : `<ComparisonBox {...props} fieldKey={'${dv?.LayoutFieldKey ?? 'text'}'}/>`;
             }
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index c72f958fc..b95553c4e 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -891,7 +891,7 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps
             }
         });
     }
-    @computed get colorStk() { return StrCast(this.selectedStrokes.lastElement()?.$olor); } // prettier-ignore
+    @computed get colorStk() { return StrCast(this.selectedStrokes.lastElement()?.$color); } // prettier-ignore
     set colorStk(value) {
         this.selectedStrokes.forEach(doc => {
             doc.$color = value || undefined;
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index fdaf13733..46bd076d4 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -143,10 +143,10 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
     @computed get highlighting()      { return this.style(this.Document, StyleProp.Highlighting); } // prettier-ignore
     @computed get borderPath()        { return this.style(this.Document, StyleProp.BorderPath); } // prettier-ignore
 
-    @computed get onClickHdlr()       { return this._props.onClickScript?.()       ?? ScriptCast(this.Document._onClick       ?? this.Document.onClick); } // prettier-ignore
-    @computed get onDoubleClickHdlr() { return this._props.onDoubleClickScript?.() ?? ScriptCast(this.Document._onDoubleClick ?? this.Document.onDoubleClick); } // prettier-ignore
-    @computed get onPointerDownHdlr() { return this._props.onPointerDownScript?.() ?? ScriptCast(this.Document._onPointerDown ?? this.Document.onPointerDown); } // prettier-ignore
-    @computed get onPointerUpHdlr()   { return this._props.onPointerUpScript?.()   ?? ScriptCast(this.Document._onPointerUp   ?? this.Document.onPointerUp); } // prettier-ignore
+    @computed get onClickHdlr()       { return this._props.onClickScript?.()       ?? ScriptCast(this.layoutDoc.onClick       ?? this.Document.onClick); } // prettier-ignore
+    @computed get onDoubleClickHdlr() { return this._props.onDoubleClickScript?.() ?? ScriptCast(this.layoutDoc.onDoubleClick ?? this.Document.onDoubleClick); } // prettier-ignore
+    @computed get onPointerDownHdlr() { return this._props.onPointerDownScript?.() ?? ScriptCast(this.layoutDoc.onPointerDown ?? this.Document.onPointerDown); } // prettier-ignore
+    @computed get onPointerUpHdlr()   { return this._props.onPointerUpScript?.()   ?? ScriptCast(this.layoutDoc.onPointerUp   ?? this.Document.onPointerUp); } // prettier-ignore
 
     @computed get disableClickScriptFunc() {
         const onScriptDisable = this._props.onClickScriptDisable ?? this._componentView?.onClickScriptDisable?.() ?? this.layoutDoc.onClickScriptDisable;
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index f5bd4f44c..e2f708700 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -1156,9 +1156,7 @@ export namespace Doc {
     // the document containing the view layout information - will be the Document itself unless the Document has
     // a layout field or 'layout' is given.
     export function Layout(doc: Doc, layout?: Doc): Doc {
-        const templateField = layout && StrCast(layout.isTemplateForField, Doc.LayoutFieldKey(layout)); // the field that the template renders
-        const overrideLayout = layout && Cast(doc[layout.title + '(' + templateField + ')'], Doc, null);
-        //  [`${StrCast(layout.isTemplateForField, 'data')}_layout[` + layout[Id] + ']'], Doc, null);
+        const overrideLayout = layout && Cast(doc[layout.title + '(' + StrCast(layout.isTemplateForField, 'data') + ')'], Doc, null);
         return overrideLayout || doc[DocLayout] || doc;
     }
     export function SetLayout(doc: Doc, layout: Doc | string) {