Fix combineFormats with multiple values repeated, closes #3336

Co-authored-by: Dorotea Franjić <dorotea.franjic@intellegens.hr>
slab · Jun 10, 2022 · 2e138a0 · 2e138a0
1 parent 271c47d
commit 2e138a0
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/core/editor.js b/core/editor.js
@@ -325,6 +325,9 @@ function combineFormats(formats, combined) {
     } else if (Array.isArray(combined[name])) {
       if (combined[name].indexOf(formats[name]) < 0) {
         merged[name] = combined[name].concat([formats[name]]);
+      } else {
+        // If style already exists, don't add to an array, but don't lose other styles
+        merged[name] = combined[name];
       }
     } else {
       merged[name] = [combined[name], formats[name]];

diff --git a/test/unit/core/editor.js b/test/unit/core/editor.js
@@ -762,6 +762,41 @@ describe('Editor', function() {
       });
     });
 
+    it('across leaves repeated', function() {
+      const editor = this.initialize(
+        Editor,
+        `
+        <h1>
+          <strong class="ql-size-small"><em>01</em></strong>
+          <em class="ql-size-large"><u>23</u></em>
+          <em class="ql-size-huge"><u>45</u></em>
+          <em class="ql-size-small"><u>45</u></em>
+        </h1>
+      `,
+      );
+      expect(editor.getFormat(1, 4)).toEqual({
+        italic: true,
+        header: 1,
+        size: ['small', 'large', 'huge'],
+      });
+    });
+
+    it('across lines repeated', function() {
+      const editor = this.initialize(
+        Editor,
+        `
+        <h1 class="ql-align-right"><em>01</em></h1>
+        <h1 class="ql-align-center"><em>34</em></h1>
+        <h1 class="ql-align-right"><em>36</em></h1>
+        <h1 class="ql-align-center"><em>33</em></h1>
+      `,
+      );
+      expect(editor.getFormat(1, 3)).toEqual({
+        italic: true,
+        header: 1,
+        align: ['right', 'center'],
+      });
+    });
     it('across lines', function() {
       const editor = this.initialize(
         Editor,