Fixes dnd for url bar icon

Resolves brave#12476

Auditors:

Test Plan:

app/renderer/components/bookmarks/bookmarksToolbar.js

@@ -32,6 +32,7 @@ const dndData = require('../../../../js/dndData')
 const isWindows = require('../../../common/lib/platformUtil').isWindows()
 const frameStateUtil = require('../../../../js/state/frameStateUtil')
 const bookmarkUtil = require('../../../common/lib/bookmarkUtil')
+const bookmarkFoldersUtil = require('../../../common/lib/bookmarkFoldersUtil')
 const {elementHasDataset} = require('../../../../js/lib/eventUtil')
 const {getCurrentWindowId} = require('../../currentWindow')
 
@@ -60,16 +61,24 @@ class BookmarksToolbar extends React.Component {
     const bookmark = dnd.prepareBookmarkDataFromCompatible(e.dataTransfer)
     if (bookmark) {
       // Figure out the droppedOn element filtering out the source drag item
-      const bookmarkKey = bookmark.get('key')
+      let bookmarkKey = bookmark.get('key')
+      if (bookmarkKey == null) {
+        if (bookmark.get('type') === siteTags.BOOKMARK_FOLDER) {
+          bookmarkKey = bookmarkFoldersUtil.getKey(bookmark)
+        } else {
+          bookmarkKey = bookmarkUtil.getKey(bookmark)
+        }
+      }
+
       const droppedOn = getClosestFromPos(e.clientX, bookmarkKey)
       if (droppedOn.selectedRef) {
         const isRightSide = !dnd.isLeftSide(ReactDOM.findDOMNode(droppedOn.selectedRef), e.clientX)
         const droppedOnKey = droppedOn.selectedRef.props.bookmarkKey
         const isDestinationParent = droppedOn.selectedRef.state.isFolder && droppedOn && droppedOn.isDroppedOn
         if (bookmark.get('type') === siteTags.BOOKMARK_FOLDER) {
-          appActions.moveBookmarkFolder(bookmark.get('key'), droppedOnKey, isRightSide, isDestinationParent)
+          appActions.moveBookmarkFolder(bookmarkKey, droppedOnKey, isRightSide, isDestinationParent)
         } else {
-          appActions.moveBookmark(bookmark.get('key'), droppedOnKey, isRightSide, isDestinationParent)
+          appActions.moveBookmark(bookmarkKey, droppedOnKey, isRightSide, isDestinationParent)
         }
         dnd.onDragEnd()
       }

app/renderer/components/navigation/urlBarIcon.js

@@ -132,7 +132,8 @@ class UrlBarIcon extends React.Component {
   onDragStart (e) {
     dndData.setupDataTransferURL(e.dataTransfer, this.props.location, this.props.title)
     dndData.setupDataTransferBraveData(e.dataTransfer, dragTypes.TAB, {
-      tabId: this.props.tabId
+      tabId: this.props.tabId,
+      location: this.props.location
     })
   }
 

js/dnd.js

@@ -6,7 +6,9 @@ const windowActions = require('./actions/windowActions')
 const appActions = require('./actions/appActions')
 const ReactDOM = require('react-dom')
 const dndData = require('./dndData')
+const Immutable = require('immutable')
 const dragTypes = require('./constants/dragTypes')
+const siteTags = require('./constants/siteTags')
 const appStoreRenderer = require('./stores/appStoreRenderer')
 const {getCurrentWindowId} = require('../app/renderer/currentWindow')
 const {ESC} = require('../app/common/constants/keyCodes.js')
@@ -138,6 +140,10 @@ module.exports.prepareBookmarkDataFromCompatible = (dataTransfer) => {
     const dragData = dndData.getDragData(dataTransfer, dragTypes.TAB)
     if (dragData) {
       windowActions.onFrameBookmark(dragData.get('tabId'))
+      bookmark = Immutable.fromJS({
+        location: dragData.get('location'),
+        type: siteTags.BOOKMARK
+      })
     }
   }
   return bookmark