diff --git a/projects/ngx-editor/src/lib/modules/menu/image/image.component.html b/projects/ngx-editor/src/lib/modules/menu/image/image.component.html index 8e9e7465..ed3707f0 100644 --- a/projects/ngx-editor/src/lib/modules/menu/image/image.component.html +++ b/projects/ngx-editor/src/lib/modules/menu/image/image.component.html @@ -1,15 +1,20 @@ -
-
+
-
- - + +
{{ src.errors?.['pattern'] && 'Please enter valid url.' }}
@@ -18,19 +23,22 @@
- - + +
- - + +
- - +
diff --git a/projects/ngx-editor/src/lib/modules/menu/image/image.component.ts b/projects/ngx-editor/src/lib/modules/menu/image/image.component.ts index 7def7ea3..991c9ddc 100644 --- a/projects/ngx-editor/src/lib/modules/menu/image/image.component.ts +++ b/projects/ngx-editor/src/lib/modules/menu/image/image.component.ts @@ -6,6 +6,7 @@ import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/fo import { NodeSelection } from 'prosemirror-state'; import { EditorView } from 'prosemirror-view'; import { Observable, Subscription } from 'rxjs'; +import { nanoid } from 'nanoid'; import { NgxEditorService } from '../../../editor.service'; import { MenuService } from '../menu.service'; @@ -20,6 +21,7 @@ import { HTML } from '../../../trustedTypesUtil'; export class ImageComponent implements OnInit, OnDestroy { showPopup = false; isActive = false; + private componentId = nanoid(); private updateSubscription: Subscription; form = new FormGroup({ @@ -53,6 +55,10 @@ export class ImageComponent implements OnInit, OnDestroy { } } + getId(name:string): string { + return `${name}-${this.componentId}`; + } + getLabel(key: string): Observable { return this.ngxeService.locals.get(key); } diff --git a/projects/ngx-editor/src/lib/modules/menu/link/link.component.html b/projects/ngx-editor/src/lib/modules/menu/link/link.component.html index eb343bb2..f2a27215 100644 --- a/projects/ngx-editor/src/lib/modules/menu/link/link.component.html +++ b/projects/ngx-editor/src/lib/modules/menu/link/link.component.html @@ -1,16 +1,19 @@ -
-
+
-
- - + +
{{ href.errors?.['pattern'] && 'Please enter valid url.' }}
@@ -19,8 +22,10 @@
- - + +
{{ text.errors?.['required'] && 'This is required' }}
@@ -31,12 +36,11 @@
- - +
diff --git a/projects/ngx-editor/src/lib/modules/menu/link/link.component.ts b/projects/ngx-editor/src/lib/modules/menu/link/link.component.ts index efdd310e..378eed4f 100644 --- a/projects/ngx-editor/src/lib/modules/menu/link/link.component.ts +++ b/projects/ngx-editor/src/lib/modules/menu/link/link.component.ts @@ -10,6 +10,7 @@ import { NgxEditorService } from '../../../editor.service'; import { MenuService } from '../menu.service'; import { Link as LinkCommand } from '../MenuCommands'; import { HTML } from '../../../trustedTypesUtil'; +import { nanoid } from 'nanoid'; @Component({ selector: 'ngx-link', @@ -21,6 +22,7 @@ export class LinkComponent implements OnInit, OnDestroy { showPopup = false; isActive = false; canExecute = true; + private componentId = nanoid(); form: FormGroup; private editorView: EditorView; @@ -54,6 +56,10 @@ export class LinkComponent implements OnInit, OnDestroy { } } + getId(name:string): string { + return `${name}-${this.componentId}`; + } + getLabel(key: string): Observable { return this.ngxeService.locals.get(key); }