Merge pull request #1 from davidbrochart/set-source

Fix ydoc loading

Author: davidbrochart

CONTRIBUTING.md

@@ -7,7 +7,7 @@ micromamba create -n my-jupyter-shared-drive
 micromamba activate my-jupyter-shared-drive
 micromamba install pip nodejs
 git clone https://github.com/davidbrochart/my-jupyter-shared-drive
-cd my jupyter-shared-drive
+cd my-jupyter-shared-drive
 pip install -e .
 pip install jupyterlab
 jupyter labextension develop --overwrite .

packages/my-shared-docprovider-extension/package.json

@@ -53,6 +53,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
+    "@jupyter/collaborative-drive": "^3.1.0",
     "@jupyter/my-shared-docprovider": "^0.1.0",
     "@jupyterlab/filebrowser": "^4.2.0"
   },
@@ -87,6 +88,10 @@
         "bundled": false,
         "singleton": true
       },
+      "@jupyter/collaborative-drive": {
+        "bundled": true,
+        "singleton": true
+      },
       "@jupyter/my-shared-drive": {
         "bundled": false,
         "singleton": true

packages/my-shared-docprovider/src/drive.ts

@@ -158,7 +158,9 @@ export class MySharedDrive extends Drive implements ICollaborativeDrive {
         translator: this._trans
       });
 
-      super.get(options.path, { content: true }).then(model => { sharedModel.source = model.content; });
+      super.get(options.path, { content: true }).then(model => {
+        provider.setSource(model.content);
+      });
 
       const key = `${options.format}:${options.contentType}:${options.path}`;
       this._providers.set(key, provider);

packages/my-shared-docprovider/src/yprovider.ts

@@ -29,6 +29,7 @@ export class MyProvider implements IDocumentProvider {
     this._contentType = options.contentType;
     this._format = options.format;
     this._awareness = options.model.awareness;
+    this._model = options.model;
 
     const user = options.user;
 
@@ -38,7 +39,10 @@ export class MyProvider implements IDocumentProvider {
       })
       .catch(e => console.error(e));
     user.userChanged.connect(this._onUserChanged, this);
+  }
 
+  setSource(value: any): void {
+    this._model.setSource(value);
     this._ready.resolve();
   }
 
@@ -82,6 +86,7 @@ export class MyProvider implements IDocumentProvider {
   private _format: string;
   private _isDisposed: boolean;
   private _ready = new PromiseDelegate<void>();
+  private _model: YDocument<DocumentChange>;
 }
 
 /**

yarn.lock

@@ -1754,7 +1754,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jupyter/collaborative-drive@npm:^3.0.0":
+"@jupyter/collaborative-drive@npm:^3.0.0, @jupyter/collaborative-drive@npm:^3.1.0":
   version: 3.1.0
   resolution: "@jupyter/collaborative-drive@npm:3.1.0"
   dependencies:
@@ -1793,6 +1793,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@jupyter/my-shared-docprovider-extension@workspace:packages/my-shared-docprovider-extension"
   dependencies:
+    "@jupyter/collaborative-drive": ^3.1.0
     "@jupyter/my-shared-docprovider": ^0.1.0
     "@jupyterlab/builder": ^4.0.5
     "@jupyterlab/filebrowser": ^4.2.0