Fix inserting inline embed not working when attributes are same

slab · Jun 7, 2023 · ded4666 · ded4666
1 parent b2a9da9
commit ded4666
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/core/editor.ts b/core/editor.ts
@@ -62,10 +62,6 @@ class Editor {
             ) {
               isImplicitNewlineAppended = true;
             }
-            // @ts-expect-error
-            const [leaf] = this.scroll.descendant(LeafBlot, index);
-            const formats = merge({}, bubbleFormats(leaf));
-            attributes = AttributeMap.diff(formats, attributes) || {};
           } else if (index > 0) {
             // @ts-expect-error
             const [leaf, offset] = this.scroll.descendant(LeafBlot, index - 1);
@@ -82,6 +78,13 @@ class Editor {
             }
           }
           this.scroll.insertAt(index, key, op.insert[key]);
+
+          if (isInlineEmbed) {
+            // @ts-expect-error
+            const [leaf] = this.scroll.descendant(LeafBlot, index);
+            const formats = merge({}, bubbleFormats(leaf));
+            attributes = AttributeMap.diff(formats, attributes) || {};
+          }
         }
         scrollLength += length;
       } else {

diff --git a/test/unit/core/editor.js b/test/unit/core/editor.js
@@ -548,6 +548,14 @@ describe('Editor', function () {
       );
     });
 
+    it('prepend inline embed to another inline embed with same attributes', function () {
+      const editor = this.initialize(Editor, '<p><img src="#" alt="hi"/></p>');
+      editor.applyDelta(new Delta().insert({ image: '#' }, { alt: 'hi' }));
+      expect(this.container).toEqualHTML(
+        '<p><img src="#" alt="hi"><img src="#" alt="hi"></p>',
+      );
+    });
+
     it('insert block embed with delete before block embed', function () {
       const editor = this.initialize(
         Editor,