Drag multiple items in tree-view #1179

UziTech · 2017-09-10T05:51:21Z

Description of the Change

Allow multiple items to be dragged to a folder. This is a rebase of Drag multiple items in tree-view #793

Allow multi-select to work like it is supposed to

Benefits

Multi-select will work like other file explorers

Possible Drawbacks

none

Applicable Issues

Fixes #232
Supersedes and closes #793

winstliu · 2017-09-10T18:02:04Z

@UziTech what is the purpose of 0f7a4b7?

UziTech · 2017-09-10T19:41:32Z

@50Wliu

When trying to drag multiple files you click and hold on one of the selected files and drag to a folder.

When selecting only a single selected file when multiple are selected you just click on the selected file.

We need to make sure the user is not dragging before deselecting all files except for the one that is clicked on. In order to do that we need to do the deselect on mouseup.

We still want most mouse operations to occur on mousedown. Only when we need to make sure there is no dragging do we do the operation on mouseup.

Ben3eeE · 2017-09-16T20:56:12Z

I'm signing up for testing here since I tested the original PR.

andyfleming · 2017-09-23T22:21:03Z

Great work! Let's get this done!

I can't believe we can't drag multiple files in atom yet 😆 .

UziTech · 2017-10-06T18:19:13Z

@Ben3eeE anything holding this up?

Ben3eeE · 2017-10-06T20:10:31Z

@UziTech Sorry been swamped with other things. I will take a look as soon as I get a chance to, hopefully I will have some time this weekend ⚡️

UziTech · 2017-10-19T18:32:40Z

I rebased again and fixed the merge conflicts in the tests

UziTech · 2017-10-27T13:40:02Z

@Ben3eeE Any way we can get this out the door so I don't have to keep rebasing?

arthurlacoste · 2017-11-08T18:29:44Z

Please, merge this feature !

When a directory and its children are being dragged, only drag the directory, not the individual children.

this test guarantees that dragging a directory d and additional files f into a new directory will move the entire directory d discreetly along with any additional files f.

re-enable a metaclick to allow an item to be selected from the multi-selection. change the behavior of drag image building so that there's no collapsing and properly deselects the drag image.

UziTech · 2018-01-29T15:23:02Z

I believe I fixed the issue where a folder would get deselected when dragging over it with files from another Atom window.

I added the class drag-over as well as selected so themes still highlight the folder but only remove the selected class on leave if it also has the drag-over class

@Ben3eeE I manually tested all of those cases on a Windows 10 and they seem to work as expected. One other case I came across that doesn't work but probably should is dropping a selection on a file. I would expect that the selection would be moved into the same folder as the file that is being dropped on, but right now the move operation is just canceled when dropping on a file.

Actual:

Expected:

Ben3eeE · 2018-01-29T15:34:53Z

One other case I came across that doesn't work but probably should is dropping a selection on a file. I would expect that the selection would be moved into the same folder as the file that is being dropped on, but right now the move operation is just canceled when dropping on a file.

Tested this quick and it appears to also be an issue on master so it's not going to block this PR from moving forward. Do you want to create an issue for this?

UziTech · 2018-01-29T15:49:25Z

I just added it to this pr

winstliu · 2018-01-29T22:12:26Z

lib/tree-view.coffee

@@ -869,7 +873,7 @@ class TreeView
      return

    entryName = path.basename(initialPath)
-    newPath = "#{newDirectoryPath}/#{entryName}".replace(/\s+$/, '')
+    newPath = "#{newDirectoryPath}#{path.sep}#{entryName}".replace(/\s+$/, '')


Nit: could you remove this change and add it in a separate PR? It should also be path.join(newDirectoryPath, entryName).

I ask because I'm also fixing this same line in both #1180 and #1173, so it would probably be better to just submit this change in a different PR.

winstliu · 2018-01-29T22:13:31Z

lib/tree-view.coffee

-        return
+    e.stopPropagation()
+
+    # TODO: meta+click and ctrl+click should not do the same thing on Windows.


Is fixing this something that would require a significant rework of the specs?

Yes. Any spec that simulates a [ctrl] + [click] on windows, does so by setting e.metaKey to true.

It is also not that big of a deal because in Windows meta(Windows key)+click isn't something people usually do.

winstliu · 2018-01-29T22:14:34Z

lib/tree-view.coffee

-      else if e.metaKey or (e.ctrlKey and process.platform isnt 'darwin')
-        @selectMultipleEntries(entryToSelect)
+    # return early if clicking on a selected entry
+    if entryToSelect.classList.contains('selected')



🔥 blank line

winstliu · 2018-01-29T22:19:27Z

lib/tree-view.coffee

@@ -38,6 +38,8 @@ class TreeView
    @emitter = new Emitter
    @roots = []
    @selectedPath = null
