From 717bd84b6a86a3533c539edf3fc4dc2fdd6cec7f Mon Sep 17 00:00:00 2001
From: Matthias risto <risto.matthias@gmail.com>
Date: Wed, 18 Sep 2024 14:48:47 +0200
Subject: [PATCH] fix: cleanup also on destroy, remove unnecessary check before
 setting signals

---
 apps/docs/src/styles/styles.css               |  1 +
 .../bna-side-menu-controller.component.ts     | 75 +++++++++++--------
 .../src/lib/styles/side-menu.css              | 30 ++++++++
 libs/ngx-blocknote/src/lib/styles/styles.css  |  1 +
 4 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 libs/ngx-blocknote/src/lib/styles/side-menu.css

diff --git a/apps/docs/src/styles/styles.css b/apps/docs/src/styles/styles.css
index 3dc2113..d03c282 100644
--- a/apps/docs/src/styles/styles.css
+++ b/apps/docs/src/styles/styles.css
@@ -2,6 +2,7 @@
 
 @import '../../../../libs/ngx-blocknote/src/lib/styles/core.css';
 @import '../../../../libs/ngx-blocknote/src/lib/styles/toolbar.css';
+@import '../../../../libs/ngx-blocknote/src/lib/styles/side-menu.css';
 @import '../../../../libs/ngx-blocknote/src/lib/styles/blocks.css';
 
 body {
diff --git a/libs/ngx-blocknote/src/lib/components/side-menu/bna-side-menu-controller.component.ts b/libs/ngx-blocknote/src/lib/components/side-menu/bna-side-menu-controller.component.ts
index f0d41f2..1830e85 100644
--- a/libs/ngx-blocknote/src/lib/components/side-menu/bna-side-menu-controller.component.ts
+++ b/libs/ngx-blocknote/src/lib/components/side-menu/bna-side-menu-controller.component.ts
@@ -3,30 +3,25 @@ import {
   Component,
   effect,
   ElementRef,
-  OnDestroy,
   Renderer2,
   signal,
 } from '@angular/core';
-import { autoUpdate, computePosition } from '@floating-ui/dom';
+import { Block, BlockNoteEditor } from '@blocknote/core';
 import { NgxBlocknoteService } from '../../services/ngx-blocknote.service';
-import { getVirtualElement } from '../../util/get-virtual-element.util';
 
 @Component({
   imports: [CommonModule],
   selector: 'bna-side-menu-controller',
   standalone: true,
   host: {
-    class: 'z-30 fixed',
+    class: 'bn-side-menu',
   },
   template: `@if (show()) {
     <ng-content />
   }`,
 })
-export class BnaSideMenuControllerComponent implements OnDestroy {
-  show = signal(false);
-  cleanup: () => void = () => {
-    return;
-  };
+export class BnaSideMenuControllerComponent {
+  show = signal(true);
 
   constructor(
     private ngxBlockNoteService: NgxBlocknoteService,
@@ -38,41 +33,59 @@ export class BnaSideMenuControllerComponent implements OnDestroy {
     });
   }
 
-  ngOnDestroy() {
-    this.cleanup();
-  }
-
   private adjustVisibilityAndPosition() {
     const editor = this.ngxBlockNoteService.editor();
     editor.sideMenu.onUpdate(async (sideMenuState) => {
-      this.cleanup();
-
       this.show.set(sideMenuState.show);
       this.ngxBlockNoteService.sideMenuFocusedBlock.set(sideMenuState.block);
       if (sideMenuState.show) {
-        //TODO: remove auto update
-        //had the problem that the first set position was not good
-        this.cleanup = autoUpdate(
-          getVirtualElement(sideMenuState.referencePos),
+        this.updateSideMenuAttributesWithBlock(editor, sideMenuState.block);
+        this.renderer2.setStyle(
           this.elRef.nativeElement,
-          async () => {
-            await this.updateSideMenuPosition(sideMenuState.referencePos);
-          },
+          'top',
+          `${sideMenuState.referencePos.y}px`,
         );
       }
     });
   }
 
-  private async updateSideMenuPosition(referencePos: DOMRect) {
-    const placement = referencePos.height < 80 ? 'left' : 'left-start';
-    const result = await computePosition(
-      getVirtualElement(referencePos),
+  private updateSideMenuAttributesWithBlock(
+    editor: BlockNoteEditor,
+    block: Block,
+  ) {
+    this.renderer2.setAttribute(
       this.elRef.nativeElement,
-      {
-        strategy: 'fixed',
-        placement: placement,
-      },
+      'data-block-type',
+      block.type,
     );
-    this.renderer2.setStyle(this.elRef.nativeElement, 'top', `${result.y}px`);
+
+    if (block.type === 'heading') {
+      this.renderer2.setAttribute(
+        this.elRef.nativeElement,
+        'data-level',
+        block.props.level.toString(),
+      );
+    } else {
+      this.renderer2.removeAttribute(this.elRef.nativeElement, 'data-level');
+    }
+    //TODO: remove any cast
+    if ((editor.schema.blockSchema[block.type] as any).isFileBlock) {
+      //TODO: remove any cast
+      if ((block.props as any).url) {
+        this.renderer2.setAttribute(
+          this.elRef.nativeElement,
+          'data-url',
+          'true',
+        );
+      } else {
+        this.renderer2.setAttribute(
+          this.elRef.nativeElement,
+          'data-url',
+          'false',
+        );
+      }
+    } else {
+      this.renderer2.removeAttribute(this.elRef.nativeElement, 'data-url');
+    }
   }
 }
diff --git a/libs/ngx-blocknote/src/lib/styles/side-menu.css b/libs/ngx-blocknote/src/lib/styles/side-menu.css
new file mode 100644
index 0000000..cd3143c
--- /dev/null
+++ b/libs/ngx-blocknote/src/lib/styles/side-menu.css
@@ -0,0 +1,30 @@
+
+/* Matching Side Menu height to block line height */
+.bn-side-menu {
+    @apply z-30 fixed flex items-center content-center;
+    height: 30px;
+}
+
+.bn-side-menu[data-block-type="heading"][data-level="1"] {
+    height: 78px;
+}
+
+.bn-side-menu[data-block-type="heading"][data-level="2"] {
+    height: 54px;
+}
+
+.bn-side-menu[data-block-type="heading"][data-level="3"] {
+    height: 37px;
+}
+
+.bn-side-menu[data-block-type="file"] {
+    height: 38px;
+}
+
+.bn-side-menu[data-block-type="audio"] {
+    height: 60px;
+}
+
+.bn-side-menu[data-url="false"] {
+    height: 54px;
+}
\ No newline at end of file
diff --git a/libs/ngx-blocknote/src/lib/styles/styles.css b/libs/ngx-blocknote/src/lib/styles/styles.css
index 81a3993..5d9537b 100644
--- a/libs/ngx-blocknote/src/lib/styles/styles.css
+++ b/libs/ngx-blocknote/src/lib/styles/styles.css
@@ -1,3 +1,4 @@
 @import './tailwind-base.css';
 @import './toolbar.css';
+@import './side-menu.css';
 @import './core.css';