From 3e2f6244f7e27fcb171ae65204b4ef3c8811315e Mon Sep 17 00:00:00 2001
From: Tanya Fomina <fomina.tatianaaa@yandex.ru>
Date: Tue, 5 Jul 2022 00:02:14 +0800
Subject: [PATCH] Rename and cleanup

---
 src/components/block/index.ts                 | 26 ++++---------------
 .../modules/toolbar/blockSettings.ts          |  2 +-
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/components/block/index.ts b/src/components/block/index.ts
index b5b1faee..d38b67ef 100644
--- a/src/components/block/index.ts
+++ b/src/components/block/index.ts
@@ -643,29 +643,13 @@ export default class Block extends EventsDispatcher<BlockEvents> {
   }
 
   /**
-   * Enumerates initialized tunes and returns fragment that can be appended to the toolbars area
-   *
-   * @returns {DocumentFragment[]}
+   * Returns list of tunes available for block
    */
-  public renderTunes(): [DocumentFragment, DocumentFragment] {
-    const tunesElement = document.createDocumentFragment();
-    const defaultTunesElement = document.createDocumentFragment();
+  public getTunesList(): PopoverItem[] {
+    const tunes = Array.from(this.tunesInstances.values());
+    const defaultTunes = Array.from(this.defaultTunesInstances.values());
 
-    this.tunesInstances.forEach((tune) => {
-      $.append(tunesElement, tune.render());
-    });
-    this.defaultTunesInstances.forEach((tune) => {
-      $.append(defaultTunesElement, tune.render());
-    });
-
-    return [tunesElement, defaultTunesElement];
-  }
-
-  /**
-   *
-   */
-  public getTunesItems(): PopoverItem[] {
-    return Array.from(this.defaultTunesInstances.values())
+    return tunes.concat(defaultTunes)
       .map(tune => tune.blockSettings)
       .filter(item => !!item);
   }
diff --git a/src/components/modules/toolbar/blockSettings.ts b/src/components/modules/toolbar/blockSettings.ts
index e4c0b5e4..44448405 100644
--- a/src/components/modules/toolbar/blockSettings.ts
+++ b/src/components/modules/toolbar/blockSettings.ts
@@ -109,7 +109,7 @@ export default class BlockSettings extends Module<BlockSettingsNodes> {
       searchable: true,
       filterLabel: I18n.ui(I18nInternalNS.ui.toolbar.toolbox, 'Filter'),
       nothingFoundLabel: I18n.ui(I18nInternalNS.ui.toolbar.toolbox, 'Nothing found'),
-      items: targetBlock.getTunesItems(),
+      items: targetBlock.getTunesList(),
       customContent: this.nodes.toolSettings,
       api: this.Editor.API.methods,
     });