Merge pull request #46 from mpreziuso/master

feat: upgrade to Lexical 0.11.1
umaranis · Jun 18, 2023 · bec69ba · bec69ba
2 parents 183335f + 7f151d3
commit bec69ba
Show file tree

Hide file tree

Showing 5 changed files with 2,325 additions and 2,272 deletions.
diff --git a/demos/playground/src/__tests__/e2e/CodeBlock.spec.mjs b/demos/playground/src/__tests__/e2e/CodeBlock.spec.mjs
@@ -1021,14 +1021,14 @@ test.describe('CodeBlock', () => {
         <code
           class="PlaygroundEditorTheme__code"
           spellcheck="false"
-          data-gutter="12"
+          data-gutter="1"
           data-highlight-language="javascript">
           <span
             class="PlaygroundEditorTheme__tokenProperty"
             data-lexical-text="true">
             1
           </span>
-          <br />
+          <span data-lexical-text="true"></span>
           <span
             class="PlaygroundEditorTheme__tokenProperty"
             data-lexical-text="true">

diff --git a/packages/svelte-lexical/package.json b/packages/svelte-lexical/package.json
@@ -20,33 +20,33 @@
     "svelte-check": "svelte-check"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.4",
-    "@babel/preset-env": "^7.21.4",
-    "@rollup/plugin-commonjs": "^24.1.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
-    "@rollup/plugin-typescript": "^11.1.0",
+    "@babel/core": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@rollup/plugin-commonjs": "^25.0.1",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-typescript": "^11.1.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/svelte": "^3.2.2",
     "@tsconfig/svelte": "^4.0.1",
     "@types/lodash-es": "^4.17.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.9",
+    "@typescript-eslint/parser": "^5.59.9",
     "babel-jest": "^29.5.0",
-    "eslint": "^8.39.0",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-svelte3": "^4.0.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "prettier-plugin-organize-attributes": "^0.0.5",
-    "prettier-plugin-svelte": "^2.10.0",
-    "rollup": "^3.21.0",
+    "prettier-plugin-svelte": "^2.10.1",
+    "rollup": "^3.25.0",
     "rollup-plugin-css-only": "^4.3.0",
-    "rollup-plugin-svelte": "^7.1.4",
-    "svelte-check": "^3.2.0",
+    "rollup-plugin-svelte": "^7.1.5",
+    "svelte-check": "^3.4.3",
     "svelte-jester": "^2.3.2",
-    "svelte-preprocess": "^5.0.3",
-    "typescript": "^5.0.4"
+    "svelte-preprocess": "^5.0.4",
+    "typescript": "^5.1.3"
   },
   "keywords": [
     "lexical",
@@ -60,28 +60,28 @@
     "dist"
   ],
   "dependencies": {
-    "@lexical/clipboard": "0.9.1",
-    "@lexical/code": "0.9.1",
-    "@lexical/file": "0.9.1",
-    "@lexical/hashtag": "0.9.1",
-    "@lexical/history": "0.9.1",
-    "@lexical/link": "0.9.1",
-    "@lexical/list": "0.9.1",
-    "@lexical/mark": "0.9.1",
-    "@lexical/overflow": "0.9.1",
-    "@lexical/plain-text": "0.9.1",
-    "@lexical/rich-text": "0.9.1",
-    "@lexical/selection": "0.9.1",
-    "@lexical/table": "0.9.1",
-    "@lexical/text": "0.9.1",
-    "@lexical/utils": "0.9.1",
-    "@lexical/yjs": "0.9.1",
-    "lexical": "0.9.1",
+    "@lexical/clipboard": "0.11.1",
+    "@lexical/code": "0.11.1",
+    "@lexical/file": "0.11.1",
+    "@lexical/hashtag": "0.11.1",
+    "@lexical/history": "0.11.1",
+    "@lexical/link": "0.11.1",
+    "@lexical/list": "0.11.1",
+    "@lexical/mark": "0.11.1",
+    "@lexical/overflow": "0.11.1",
+    "@lexical/plain-text": "0.11.1",
+    "@lexical/rich-text": "0.11.1",
+    "@lexical/selection": "0.11.1",
+    "@lexical/table": "0.11.1",
+    "@lexical/text": "0.11.1",
+    "@lexical/utils": "0.11.1",
+    "@lexical/yjs": "0.11.1",
+    "lexical": "0.11.1",
     "lodash-es": "^4.17.21",
     "prettier": "^2.8.8",
-    "svelte": "^3.58.0",
+    "svelte": "^3.59.1",
     "y-websocket": "1.5.0",
-    "yjs": "13.6.0"
+    "yjs": "13.6.2"
   },
   "jest": {
     "transform": {

diff --git a/packages/svelte-lexical/src/core/plugins/collaboration/YjsCollaboration.svelte b/packages/svelte-lexical/src/core/plugins/collaboration/YjsCollaboration.svelte
@@ -94,6 +94,7 @@
       name,
       color,
       document.activeElement === editor.getRootElement(),
+      awareness,
     );
 
     const onProviderDocReload = (ydoc: Doc) => {

diff --git a/packages/svelte-lexical/src/core/plugins/collaboration/YjsFocusTracking.svelte b/packages/svelte-lexical/src/core/plugins/collaboration/YjsFocusTracking.svelte
@@ -15,19 +15,21 @@
   export let color: string;
 
   onMount(() => {
+    const {awareness} = provider;
+
     return mergeRegister(
       editor.registerCommand(
         FOCUS_COMMAND,
         () => {
-          setLocalStateFocus(provider, name, color, true);
+          setLocalStateFocus(provider, name, color, true, awareness);
           return false;
         },
         COMMAND_PRIORITY_EDITOR,
       ),
       editor.registerCommand(
         BLUR_COMMAND,
         () => {
-          setLocalStateFocus(provider, name, color, false);
+          setLocalStateFocus(provider, name, color, false, awareness);
           return false;
         },
         COMMAND_PRIORITY_EDITOR,
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,6 +94,7 @@ @@
           name,
           color,
           document.activeElement === editor.getRootElement(),
+          awareness,
         );
         const onProviderDocReload = (ydoc: Doc) => {
@@ Expand Down @@