2 files changed, 5 insertions, 4 deletions
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();