Fix/add tunes data in mutation events

docs/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### 2.30.1
 
+– `Fix` – Block Tunes data are returned inside Block Mutations
 – `New` – Block Tunes now supports nesting items
 
 ### 2.30.0

src/components/block/index.ts

@@ -552,21 +552,7 @@ export default class Block extends EventsDispatcher<BlockEvents> {
    */
   public async save(): Promise<undefined | SavedData> {
     const extractedBlock = await this.toolInstance.save(this.pluginsContent as HTMLElement);
-    const tunesData: { [name: string]: BlockTuneData } = this.unavailableTunesData;
-
-    [
-      ...this.tunesInstances.entries(),
-      ...this.defaultTunesInstances.entries(),
-    ]
-      .forEach(([name, tune]) => {
-        if (_.isFunction(tune.save)) {
-          try {
-            tunesData[name] = tune.save();
-          } catch (e) {
-            _.log(`Tune ${tune.constructor.name} save method throws an Error %o`, 'warn', e);
-          }
-        }
-      });
+    const tunesData: { [name: string]: BlockTuneData } = this.getTunesData();
 
     /**
      * Measuring execution time
@@ -728,6 +714,30 @@ export default class Block extends EventsDispatcher<BlockEvents> {
     return convertBlockDataToString(blockData, this.tool.conversionConfig);
   }
 
+
+  /**
+   * Return the data of the corresponding tunes
+   */
+  public getTunesData(): { [name: string]: BlockTuneData } {
+    const tunesData: { [name: string]: BlockTuneData } = this.unavailableTunesData;
+
+    [
+      ...this.tunesInstances.entries(),
+      ...this.defaultTunesInstances.entries(),
+    ]
+      .forEach(([name, tune]) => {
+        if (_.isFunction(tune.save)) {
+          try {
+            tunesData[name] = tune.save();
+          } catch (e) {
+            _.log(`Tune ${tune.constructor.name} save method throws an Error %o`, 'warn', e);
+          }
+        }
+      });
+
+    return tunesData;
+  }
+
   /**
    * Make default Block wrappers and put Tool`s content there
    *

src/components/modules/blockManager.ts

@@ -989,15 +989,18 @@ export default class BlockManager extends Module {
    * @param detailData - additional data to pass with change event
    */
   private blockDidMutated<Type extends BlockMutationType>(mutationType: Type, block: Block, detailData: BlockMutationEventDetailWithoutTarget<Type>): Block {
+    const tunesData = block.getTunesData();
+
     const event = new CustomEvent(mutationType, {
       detail: {
         target: new BlockAPI(block),
+        tunes: tunesData,
         ...detailData as BlockMutationEventDetailWithoutTarget<Type>,
       },
     });
 
     this.eventsDispatcher.emit(BlockChanged, {
-      event: event as BlockMutationEventMap[Type],
+      event: event as unknown as BlockMutationEventMap[Type],
     });
 
     return block;

types/events/block/Base.ts

@@ -1,4 +1,5 @@
 import type { BlockAPI } from '../../api';
+import { BlockTuneData } from '../../block-tunes/block-tune-data';
 
 /**
  * Details of CustomEvent fired on block mutation
@@ -8,4 +9,6 @@ export interface BlockMutationEventDetail {
    * Affected block
    */
   target: BlockAPI;
+
+  tunes?: { [name: string]: BlockTuneData };
 }