fix: allow disabling menu component

sibiraj-s · Dec 28, 2020 · 998ca3c · 998ca3c
1 parent 0fd4f42
commit 998ca3c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/src/lib/editor.component.html b/src/lib/editor.component.html
@@ -2,6 +2,7 @@
   <ngx-menu 
     [toolbar]="toolbar" 
     [editorView]="view"
+    *ngIf="toolbar"
   >
   </ngx-menu>
   <ngx-bubble></ngx-bubble>

diff --git a/src/lib/editor.component.ts b/src/lib/editor.component.ts
@@ -51,7 +51,7 @@ export class NgxEditorComponent implements ControlValueAccessor, OnInit, OnDestr
   }
 
   get toolbar(): Toolbar {
-    return this.config.menu.toolbar;
+    return this.config.menu?.toolbar;
   }
 
   writeValue(value: object | null): void {

diff --git a/src/lib/editor.service.ts b/src/lib/editor.service.ts
@@ -102,18 +102,20 @@ export class NgxEditorService {
 export const provideMyServiceOptions = (config?: NgxEditorConfig): NgxEditorServiceConfig => {
   let menu: Menu;
 
-  if (!config.menu) {
-    menu = DEFAULT_MENU;
-  } else if (Array.isArray(config.menu)) {
-    menu = {
-      ...DEFAULT_MENU,
-      toolbar: config.menu,
-    };
-  } else {
-    menu = {
-      ...DEFAULT_MENU,
-      ...config.menu,
-    };
+  if (config.menu !== null) {
+    if (!config.menu) {
+      menu = DEFAULT_MENU;
+    } else if (Array.isArray(config.menu)) {
+      menu = {
+        ...DEFAULT_MENU,
+        toolbar: config.menu,
+      };
+    } else {
+      menu = {
+        ...DEFAULT_MENU,
+        ...config.menu,
+      };
+    }
   }
 
   return {

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -40,6 +40,6 @@ export interface NgxEditorConfig {
   schema?: Schema;
   plugins?: Plugin[];
   nodeViews?: NodeViews;
-  menu?: Menu | Toolbar;
+  menu?: null | Menu | Toolbar;
   locals?: Partial<Record<LocalsKeys, string>>;
 }