Skip to content

Switch setTimeout to Animation Frames #14

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

Draft
ethanrushh wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Switch setTimeout to Animation Frames #14

Show file tree
Hide file tree
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
11 changes: 5 additions & 6 deletions apps/web/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ const OrbitItemFreezeOnMouseOver = ({ children, radius }: Props.ForceChildren &
config={{
direction: 'clockwise',
startAngle: 120,
anglePerStep: isFreeze ? 0 : 0.2,
timeBetweenSteps: 0.1,
speed: isFreeze ? 0 : 0.01
}}
style={{
transition: 'transform 0.1s ease-in-out',
Expand Down Expand Up @@ -46,7 +45,7 @@ export default function Page(): JSX.Element {
config={{
direction: 'clockwise',
startAngle: 120,
anglePerStep: 0.2,
speed: 0.01,
}}
className={SHARED_CLASSNAME}
>
Expand All @@ -57,7 +56,7 @@ export default function Page(): JSX.Element {
config={{
direction: 'clockwise',
startAngle: 240,
anglePerStep: 0.2,
speed: 0.01,
}}
className={SHARED_CLASSNAME}
>
Expand All @@ -68,7 +67,7 @@ export default function Page(): JSX.Element {
config={{
direction: 'clockwise',
startAngle: 0,
anglePerStep: 0.2,
speed: 0.01,
}}
className={SHARED_CLASSNAME}
>
Expand All @@ -84,7 +83,7 @@ export default function Page(): JSX.Element {
config={{
direction: 'clockwise',
startAngle: 240,
anglePerStep: 0.3,
speed: 0.02,
}}
className={SHARED_CLASSNAME}
>
Expand Down
31 changes: 22 additions & 9 deletions packages/react-orbit/src/components/orbit.item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ type OrbitItemDirection = 'clockwise' | 'counter-clockwise';
type OrbitItemProps = {
radius?: number;
config?: {
anglePerStep?: number;
timeBetweenSteps?: number;
speed?: number
startAngle?: number;
direction?: OrbitItemDirection;
angle?: number;
Expand Down Expand Up @@ -51,7 +50,7 @@ export const OrbitItem = forwardRef<HTMLDivElement, OrbitItemProps & Props.HasCh
className,
children,
radius = 0,
config: { anglePerStep = 0.1, timeBetweenSteps = 0.1, startAngle = 0, direction = 'clockwise', angle },
config: { speed = 0.01, startAngle = 0, direction = 'clockwise', angle },
style,
...rest
},
Expand All @@ -63,12 +62,26 @@ export const OrbitItem = forwardRef<HTMLDivElement, OrbitItemProps & Props.HasCh
const actualRef = (ref ?? internalRef) as React.MutableRefObject<HTMLDivElement>;

useEffect(() => {
const interval = setInterval(() => {
setAngle((prevAngle) => (direction === 'clockwise' ? prevAngle + (anglePerStep % 360) : prevAngle - (anglePerStep % 360)));
}, timeBetweenSteps);

return () => clearInterval(interval);
}, [anglePerStep, timeBetweenSteps]);
let animationFrameId: number
let lastTime = performance.now()

const updateAngle = (time: number) => {
const deltaTime = time - lastTime

setAngle((prevAngle) =>
direction === 'clockwise'
? (prevAngle + speed*deltaTime) % 360
: (prevAngle - speed*deltaTime) % 360
)
lastTime = time

animationFrameId = requestAnimationFrame(updateAngle)
}

animationFrameId = requestAnimationFrame(updateAngle)

return () => cancelAnimationFrame(animationFrameId)
}, [speed, direction])

const { x, y } = calculateCoordinatesOnCircle(radius, effectiveAngle, actualRef.current?.getBoundingClientRect() ?? new DOMRect());

Expand Down