@jupyter/docprovider 1.0.0-alpha.2 → 1.0.0-alpha.3

package/lib/ydrive.d.ts

@@ -1,3 +1,4 @@
+import { DocumentChange, ISharedDocument, YDocument } from '@jupyter/ydoc';
 import { TranslationBundle } from '@jupyterlab/translation';
 import { Contents, Drive, User } from '@jupyterlab/services';
 /**
@@ -14,7 +15,7 @@ export declare class YDrive extends Drive {
     /**
      * SharedModel factory for the YDrive.
      */
-    readonly sharedModelFactory: Contents.ISharedFactory;
+    readonly sharedModelFactory: SharedModelFactory;
     /**
      * Delete a file.
      *
@@ -77,3 +78,23 @@ export declare class YDrive extends Drive {
     private _trans;
     private _providers;
 }
+/**
+ * Yjs sharedModel factory for real-time collaboration.
+ */
+declare class SharedModelFactory implements Contents.ISharedFactory {
+    private _onCreate;
+    private _documentOptions;
+    constructor(_onCreate: (options: Contents.ISharedFactoryOptions, sharedModel: YDocument<DocumentChange>) => void);
+    /**
+     * Whether the IDrive supports real-time collaboration or not.
+     */
+    readonly collaborative = true;
+    setDocumentOptions(type: Contents.ContentType, value: Record<string, any>): void;
+    /**
+     * Create a new `ISharedDocument` instance.
+     *
+     * It should return `undefined` if the factory is not able to create a `ISharedDocument`.
+     */
+    createNew(options: Contents.ISharedFactoryOptions): ISharedDocument | undefined;
+}
+export {};

package/lib/ydrive.js

@@ -151,6 +151,13 @@ class SharedModelFactory {
          * Whether the IDrive supports real-time collaboration or not.
          */
         this.collaborative = true;
+        this._documentOptions = new Map();
+        this._documentOptions.set('notebook', {
+            disableDocumentWideUndoRedo: true
+        });
+    }
+    setDocumentOptions(type, value) {
+        this._documentOptions.set(type, value);
     }
     /**
      * Create a new `ISharedDocument` instance.
@@ -171,7 +178,7 @@ class SharedModelFactory {
                 sharedModel = new YFile();
                 break;
             case 'notebook':
-                sharedModel = new YNotebook();
+                sharedModel = new YNotebook(this._documentOptions.get('notebook'));
                 break;
             //default:
             // FIXME we should request a registry for the proper sharedModel

package/lib/yprovider.js

@@ -24,7 +24,11 @@ export class WebSocketProvider {
             if (event.code === 1003) {
                 console.error('Document provider closed:', event.reason);
                 showErrorMessage(this._trans.__('Session expired'), this._trans.__('The document session expired. You need to reload this browser tab.'), [Dialog.okButton({ label: this._trans.__('Reload') })])
-                    .then(r => window.location.reload())
+                    .then((r) => {
+                    if (r.button.accept) {
+                        window.location.reload();
+                    }
+                })
                     .catch(e => window.location.reload());
                 // Dispose shared model immediately. Better break the document model,
                 // than overriding data on disk.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter/docprovider",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "JupyterLab - Document Provider",
   "homepage": "https://github.com/jupyterlab/jupyter_collaboration",
   "bugs": {