+    @selectOnMouseUp = null
+    @lastFocusedElement = null


Seems like this makes more sense as @lastFocusedEntry?

winstliu · 2018-01-29T22:21:55Z

lib/tree-view.coffee

  #         menu with only items that make sense for multi select functionality
  showMultiSelectMenu: ->
    @list.classList.remove('full-menu')
    @list.classList.add('multi-select')

+  toggleMultiSelectMenu: ->


toggle generally implies "if on, turn off (and vice versa)". Therefore a better name for this method might be showMultiSelectMenuIfNecessary.

winstliu · 2018-01-29T22:23:35Z

lib/tree-view.coffee

+          newElement.style.paddingRight = "1em"
+          dragImage.append(newElement)
+
+


🔥 extra empty line

winstliu · 2018-01-29T22:34:02Z

Going back to your comment here: #1179 (comment)

Perhaps click could be used to combine the two cases?

UziTech · 2018-01-29T23:07:21Z

I could use click but I would still need a variable letting the onClick function know if it should execute otherwise it would deselect a file after selecting it on mousedown. And we do want to use the mousedown function for selecting because someone might want to ctrl+click then just start dragging.

adamreisnz · 2018-02-03T03:13:11Z

Would be great to have this 👍

winstliu · 2018-02-03T03:23:17Z

Code changes look good to me. @Ben3eeE if you're good with this as well I think it can 🚢?

Ben3eeE · 2018-02-06T19:19:01Z

@UziTech All good from me when testing on Windows 👍 @ungb is going to go over the test plan on macOS and Linux and merge if all is good.

ungb · 2018-02-06T21:32:30Z

I'm looking into this now. going off test plan in #1179 (comment). I'll merge this once I'm done

ungb · 2018-02-07T04:49:17Z

I ran into the following while dragging between two atom windows.

See gif for repro.

Repro steps:
Run the following command to create the folders and file

mkdir test1 test2
cd test1 && touch a b c && cd ../test2 && touch a b c && cd ..
atom test1 && atom test2

Drag file a from folder test1 to folder test2 in the other atom window

Atom: 1.23.3 x64
Electron: 1.6.15
OS: Mac OS X 10.12.6
Thrown From: tree-view package 0.222.0

Stack Trace

Uncaught TypeError: Cannot read property 'collapse' of null

At /Users/ungb/github/packages/tree-view/lib/tree-view.coffee:1126

TypeError: Cannot read property 'collapse' of null
    at TreeView.module.exports.TreeView.onDrop (/packages/tree-view/lib/tree-view.coffee:1126:9)
    at /packages/tree-view/lib/tree-view.coffee:206:47)

UziTech · 2018-02-07T05:36:32Z

Nice catch

ungb · 2018-02-07T18:42:08Z

Ctrl+click doesn't work on linux.. it seems to just open up the context menu. Shift works fine.

@Ben3eeE does this work on windows? I can spend some time testing windows today as well.

After the latest change, everything works great on mac!

Ben3eeE · 2018-02-07T19:47:55Z

@Ben3eeE does this work on windows?

@ungb It did when I tested. I have not tested on the most recent commit however.

ungb · 2018-02-09T01:58:51Z

@Ben3eeE I think my issues is because I'm running on a VM on mac and it's doing something weird. I'll take a look when I get home on my windows machine and then try to see if I spin up a VM on there for linux. So far everything looks good, but every time I hit ctrl+click it opens up the context menu. I'm noticing this on my VM and happens on the desktop on windows too.

Ben3eeE · 2018-02-09T09:07:54Z

@ungb I have Ubuntu installed so I can test this on Linux if you run into more issues because of testing in a VM.

ungb · 2018-02-10T07:15:57Z

I've tested this and everything looks good to me. I'm going to merge this. I'm going to follow up with the team later on the appveyor failure so we can get this into master.

UziTech · 2018-02-10T07:35:08Z

jonathan-dejong · 2018-05-08T13:51:11Z

Any news on this?
From what I can tell with Atom 1.26.1 it is not merged yet.

Ben3eeE · 2018-05-08T14:17:12Z

@jonathan-dejong This is merged but it's not released yet because the tests are failing on atom/atom when upgrading the tree-view. You may want to subscribe to atom/atom#17088 for updates on when it will be available in a released version of Atom.

winstliu added the needs-review label Sep 10, 2017

winstliu self-assigned this Sep 10, 2017

UziTech force-pushed the multi-drag branch from c53de9d to 2802c7b Compare September 17, 2017 05:43

UziTech mentioned this pull request Sep 19, 2017

Drag multiple items in tree-view #793

Closed

andyfleming mentioned this pull request Sep 23, 2017

