initialContent option

BrianHung · May 20, 2021 · c96ec7c · c96ec7c
1 parent ccfd444
commit c96ec7c
Show file tree

Hide file tree

Showing 10 changed files with 27,683 additions and 48 deletions.
diff --git a/demo/dist/prosemirror.js b/demo/dist/prosemirror.js
diff --git a/demo/dist/prosemirror.js.map b/demo/dist/prosemirror.js.map
diff --git a/dist/src/plugins/sync-plugin.d.ts b/dist/src/plugins/sync-plugin.d.ts
@@ -1,5 +1,5 @@
 export function isVisible(item: any, snapshot?: any): boolean;
-export function ySyncPlugin(yXmlFragment: any, { colors, colorMapping, permanentUserData }?: YSyncOpts): any;
+export function ySyncPlugin(yXmlFragment: any, { colors, colorMapping, permanentUserData, initialContent }?: YSyncOpts): any;
 export function getRelativeSelection(pmbinding: any, state: any): {
     anchor: any;
     head: any;
@@ -69,6 +69,7 @@ export type YSyncOpts = {
     colors?: Array<ColorDef>;
     colorMapping?: Map<string, ColorDef>;
     permanentUserData?: any | null;
+    initialContent?: JSON | null;
 };
 export type NormalizedPNodeContent = (PMNode<any> | PMNode<any>[])[];
 import { Node as PMNode } from "prosemirror-model";
diff --git a/dist/test.cjs b/dist/test.cjs
@@ -9574,6 +9574,7 @@ const isVisible$1 = (item, snapshot) => snapshot === undefined ? !item.deleted :
  * @property {Array<ColorDef>} [YSyncOpts.colors]
  * @property {Map<string,ColorDef>} [YSyncOpts.colorMapping]
  * @property {Y.PermanentUserData|null} [YSyncOpts.permanentUserData]
+ * @property {JSON|null} [YSyncOpts.initialContent]
  */
 
 /**
@@ -9602,7 +9603,7 @@ const getUserColor = (colorMapping, colors, user) => {
  * @param {YSyncOpts} opts
  * @return {any} Returns a prosemirror plugin that binds to this type
  */
-const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null } = {}) => {
+const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null, initialContent = null } = {}) => {
   let changedInitialContent = false;
   const plugin = new prosemirrorState.Plugin({
     props: {
@@ -9657,16 +9658,16 @@ const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new
       }
     },
     view: view => {
-
       const binding = new ProsemirrorBinding(yXmlFragment, view);
       binding._forceRerender();
-      view.dispatch(view.state.tr.setMeta(ySyncPluginKey, { binding }));
-
       return {
         update: () => {
           const pluginState = plugin.getState(view.state);
           if (pluginState.snapshot == null && pluginState.prevSnapshot == null) {
-            if (changedInitialContent || view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content) != null) {
+            changedInitialContent = changedInitialContent || initialContent 
+              ? view.state.doc.content.findDiffStart(view.state.schema.nodeFromJSON(initialContent)) !== null 
+              : view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content)    !== null;
+            if (changedInitialContent) {
               changedInitialContent = true;
               binding._prosemirrorChanged(view.state.doc);
             }
@@ -9804,12 +9805,12 @@ class ProsemirrorBinding {
   _forceRerender () {
     this.mapping = new Map();
     this.mux(() => {
-      let content = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null);
-      if (content.length) {
-        // @ts-ignore
-        const tr = this.prosemirrorView.state.tr.replaceWith(0, this.prosemirrorView.state.doc.content.size, new prosemirrorModel.Fragment(content));
-        this.prosemirrorView.dispatch(tr);
-      }
+      // const fragmentContent = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null)
+      // @ts-ignore
+      // const tr = this.prosemirrorView.state.tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(new PModel.Fragment(fragmentContent), 0, 0))      const tr = this.prosemirrorView.state.tr
+      const tr = this.prosemirrorView.state.tr;
+      tr.setMeta(ySyncPluginKey, { binding: this });
+      this.prosemirrorView.dispatch(tr);
     });
   }
 

diff --git a/dist/test.cjs.map b/dist/test.cjs.map
diff --git a/dist/test.js b/dist/test.js
@@ -23911,6 +23911,7 @@
    * @property {Array<ColorDef>} [YSyncOpts.colors]
    * @property {Map<string,ColorDef>} [YSyncOpts.colorMapping]
    * @property {Y.PermanentUserData|null} [YSyncOpts.permanentUserData]
+   * @property {JSON|null} [YSyncOpts.initialContent]
    */
 
   /**
@@ -23939,7 +23940,7 @@
    * @param {YSyncOpts} opts
    * @return {any} Returns a prosemirror plugin that binds to this type
    */
-  const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null } = {}) => {
+  const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null, initialContent = null } = {}) => {
     let changedInitialContent = false;
     const plugin = new Plugin({
       props: {
@@ -23994,16 +23995,16 @@
         }
       },
       view: view => {
-
         const binding = new ProsemirrorBinding(yXmlFragment, view);
         binding._forceRerender();
-        view.dispatch(view.state.tr.setMeta(ySyncPluginKey, { binding }));
-
         return {
           update: () => {
             const pluginState = plugin.getState(view.state);
             if (pluginState.snapshot == null && pluginState.prevSnapshot == null) {
-              if (changedInitialContent || view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content) != null) {
+              changedInitialContent = changedInitialContent || initialContent 
+                ? view.state.doc.content.findDiffStart(view.state.schema.nodeFromJSON(initialContent)) !== null 
+                : view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content)    !== null;
+              if (changedInitialContent) {
                 changedInitialContent = true;
                 binding._prosemirrorChanged(view.state.doc);
               }
@@ -24141,12 +24142,12 @@
     _forceRerender () {
       this.mapping = new Map();
       this.mux(() => {
-        let content = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null);
-        if (content.length) {
-          // @ts-ignore
-          const tr = this.prosemirrorView.state.tr.replaceWith(0, this.prosemirrorView.state.doc.content.size, new Fragment(content));
-          this.prosemirrorView.dispatch(tr);
-        }
+        // const fragmentContent = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null)
+        // @ts-ignore
+        // const tr = this.prosemirrorView.state.tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(new PModel.Fragment(fragmentContent), 0, 0))      const tr = this.prosemirrorView.state.tr
+        const tr = this.prosemirrorView.state.tr;
+        tr.setMeta(ySyncPluginKey, { binding: this });
+        this.prosemirrorView.dispatch(tr);
       });
     }
 

diff --git a/dist/test.js.map b/dist/test.js.map
diff --git a/dist/y-prosemirror.cjs b/dist/y-prosemirror.cjs
@@ -64,6 +64,7 @@ const isVisible = (item, snapshot) => snapshot === undefined ? !item.deleted : (
  * @property {Array<ColorDef>} [YSyncOpts.colors]
  * @property {Map<string,ColorDef>} [YSyncOpts.colorMapping]
  * @property {Y.PermanentUserData|null} [YSyncOpts.permanentUserData]
+ * @property {JSON|null} [YSyncOpts.initialContent]
  */
 
 /**
@@ -92,7 +93,7 @@ const getUserColor = (colorMapping, colors, user) => {
  * @param {YSyncOpts} opts
  * @return {any} Returns a prosemirror plugin that binds to this type
  */
-const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null } = {}) => {
+const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null, initialContent = null } = {}) => {
   let changedInitialContent = false;
   const plugin = new prosemirrorState.Plugin({
     props: {
@@ -147,16 +148,16 @@ const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new
       }
     },
     view: view => {
-
       const binding = new ProsemirrorBinding(yXmlFragment, view);
       binding._forceRerender();
-      view.dispatch(view.state.tr.setMeta(ySyncPluginKey, { binding }));
-
       return {
         update: () => {
           const pluginState = plugin.getState(view.state);
           if (pluginState.snapshot == null && pluginState.prevSnapshot == null) {
-            if (changedInitialContent || view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content) != null) {
+            changedInitialContent = changedInitialContent || initialContent 
+              ? view.state.doc.content.findDiffStart(view.state.schema.nodeFromJSON(initialContent)) !== null 
+              : view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content)    !== null;
+            if (changedInitialContent) {
               changedInitialContent = true;
               binding._prosemirrorChanged(view.state.doc);
             }
@@ -294,12 +295,12 @@ class ProsemirrorBinding {
   _forceRerender () {
     this.mapping = new Map();
     this.mux(() => {
-      let content = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null);
-      if (content.length) {
-        // @ts-ignore
-        const tr = this.prosemirrorView.state.tr.replaceWith(0, this.prosemirrorView.state.doc.content.size, new prosemirrorModel.Fragment(content));
-        this.prosemirrorView.dispatch(tr);
-      }
+      // const fragmentContent = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null)
+      // @ts-ignore
+      // const tr = this.prosemirrorView.state.tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(new PModel.Fragment(fragmentContent), 0, 0))      const tr = this.prosemirrorView.state.tr
+      const tr = this.prosemirrorView.state.tr;
+      tr.setMeta(ySyncPluginKey, { binding: this });
+      this.prosemirrorView.dispatch(tr);
     });
   }
 

diff --git a/dist/y-prosemirror.cjs.map b/dist/y-prosemirror.cjs.map
diff --git a/src/plugins/sync-plugin.js b/src/plugins/sync-plugin.js
@@ -37,6 +37,7 @@ export const isVisible = (item, snapshot) => snapshot === undefined ? !item.dele
  * @property {Array<ColorDef>} [YSyncOpts.colors]
  * @property {Map<string,ColorDef>} [YSyncOpts.colorMapping]
  * @property {Y.PermanentUserData|null} [YSyncOpts.permanentUserData]
+ * @property {JSON|null} [YSyncOpts.initialContent]
  */
 
 /**
@@ -65,7 +66,7 @@ const getUserColor = (colorMapping, colors, user) => {
  * @param {YSyncOpts} opts
  * @return {any} Returns a prosemirror plugin that binds to this type
  */
-export const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null } = {}) => {
+export const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping = new Map(), permanentUserData = null, initialContent = null } = {}) => {
   let changedInitialContent = false
   const plugin = new Plugin({
     props: {
@@ -120,16 +121,16 @@ export const ySyncPlugin = (yXmlFragment, { colors = defaultColors, colorMapping
       }
     },
     view: view => {
-
       const binding = new ProsemirrorBinding(yXmlFragment, view);
       binding._forceRerender();
-      view.dispatch(view.state.tr.setMeta(ySyncPluginKey, { binding }));
-
       return {
         update: () => {
           const pluginState = plugin.getState(view.state)
           if (pluginState.snapshot == null && pluginState.prevSnapshot == null) {
-            if (changedInitialContent || view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content) != null) {
+            changedInitialContent = changedInitialContent || initialContent 
+              ? view.state.doc.content.findDiffStart(view.state.schema.nodeFromJSON(initialContent)) !== null 
+              : view.state.doc.content.findDiffStart(view.state.doc.type.createAndFill().content)    !== null
+            if (changedInitialContent) {
               changedInitialContent = true
               binding._prosemirrorChanged(view.state.doc)
             }
@@ -267,12 +268,12 @@ export class ProsemirrorBinding {
   _forceRerender () {
     this.mapping = new Map()
     this.mux(() => {
-      let content = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null);
-      if (content.length) {
-        // @ts-ignore
-        const tr = this.prosemirrorView.state.tr.replaceWith(0, this.prosemirrorView.state.doc.content.size, new PMFragment(content));
-        this.prosemirrorView.dispatch(tr);
-      }
+      // const fragmentContent = this.type.toArray().map(t => createNodeFromYElement(/** @type {Y.XmlElement} */ (t), this.prosemirrorView.state.schema, this.mapping)).filter(n => n !== null)
+      // @ts-ignore
+      // const tr = this.prosemirrorView.state.tr.replace(0, this.prosemirrorView.state.doc.content.size, new PModel.Slice(new PModel.Fragment(fragmentContent), 0, 0))      const tr = this.prosemirrorView.state.tr
+      const tr = this.prosemirrorView.state.tr
+      tr.setMeta(ySyncPluginKey, { binding: this })
+      this.prosemirrorView.dispatch(tr)
     })
   }