Skip to content

[rewrite] Rate limit re-renders w/ m.mount/m.route #1047

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

Merged
merged 2 commits into from
May 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions limiter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
var FRAME_BUDGET = 16 // 60 frames per second = 1 call per 16 ms

module.exports = function($window, render) {
var rAF = $window.requestAnimationFrame || $window.setTimeout
var cAF = $window.cancelAnimationFrame || $window.clearTimeout

var last = 0
var pending

return function() {
var now = new Date()

// First render, OR if the time since the last render is greater
// than the frame budget
// just immediately render
if(!last || now - last > FRAME_BUDGET) {
last = now;

return render()
}

// Redraw already pending, abort
if(pending) {
return
}

// Schedule a redraw for the next tick
pending = rAF(function() {
render()

last = new Date()
pending = null
}, FRAME_BUDGET - (now - last))
}
}
51 changes: 45 additions & 6 deletions mithril.js
Original file line number Diff line number Diff line change
Expand Up @@ -575,21 +575,58 @@ var createRenderer = function($window) {
return {render: render, setEventCallback: setEventCallback}
}

var FRAME_BUDGET = 16 // 60 frames per second = 1 call per 16 ms

var limiter = function($window, render) {
var rAF = $window.requestAnimationFrame || $window.setTimeout
var cAF = $window.cancelAnimationFrame || $window.clearTimeout

var last = 0
var pending

return function() {
var now = new Date()

// First render, OR if the time since the last render is greater
// than the frame budget
// just immediately render
if(!last || now - last > FRAME_BUDGET) {
last = now;

return render()
}

// Redraw already pending, abort
if(pending) {
return
}

// Schedule a redraw for the next tick
pending = rAF(function() {
render()

last = new Date()
pending = null
}, FRAME_BUDGET - (now - last))
}
}
;

var createMounter = function($window, redraw) {
return function(root, component) {
var renderer = createRenderer($window)
renderer.setEventCallback(draw)

function draw() {
var draw = limiter($window, function draw() {
renderer.render(root, {tag: component})
}
})

renderer.setEventCallback(draw)

redraw.run = draw
draw()
}
}


var buildQueryString = function buildQueryString(object) {
if (Object.prototype.toString.call(object) !== "[object Object]") return ""

Expand Down Expand Up @@ -758,15 +795,17 @@ var createRouter = function($window) {
return {setPrefix: setPrefix, getPath: getPath, setPath: setPath, defineRoutes: defineRoutes, link: link}
}


var createRouterInstance = function($window, redraw) {
var renderer = createRenderer($window)
var router = createRouter($window)
var route = function(root, defaultRoute, routes) {
var replay = router.defineRoutes(routes, function(component, args) {
var replay = limiter($window, router.defineRoutes(routes, function(component, args) {
renderer.render(root, {tag: component, attrs: args})
}, function() {
router.setPath(defaultRoute)
})
}))

renderer.setEventCallback(replay)
redraw.run = replay
}
Expand Down
11 changes: 6 additions & 5 deletions mount.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
var createRenderer = require("./render/render")
var limiter = require("./limiter");

module.exports = function($window, redraw) {
return function(root, component) {
var renderer = createRenderer($window)
renderer.setEventCallback(draw)

function draw() {
var draw = limiter($window, function draw() {
renderer.render(root, {tag: component})
}
})

renderer.setEventCallback(draw)

redraw.run = draw
draw()
}
}
}
6 changes: 4 additions & 2 deletions router.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
var createRenderer = require("./render/render")
var createRouter = require("./router/router")
var limiter = require("./limiter")

module.exports = function($window, redraw) {
var renderer = createRenderer($window)
var router = createRouter($window)
var route = function(root, defaultRoute, routes) {
var replay = router.defineRoutes(routes, function(component, args) {
var replay = limiter($window, router.defineRoutes(routes, function(component, args) {
renderer.render(root, {tag: component, attrs: args})
}, function() {
router.setPath(defaultRoute)
})
}))

renderer.setEventCallback(replay)
redraw.run = replay
}
Expand Down
57 changes: 57 additions & 0 deletions test-redraw.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<!doctype html>
<html>
<head></head>
<style>
html, body {
width: 100%;
height: 100%;

margin: 0;
}

.mount {
display: flex;
flex-direction: column;

height: 100%;
}

.outer {
flex: 1;
overflow-y: auto;
}

.inner {
height: 99999px;
background: #CCC;
}
</style>
<body>
<div class="mount"></div>
<script src="./module/module.js"></script>
<script src="./mithril.js"></script>
<script type="text/javascript">
var m = require("./mithril")

var last = 0

m.mount(document.querySelector(".mount"), {
view : function() {
var now = performance.now()
console.log("draw", now - last)
last = now

return m(".outer", {
onscroll : function() {
// Unused except to trigger redraws
}
},
m(".inner",
m("p", "Scroll me")
)
)
}
})
</script>
</body>
</html>