Commit 6c8eea51 authored by mgabdev's avatar mgabdev

Updates for missing vars in components

parent a2b5d72e
......@@ -64,9 +64,7 @@ class Account extends ImmutablePureComponent {
render() {
const { account, intl, hidden, onActionClick, actionIcon, actionTitle, displayOnly } = this.props;
if (!account) {
return <div />;
}
if (!account) return null;
if (hidden) {
return (
......
......@@ -9,12 +9,12 @@ export default class ColumnHeaderSettingButton extends PureComponent {
static propTypes = {
title: PropTypes.node.isRequired,
icon: PropTypes.string.isRequired,
onClick: PropTypes.func.isRequired,
onClick: PropTypes.func,
to: PropTypes.string,
};
render () {
const { title, icon, to } = this.props;
const { title, icon, to, onClick } = this.props;
const classes = classNames('column-header-setting-btn', {
'column-header-setting-btn--link': !!to
......@@ -30,7 +30,7 @@ export default class ColumnHeaderSettingButton extends PureComponent {
}
return (
<button className={classes} tabIndex='0' onClick={this.props.onClick}>
<button className={classes} tabIndex='0' onClick={onClick}>
<Icon id={icon} />
{title}
</button>
......
......@@ -3,6 +3,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { openModal } from '../../../actions/modal';
import { cancelReplyCompose } from '../../../actions/compose';
import ModalLayout from '../modal_layout';
import TimelineComposeBlock from '../../timeline_compose_block';
const messages = defineMessages({
confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
......@@ -46,7 +47,7 @@ class ComposeModal extends ImmutablePureComponent {
const { intl } = this.props;
return (
<ModalLayout title={intl.formatMessage(messages.title)} onClose={onClickClose}>
<ModalLayout title={intl.formatMessage(messages.title)} onClose={this.onClickClose}>
<TimelineComposeBlock />
</ModalLayout>
);
......
......@@ -16,7 +16,7 @@ class ModalLayout extends PureComponent {
};
render() {
const { title, children } = this.props;
const { title, children, intl, onClose } = this.props;
return (
<div className='modal modal--layout modal--root'>
......
......@@ -8,7 +8,7 @@ class SectionHeadlineBarItem extends PureComponent {
icon: PropTypes.string,
className: PropTypes.string,
onClick: PropTypes.func,
title: PropTypes.oneOf([
title: PropTypes.oneOfType([
PropTypes.string,
PropTypes.node,
]),
......@@ -21,14 +21,20 @@ class SectionHeadlineBarItem extends PureComponent {
const classes = classNames('section-header-bar__item', className);
if (to) {
return (<NavLink className={classes} exact={exact} to={to}>{title}</NavLink>);
return (
<NavLink className={classes} exact={exact} to={to}>{title}</NavLink>
)
} else if (icon) {
return (
<button className={classes} onClick={onClick} title={title}>
<Icon id={icon} fixedWidth />
</button>
)
}
return (<button className={classes} onClick={onClick}>{title}</button>)
return (
<button className={classes} onClick={onClick}>{title}</button>
)
}
};
......@@ -46,8 +52,8 @@ export default class SectionHeadlineBar extends PureComponent {
return (
<div className={classes}>
{
items.forEach(item, i => (
<SectionHeadlineBarItem key={`shbi-{i}`} {...item} />
items.forEach((item, i) => (
<SectionHeadlineBarItem key={`shbi-${i}`} {...item} />
))
}
</div>
......
......@@ -14,6 +14,8 @@ export default class TrendingItem extends ImmutablePureComponent {
};
render() {
const { hashtag } = this.props;
return (
<div className='trending-item'>
<div className='trending-item__text'>
......
......@@ -157,7 +157,7 @@ class AccountGallery extends ImmutablePureComponent {
}
render () {
const { attachments, isLoading, hasMore, isAccount, accountId, unavailable, accountUsername } = this.props;
const { attachments, isLoading, hasMore, isAccount, accountId, unavailable, accountUsername, intl } = this.props;
const { width } = this.state;
if (!isAccount && accountId !== -1) {
......
......@@ -6,6 +6,8 @@ import classNames from 'classnames';
import { decode } from 'blurhash';
import { isIOS } from 'gabsocial/utils/is_mobile';
import './media_item.scss';
export default class MediaItem extends ImmutablePureComponent {
static propTypes = {
......
......@@ -17,9 +17,11 @@ export default class CharacterCounter extends PureComponent {
'character-counter--over': (diff < 0),
});
return (
<div className='character-counter__wrapper'>
<span className={classes}>{diff}</span>
</div>
)
}
}
......@@ -50,7 +50,7 @@ class ComposeSearch extends PureComponent {
}
render () {
const { intl, value, onShow, ...rest } = this.props;
const { intl, value, onShow, openInRoute } = this.props;
return (
<Search
......@@ -61,7 +61,7 @@ class ComposeSearch extends PureComponent {
handleClear={this.handleClear}
onShow={onShow}
withOverlay
{...rest}
openInRoute
/>
)
}
......
......@@ -43,7 +43,6 @@ const mapStateToProps = (state, { params: { username } }) => {
export default @connect(mapStateToProps)
@injectIntl
class Following extends ImmutablePureComponent {
static propTypes = {
......
......@@ -48,7 +48,7 @@ class ListEditorSearch extends PureComponent {
}
render () {
const { value, intl, ...rest } = this.props;
const { value, intl } = this.props;
return (
<Search
......@@ -60,7 +60,6 @@ class ListEditorSearch extends PureComponent {
handleSubmit={this.handleSubmit}
handleClear={this.handleClear}
searchTitle={intl.formatMessage(messages.searchTitle)}
{...rest}
/>
)
}
......
import { defineMessages, injectIntl } from 'react-intl';
import SectionHeadlineBar from '../../../../components/section_headline_bar';
const tooltips = defineMessages({
const messages = defineMessages({
mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favorites' },
boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' },
......@@ -58,33 +58,33 @@ class NotificationFilterBar extends PureComponent {
{
className: selectedFilter === 'mention' ? 'active' : '',
onClick: this.onClick('mention'),
title: intl.formatMessage(tooltips.mentions),
title: intl.formatMessage(messages.mentions),
icon: 'at',
},
{
className: selectedFilter === 'favourite' ? 'active' : '',
onClick: this.onClick('favourite'),
title: intl.formatMessage(tooltips.favourites),
title: intl.formatMessage(messages.favourites),
icon: 'star',
},
{
className: selectedFilter === 'reblog' ? 'active' : '',
onClick: this.onClick('reblog'),
title: intl.formatMessage(tooltips.boosts),
title: intl.formatMessage(messages.boosts),
icon: 'retweet',
},
{
className: selectedFilter === 'poll' ? 'active' : '',
onClick: this.onClick('poll'),
title: intl.formatMessage(tooltips.polls),
title: intl.formatMessage(messages.polls),
icon: 'tasks',
},
{
className: selectedFilter === 'follow' ? 'active' : '',
onClick: this.onClick('follow'),
title: intl.formatMessage(tooltips.follows),
title: intl.formatMessage(messages.follows),
icon: 'user-plus',
}
},
]}
/>
)
......
......@@ -420,7 +420,7 @@ class Status extends ImmutablePureComponent {
const { fullscreen } = this.state;
if (status === null) {
return (<ColumnIndicator type='missing' />);
return (<ColumnIndicator type='loading' />);
}
if (ancestorsIds && ancestorsIds.size > 0) {
......
......@@ -2,7 +2,7 @@ import { Fragment } from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import HeaderContainer from '../features/account_timeline/containers/header_container';
import {WhoToFollowPanel, SignUpPanel} from '../components/panel';
import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
import LinkFooter from '../components/link_footer';
import ProfileInfoPanel from '../features/account_timeline/components/profile_info_panel/profile_info_panel';
import ColumnsArea from '../components/columns_area';
......@@ -37,12 +37,15 @@ class ProfilePage extends ImmutablePureComponent {
static propTypes = {
account: ImmutablePropTypes.map,
accountUsername: PropTypes.string.isRequired,
accountId: PropTypes.number.isRequired,
accountId: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]).isRequired,
children: PropTypes.node,
};
render () {
const {accountId, account, accountUsername} = this.props;
render() {
const { accountId, account, accountUsername } = this.props;
return (
<ColumnsArea
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment