Skip to content

Commit

Permalink
Fixing test
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattgperry
mattgperry committed Aug 30, 2023
1 parent cebd3c3 commit d9ea31b
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 273 deletions.
253 changes: 1 addition & 252 deletions dev/examples/layout-stress.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,258 +127,7 @@ export const App = () => {
setExpanded(!expanded)
}}
>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>
<Group />
</Group>
<Group>{/* <Group /> */}</Group>
</Container>
</MotionConfig>
)
Expand Down
60 changes: 39 additions & 21 deletions packages/framer-motion/src/frameloop/render-step.ts
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,39 @@
import { Step, Process } from "./types"

class Queue {
order: Process[] = []
scheduled: Set<Process> = new Set()

add(process: Process) {
if (!this.scheduled.has(process)) {
this.scheduled.add(process)
this.order.push(process)
return true
}
}

remove(process: Process) {
const index = this.order.indexOf(process)
if (index !== -1) {
this.order.splice(index, 1)
this.scheduled.delete(process)
}
}

clear() {
this.order.length = 0
this.scheduled.clear()
}
}

export function createRenderStep(runNextFrame: () => void): Step {
/**
* We create and reuse two arrays, one to queue jobs for the current frame
* We create and reuse two queues, one to queue jobs for the current frame
* and one for the next. We reuse to avoid triggering GC after x frames.
*/
let toRun: Process[] = []
let toRunNextFrame: Process[] = []
let thisFrame = new Queue()
let nextFrame = new Queue()

/**
*
*/
let numToRun = 0

/**
Expand All @@ -32,16 +55,13 @@ export function createRenderStep(runNextFrame: () => void): Step {
*/
schedule: (callback, keepAlive = false, immediate = false) => {
const addToCurrentFrame = immediate && isProcessing
const buffer = addToCurrentFrame ? toRun : toRunNextFrame
const queue = addToCurrentFrame ? thisFrame : nextFrame

if (keepAlive) toKeepAlive.add(callback)

// If the buffer doesn't already contain this callback, add it
if (buffer.indexOf(callback) === -1) {
buffer.push(callback)

// If we're adding it to the currently running buffer, update its measured size
if (addToCurrentFrame && isProcessing) numToRun = toRun.length
if (queue.add(callback) && addToCurrentFrame && isProcessing) {
// If we're adding it to the currently running queue, update its measured size
numToRun = thisFrame.order.length
}

return callback
Expand All @@ -51,9 +71,7 @@ export function createRenderStep(runNextFrame: () => void): Step {
* Cancel the provided callback from running on the next frame.
*/
cancel: (callback) => {
const index = toRunNextFrame.indexOf(callback)
if (index !== -1) toRunNextFrame.splice(index, 1)

nextFrame.remove(callback)
toKeepAlive.delete(callback)
},

Expand All @@ -74,17 +92,17 @@ export function createRenderStep(runNextFrame: () => void): Step {
isProcessing = true

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

// Clear the next frame list
toRunNextFrame.length = 0
// Clear the next frame queue
nextFrame.clear()

// Execute this frame
numToRun = toRun.length
numToRun = thisFrame.order.length

if (numToRun) {
for (let i = 0; i < numToRun; i++) {
const callback = toRun[i]
const callback = thisFrame.order[i]

callback(frameData)

Expand Down

0 comments on commit d9ea31b

Please sign in to comment.