chore: Fix merge issues

packages/admin-ui/src/lib/core/src/shared/components/rich-text-editor/prosemirror/context-menu/context-menu.component.ts

@@ -13,8 +13,6 @@ import {
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 
-import { RichTextEditorComponent } from '../../rich-text-editor.component';
-
 import { ContextMenuConfig, ContextMenuItem, ContextMenuService } from './context-menu.service';
 
 type DropdownPosition = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
@@ -26,6 +24,7 @@ type DropdownPosition = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ContextMenuComponent implements AfterViewInit, OnDestroy {
+    @Input() editorMenuElement: HTMLElement;
     @ViewChild('contextMenu', { static: true }) private menuTemplate: TemplateRef<any>;
 
     menuConfig: ContextMenuConfig | undefined;
@@ -38,7 +37,6 @@ export class ContextMenuComponent implements AfterViewInit, OnDestroy {
     private hideTriggerHandler: (() => void) | undefined;
 
     constructor(
-        private richTextEditor: RichTextEditorComponent,
         private overlay: Overlay,
         private viewContainerRef: ViewContainerRef,
         public contextMenuService: ContextMenuService,
@@ -71,7 +69,7 @@ export class ContextMenuComponent implements AfterViewInit, OnDestroy {
                 this.triggerIsHidden.next(false);
 
                 const triggerButton = this.overlayRef.hostElement.querySelector('.context-menu-trigger');
-                const editorMenu = this.richTextEditor.menuElement;
+                const editorMenu = this.editorMenuElement;
                 if (triggerButton) {
                     const overlapMarginPx = 5;
                     this.hideTriggerHandler = () => {

packages/admin-ui/src/lib/core/src/shared/components/rich-text-editor/prosemirror/context-menu/context-menu.service.ts

@@ -77,6 +77,6 @@ export class ContextMenuService {
     }
 
     clearContextMenu() {
-        this.setContextMenuConfig$.next();
+        this.setContextMenuConfig$.next(undefined);
     }
 }

packages/admin-ui/src/lib/core/src/shared/components/rich-text-editor/raw-html-dialog/raw-html-dialog.component.ts

@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 
 import { ConfigArgDefinition } from '../../../../common/generated-types';
-import { Dialog } from '../../../../providers/modal/modal.service';
+import { Dialog } from '../../../../providers/modal/modal.types';
 import { HtmlEditorFormInputComponent } from '../../../dynamic-form-inputs/code-editor-form-input/html-editor-form-input.component';
 
 @Component({

packages/admin-ui/src/lib/core/src/shared/components/rich-text-editor/rich-text-editor.component.html

@@ -1,3 +1,3 @@
 <label class="clr-control-label">{{ label }}</label>
 <div #editor></div>
-<vdr-context-menu></vdr-context-menu>
+<vdr-context-menu [editorMenuElement]="menuElement"></vdr-context-menu>

yarn.lock

@@ -13782,10 +13782,10 @@ ordered-read-streams@^1.0.0:
   dependencies:
     readable-stream "^2.0.1"
 
-orderedmap@^1.1.0:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/orderedmap/-/orderedmap-1.1.5.tgz#4174c90b61bd7c25294932edf789f3b5677744d0"
-  integrity sha512-/fzlCGKRmfayGoI9UUXvJfc2nMZlJHW30QqEvwPvlg8tsX7jyiUSomYie6mYqx7Z9bOMGoag0H/q1PS/0PjYkg==
+orderedmap@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.0.0.tgz#12ff5ef6ea9d12d6430b80c701b35475e1c9ff34"
+  integrity sha512-buf4PoAMlh45b8a8gsGy/X6w279TSqkyAS0C0wdTSJwFSU+ljQFJON5I8NfjLHoCXwpSROIo2wr0g33T+kQshQ==
 
 os-homedir@^1.0.0:
   version "1.0.2"