Move multiple files. #232

Closed

UziTech mentioned this pull request Sep 25, 2017

rebase Multi drag anderoonies/tree-view#1

Closed

UziTech force-pushed the multi-drag branch from 2802c7b to d77c861 Compare September 30, 2017 04:58

UziTech force-pushed the multi-drag branch from d77c861 to dc2e8ae Compare October 19, 2017 18:30

UziTech force-pushed the multi-drag branch from bfcbf81 to 1b832b4 Compare October 19, 2017 18:41

UziTech force-pushed the multi-drag branch from 2ef40f7 to aae42e7 Compare October 27, 2017 04:33

UziTech force-pushed the multi-drag branch from aae42e7 to 8f89574 Compare November 11, 2017 20:20

anderoonies and others added 10 commits November 15, 2017 07:55

allow mutliple dragging

f9f3c16

refactor event helpers for multiple targets in drag

bef2e44

spec for multi-drag

ff65c23

move files before their containing dir

911dab0

Don't drag dir entries on multi-drag

86ec83e

When a directory and its children are being dragged, only drag the directory, not the individual children.

collapse directories on drag for pretty dragImage

8d4ef3b

spec dragging a directory and files to a new directory

7283ece

this test guarantees that dragging a directory d and additional files f into a new directory will move the entire directory d discreetly along with any additional files f.

refactor drag image, clicking logic

3a5e85b

re-enable a metaclick to allow an item to be selected from the multi-selection. change the behavior of drag image building so that there's no collapsing and properly deselects the drag image.

fix merge leftovers

0310b07

select on mouse up

6ac91e9

UziTech added 2 commits January 29, 2018 09:48

allow drag onto file

a5cb6ec

add drag onto file tests

7fc8aef

winstliu reviewed Jan 29, 2018

View reviewed changes

small fixes

e704ee3

UziTech mentioned this pull request Feb 2, 2018

use path.join #1221

Merged

Merge branch 'master' into multi-drag

602fed0

fix dragging between windows

b717e0f

ungb merged commit 3424331 into atom:master Feb 10, 2018

winstliu mentioned this pull request Feb 24, 2018

Reset drag counts when dropping #851

Closed

Ben3eeE mentioned this pull request Mar 20, 2018

Can't move selected files to another folder #1033

Closed

winstliu mentioned this pull request Jul 4, 2018

Implement multi-selection move (#232) #619

Closed

		newElement.style.paddingRight = "1em"
		dragImage.append(newElement)

Drag multiple items in tree-view #1179

Drag multiple items in tree-view #1179

Conversation

UziTech commented Sep 10, 2017 • edited by Ben3eeE Loading

Description of the Change

Benefits

Possible Drawbacks

Applicable Issues

winstliu commented Sep 10, 2017

UziTech commented Sep 10, 2017

Ben3eeE commented Sep 16, 2017

andyfleming commented Sep 23, 2017

UziTech commented Oct 6, 2017

Ben3eeE commented Oct 6, 2017

UziTech commented Oct 19, 2017

UziTech commented Oct 27, 2017

arthurlacoste commented Nov 8, 2017

UziTech commented Jan 29, 2018

Ben3eeE commented Jan 29, 2018

UziTech commented Jan 29, 2018

winstliu Jan 29, 2018

Choose a reason for hiding this comment

winstliu Jan 29, 2018

Choose a reason for hiding this comment

UziTech Jan 29, 2018 • edited Loading

Choose a reason for hiding this comment

winstliu Jan 29, 2018

Choose a reason for hiding this comment

winstliu Jan 29, 2018

Choose a reason for hiding this comment

winstliu Jan 29, 2018

Choose a reason for hiding this comment

winstliu Jan 29, 2018

Choose a reason for hiding this comment

winstliu commented Jan 29, 2018

UziTech commented Jan 29, 2018

adamreisnz commented Feb 3, 2018

winstliu commented Feb 3, 2018

Ben3eeE commented Feb 6, 2018

ungb commented Feb 6, 2018

ungb commented Feb 7, 2018 • edited Loading

Stack Trace

UziTech commented Feb 7, 2018

ungb commented Feb 7, 2018 • edited Loading

Ben3eeE commented Feb 7, 2018

ungb commented Feb 9, 2018

Ben3eeE commented Feb 9, 2018

ungb commented Feb 10, 2018

UziTech commented Feb 10, 2018

jonathan-dejong commented May 8, 2018

Ben3eeE commented May 8, 2018

UziTech commented Sep 10, 2017 •

edited by Ben3eeE

Loading

UziTech Jan 29, 2018 •

edited

Loading

ungb commented Feb 7, 2018 •

edited

Loading

ungb commented Feb 7, 2018 •

edited

Loading