Merge fixes (#541)

* Merge fixes

* add type

* source map

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex.editor",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Codex Editor. Native JS, based on API and Open Source",
   "main": "build/codex-editor.js",
   "types": "./types/index.d.ts",

src/components/block.ts

@@ -153,8 +153,14 @@ export default class Block {
    * Get Block's JSON data
    * @return {Object}
    */
-  get data(): object {
-    return this.save();
+  get data(): BlockToolData {
+    return this.save().then((savedObject) => {
+      if (savedObject && !_.isEmpty(savedObject.data)) {
+        return savedObject.data;
+      } else {
+        return {};
+      }
+    });
   }
 
   /**

src/components/modules/blockManager.ts

@@ -243,7 +243,9 @@ export default class BlockManager extends Module {
 
     const blockToMergeData = await blockToMerge.data;
 
-    await targetBlock.mergeWith(blockToMergeData);
+    if (!_.isEmpty(blockToMergeData)) {
+      await targetBlock.mergeWith(blockToMergeData);
+    }
 
     this.removeBlock(blockToMergeIndex);
     this.currentBlockIndex = this._blocks.indexOf(targetBlock);

src/components/modules/sanitizer.ts

@@ -182,9 +182,8 @@ export default class Sanitizer extends Module {
    */
   public getInlineToolsConfig(name: string): SanitizerConfig {
     const {Tools} = this.Editor;
-
-    const toolsConfig = Tools.getToolSettings(name),
-      enableInlineTools = toolsConfig.inlineToolbar || [];
+    const toolsConfig = Tools.getToolSettings(name);
+    const enableInlineTools = toolsConfig.inlineToolbar || [];
 
     let config = {} as SanitizerConfig;
 

src/components/modules/saver.ts

@@ -27,12 +27,12 @@ export default class Saver extends Module {
       chainData = [];
 
     blocks.forEach((block) => {
-      chainData.push(block.data);
+      chainData.push(block.save());
     });
 
     const extractedData = await Promise.all(chainData);
-
     const sanitizedData = await this.Editor.Sanitizer.sanitizeBlocks(extractedData);
+
     return this.makeOutput(sanitizedData);
   }