Merge remote-tracking branch 'origin/main' into faker-name-deprecated

Author: pierrelouisdelx

docs/walkthroughs/collaboration-hocuspocus.md

@@ -40,7 +40,7 @@ server.listen();
 
 ```javascript
 import { HocuspocusProvider } from '@hocuspocus/provider';
-import { withYHistory, withYjs, YjsEditor, withYHistory } from '@slate-yjs/core';
+import { withYjs, YjsEditor, withYHistory } from '@slate-yjs/core';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { createEditor, Descendant, Editor, Transforms } from 'slate';
 import { Editable, Slate, withReact } from 'slate-react';

examples/backend/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @slate-yjs/example-backend
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`c453baf`](https://github.com/BitPhinix/slate-yjs/commit/c453baf5c7a720436ee434eda3e93fe16e1482fc)]:
+  - @slate-yjs/core@1.0.1
+
 ## 0.0.9
 
 ### Patch Changes

examples/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slate-yjs/example-backend",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "private": true,
   "type": "module",
   "scripts": {

examples/frontend/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @slate-yjs/example
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`c453baf`](https://github.com/BitPhinix/slate-yjs/commit/c453baf5c7a720436ee434eda3e93fe16e1482fc)]:
+  - @slate-yjs/core@1.0.1
+
 ## 0.0.9
 
 ### Patch Changes

examples/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slate-yjs/example",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "private": true,
   "scripts": {
     "dev": "vite",

packages/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @slate-yjs/core
 
+## 1.0.1
+
+### Patch Changes
+
+- [#402](https://github.com/BitPhinix/slate-yjs/pull/402) [`c453baf`](https://github.com/BitPhinix/slate-yjs/commit/c453baf5c7a720436ee434eda3e93fe16e1482fc) Thanks [@juliankrispel](https://github.com/juliankrispel)! - Fix applyDelta to produce correct slate operations for adjacent text operations
+
 ## 1.0.0
 
 ### Minor Changes

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@slate-yjs/core",
   "sideEffects": false,
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Yjs binding for Slate.",
   "keywords": [
     "slate",

packages/core/src/applyToSlate/textEvent.ts

@@ -159,9 +159,38 @@ function applyDelta(node: Element, slatePath: Path, delta: Delta): Operation[] {
       const childPath = [...slatePath, pathOffset];
 
       if (Text.isText(child)) {
+        const lastOp = ops[ops.length - 1];
+
+        /**
+         * The props that exist at the current path
+         * Since we're not actually using slate to update the node
+         * this is a simulation
+         */
+        const currentProps =
+          lastOp != null && lastOp.type === 'insert_node'
+            ? lastOp.node
+            : getProperties(child);
+
+        let lastPath: Path = [];
+
+        if (
+          lastOp != null &&
+          (lastOp.type === 'insert_node' ||
+            lastOp.type === 'insert_text' ||
+            lastOp.type === 'split_node' ||
+            lastOp.type === 'set_node')
+        ) {
+          lastPath = lastOp.path;
+        }
+
+        /**
+         * If the insert is a string and the attributes are the same as the
+         * props at the current path, we can just insert a text node
+         */
         if (
           typeof change.insert === 'string' &&
-          deepEquals(change.attributes ?? {}, getProperties(child))
+          deepEquals(change.attributes ?? {}, currentProps) &&
+          Path.equals(childPath, lastPath)
         ) {
           return ops.push({
             type: 'insert_text',