From c85671aba479eb90b4e70757852dc66a4bf2f943 Mon Sep 17 00:00:00 2001
From: Ian Storm Taylor <ian@ianstormtaylor.com>
Date: Wed, 27 Jul 2016 14:34:11 -0700
Subject: [PATCH] add fragment handling to core onPaste

---
 lib/components/content.js | 14 +++-----------
 lib/plugins/core.js       | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/components/content.js b/lib/components/content.js
index fbb3d8e41..6ba364811 100644
--- a/lib/components/content.js
+++ b/lib/components/content.js
@@ -532,21 +532,13 @@ class Content extends React.Component {
 
     // If html, and the html includes a `data-fragment` attribute, it's actually
     // a raw-serialized JSON fragment from a previous cut/copy, so deserialize
-    // it and insert it normally.
+    // it and update the data.
     if (data.type == 'html' && ~data.html.indexOf('<span data-fragment="')) {
       const regexp = /data-fragment="([^\s]+)"/
       const matches = regexp.exec(data.html)
       const [ full, encoded ] = matches
-      const fragment = Base64.deserializeNode(encoded)
-      let { state } = this.props
-
-      state = state
-        .transform()
-        .insertFragment(fragment)
-        .apply()
-
-      this.onChange(state)
-      return
+      data.type = 'fragment'
+      data.fragment = Base64.deserializeNode(encoded)
     }
 
     this.props.onPaste(e, data)
diff --git a/lib/plugins/core.js b/lib/plugins/core.js
index 88f066fd4..5dc5125cb 100644
--- a/lib/plugins/core.js
+++ b/lib/plugins/core.js
@@ -4,8 +4,6 @@ import Character from '../models/character'
 import Placeholder from '../components/placeholder'
 import React from 'react'
 import String from '../utils/string'
-import keycode from 'keycode'
-import { IS_WINDOWS, IS_MAC } from '../utils/environment'
 
 /**
  * The default plugin.
@@ -482,12 +480,30 @@ function Plugin(options = {}) {
 
   function onPaste(e, data, state) {
     switch (data.type) {
+      case 'fragment':
+        return onPasteFragment(e, data, state)
       case 'text':
       case 'html':
         return onPasteText(e, data, state)
     }
   }
 
+  /**
+   * On paste fragment.
+   *
+   * @param {Event} e
+   * @param {Object} data
+   * @param {State} state
+   * @return {State}
+   */
+
+  function onPasteFragment(e, data, state) {
+    return state
+      .transform()
+      .insertFragment(data.fragment)
+      .apply()
+  }
+
   /**
    * On paste text, split blocks at new lines.
    *