kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Trap Tab key in emoji selector
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>build-json
rodzic
e652de227c
commit
5a7b6e6a06
|
@ -35,21 +35,38 @@ class EmojiSelector extends ImmutablePureComponent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleKeyUp = i => e => {
|
_selectPreviousEmoji = i => {
|
||||||
|
if (i !== 0) {
|
||||||
|
this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i})`).focus();
|
||||||
|
} else {
|
||||||
|
this.node.querySelector('.emoji-react-selector__emoji:last-child').focus();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
_selectNextEmoji = i => {
|
||||||
|
if (i !== this.props.allowedEmoji.size - 1) {
|
||||||
|
this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i + 2})`).focus();
|
||||||
|
} else {
|
||||||
|
this.node.querySelector('.emoji-react-selector__emoji:first-child').focus();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
handleKeyDown = i => e => {
|
||||||
const { onUnfocus } = this.props;
|
const { onUnfocus } = this.props;
|
||||||
|
|
||||||
switch (e.key) {
|
switch (e.key) {
|
||||||
|
case 'Tab':
|
||||||
|
e.preventDefault();
|
||||||
|
if (e.shiftKey) this._selectPreviousEmoji(i);
|
||||||
|
else this._selectNextEmoji(i);
|
||||||
|
break;
|
||||||
case 'Left':
|
case 'Left':
|
||||||
case 'ArrowLeft':
|
case 'ArrowLeft':
|
||||||
if (i !== 0) {
|
this._selectPreviousEmoji(i);
|
||||||
this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i})`).focus();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 'Right':
|
case 'Right':
|
||||||
case 'ArrowRight':
|
case 'ArrowRight':
|
||||||
if (i !== this.props.allowedEmoji.size - 1) {
|
this._selectNextEmoji(i);
|
||||||
this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i + 2})`).focus();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 'Escape':
|
case 'Escape':
|
||||||
onUnfocus();
|
onUnfocus();
|
||||||
|
@ -94,7 +111,7 @@ class EmojiSelector extends ImmutablePureComponent {
|
||||||
className='emoji-react-selector__emoji'
|
className='emoji-react-selector__emoji'
|
||||||
dangerouslySetInnerHTML={{ __html: emojify(emoji) }}
|
dangerouslySetInnerHTML={{ __html: emojify(emoji) }}
|
||||||
onClick={this.handleReact(emoji)}
|
onClick={this.handleReact(emoji)}
|
||||||
onKeyUp={this.handleKeyUp(i, emoji)}
|
onKeyDown={this.handleKeyDown(i, emoji)}
|
||||||
tabIndex={(visible || focused) ? 0 : -1}
|
tabIndex={(visible || focused) ? 0 : -1}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
|
Ładowanie…
Reference in New Issue