ref(avatars): remove Avatar.js (#2289)

* ref(avatars): remove Avatar.js

- Rely on redux getting updated with new participant state
and any calls to getAvatarURL passing in the redux
participant state. This way the state within Avatar.js can
be removed.
- Clean up methods on UI.js. Because all state is in the
store, separate methods for updating the avatar aren't as
necessary. Instead centralize accessing of the avatar for
components outside of redux and centralize the call to
update avatars for non-react components.
- Controversial: cache a participant's avatarURL on the
participant state. Currently the participant's avatarURL
that is generated without jwt (which sets the avatarURL directly)
is not cached. Without cache, there can be many redundant
calls to APP.API.notifyAvatarChanged.

* Leverage middleware timing to diff avatars

One alternative implementation is to leverage middleware's
ability to intercept updates before and after redux has
upated and then compare avatarURLs.

* kill UI.getAvatarUrl

* profile button sets its own avatar url (solves update timing)

* remove calls to updating avatar outside of middleware

* update UI.js doc

* remove left over logic from initial implementation

* try to move local user fallback into selector func

* default to id 'local' in selector
This commit is contained in:
virtuacoplenny
2017-12-19 15:11:54 -08:00
committed by yanas
parent 5640524647
commit 28013f6ffa
10 changed files with 114 additions and 184 deletions

View File

@@ -5,7 +5,10 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { TOOLBAR_PROFILE_TOGGLED, sendAnalyticsEvent } from '../../analytics';
import { DEFAULT_AVATAR_RELATIVE_PATH } from '../../base/participants';
import {
getAvatarURL,
getLocalParticipant
} from '../../base/participants';
import UIEvents from '../../../../service/UI/UIEvents';
import ToolbarButton from './ToolbarButton';
@@ -39,6 +42,11 @@ class ProfileButton extends Component<*> {
* @static
*/
static propTypes = {
/**
* The redux representation of the local participant.
*/
_localParticipant: PropTypes.object,
/**
* Whether the button support clicking or not.
*/
@@ -76,7 +84,12 @@ class ProfileButton extends Component<*> {
* @returns {ReactElement}
*/
render() {
const { _unclickable, tooltipPosition, toggled } = this.props;
const {
_localParticipant,
_unclickable,
tooltipPosition,
toggled
} = this.props;
const buttonConfiguration = {
...DEFAULT_BUTTON_CONFIGURATION,
unclickable: _unclickable,
@@ -90,7 +103,7 @@ class ProfileButton extends Component<*> {
tooltipPosition = { tooltipPosition }>
<img
id = 'avatar'
src = { DEFAULT_AVATAR_RELATIVE_PATH } />
src = { getAvatarURL(_localParticipant) } />
</ToolbarButton>
);
}
@@ -115,11 +128,13 @@ class ProfileButton extends Component<*> {
* @param {Object} state - The Redux state.
* @private
* @returns {{
* _localParticipant: Object,
* _unclickable: boolean
* }}
*/
function _mapStateToProps(state) {
return {
_localParticipant: getLocalParticipant(state),
_unclickable: !state['features/base/jwt'].isGuest
};
}