fix: register config modules/options only once

KillerCodeMonkey · May 3, 2020 · da1bac8 · da1bac8
1 parent 0ae143d
commit da1bac8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/src/quill-editor.component.spec.ts b/src/quill-editor.component.spec.ts
@@ -1096,8 +1096,14 @@ describe('Advanced QuillEditorComponent', () => {
 
 describe('QuillEditor - base config', () => {
   let fixture: ComponentFixture<TestComponent>
+  let registerSpy: jasmine.Spy
+
+  beforeAll(() => {
+    registerSpy = spyOn(QuillNamespace, 'register').and.callThrough()
+  })
 
   beforeEach(() => {
+
     TestBed.configureTestingModule({
       declarations: [TestComponent, TestToolbarComponent],
       imports: [FormsModule, QuillModule],
@@ -1126,11 +1132,12 @@ describe('QuillEditor - base config', () => {
         trackChanges: 'all'
       }).providers
     }).compileComponents()
+
+    expect(registerSpy).toHaveBeenCalledWith('modules/custom', CustomModule)
   })
 
   it('renders editor with config',  async () => {
     fixture = TestBed.createComponent(TestComponent)
-    const spy = spyOn(QuillNamespace, 'register').and.callThrough()
     const spy2 = spyOn(QuillNamespace, 'import').and.callThrough()
     fixture.detectChanges()
     await fixture.whenStable()
@@ -1152,9 +1159,8 @@ describe('QuillEditor - base config', () => {
     expect(JSON.stringify(fixture.componentInstance.title)).toEqual(JSON.stringify({ ops: [{ attributes: { bold: true }, insert: `content`}, {'insert':'\n'}] }))
     expect(editor.root.dataset.placeholder).toEqual('placeholder')
     expect(spy2).toHaveBeenCalledWith('attributors/style/size')
-    expect(spy).toHaveBeenCalledWith({'attrName': 'size', 'keyName': 'font-size', 'scope': 5, 'whitelist': ['14']}, true)
-    expect(spy).toHaveBeenCalledWith('formats/size', {'attrName': 'size', 'keyName': 'font-size', 'scope': 5, 'whitelist': ['14']}, true)
-    expect(spy).toHaveBeenCalledWith('modules/custom', CustomModule)
+    expect(registerSpy).toHaveBeenCalledWith({'attrName': 'size', 'keyName': 'font-size', 'scope': 5, 'whitelist': ['14']}, true)
+    expect(registerSpy).toHaveBeenCalledWith('formats/size', {'attrName': 'size', 'keyName': 'font-size', 'scope': 5, 'whitelist': ['14']}, true)
 
     expect(fixture).toMatchSnapshot()
   })

diff --git a/src/quill-editor.component.ts b/src/quill-editor.component.ts
@@ -234,15 +234,13 @@ export class QuillEditorComponent implements AfterViewInit, ControlValueAccessor
       this.addClasses(this.classes)
     }
 
-    const customOptions = [...(this.config.customOptions || []), ...this.customOptions]
-    customOptions.forEach((customOption) => {
+    this.customOptions.forEach((customOption) => {
       const newCustomOption = QuillNamespace.import(customOption.import)
       newCustomOption.whitelist = customOption.whitelist
       QuillNamespace.register(newCustomOption, true)
     })
 
-    const customModules = [...(this.config.customModules || []), ...this.customModules]
-    customModules.forEach(({implementation, path}) => {
+    this.customModules.forEach(({implementation, path}) => {
       QuillNamespace.register(path, implementation)
     })
 

diff --git a/src/quill-view.component.ts b/src/quill-view.component.ts
@@ -88,15 +88,13 @@ export class QuillViewComponent implements AfterViewInit, OnChanges {
     const modules = Object.assign({}, this.modules || (this.config.modules || defaultModules))
     modules.toolbar = false
 
-    const customOptions = [...(this.config.customOptions || []), ...this.customOptions]
-    customOptions.forEach((customOption) => {
+    this.customOptions.forEach((customOption) => {
       const newCustomOption = QuillNamespace.import(customOption.import)
       newCustomOption.whitelist = customOption.whitelist
       QuillNamespace.register(newCustomOption, true)
     })
 
-    const customModules = [...(this.config.customModules || []), ...this.customModules]
-    customModules.forEach(({implementation, path}) => {
+    this.customModules.forEach(({implementation, path}) => {
       QuillNamespace.register(path, implementation)
     })
 

diff --git a/src/quill.module.ts b/src/quill.module.ts
@@ -22,6 +22,7 @@ import { QuillViewComponent } from './quill-view.component'
 export class QuillModule {
   static forRoot(config?: QuillConfig): ModuleWithProviders {
     if (config) {
+      // Only register custom options and modules once
       config.customOptions?.forEach((customOption) => {
         const newCustomOption = Quill.import(customOption.import)
         newCustomOption.whitelist = customOption.whitelist
@@ -31,7 +32,13 @@ export class QuillModule {
       config.customModules?.forEach(({implementation, path}) => {
         Quill.register(path, implementation)
       })
+
+      // set default modules as modules if not modules key passed on custom config
+      if (!config.modules) {
+        config.modules = defaultModules
+      }
     }
+
     return {
       ngModule: QuillModule,
       providers: [