Clean up cell selection behavior #3414

jasongrout · 2017-12-19T01:06:20Z

This PR:

disambiguates selected from active at the notebook widget level. There is a new function isSelectedOrActive that is the equivalent of the previous isSelected, and now isSelected and friends only refer to the selected property of a cell.
introduces a contiguous cell selection framework on the notebook widget. A contiguous selection is a single contiguous sequence of selected cells with the active cell at one end of the selection. The head of the selection is the active cell, and the anchor is the other end of the selection. Comprehensive tests are included for this framework.
Converts all selection UX to use the contiguous selection framework
Enhances the user interaction for selection so that it behaves more like text selection - shift-click and shift-drag updates a selection, clicking outside deselects all, etc.
Fixes a bug in updating the active cell index when a cell is moved
Other refactoring as necessary.

Another PR should create comprehensive tests for the UX around selection, particularly with keyboard handling and mouse events.

blink1073 · 2017-12-19T01:08:00Z

TDD baby!

blink1073

Nice!

blink1073 · 2017-12-20T22:17:59Z

packages/notebook/src/widget.ts

+      if (index === this.activeCellIndex) {
+        // Already collapsed selection, nothing more to do.
+        return;
+      } else {


else after a return

blink1073 · 2017-12-20T22:21:12Z

packages/notebook/src/widget.ts

+        Private.selectedProperty.set(this.widgets[head], false);
+      }
+
+      // Toggle everything strictly between head and index except anchor.


Reverse order in comment for clarity? between index and head?

blink1073 · 2017-12-20T22:26:08Z

test/src/notebook/widget.spec.ts

+        expect(selected(widget)).to.eql([]);
+        widget.select(widget.activeCell);
+        expect(selected(widget)).to.eql([widget.activeCellIndex]);
+      })


Missing semicolon (from the lint report)

blink1073 · 2017-12-21T10:16:45Z

Tested locally, fixed one bug where shift+click would immediately deselect on mouseup. This LGTM, thanks!

ellisonbg · 2017-12-21T15:58:30Z

@jasongrout, is this ready for testing/review?

…

On Thu, Dec 21, 2017 at 2:16 AM, Steven Silvester ***@***.***> wrote: Tested locally, fixed one bug where shift+click would immediately deselect on mouseup. This LGTM, thanks! — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#3414 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABr0E8yjaprnRNewZS4vNQMJk1iYnQHks5tCjANgaJpZM4RGTXw> .

-- Brian E. Granger Associate Professor of Physics and Data Science Cal Poly State University, San Luis Obispo @ellisonbg on Twitter and GitHub bgranger@calpoly.edu and ellisonbg@gmail.com

jasongrout · 2017-12-21T17:44:34Z

Tested locally, fixed one bug where shift+click would immediately deselect on mouseup. This LGTM, thanks!

I think I accidentally overwrote your fix with a force-push (since this was still a WIP PR), but I think I fixed the same thing.

jasongrout · 2017-12-21T17:50:44Z

@ellisonbg - there still are some questions about the interaction of selection and dragging, but I think the selection by itself is ready for comment. One problem I did notice with the current PR is that selecting a different notebook resets the active cell for the notebook you are leaving to 0.

jasongrout · 2017-12-22T03:13:32Z

@ellisonbg - I think this is ready for taking a spin. I haven't written tests for commits past fa914e3. I can work on writing those tests, or I can work on something more pressing for the release.

ellisonbg · 2017-12-22T05:18:17Z

Hmm, this builds but lab is pretty broken. Like the themes are not loading. @jasongrout have you rebased today? Could you? A lot has changed and I want to test it with everything else in place.

jasongrout · 2017-12-22T05:46:59Z

Sure, I could try to rebase. I'm still not quite happy with how selection and dragging interplays, so I'm tackling that again.

jasongrout · 2017-12-22T07:07:52Z

@ellisonbg - I'm much happier with how this works now. There still is a bug where it highlights too much when dragging a selection in the same document.

I'll rebase this tomorrow, but probably will not be able to do it in the morning.

jasongrout · 2017-12-22T07:09:18Z

Note to self: some of the tests are out of date, and lots of new tests need to be written to clarify the behavior. Let's see how many we can get done before a release deadline :).

jasongrout · 2017-12-22T07:13:21Z

(Of note, just like in a text editor, now shift and dragging the mouse changes the selection)

jasongrout · 2017-12-22T16:46:30Z

The bug that I'm still tracking down is if I highlight a bunch of cells and drag to move them in the same document, the active cell after the move seems to be randomly set - sometimes it's at the top of the selected/moved cells, sometimes at the bottom, and sometimes in the middle (!).

I think it's a race condition with the cell widgets catching up to the model moves. I'll investigate more when I'm back online in a few hours.

…ected querying just the selected state.

…own. There are still some subtle issues with starting a drag/drop we need to work through.

We need to use currentTarget, not target.

1. Prevent text selection right off. 2. If we don’t have a contiguous selection, deselect everything and write an error to the console.

jasongrout · 2017-12-22T23:17:58Z

I rebased on master.

We were not considering the case when a cell moves from before to behind the active cell, or vice versa.

blink1073 · 2017-12-23T07:04:29Z

LGTM, no longer WIP?

jasongrout · 2017-12-23T07:11:03Z

No longer WIP. Hopefully the tests pass (they do on my computer).

jasongrout · 2017-12-23T07:55:01Z

Travis passes!

blink1073 · 2017-12-23T11:59:19Z

