Merge pull request #1218 from julien/issue/1215

Fix toolbar location for images

Author: julien

src/ui/react/src/selections/selection-position.js

@@ -59,8 +59,15 @@
             payload.editorEvent.data.selectionData : null;
 
         if (selectionData && selectionData.element) {
-            centerToolbar(this, selectionData.element.getClientRect());
+            var nativeEditor = payload.editor.get('nativeEditor');
+            var uiNode = nativeEditor.config.uiNode;
 
+            var scrollTop = uiNode ? uiNode.scrollTop : 0;
+
+            var rect = selectionData.element.getClientRect();
+            rect.top += scrollTop;
+
+            centerToolbar(this, rect);
             return true;
         }
     };
@@ -92,4 +99,4 @@
         image: imageSelectionSetPosition,
         table: tableSelectionSetPosition
     };
-}());
+}());