-
Notifications
You must be signed in to change notification settings - Fork 200
#01 - The Medium Clap #1
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.
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
Open
ohansemmanuel
wants to merge
9
commits into
master
Choose a base branch
from
01
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5b81faf
01 - The Medium Clap
ohansemmanuel 9d40a13
fix total count bug
ohansemmanuel f1ea609
cleanup
ohansemmanuel 15bf113
even better comments
ohansemmanuel c020873
additional comment
ohansemmanuel da44d1e
further cleanups
ohansemmanuel 36d60aa
reorder component lisiting
ohansemmanuel 820e413
fix: timeline update logic
ohansemmanuel f9e21f0
Merge branch 'master' into 01
ohansemmanuel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,87 +1,81 @@ | ||
/* Clap button */ | ||
.clap { | ||
position: relative; | ||
outline: 1px solid transparent; | ||
border-radius: 50%; | ||
border: 1px solid #bdc3c7; | ||
width: 80px; | ||
height: 80px; | ||
background: none; | ||
user-select: none; | ||
} | ||
position: relative; | ||
outline: 1px solid transparent; | ||
border-radius: 50%; | ||
border: 1px solid #bdc3c7; | ||
width: 80px; | ||
height: 80px; | ||
background: none; | ||
user-select: none; | ||
} | ||
.clap:after { | ||
content: ''; | ||
position: absolute; | ||
top: 0; | ||
left: 0; | ||
display: block; | ||
border-radius: 50%; | ||
width: 79px; | ||
height: 79px; | ||
content: ""; | ||
position: absolute; | ||
top: 0; | ||
left: 0; | ||
display: block; | ||
border-radius: 50%; | ||
width: 79px; | ||
height: 79px; | ||
} | ||
.clap:hover { | ||
cursor: pointer; | ||
border: 1px solid #27ae60; | ||
transition: border-color 0.3s ease-in; | ||
cursor: pointer; | ||
border: 1px solid #27ae60; | ||
transition: border-color 0.3s ease-in; | ||
} | ||
.clap:hover:after { | ||
animation: shockwave 1s ease-in infinite; | ||
animation: shockwave 1s ease-in infinite; | ||
} | ||
|
||
@keyframes shockwave { | ||
0% { | ||
transform: scale(1); | ||
box-shadow: 0 0 2px #27ae60; | ||
opacity: 1; | ||
} | ||
100% { | ||
transform: scale(1); | ||
opacity: 0; | ||
box-shadow: 0 0 50px #145b32, inset 0 0 10px #27ae60; | ||
} | ||
0% { | ||
transform: scale(1); | ||
box-shadow: 0 0 2px #27ae60; | ||
opacity: 1; | ||
} | ||
100% { | ||
transform: scale(1); | ||
opacity: 0; | ||
box-shadow: 0 0 50px #145b32, inset 0 0 10px #27ae60; | ||
} | ||
} | ||
|
||
/* Count */ | ||
.count { | ||
position: absolute; | ||
top: -50px; | ||
left: 20px; | ||
font-size: 0.8rem; | ||
color: white; | ||
background: #27ae60; | ||
border-radius: 50%; | ||
height: 40px; | ||
width: 40px; | ||
line-height: 40px; | ||
position: absolute; | ||
top: -50px; | ||
left: 20px; | ||
font-size: 0.8rem; | ||
color: white; | ||
background: #27ae60; | ||
border-radius: 50%; | ||
height: 40px; | ||
width: 40px; | ||
line-height: 40px; | ||
} | ||
|
||
/* Count total */ | ||
.total { | ||
position: absolute; | ||
font-size: 0.8rem; | ||
width: 80px; | ||
text-align: center; | ||
left: 0; | ||
top: -22px; | ||
color: #bdc3c7; | ||
} | ||
position: absolute; | ||
font-size: 0.8rem; | ||
width: 80px; | ||
text-align: center; | ||
left: 0; | ||
top: -22px; | ||
color: #bdc3c7; | ||
} | ||
|
||
/* Clap Icon */ | ||
.icon { | ||
width: 40px; | ||
fill: none; | ||
stroke: #27ae60; | ||
stroke-width: 2px; | ||
} | ||
width: 40px; | ||
fill: none; | ||
stroke: #27ae60; | ||
stroke-width: 2px; | ||
} | ||
|
||
.icon.checked { | ||
fill: #27ae60; | ||
stroke: #fff; | ||
stroke-width: 1px; | ||
} | ||
|
||
/* Clap Info */ | ||
.info { | ||
position: relative; | ||
top: 47px; | ||
fill: #27ae60; | ||
stroke: #fff; | ||
stroke-width: 1px; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,198 @@ | ||
import React, { Component, useState } from 'react' | ||
import mojs from 'mo-js' | ||
import { generateRandomNumber } from '../utils/generateRandomNumber' | ||
import styles from './index.css' | ||
|
||
/** ==================================== | ||
* 🔰HOC | ||
Higher Order Component for Animation | ||
==================================== **/ | ||
const withClapAnimation = WrappedComponent => { | ||
class WithClapAnimation extends Component { | ||
animationTimeline = new mojs.Timeline() | ||
state = { | ||
animationTimeline: this.animationTimeline | ||
} | ||
|
||
componentDidMount () { | ||
const tlDuration = 300 | ||
|
||
const triangleBurst = new mojs.Burst({ | ||
parent: '#clap', | ||
radius: { 50: 95 }, | ||
count: 5, | ||
angle: 30, | ||
children: { | ||
shape: 'polygon', | ||
radius: { 6: 0 }, | ||
scale: 1, | ||
stroke: 'rgba(211,84,0 ,0.5)', | ||
strokeWidth: 2, | ||
angle: 210, | ||
delay: 30, | ||
speed: 0.2, | ||
easing: mojs.easing.bezier(0.1, 1, 0.3, 1), | ||
duration: tlDuration | ||
} | ||
}) | ||
|
||
const circleBurst = new mojs.Burst({ | ||
parent: '#clap', | ||
radius: { 50: 75 }, | ||
angle: 25, | ||
duration: tlDuration, | ||
children: { | ||
shape: 'circle', | ||
fill: 'rgba(149,165,166 ,0.5)', | ||
delay: 30, | ||
speed: 0.2, | ||
radius: { 3: 0 }, | ||
easing: mojs.easing.bezier(0.1, 1, 0.3, 1) | ||
} | ||
}) | ||
|
||
const countAnimation = new mojs.Html({ | ||
el: '#clapCount', | ||
isShowStart: false, | ||
isShowEnd: true, | ||
y: { 0: -30 }, | ||
opacity: { 0: 1 }, | ||
duration: tlDuration | ||
}).then({ | ||
opacity: { 1: 0 }, | ||
y: -80, | ||
delay: tlDuration / 2 | ||
}) | ||
|
||
const countTotalAnimation = new mojs.Html({ | ||
el: '#clapCountTotal', | ||
isShowStart: false, | ||
isShowEnd: true, | ||
opacity: { 0: 1 }, | ||
delay: (3 * tlDuration) / 2, | ||
duration: tlDuration, | ||
y: { 0: -3 } | ||
}) | ||
|
||
const scaleButton = new mojs.Html({ | ||
el: '#clap', | ||
duration: tlDuration, | ||
scale: { 1.3: 1 }, | ||
easing: mojs.easing.out | ||
}) | ||
|
||
const clap = document.getElementById('clap') | ||
clap.style.transform = 'scale(1, 1)' | ||
|
||
const newAnimationTimeline = this.animationTimeline.add([ | ||
countAnimation, | ||
countTotalAnimation, | ||
scaleButton, | ||
circleBurst, | ||
triangleBurst | ||
]) | ||
this.setState({ animationTimeline: newAnimationTimeline }) | ||
} | ||
|
||
render () { | ||
return ( | ||
<WrappedComponent | ||
animationTimeline={this.state.animationTimeline} | ||
{...this.props} | ||
/> | ||
) | ||
} | ||
} | ||
|
||
WithClapAnimation.displayName = `WithClapAnimation(${getDisplayName( | ||
WrappedComponent | ||
)})` | ||
|
||
return WithClapAnimation | ||
} | ||
|
||
function getDisplayName (WrappedComponent) { | ||
return WrappedComponent.displayName || WrappedComponent.name || 'Component' | ||
} | ||
|
||
/** ==================================== | ||
* 🔰 MediumClap | ||
==================================== **/ | ||
const initialState = { | ||
count: 0, | ||
countTotal: generateRandomNumber(500, 10000), | ||
isClicked: false | ||
} | ||
|
||
const MediumClap = ({ animationTimeline }) => { | ||
const MAXIMUM_USER_CLAP = 50 | ||
const [clapState, setClapState] = useState(initialState) | ||
const { count, countTotal, isClicked } = clapState | ||
|
||
const handleClapClick = () => { | ||
// 👉 prop from HOC | ||
animationTimeline.replay() | ||
|
||
setClapState({ | ||
count: Math.min(count + 1, MAXIMUM_USER_CLAP), | ||
countTotal: count < MAXIMUM_USER_CLAP ? countTotal + 1 : countTotal, | ||
isClicked: true | ||
}) | ||
} | ||
|
||
return ( | ||
<button id='clap' className={styles.clap} onClick={handleClapClick}> | ||
<ClapIcon isClicked={isClicked} /> | ||
<ClapCount count={count} /> | ||
<CountTotal countTotal={countTotal} /> | ||
</button> | ||
) | ||
} | ||
|
||
/** ==================================== | ||
* 🔰SubComponents | ||
Smaller Component used by <MediumClap /> | ||
==================================== **/ | ||
|
||
const ClapIcon = ({ isClicked }) => { | ||
return ( | ||
<span> | ||
<svg | ||
id='clapIcon' | ||
xmlns='http://www.w3.org/2000/svg' | ||
viewBox='-549 338 100.1 125' | ||
className={`${styles.icon} ${isClicked && styles.checked}`} | ||
> | ||
<path d='M-471.2 366.8c1.2 1.1 1.9 2.6 2.3 4.1.4-.3.8-.5 1.2-.7 1-1.9.7-4.3-1-5.9-2-1.9-5.2-1.9-7.2.1l-.2.2c1.8.1 3.6.9 4.9 2.2zm-28.8 14c.4.9.7 1.9.8 3.1l16.5-16.9c.6-.6 1.4-1.1 2.1-1.5 1-1.9.7-4.4-.9-6-2-1.9-5.2-1.9-7.2.1l-15.5 15.9c2.3 2.2 3.1 3 4.2 5.3zm-38.9 39.7c-.1-8.9 3.2-17.2 9.4-23.6l18.6-19c.7-2 .5-4.1-.1-5.3-.8-1.8-1.3-2.3-3.6-4.5l-20.9 21.4c-10.6 10.8-11.2 27.6-2.3 39.3-.6-2.6-1-5.4-1.1-8.3z' /> | ||
<path d='M-527.2 399.1l20.9-21.4c2.2 2.2 2.7 2.6 3.5 4.5.8 1.8 1 5.4-1.6 8l-11.8 12.2c-.5.5-.4 1.2 0 1.7.5.5 1.2.5 1.7 0l34-35c1.9-2 5.2-2.1 7.2-.1 2 1.9 2 5.2.1 7.2l-24.7 25.3c-.5.5-.4 1.2 0 1.7.5.5 1.2.5 1.7 0l28.5-29.3c2-2 5.2-2 7.1-.1 2 1.9 2 5.1.1 7.1l-28.5 29.3c-.5.5-.4 1.2 0 1.7.5.5 1.2.4 1.7 0l24.7-25.3c1.9-2 5.1-2.1 7.1-.1 2 1.9 2 5.2.1 7.2l-24.7 25.3c-.5.5-.4 1.2 0 1.7.5.5 1.2.5 1.7 0l14.6-15c2-2 5.2-2 7.2-.1 2 2 2.1 5.2.1 7.2l-27.6 28.4c-11.6 11.9-30.6 12.2-42.5.6-12-11.7-12.2-30.8-.6-42.7m18.1-48.4l-.7 4.9-2.2-4.4m7.6.9l-3.7 3.4 1.2-4.8m5.5 4.7l-4.8 1.6 3.1-3.9' /> | ||
</svg> | ||
</span> | ||
) | ||
} | ||
const ClapCount = ({ count }) => { | ||
return ( | ||
<span id='clapCount' className={styles.count}> | ||
+{count} | ||
</span> | ||
) | ||
} | ||
const CountTotal = ({ countTotal }) => { | ||
return ( | ||
<span id='clapCountTotal' className={styles.total}> | ||
{countTotal} | ||
</span> | ||
) | ||
} | ||
|
||
/** ==================================== | ||
* 🔰USAGE | ||
Below's how a potential user | ||
may consume the component API | ||
==================================== **/ | ||
|
||
const Usage = () => { | ||
const AnimatedMediumClap = withClapAnimation(MediumClap) | ||
return <AnimatedMediumClap /> | ||
} | ||
|
||
export default Usage |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔥 IMPROVEMENT:
Relying on the previous state when invoking the updater function returned from
useState
? It's better to pass a function to the updater e.g.