Merge branch 'main' into forward-refs

Author: nperez0111

examples/05-interoperability/05-converting-blocks-to-pdf/README.md

@@ -1 +1,5 @@
 # Exporting documents to PDF
+
+This example exports the current document (all blocks) as an PDF file and downloads it to your computer.
+
+**Try it out:** Edit the document and click "Download .pdf" in top-left corner, to download the PDF file.

examples/05-interoperability/06-converting-blocks-to-docx/README.md

@@ -1 +1,5 @@
 # Exporting documents to .docx (Office Open XML)
+
+This example exports the current document (all blocks) as an Microsoft Word Document (DOCX) file and downloads it to your computer.
+
+**Try it out:** Edit the document and click "Download .docx" in top-left corner, to download the DOCX file.

examples/05-interoperability/07-converting-blocks-to-odt/tsconfig.json

@@ -15,7 +15,7 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,

nx.json

@@ -11,7 +11,7 @@
     "build": {
       "cache": true,
       "dependsOn": ["^build"],
-      "outputs": ["{projectRoot}/dist"]
+      "outputs": ["{projectRoot}/dist", "{projectRoot}/types"]
     },
     "test": {
       "cache": true,

package-lock.json

@@ -25,7 +25,7 @@
     "start:built": "npx serve playground/dist -c ../serve.json",
     "build:clean": "npm run clean && npm run gen && npm run clean && lerna run --stream build",
     "build": "lerna run --stream build",
-    "build:site": "lerna run --stream docs:build --concurrency 1",
+    "build:site": "npm run gen && lerna run --stream docs:build --concurrency 1",
     "lint": "lerna run --stream lint",
     "bootstrap": "lerna bootstrap --ci -- --force && patch-package",
     "install-new-packages": "lerna bootstrap -- --force && patch-package",

package.json

@@ -54,11 +54,11 @@
   "dependencies": {
     "@blocknote/core": "^0.24.2",
     "@emoji-mart/data": "^1.2.1",
-    "@emoji-mart/react": "^1.1.1",
     "@floating-ui/react": "^0.26.4",
     "@tiptap/core": "^2.7.1",
     "@tiptap/react": "^2.7.1",
     "@tiptap/pm": "^2.7.1",
+    "emoji-mart": "^5.6.0",
     "lodash.merge": "^4.6.2",
     "react-icons": "^5.2.1"
   },

packages/react/package.json

@@ -0,0 +1,23 @@
+// From https://github.com/missive/emoji-mart/blob/main/packages/emoji-mart-react/react.tsx
+import React, { useEffect, useRef } from "react";
+import { Picker } from "emoji-mart";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export default function EmojiPicker(props: any) {
+  const ref = useRef(null);
+  const instance = useRef(null) as any;
+
+  if (instance.current) {
+    instance.current.update(props);
+  }
+
+  useEffect(() => {
+    instance.current = new Picker({ ...props, ref });
+
+    return () => {
+      instance.current = null;
+    };
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return React.createElement("div", { ref });
+}

packages/react/src/components/Comments/EmojiMartPicker.tsx

@@ -1,8 +1,8 @@
-import Picker from "@emoji-mart/react";
 import { ReactNode, useState } from "react";
 
 import { useComponentsContext } from "../../editor/ComponentsContext.js";
 import { useBlockNoteContext } from "../../editor/BlockNoteContext.js";
+import Picker from "./EmojiMartPicker.js";
 
 export const EmojiPicker = (props: {
   onEmojiSelect: (emoji: { native: string }) => void;