fix: bulleted/numbered list is not detected as change(fix #757) (#1020)

* fix: initalize _ignoreChange in getCursorPosition function * chore: add `change` event test case(ol, ul wysiwyg command)
nhn · Jun 8, 2020 · d03b508 · d03b508
1 parent d9b9412
commit d03b508
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/apps/editor/test/unit/wysiwygCommands/ol.spec.js b/apps/editor/test/unit/wysiwygCommands/ol.spec.js
@@ -12,13 +12,14 @@ import EventManager from '@/eventManager';
 import WwTableSelectionManager from '@/wwTableSelectionManager';
 
 describe('OL', () => {
-  let wwe, sq, container;
+  let wwe, sq, container, eventManager;
 
-  beforeEach(() => {
+  beforeEach(done => {
     container = document.createElement('div');
+    eventManager = new EventManager();
     document.body.appendChild(container);
 
-    wwe = new WysiwygEditor(container, new EventManager());
+    wwe = new WysiwygEditor(container, eventManager);
 
     wwe.init();
 
@@ -27,6 +28,11 @@ describe('OL', () => {
     wwe.componentManager.addManager('list', WwListManager);
     wwe.componentManager.addManager('tableSelection', WwTableSelectionManager);
     sq.focus();
+
+    // wait for squire events routine
+    setTimeout(() => {
+      done();
+    }, 0);
   });
 
   // we need to wait squire input event process
@@ -263,4 +269,12 @@ describe('OL', () => {
     expect(range.startOffset).toBe(startOffset);
     expect(range.endOffset).toBe(endOffset);
   });
+
+  it('should emit change event', () => {
+    eventManager.listen('change', editor => {
+      expect(editor).toBe(wwe);
+    });
+
+    OL.exec(wwe);
+  });
 });
diff --git a/apps/editor/test/unit/wysiwygCommands/ul.spec.js b/apps/editor/test/unit/wysiwygCommands/ul.spec.js
@@ -12,13 +12,14 @@ import EventManager from '@/eventManager';
 import WwTableSelectionManager from '@/wwTableSelectionManager';
 
 describe('UL', () => {
-  let wwe, sq, container;
+  let wwe, sq, container, eventManager;
 
-  beforeEach(() => {
+  beforeEach(done => {
     container = document.createElement('div');
+    eventManager = new EventManager();
     document.body.appendChild(container);
 
-    wwe = new WysiwygEditor(container, new EventManager());
+    wwe = new WysiwygEditor(container, eventManager);
 
     wwe.init();
 
@@ -27,6 +28,11 @@ describe('UL', () => {
     wwe.componentManager.addManager('list', WwListManager);
     wwe.componentManager.addManager('tableSelection', WwTableSelectionManager);
     sq.focus();
+
+    // wait for squire events routine
+    setTimeout(() => {
+      done();
+    }, 0);
   });
 
   // we need to wait squire input event process
@@ -245,4 +251,12 @@ describe('UL', () => {
     expect(range.startOffset).toBe(startOffset);
     expect(range.endOffset).toBe(endOffset);
   });
+
+  it('should emit change event', () => {
+    eventManager.listen('change', editor => {
+      expect(editor).toBe(wwe);
+    });
+
+    UL.exec(wwe);
+  });
 });
diff --git a/libs/squire/build/squire-raw.js b/libs/squire/build/squire-raw.js
@@ -2993,6 +2993,7 @@ proto.getCursorPosition = function ( range ) {
         parent = node.parentNode;
         parent.removeChild( node );
         mergeInlines( parent, range );
+        this._ignoreChange = false;
     }
     return rect;
 };

diff --git a/libs/squire/build/squire.js b/libs/squire/build/squire.js
diff --git a/libs/squire/source/Editor.js b/libs/squire/source/Editor.js
@@ -410,6 +410,7 @@ proto.getCursorPosition = function ( range ) {
         parent = node.parentNode;
         parent.removeChild( node );
         mergeInlines( parent, range );
+        this._ignoreChange = false;
     }
     return rect;
 };