croco-html 20.4.4 → 20.4.6

package/fesm2022/croco-html.mjs

@@ -3428,19 +3428,24 @@ class TagEditorService {
 
 class DefinedCustomEditorBlockComponent {
     set tagService(data) {
+        this._tagServiceSub$.next();
         this._tagService = data;
         this._tagService.tag$
-            .pipe(takeUntilDestroyed(this._destroyRef))
+            .pipe(takeUntil(this._tagServiceSub$))
             .subscribe(tag => {
             this._tag = tag;
             this._cdr.markForCheck();
         });
+        if (this.dynamicContainerRef) {
+            this.dynamicContainerRef.setInput("tagService", this._tagService);
+        }
         this._cdr.markForCheck();
     }
     constructor(_options) {
         this._options = _options;
         this._cdr = inject(ChangeDetectorRef);
-        this._destroyRef = inject(DestroyRef);
+        this._destroy$ = new Subject();
+        this._tagServiceSub$ = new Subject();
         this.useDynamicComponent = false;
     }
     ngOnInit() {
@@ -3454,7 +3459,11 @@ class DefinedCustomEditorBlockComponent {
         this._cdr.markForCheck();
     }
     ngOnDestroy() {
-        this.dynamicContainerRef.destroy();
+        this._tagServiceSub$.next();
+        this._tagServiceSub$.complete();
+        this._destroy$.next();
+        this._destroy$.complete();
+        this.dynamicContainerRef?.destroy();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: DefinedCustomEditorBlockComponent, deps: [{ token: CrocoHtmlOptionsToken }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.15", type: DefinedCustomEditorBlockComponent, isStandalone: true, selector: "croco-html-defined-custom-editor-block", inputs: { tagService: "tagService" }, viewQueries: [{ propertyName: "viewContainerRef", first: true, predicate: ["container"], descendants: true, read: ViewContainerRef, static: true }], ngImport: i0, template: "<ng-container #container>\n    @if (!useDynamicComponent) {\n    <div>\n        \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0440\u0430\u0437\u043C\u0435\u0442\u043A\u0438 \u0434\u043B\u044F {{_tag.tagDescription.tag}} \u043D\u0435 \u043E\u043F\u0438\u0441\u0430\u043D.\n    </div>\n    <div>\n        \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0435 CrocoHtmlOptions.definedCustomTagViewRenderers[{{_tag.tagDescription.tag}}].editorComponent\n    </div>\n    }\n</ng-container>", changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
@@ -3475,11 +3484,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
 
 class MainEditorBlockComponent {
     set tag(data) {
+        this._tagSub$.next();
         this._tag = data;
         this._tagService = new TagEditorService();
         this._tagService.tag$.next(this._tag);
         this._tagService.presentOrEdit$
-            .pipe(takeUntil(this.unsubscribe))
+            .pipe(takeUntil(this._tagSub$))
             .subscribe(val => {
             this.presentOrEdit = val;
             this._cdr.markForCheck();
@@ -3489,6 +3499,7 @@ class MainEditorBlockComponent {
         this._options = _options;
         this.textTags = TextTags.allTextTags;
         this.unsubscribe = new Subject();
+        this._tagSub$ = new Subject();
         this._cdr = inject(ChangeDetectorRef);
         this._tag = null;
         this.presentOrEdit = true;
@@ -3510,6 +3521,8 @@ class MainEditorBlockComponent {
         this.onTagRemoved.emit(this._tag);
     }
     ngOnDestroy() {
+        this._tagSub$.next();
+        this._tagSub$.complete();
         this.unsubscribe.next();
         this.unsubscribe.complete();
     }