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

Fix regressions and improve the insert link search field and suggestions list #10838

Merged
merged 5 commits into from
Nov 8, 2018
Merged

Fix regressions and improve the insert link search field and suggestions list #10838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52a24a4
Fix link search field padding and spinner.
afercia Oct 20, 2018
b3a5f1c
Select the highlighted link when tabbing away, set focus when clickin…
afercia Oct 20, 2018
d09108e
Fix links suggestions popover position and size.
afercia Oct 20, 2018
dc5163a
Avoid events, they're bad.
afercia Oct 21, 2018
6bd3ae2
Revert custom getAnchorRect.
afercia Oct 22, 2018
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
24 changes: 21 additions & 3 deletions packages/editor/src/components/url-input/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import scrollIntoView from 'dom-scroll-into-view';
import { __, sprintf, _n } from '@wordpress/i18n';
import { Component, Fragment, createRef } from '@wordpress/element';
import { decodeEntities } from '@wordpress/html-entities';
import { UP, DOWN, ENTER } from '@wordpress/keycodes';
import { UP, DOWN, ENTER, TAB } from '@wordpress/keycodes';
import { Spinner, withSpokenMessages, Popover } from '@wordpress/components';
import { withInstanceId } from '@wordpress/compose';
import apiFetch from '@wordpress/api-fetch';
Expand All @@ -29,6 +29,7 @@ class URLInput extends Component {
this.onChange = this.onChange.bind( this );
this.onKeyDown = this.onKeyDown.bind( this );
this.autocompleteRef = autocompleteRef || createRef();
this.inputRef = createRef();
this.updateSuggestions = throttle( this.updateSuggestions.bind( this ), 200 );

this.suggestionNodes = [];
Expand Down Expand Up @@ -140,6 +141,8 @@ class URLInput extends Component {
return;
}

const post = this.state.posts[ this.state.selectedSuggestion ];

switch ( event.keyCode ) {
case UP: {
event.stopPropagation();
Expand All @@ -159,12 +162,20 @@ class URLInput extends Component {
} );
break;
}
case TAB: {
if ( this.state.selectedSuggestion !== null ) {
this.selectLink( post );
// Announce a link has been selected when tabbing away from the input field.
this.props.speak( __( 'Link selected' ) );
}
break;
}
case ENTER: {
if ( this.state.selectedSuggestion !== null ) {
event.stopPropagation();
const post = this.state.posts[ this.state.selectedSuggestion ];
this.selectLink( post );
}
break;
}
}
}
Expand All @@ -177,6 +188,12 @@ class URLInput extends Component {
} );
}

handleOnClick( post ) {
this.selectLink( post );
// Move focus to the input field when a link suggestion is clicked.
this.inputRef.current.focus();
}

render() {
const { value = '', autoFocus = true, instanceId } = this.props;
const { showSuggestions, posts, selectedSuggestion, loading } = this.state;
Expand All @@ -199,6 +216,7 @@ class URLInput extends Component {
aria-autocomplete="list"
aria-owns={ `editor-url-input-suggestions-${ instanceId }` }
aria-activedescendant={ selectedSuggestion !== null ? `editor-url-input-suggestion-${ instanceId }-${ selectedSuggestion }` : undefined }
ref={ this.inputRef }
/>

{ ( loading ) && <Spinner /> }
Expand All @@ -222,7 +240,7 @@ class URLInput extends Component {
className={ classnames( 'editor-url-input__suggestion', {
'is-selected': index === selectedSuggestion,
} ) }
onClick={ () => this.selectLink( post ) }
onClick={ () => this.handleOnClick( post ) }
aria-selected={ index === selectedSuggestion }
>
{ decodeEntities( post.title ) || __( '(no title)' ) }
Expand Down
14 changes: 7 additions & 7 deletions packages/editor/src/components/url-input/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
// Link input
$input-padding: 9px 8px;
$input-padding: 8px;
$input-size: 300px;

.editor-block-list__block .editor-url-input,
.components-popover .editor-url-input,
.editor-url-input {
width: 100%;
flex-grow: 1;
position: relative;
padding: 1px;
Expand All @@ -28,8 +27,8 @@ $input-size: 300px;

.components-spinner {
position: absolute;
right: 0;
top: $input-padding;
right: $input-padding;
top: $input-padding + 1;
margin: 0;
}
}
Expand All @@ -38,9 +37,10 @@ $input-size: 300px;
.editor-url-input__suggestions {
max-height: 200px;
transition: all 0.15s ease-in-out;
list-style: none;
padding: 4px 0;
width: $input-size + 2 * $icon-button-size;
// To match the url-input width: input width + padding + 2 buttons.
width: $input-size + 2 + 2 * $icon-button-size;
overflow-y: auto;
}

// Hide suggestions on mobile until we @todo find a better way to show them
Expand All @@ -53,7 +53,7 @@ $input-size: 300px;
}

.editor-url-input__suggestion {
padding: 4px #{ $icon-button-size + $input-padding } 4px $input-padding;
padding: 4px $input-padding;
color: $dark-gray-300; // lightest we can use for contrast
display: block;
font-size: $default-font-size;
Expand Down
4 changes: 2 additions & 2 deletions packages/format-library/src/link/inline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ class InlineLinkUI extends Component {
this.resetState();

if ( isActive ) {
speak( __( 'Link edited.' ), 'assertive' );
speak( __( 'Link edited' ), 'assertive' );
} else {
speak( __( 'Link added.' ), 'assertive' );
speak( __( 'Link inserted' ), 'assertive' );
}
}

Expand Down