Merge remote-tracking branch 'TypeCellOS/main' into refactor/tables-customelements-copypaste

Author: YousefED

package-lock.json

@@ -172,6 +172,33 @@ const UniqueID = Extension.create({
                   ? void 0
                   : _a.attrs[attributeName];
               if (id === null) {
+                // edge case, when using collaboration, yjs will set the id to null in `_forceRerender`
+                // when loading the editor
+                // this checks for this case and keeps it at initialBlockId so there will be no change
+                const initialDoc = oldState.doc.type.createAndFill()!.content;
+                const wasInitial =
+                  oldState.doc.content.findDiffStart(initialDoc) === null;
+
+                if (wasInitial) {
+                  // the old state was the "initial content"
+                  const jsonNode = JSON.parse(
+                    JSON.stringify(newState.doc.toJSON())
+                  );
+                  jsonNode.content[0].content[0].attrs.id = "initialBlockId";
+                  // would the new state with the fix also be the "initial content"?
+                  if (
+                    JSON.stringify(jsonNode.content) ===
+                    JSON.stringify(initialDoc.toJSON())
+                  ) {
+                    // yes, apply the fix
+                    tr.setNodeMarkup(pos, undefined, {
+                      ...node.attrs,
+                      [attributeName]: "initialBlockId",
+                    });
+                    return;
+                  }
+                }
+
                 tr.setNodeMarkup(pos, undefined, {
                   ...node.attrs,
                   [attributeName]: generateID(),
@@ -285,5 +312,5 @@ const UniqueID = Extension.create({
   },
 });
 
-export { UniqueID, UniqueID as default };
+export { UniqueID as default, UniqueID };
 //# sourceMappingURL=tiptap-extension-unique-id.esm.js.map

packages/core/src/extensions/UniqueID/UniqueID.ts

@@ -45,7 +45,8 @@ export function ReactBlockNote(props: { theme: "light" | "dark" }) {
     const doc = new Y.Doc();
     const provider = new YPartyKitProvider(
       "blocknote.yousefed.partykit.dev",
-      "homepage-1",
+      // "127.0.0.1:1999", // (dev server)
+      "homepage-2",
       doc
     );
     return [doc, provider];

packages/website/docs/.vitepress/theme/components/Examples/BlockNote/ReactBlockNote.tsx

@@ -57,7 +57,7 @@ When a user edits the document, an incremental change (or "update") is captured
 For development purposes, you can use our Partykit server to test collaborative features. Replace the `WebrtcProvider` provider in the example below with a `YPartyKitProvider`:
 
 ```typescript
-// npm install y-partykit@beta
+// npm install y-partykit
 import YPartyKitProvider from "y-partykit/provider";
 
 const provider = new YPartyKitProvider(

packages/website/docs/docs/real-time-collaboration.md

@@ -16,7 +16,7 @@
     "@vercel/og": "^0.5.6",
     "veaury": "^2.3.12",
     "vue-github-button": "^3.1.0",
-    "y-partykit": "^0.0.0-4d484bc",
+    "y-partykit": "^0.0.10",
     "yjs": "^13.6.1"
   },
   "devDependencies": {

packages/website/package.json

@@ -1,10 +1,32 @@
-import type { PartyKitServer } from "partykit/server";
+import type * as Party from "partykit/server";
 import { onConnect } from "y-partykit";
 
-// deploy with npx partykit@beta deploy partykitserver.ts --name blocknote
-// preview with npx partykit@beta dev partykitserver.ts
-export default {
-  onConnect(ws, room) {
-    return onConnect(ws, room, { persist: false, gc: true });
-  },
-} satisfies PartyKitServer;
+const EXPIRY_PERIOD_MILLISECONDS = 60 * 60 * 1000; // 1 hour
+
+// deploy with npx partykit deploy partykitserver.ts --name blocknote
+// preview with npx partykit dev partykitserver.ts
+export default class Server implements Party.Server {
+  constructor(readonly party: Party.Party) {}
+
+  onConnect(conn: Party.Connection, ctx: Party.ConnectionContext) {
+    // A websocket just connected!
+
+    return onConnect(conn, this.party, { persist: false, gc: true });
+  }
+
+  async onMessage(message: string) {
+    // const data = JSON.parse(message);
+    // do something, and save to storage
+    // await this.party.storage.put(data.id, data);
+    // console.log("on message");
+    await this.party.storage.setAlarm(Date.now() + EXPIRY_PERIOD_MILLISECONDS);
+  }
+
+  async onAlarm() {
+    // clear all storage in this room
+    console.log("alarm, delete storage");
+    await this.party.storage.deleteAll();
+  }
+}
+
+Server satisfies Party.Worker;