Skip to content

fork: fix memory leak in prefers-reduced-motion listener and one othe… #3304

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

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

fork: fix memory leak in prefers-reduced-motion listener and one othe… #3304

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
5 changes: 3 additions & 2 deletions packages/framer-motion/src/frameloop/render-step.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ export function createRenderStep(runNextFrame: () => void): Step {

isProcessing = true

// Swap this frame and the next to avoid GC
;[thisFrame, nextFrame] = [nextFrame, thisFrame]
// Swap this frame and the next to avoid GC
;[thisFrame, nextFrame] = [nextFrame, thisFrame]

// Clear the next frame queue
nextFrame.clear()
Expand All @@ -111,6 +111,7 @@ export function createRenderStep(runNextFrame: () => void): Step {

callback(frameData)
}
thisFrame.clear()
}

isProcessing = false
Expand Down
14 changes: 8 additions & 6 deletions packages/framer-motion/src/render/VisualElement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,16 +441,18 @@ export abstract class VisualElement<

this.values.forEach((value, key) => this.bindToMotionValue(key, value))

if (!hasReducedMotionListener.current) {
const isAutoConfig = this.reducedMotionConfig !== "never" && this.reducedMotionConfig !== "always";

if (isAutoConfig && !hasReducedMotionListener.current) {
initPrefersReducedMotion()
}

this.shouldReduceMotion =
this.reducedMotionConfig === "never"
? false
: this.reducedMotionConfig === "always"
? true
: prefersReducedMotion.current
? true
: prefersReducedMotion.current

if (process.env.NODE_ENV !== "production") {
warnOnce(
Expand Down Expand Up @@ -745,8 +747,8 @@ export abstract class VisualElement<
return this.isVariantNode
? this
: this.parent
? this.parent.getClosestVariantNode()
: undefined
? this.parent.getClosestVariantNode()
: undefined
}

getVariantContext(startAtParent = false): undefined | VariantStateContext {
Expand Down Expand Up @@ -862,7 +864,7 @@ export abstract class VisualElement<
this.latestValues[key] !== undefined || !this.current
? this.latestValues[key]
: this.getBaseTargetFromProps(this.props, key) ??
this.readValueFromInstance(this.current, key, this.options)
this.readValueFromInstance(this.current, key, this.options)

if (value !== undefined && value !== null) {
if (
Expand Down