Skip to content

fix(CallAvatar): refine the default avatar displaying, fix the random overlap behavior #1098

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

Merged
merged 1 commit into from
Aug 20, 2018
Merged

fix(CallAvatar): refine the default avatar displaying, fix the random overlap behavior #1098

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 12 additions & 16 deletions packages/ringcentral-widgets/components/CallAvatar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ class CallAvatar extends Component {
constructor(props) {
super(props);
this.state = {
avatarUrl: null,
avatarUrlLoadFailed: false
avatarUrl: null
};
this._mounted = false;
}
Expand Down Expand Up @@ -55,8 +54,7 @@ class CallAvatar extends Component {
return;
}
this.setState({
avatarUrl: null,
avatarUrlLoadFailed: true
avatarUrl: null
});
};
}
Expand Down Expand Up @@ -85,7 +83,6 @@ class CallAvatar extends Component {

render() {
const { extraNum, isOnConferenceCall, spinnerMode } = this.props;
const avatarUrlSource = this.props.avatarUrl;
const { avatarUrl } = this.state;
const initialSize = 38;
const margin = 4;
Expand All @@ -103,8 +100,7 @@ class CallAvatar extends Component {
const textId = `text-${hash}`;
const clipId = `circleClip-${hash}`;
const avatarStyle = { stroke: $dark, strokeWidth: `${circleBorder}px` };
const avatarUrlLoadFailed = this.state.avatarUrlLoadFailed;
const showSpinner = spinnerMode;
const showingSpinner = spinnerMode;

// spinner sizing
const spinnerId = `spinner-${hash}`;
Expand Down Expand Up @@ -146,8 +142,8 @@ class CallAvatar extends Component {
cy={margin + avatarCircleRadius}
r={avatarCircleRadius}
fill={$snow}
stroke={showSpinner ? $dark : 'inherit'}
strokeOpacity={showSpinner ? $transparency : '1'}
stroke={showingSpinner ? $dark : 'inherit'}
strokeOpacity={showingSpinner ? $transparency : '1'}
/>
<g>
<clipPath id={clipId}>
Expand All @@ -159,7 +155,7 @@ class CallAvatar extends Component {
</clipPath>
</g>
{
showSpinner && (
showingSpinner && (
<g transform={spinnerTransform}>
<use xlinkHref={`#${spinnerId}`} />
</g>
Expand All @@ -171,7 +167,7 @@ class CallAvatar extends Component {
)
}
{
(!showSpinner && (!avatarUrlSource || !avatarUrl || avatarUrlLoadFailed)) && <use xlinkHref={`#${textId}`} clipPath={`url(#${clipId})`} />
(!avatarUrl && !showingSpinner) && <use xlinkHref={`#${textId}`} clipPath={`url(#${clipId})`} />
}
<circle
cx={initialSize - extraNumCircleRadius}
Expand Down Expand Up @@ -230,8 +226,8 @@ class CallAvatar extends Component {
cy={initialSize / 2}
r={initialSize / 2 - circleBorder}
fill={$snow}
stroke={showSpinner ? $dark : 'inherit'}
strokeOpacity={showSpinner ? $transparency : '1'}
stroke={showingSpinner ? $dark : 'inherit'}
strokeOpacity={showingSpinner ? $transparency : '1'}
/>
<g>
<clipPath id={clipId}>
Expand All @@ -243,14 +239,14 @@ class CallAvatar extends Component {
</clipPath>
</g>
{
showSpinner && (
showingSpinner && (
<g transform={spinnerTransform} >
<use xlinkHref={`#${spinnerId}`} />
</g>
)
}
{
showSpinner && (
showingSpinner && (
<g transform={spinnerTransform} >
<use xlinkHref={`#${spinnerId}`} />
</g>
Expand All @@ -266,7 +262,7 @@ class CallAvatar extends Component {
)
}
{
(!showSpinner && (!avatarUrlSource || !avatarUrl || avatarUrlLoadFailed)) && <use xlinkHref={`#${textId}`} clipPath={`url(#${clipId})`} />
(!avatarUrl && !showingSpinner) && <use xlinkHref={`#${textId}`} clipPath={`url(#${clipId})`} />
}
</svg>
);
Expand Down