Great work, thank you!

jasongrout changed the title ~~Add tests for selection~~ [WIP] Add tests for selection Dec 19, 2017

jasongrout changed the title ~~[WIP] Add tests for selection~~ [WIP] Audit cell selection behavior Dec 20, 2017

jasongrout changed the title ~~[WIP] Audit cell selection behavior~~ [WIP] Clean up cell selection behavior Dec 20, 2017

blink1073 added this to the Beta milestone Dec 20, 2017

blink1073 reviewed Dec 20, 2017

View reviewed changes

blink1073 assigned jasongrout Dec 21, 2017

blink1073 added pkg:notebook tag:Design and UX labels Dec 21, 2017

jasongrout force-pushed the selection branch from 84ce15d to b2bc05f Compare December 21, 2017 17:06

jasongrout added 9 commits December 22, 2017 15:56

Add tests for shift-clicking to extend selection.

86be612

Refactor some tests using the selected utility function.

a9ac14b

Mouseup when not dragging should deselect cells.

7fbb149

Mousedown should *not* deselect cells.

c03a2df

Rename notebook isSelected -> isSelectedOrActive and make a new isSel…

751afde

…ected querying just the selected state.

Add a contiguous selection framework to a notebook widget.

b126aa3

Add a mouseup handler to a notebook to deselect cells.

639917f

Add more tests for current behavior around extending selections.

d004a78

Add extendContiguousSelectionTo tests.

5289364

jasongrout added 12 commits December 22, 2017 15:56

Break up the extendContiguousSelectionTo tests.

1a68570

Add tests for getContiguousSelection.

ea71dd5

Extend selection (and move active cell) on mouseup rather than moused…

61746b9

…own. There are still some subtle issues with starting a drag/drop we need to work through.

Unnecessary else.

eb32b00

More cleanup.

7cf4a2a

Missing semicolon.

d94092a

Cleanup comment.

584370e

Be careful about when to call the various event handlers.

01a219d

We need to use currentTarget, not target.

If we click outside of the cells, just deselect all of the cells.

cfbbfbf

Select dropped cells.

975d937

Clean up event handling around mouse down/move/up events.

4fc4f46

When shift-clicking, handle contiguous selection errors.

e4302d2

1. Prevent text selection right off. 2. If we don’t have a contiguous selection, deselect everything and write an error to the console.

jasongrout force-pushed the selection branch from 2e0ae01 to 0920d53 Compare December 22, 2017 23:17

Fix the active cell index when a cell moves.

5d67859

We were not considering the case when a cell moves from before to behind the active cell, or vice versa.

jasongrout force-pushed the selection branch from 0920d53 to 5d67859 Compare December 23, 2017 06:14

jasongrout added 2 commits December 23, 2017 00:01

Add comprehensive onCellMoved tests for active cell index updates.

c53d316

Delete obsolete mouseup test.

0251d6b

jasongrout mentioned this pull request Dec 23, 2017

Audit multi-cell selection #3373

Closed

jasongrout changed the title ~~[WIP] Clean up cell selection behavior~~ Clean up cell selection behavior Dec 23, 2017

Fix lint errors.

63b38c6

blink1073 merged commit f635072 into jupyterlab:master Dec 23, 2017

This was referenced Dec 23, 2017

Prep for the beta release #3475

Merged

JupyterLab beta release plans #3299

Closed

lock bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Aug 9, 2019

lock bot locked as resolved and limited conversation to collaborators Aug 9, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up cell selection behavior #3414

Clean up cell selection behavior #3414

jasongrout commented Dec 19, 2017 •

edited

Loading

blink1073 commented Dec 19, 2017

blink1073 left a comment

blink1073 Dec 20, 2017

jasongrout Dec 21, 2017

blink1073 Dec 20, 2017

blink1073 Dec 20, 2017

blink1073 commented Dec 21, 2017

ellisonbg commented Dec 21, 2017 via email

jasongrout commented Dec 21, 2017

jasongrout commented Dec 21, 2017

jasongrout commented Dec 22, 2017

ellisonbg commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017 •

edited

Loading

jasongrout commented Dec 22, 2017

blink1073 commented Dec 23, 2017

jasongrout commented Dec 23, 2017

jasongrout commented Dec 23, 2017

blink1073 commented Dec 23, 2017

Clean up cell selection behavior #3414

Clean up cell selection behavior #3414

Conversation

jasongrout commented Dec 19, 2017 • edited Loading

blink1073 commented Dec 19, 2017

blink1073 left a comment

Choose a reason for hiding this comment

blink1073 Dec 20, 2017

Choose a reason for hiding this comment

jasongrout Dec 21, 2017

Choose a reason for hiding this comment

blink1073 Dec 20, 2017

Choose a reason for hiding this comment

blink1073 Dec 20, 2017

Choose a reason for hiding this comment

blink1073 commented Dec 21, 2017

ellisonbg commented Dec 21, 2017 via email

jasongrout commented Dec 21, 2017

jasongrout commented Dec 21, 2017

jasongrout commented Dec 22, 2017

ellisonbg commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017

jasongrout commented Dec 22, 2017 • edited Loading

jasongrout commented Dec 22, 2017

blink1073 commented Dec 23, 2017

jasongrout commented Dec 23, 2017

jasongrout commented Dec 23, 2017

blink1073 commented Dec 23, 2017

jasongrout commented Dec 19, 2017 •

edited

Loading

jasongrout commented Dec 22, 2017 •

edited

Loading