Merge branch 'main' into export-irangestyle

Author: biswalom22

dist/canvas-editor.es.js

@@ -6790,6 +6790,8 @@ class RangeManager {
     return rangeStyle;
   }
   setRangeStyle() {
+    if (!this.eventBus || !this.listener)
+      return;
     const rangeStyleChangeListener = this.listener.rangeStyleChange;
     const isSubscribeRangeStyleChange = this.eventBus.isSubscribe("rangeStyleChange");
     if (!rangeStyleChangeListener && !isSubscribeRangeStyleChange)
@@ -10870,6 +10872,7 @@ class Draw {
     __publicField(this, "visiblePageNoList");
     __publicField(this, "intersectionPageNo");
     __publicField(this, "lazyRenderIntersectionObserver");
+    __publicField(this, "isDestroyed", false);
     this.container = this._wrapContainer(rootContainer);
     this.pageList = [];
     this.ctxList = [];
@@ -11039,6 +11042,8 @@ class Draw {
     return this.intersectionPageNo;
   }
   setIntersectionPageNo(payload) {
+    if (this.isDestroyed)
+      return;
     this.intersectionPageNo = payload;
     if (this.listener.intersectionPageNoChange) {
       this.listener.intersectionPageNoChange(this.intersectionPageNo);
@@ -12085,6 +12090,8 @@ class Draw {
   }
   render(payload) {
     var _a;
+    if (this.isDestroyed)
+      return;
     const { header, footer } = this.options;
     const { isSubmitHistory = true, isSetCursor = true, isCompute = true, isLazy = true, isInit = false } = payload || {};
     let { curIndex } = payload || {};
@@ -12187,6 +12194,7 @@ class Draw {
     });
   }
   destroy() {
+    this.isDestroyed = true;
     this.container.remove();
     this.globalEvent.removeEvent();
     this.scrollObserver.removeEvent();

src/editor/DOMEventHandlers.ts

@@ -35,16 +35,16 @@ export class DOMEventHandlers {
     // }
     if (DOMEventHandlers.instance) {
       try {
-        DOMEventHandlers.instance.destroy();
+        DOMEventHandlers.instance.destroy()
       } catch (e) {
-        console.warn("Cleaning up old editor instance");
+        console.warn('Cleaning up old editor instance')
       }
     }
     DOMEventHandlers.instance = new Editor(container, data, options)
     DOMEventHandlers.instance.command.executeSetLocale('en')
     DOMEventHandlers.instance.register.langMap('en', en)
 
-    return DOMEventHandlers.instance;
+    return DOMEventHandlers.instance
   }
 
   static handleUndo() {

src/editor/core/draw/Draw.ts

@@ -143,6 +143,8 @@ export class Draw {
   private intersectionPageNo: number
   private lazyRenderIntersectionObserver: IntersectionObserver | null
 
+  private isDestroyed = false
+
   constructor(
     rootContainer: HTMLElement,
     options: DeepRequired<IEditorOption>,
@@ -357,6 +359,7 @@ export class Draw {
   }
 
   public setIntersectionPageNo(payload: number) {
+    if (this.isDestroyed) return
     this.intersectionPageNo = payload
     if (this.listener.intersectionPageNoChange) {
       this.listener.intersectionPageNoChange(this.intersectionPageNo)
@@ -1716,6 +1719,7 @@ export class Draw {
   }
 
   public render(payload?: IDrawOption) {
+    if (this.isDestroyed) return
     const { header, footer } = this.options
     const {
       isSubmitHistory = true,
@@ -1849,6 +1853,7 @@ export class Draw {
   }
 
   public destroy() {
+    this.isDestroyed = true
     this.container.remove()
     this.globalEvent.removeEvent()
     this.scrollObserver.removeEvent()

src/editor/core/range/RangeManager.ts

@@ -318,6 +318,7 @@ export class RangeManager {
   }
 
   public setRangeStyle() {
+    if (!this.eventBus || !this.listener) return
     const rangeStyleChangeListener = this.listener.rangeStyleChange
     const isSubscribeRangeStyleChange =
       this.eventBus.isSubscribe('rangeStyleChange')

src/editor/dataset/enum/Row.ts

@@ -3,5 +3,5 @@ export enum RowFlex {
   CENTER = 'center',
   RIGHT = 'right',
   ALIGNMENT = 'alignment',
-  JUSTIFY = "justify",
+  JUSTIFY = 'justify',
 }

src/editor/index.ts

@@ -185,7 +185,7 @@ export default class Editor {
     })
     // 监听
     this.listener = new Listener()
-    this.eventBus = new EventBus()
+    this.eventBus = new EventBus<EventBusMap>()
     // start up
     const draw = new Draw(
       container,