tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP <Compose> Refactor; 1000 tiny edits

Browse Source
This commit is contained in:
kibigo!
2018-01-03 12:36:21 -08:00
parent b4a3792201
commit 42f50049ff
32 changed files with 873 additions and 795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/composer/textarea/suggestions/index.js
View File

@ -18,9 +18,9 @@ export default function ComposerTextareaSuggestions ({
return (
<div
className='composer--textarea--suggestions'
hidden={hidden || suggestions.isEmpty()}
hidden={hidden || !suggestions || suggestions.isEmpty()}
>
{!hidden ? suggestions.map(
{!hidden && suggestions ? suggestions.map(
(suggestion, index) => (
<ComposerTextareaSuggestionsItem
index={index}
@ -39,5 +39,5 @@ ComposerTextareaSuggestions.propTypes = {
hidden: PropTypes.bool,
onSuggestionClick: PropTypes.func,
suggestions: ImmutablePropTypes.list,
value: PropTypes.string,
value: PropTypes.number,
};

6
app/javascript/flavours/glitch/features/composer/textarea/suggestions/item/index.js
View File

@ -17,7 +17,7 @@ const assetHost = ((process || {}).env || {}).CDN_HOST || '';
const handlers = {
// Handles a click on a suggestion.
click (e) {
handleClick (e) {
const {
index,
onClick,
@ -40,7 +40,7 @@ export default class ComposerTextareaSuggestionsItem extends React.Component {
// Rendering.
render () {
const { click } = this.handlers;
const { handleClick } = this.handlers;
const {
selected,
suggestion,
@ -51,7 +51,7 @@ export default class ComposerTextareaSuggestionsItem extends React.Component {
return (
<div
className={computedClass}
onMouseDown={click}
onMouseDown={handleClick}
role='button'
tabIndex='0'
>