Skip to content
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

Rewrite AvatarOverlay component with React hooks #24543

Merged
merged 3 commits into from
Apr 17, 2023
+53 −55
Merged

Rewrite AvatarOverlay component with React hooks #24543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3168b35
rename avatar_overlay.jsx to tsx
takayamaki Apr 15, 2023
9355c4c
rewrite AvatarOverlay component with React hooks
takayamaki Apr 15, 2023
b1397f8
Play both avatars when this component hoverd
takayamaki Apr 16, 2023
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
Prev Previous commit
Play both avatars when this component hoverd 
For playing same time, do not attach event handlers to inner elements.
  • Loading branch information
@takayamaki
takayamaki committed Apr 16, 2023
commit b1397f831958e559241ebf6d813868a141ea2a40
6 changes: 2 additions & 4 deletions app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
exports[`<AvatarOverlay renders a overlay avatar 1`] = `
<div
className="account__avatar-overlay"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
{
"height": 46,
Expand All @@ -15,8 +17,6 @@ exports[`<AvatarOverlay renders a overlay avatar 1`] = `
>
<div
className="account__avatar"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
{
"height": "36px",
Expand All @@ -35,8 +35,6 @@ exports[`<AvatarOverlay renders a overlay avatar 1`] = `
>
<div
className="account__avatar"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
{
"height": "24px",
Expand Down
39 changes: 32 additions & 7 deletions app/javascript/mastodon/components/avatar_overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import type { Account } from '../../types/resources';
import { Avatar } from './avatar';
import { useHovering } from '../../hooks/useHovering';
import { autoPlayGif } from '../initial_state';

type Props = {
account: Account;
Expand All @@ -16,11 +17,35 @@ export const AvatarOverlay: React.FC<Props> = ({
size = 46,
baseSize = 36,
overlaySize = 24,
}) => (
<div className='account__avatar-overlay' style={{ width: size, height: size }}>
<div className='account__avatar-overlay-base'><Avatar account={account} size={baseSize} /></div>
<div className='account__avatar-overlay-overlay'><Avatar account={friend} size={overlaySize} /></div>
</div>
);
}) => {
const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(autoPlayGif);
const accountSrc = hovering ? account?.get('avatar') : account?.get('avatar_static');
const friendSrc = hovering ? friend?.get('avatar') : friend?.get('avatar_static');

return (
<div
className='account__avatar-overlay' style={{ width: size, height: size }}
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
>
<div className='account__avatar-overlay-base'>
<div
className='account__avatar'
style={{ width: `${baseSize}px`, height: `${baseSize}px` }}
>
{accountSrc && <img src={accountSrc} alt={account?.get('acct')} />}
</div>
</div>
<div className='account__avatar-overlay-overlay'>
<div
className='account__avatar'
style={{ width: `${overlaySize}px`, height: `${overlaySize}px` }}
>
{friendSrc && <img src={friendSrc} alt={friend?.get('acct')} />}
</div>
</div>
</div>
);
};

export default AvatarOverlay;