Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi-select: try no buffer and lower throttle delay #2935

Merged
merged 2 commits into from
Oct 27, 2017
Merged

Multi-select: try no buffer and lower throttle delay #2935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35ad503
Multi-select: try no buffer and lower throttle delay
ellatrix Oct 9, 2017
da80229
Refactor reduce -> findLast
mcsf Oct 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions editor/modes/visual-editor/block-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
* External dependencies
*/
import { connect } from 'react-redux';
import { throttle, mapValues, noop, invert, flatMap } from 'lodash';
import {
findLast,
flatMap,
invert,
mapValues,
noop,
throttle,
} from 'lodash';

/**
* WordPress dependencies
Expand Down Expand Up @@ -40,7 +47,7 @@ class VisualEditorBlockList extends Component {
this.setBlockRef = this.setBlockRef.bind( this );
this.appendDefaultBlock = this.appendDefaultBlock.bind( this );
this.setLastClientY = this.setLastClientY.bind( this );
this.onPointerMove = throttle( this.onPointerMove.bind( this ), 250 );
this.onPointerMove = throttle( this.onPointerMove.bind( this ), 100 );
// Browser does not fire `*move` event when the pointer position changes
// relative to the document, so fire it with the last known position.
this.onScroll = () => this.onPointerMove( { clientY: this.lastClientY } );
Expand Down Expand Up @@ -77,22 +84,9 @@ class VisualEditorBlockList extends Component {
}

onPointerMove( { clientY } ) {
const BUFFER = 20;
const { multiSelectedBlocks } = this.props;
const boundaries = this.refs[ this.selectionAtStart ].getBoundingClientRect();
const y = clientY - boundaries.top;

// If there is no selection yet, make the use move at least BUFFER px
// away from the block with the pointer.
if (
! multiSelectedBlocks.length &&
y + BUFFER > 0 &&
y - BUFFER < boundaries.height
) {
return;
}

const key = this.coordMapKeys.reduce( ( acc, topY ) => y > topY ? topY : acc );
const key = findLast( this.coordMapKeys, ( coordY ) => coordY < y );

this.onSelectionChange( this.coordMap[ key ] );
}
Expand Down Expand Up @@ -122,14 +116,14 @@ class VisualEditorBlockList extends Component {
onSelectionStart( uid ) {
const boundaries = this.refs[ uid ].getBoundingClientRect();

// Create a uid to Y coödinate map.
// Create a uid to Y coördinate map.
const uidToCoordMap = mapValues( this.refs, ( node ) => {
return node.getBoundingClientRect().top - boundaries.top;
} );

// Cache a Y coödinate to uid map for use in `onPointerMove`.
// Cache a Y coördinate to uid map for use in `onPointerMove`.
this.coordMap = invert( uidToCoordMap );
// Cache an array of the Y coödrinates for use in `onPointerMove`.
// Cache an array of the Y coördinates for use in `onPointerMove`.
this.coordMapKeys = Object.values( uidToCoordMap );
this.selectionAtStart = uid;

Expand Down