Widget with toolbar and sidepanel in cell output

packages/base/src/annotations/components/Annotation.tsx

@@ -36,7 +36,7 @@ const Annotation = ({
    * Update the model when it changes.
    */
   rightPanelModel?.documentChanged.connect((_, widget) => {
-    setJgisModel(widget?.context.model);
+    setJgisModel(widget?.model);
   });
 
   const handleSubmit = () => {

packages/base/src/annotations/model.ts

@@ -4,13 +4,12 @@ import {
   IAnnotationModel,
   IJupyterGISModel
 } from '@jupytergis/schema';
-import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { User } from '@jupyterlab/services';
 import { ISignal, Signal } from '@lumino/signaling';
 
 export class AnnotationModel implements IAnnotationModel {
   constructor(options: AnnotationModel.IOptions) {
-    this.context = options.context;
+    this.model = options.model;
   }
 
   get updateSignal(): ISignal<this, null> {
@@ -21,39 +20,37 @@ export class AnnotationModel implements IAnnotationModel {
     return this._user;
   }
 
-  set context(
-    context: DocumentRegistry.IContext<IJupyterGISModel> | undefined
-  ) {
-    this._context = context;
+  set model(model: IJupyterGISModel | undefined) {
+    this._model = model;
 
-    const state = this._context?.model.sharedModel.awareness.getLocalState();
+    const state = this._model?.sharedModel.awareness.getLocalState();
     this._user = state?.user;
 
-    this._contextChanged.emit(void 0);
+    this._modelChanged.emit(void 0);
   }
 
-  get context(): DocumentRegistry.IContext<IJupyterGISModel> | undefined {
-    return this._context;
+  get model(): IJupyterGISModel | undefined {
+    return this._model;
   }
 
-  get contextChanged(): ISignal<this, void> {
-    return this._contextChanged;
+  get modelChanged(): ISignal<this, void> {
+    return this._modelChanged;
   }
 
   update(): void {
     this._updateSignal.emit(null);
   }
 
   getAnnotation(id: string): IAnnotation | undefined {
-    const rawData = this._context?.model.sharedModel.getMetadata(id);
+    const rawData = this._model?.sharedModel.getMetadata(id);
     if (rawData) {
       return JSON.parse(rawData) as IAnnotation;
     }
   }
 
   getAnnotationIds(): string[] {
     const annotationIds: string[] = [];
-    for (const id in this._context?.model.sharedModel.metadata) {
+    for (const id in this._model?.sharedModel.metadata) {
       if (id.startsWith('annotation')) {
         annotationIds.push(id);
       }
@@ -62,14 +59,14 @@ export class AnnotationModel implements IAnnotationModel {
   }
 
   addAnnotation(key: string, value: IAnnotation): void {
-    this._context?.model.sharedModel.setMetadata(
+    this._model?.sharedModel.setMetadata(
       `annotation_${key}`,
       JSON.stringify(value)
     );
   }
 
   removeAnnotation(key: string): void {
-    this._context?.model.removeMetadata(key);
+    this._model?.removeMetadata(key);
   }
 
   addContent(id: string, value: string): void {
@@ -84,21 +81,18 @@ export class AnnotationModel implements IAnnotationModel {
         contents: [...currentAnnotation.contents, newContent]
       };
 
-      this._context?.model.sharedModel.setMetadata(
-        id,
-        JSON.stringify(newAnnotation)
-      );
+      this._model?.sharedModel.setMetadata(id, JSON.stringify(newAnnotation));
     }
   }
 
-  private _context: DocumentRegistry.IContext<IJupyterGISModel> | undefined;
-  private _contextChanged = new Signal<this, void>(this);
+  private _model: IJupyterGISModel | undefined;
+  private _modelChanged = new Signal<this, void>(this);
   private _updateSignal = new Signal<this, null>(this);
   private _user?: User.IIdentity;
 }
 
 namespace AnnotationModel {
   export interface IOptions {
-    context: DocumentRegistry.IContext<IJupyterGISModel> | undefined;
+    model: IJupyterGISModel | undefined;
   }
 }