pm_list: Simplify redraws for Private Messages.
We now use vdom-ish techniques to track the
list items for the pm list. When we go to update
the list, we only re-render nodes whose data
has changed, with two exceptions:
- Obviously, the first time we do a full render.
- If the keys for the items have changed (i.e.
a new node has come in or the order has changed),
we just re-render the whole list.
If the keys are the same since the last re-render, we
only re-render individual items if their data has
changed.
Most of the new code is in these two modules:
- pm_list_dom.js
- vdom.js
We remove all of the code in pm_list.js that is
related to updating DOM with unread counts.
For presence updates, we are now *never*
re-rendering the whole list, since presence
updates only change individual line items and
don't affect the keys. Instead, we just update
any changed elements in place.
The main thing that makes this all work is the
`update` method in `vdom`, which is totally generic
and essentially does a few simple jobs:
- detect if keys are different
- just render the whole ul as needed
- for items that change, do the appropriate
jQuery to update the item in place
Note that this code seems to play nice with simplebar.
Also, this code continues to use templates to render
the individual list items.
FWIW this code isn't radically different than list_render,
but it's got some key differences:
- There are fewer bells and whistles in this code.
Some of the stuff that list_render does is overkill
for the PM list.
- This code detects data changes.
Note that the vdom scheme is agnostic about templates;
it simply requires the child nodes to provide a render
method. (This is similar to list_render, which is also
technically agnostic about rendering, but which also
does use templates in most cases.)
These fixes are somewhat related to #13605, but we
haven't gotten a solid repro on that issue, and
the scrolling issues there may be orthogonal to the
redraws. But having fewer moving parts here should
help, and we won't get the rug pulled out from under
us on every presence update.
There are two possible extensions to this that are
somewhat overlapping in nature, but can be done
one a time.
* We can do a deeper vdom approach here that
gets us away from templates, and just have
nodes write to an AST. I have this on another
branch, but it might be overkill.
* We can avoid some redraws by detecting where
keys are moving up and down. I'm not completely
sure we need it for the PM list.
If this gets merged, we may want to try similar
things for the stream list, which also does a fairly
complicated mixture of big-hammer re-renders and
surgical updates-in-place (with custom code).
BTW we have 100% line coverage for vdom.js.
2020-01-04 17:17:44 +01:00
|
|
|
set_global('blueslip', global.make_zblueslip());
|
|
|
|
zrequire('util');
|
|
|
|
zrequire('vdom');
|
|
|
|
|
|
|
|
run_test('basics', () => {
|
|
|
|
const opts = {
|
|
|
|
keyed_nodes: [],
|
|
|
|
attrs: [
|
|
|
|
['class', 'foo'],
|
|
|
|
['title', 'cats & <"dogs">'],
|
|
|
|
],
|
|
|
|
};
|
|
|
|
|
|
|
|
const ul = vdom.ul(opts);
|
|
|
|
|
|
|
|
const html = vdom.render_tag(ul);
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
html,
|
|
|
|
'<ul class="foo" title="cats & <"dogs">">\n\n' +
|
|
|
|
'</ul>'
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2020-01-18 17:56:09 +01:00
|
|
|
run_test('attributes', () => {
|
|
|
|
const opts = {
|
|
|
|
keyed_nodes: [],
|
|
|
|
attrs: [
|
|
|
|
['class', 'same'],
|
|
|
|
['color', 'blue'],
|
|
|
|
['id', '101'],
|
|
|
|
],
|
|
|
|
};
|
|
|
|
|
|
|
|
const ul = vdom.ul(opts);
|
|
|
|
|
|
|
|
const html = vdom.render_tag(ul);
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
html,
|
|
|
|
'<ul class="same" color="blue" id="101">\n\n' +
|
|
|
|
'</ul>'
|
|
|
|
);
|
|
|
|
|
|
|
|
let updated;
|
|
|
|
let removed;
|
|
|
|
|
|
|
|
const container = {
|
|
|
|
find: (tag_name) => {
|
|
|
|
assert.equal(tag_name, 'ul');
|
|
|
|
return {
|
|
|
|
children: () => [],
|
|
|
|
|
|
|
|
attr: (k, v) => {
|
|
|
|
assert.equal(k, 'color');
|
|
|
|
assert.equal(v, 'red');
|
|
|
|
updated = true;
|
|
|
|
},
|
|
|
|
|
|
|
|
removeAttr: (k) => {
|
|
|
|
assert.equal(k, 'id');
|
|
|
|
removed = true;
|
|
|
|
},
|
|
|
|
};
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const new_opts = {
|
|
|
|
keyed_nodes: [],
|
|
|
|
attrs: [
|
|
|
|
['class', 'same'], // unchanged
|
|
|
|
['color', 'red'],
|
|
|
|
],
|
|
|
|
};
|
|
|
|
|
|
|
|
const new_ul = vdom.ul(new_opts);
|
|
|
|
|
|
|
|
vdom.update(container, new_ul, ul);
|
|
|
|
|
|
|
|
assert(updated);
|
|
|
|
assert(removed);
|
|
|
|
});
|
|
|
|
|
pm_list: Simplify redraws for Private Messages.
We now use vdom-ish techniques to track the
list items for the pm list. When we go to update
the list, we only re-render nodes whose data
has changed, with two exceptions:
- Obviously, the first time we do a full render.
- If the keys for the items have changed (i.e.
a new node has come in or the order has changed),
we just re-render the whole list.
If the keys are the same since the last re-render, we
only re-render individual items if their data has
changed.
Most of the new code is in these two modules:
- pm_list_dom.js
- vdom.js
We remove all of the code in pm_list.js that is
related to updating DOM with unread counts.
For presence updates, we are now *never*
re-rendering the whole list, since presence
updates only change individual line items and
don't affect the keys. Instead, we just update
any changed elements in place.
The main thing that makes this all work is the
`update` method in `vdom`, which is totally generic
and essentially does a few simple jobs:
- detect if keys are different
- just render the whole ul as needed
- for items that change, do the appropriate
jQuery to update the item in place
Note that this code seems to play nice with simplebar.
Also, this code continues to use templates to render
the individual list items.
FWIW this code isn't radically different than list_render,
but it's got some key differences:
- There are fewer bells and whistles in this code.
Some of the stuff that list_render does is overkill
for the PM list.
- This code detects data changes.
Note that the vdom scheme is agnostic about templates;
it simply requires the child nodes to provide a render
method. (This is similar to list_render, which is also
technically agnostic about rendering, but which also
does use templates in most cases.)
These fixes are somewhat related to #13605, but we
haven't gotten a solid repro on that issue, and
the scrolling issues there may be orthogonal to the
redraws. But having fewer moving parts here should
help, and we won't get the rug pulled out from under
us on every presence update.
There are two possible extensions to this that are
somewhat overlapping in nature, but can be done
one a time.
* We can do a deeper vdom approach here that
gets us away from templates, and just have
nodes write to an AST. I have this on another
branch, but it might be overkill.
* We can avoid some redraws by detecting where
keys are moving up and down. I'm not completely
sure we need it for the PM list.
If this gets merged, we may want to try similar
things for the stream list, which also does a fairly
complicated mixture of big-hammer re-renders and
surgical updates-in-place (with custom code).
BTW we have 100% line coverage for vdom.js.
2020-01-04 17:17:44 +01:00
|
|
|
function make_child(i, name) {
|
|
|
|
const render = () => {
|
|
|
|
return '<li>' + name + '</li>';
|
|
|
|
};
|
|
|
|
|
|
|
|
const eq = (other) => {
|
|
|
|
return name === other.name;
|
|
|
|
};
|
|
|
|
|
|
|
|
return {
|
|
|
|
key: i,
|
|
|
|
render: render,
|
|
|
|
name: name,
|
|
|
|
eq: eq,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
function make_children(lst) {
|
|
|
|
return _.map(lst, (i) => {
|
|
|
|
return make_child(i, 'foo' + i);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
run_test('children', () => {
|
|
|
|
let rendered_html;
|
|
|
|
|
|
|
|
const container = {
|
|
|
|
html: (html) => {
|
|
|
|
rendered_html = html;
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const nodes = make_children([1, 2, 3]);
|
|
|
|
|
|
|
|
const opts = {
|
|
|
|
keyed_nodes: nodes,
|
|
|
|
attrs: [],
|
|
|
|
};
|
|
|
|
|
|
|
|
const ul = vdom.ul(opts);
|
|
|
|
|
|
|
|
vdom.update(container, ul);
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
rendered_html,
|
|
|
|
'<ul>\n' +
|
|
|
|
'<li>foo1</li>\n' +
|
|
|
|
'<li>foo2</li>\n' +
|
|
|
|
'<li>foo3</li>\n' +
|
|
|
|
'</ul>'
|
|
|
|
);
|
|
|
|
|
|
|
|
// Force a complete redraw.
|
|
|
|
const new_nodes = make_children([4, 5]);
|
|
|
|
const new_opts = {
|
|
|
|
keyed_nodes: new_nodes,
|
|
|
|
attrs: [
|
|
|
|
['class', 'main'],
|
|
|
|
],
|
|
|
|
};
|
|
|
|
|
|
|
|
const new_ul = vdom.ul(new_opts);
|
|
|
|
vdom.update(container, new_ul, ul);
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
rendered_html,
|
|
|
|
'<ul class="main">\n' +
|
|
|
|
'<li>foo4</li>\n' +
|
|
|
|
'<li>foo5</li>\n' +
|
|
|
|
'</ul>'
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
|
|
|
run_test('partial updates', () => {
|
|
|
|
let rendered_html;
|
|
|
|
|
|
|
|
const container = {
|
|
|
|
html: (html) => {
|
|
|
|
rendered_html = html;
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const nodes = make_children([1, 2, 3]);
|
|
|
|
|
|
|
|
const opts = {
|
|
|
|
keyed_nodes: nodes,
|
|
|
|
attrs: [],
|
|
|
|
};
|
|
|
|
|
|
|
|
const ul = vdom.ul(opts);
|
|
|
|
|
|
|
|
vdom.update(container, ul);
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
rendered_html,
|
|
|
|
'<ul>\n' +
|
|
|
|
'<li>foo1</li>\n' +
|
|
|
|
'<li>foo2</li>\n' +
|
|
|
|
'<li>foo3</li>\n' +
|
|
|
|
'</ul>'
|
|
|
|
);
|
|
|
|
|
|
|
|
container.html = () => {
|
|
|
|
throw Error('should not replace entire html');
|
|
|
|
};
|
|
|
|
|
|
|
|
let patched_html;
|
|
|
|
|
|
|
|
container.find = (tag_name) => {
|
|
|
|
assert.equal(tag_name, 'ul');
|
|
|
|
return {
|
|
|
|
children: () => {
|
|
|
|
return {
|
|
|
|
eq: (i) => {
|
|
|
|
assert.equal(i, 0);
|
|
|
|
return {
|
|
|
|
replaceWith: (html) => {
|
|
|
|
patched_html = html;
|
|
|
|
},
|
|
|
|
};
|
|
|
|
},
|
|
|
|
};
|
|
|
|
},
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
const new_nodes = make_children([1, 2, 3]);
|
|
|
|
new_nodes[0] = make_child(1, 'modified1');
|
|
|
|
|
|
|
|
const new_opts = {
|
|
|
|
keyed_nodes: new_nodes,
|
|
|
|
attrs: [],
|
|
|
|
};
|
|
|
|
|
|
|
|
const new_ul = vdom.ul(new_opts);
|
|
|
|
vdom.update(container, new_ul, ul);
|
|
|
|
|
|
|
|
assert.equal(patched_html, '<li>modified1</li>');
|
|
|
|
});
|
|
|
|
|
|
|
|
run_test('eq_array easy cases', () => {
|
|
|
|
const bogus_eq = () => {
|
|
|
|
throw Error('we should not be comparing elements');
|
|
|
|
};
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
vdom.eq_array(undefined, undefined, bogus_eq),
|
|
|
|
true);
|
|
|
|
|
|
|
|
const x = [1, 2, 3];
|
|
|
|
assert.equal(
|
|
|
|
vdom.eq_array(x, undefined, bogus_eq),
|
|
|
|
false);
|
|
|
|
|
|
|
|
assert.equal(
|
|
|
|
vdom.eq_array(undefined, x, bogus_eq),
|
|
|
|
false);
|
|
|
|
|
|
|
|
assert.equal(vdom.eq_array(x, x, bogus_eq), true);
|
|
|
|
|
|
|
|
// length check should also short-circuit
|
|
|
|
const y = [1, 2, 3, 4, 5];
|
|
|
|
assert.equal(vdom.eq_array(x, y, bogus_eq), false);
|
|
|
|
|
|
|
|
// same length, same values, but different order
|
|
|
|
const eq = (a, b) => a === b;
|
|
|
|
const z = [3, 2, 1];
|
|
|
|
assert.equal(vdom.eq_array(x, z, eq), false);
|
|
|
|
});
|
|
|
|
|
|
|
|
run_test('eq_array elementwise', () => {
|
|
|
|
const a = [51, 32, 93];
|
|
|
|
const b = [31, 52, 43];
|
|
|
|
const eq = (a, b) => a % 10 === b % 10;
|
|
|
|
assert.equal(vdom.eq_array(a, b, eq), true);
|
|
|
|
});
|
|
|
|
|
|
|
|
run_test('error checking', () => {
|
|
|
|
blueslip.set_test_data(
|
|
|
|
'error',
|
|
|
|
'We need keyed_nodes for updates.');
|
|
|
|
|
|
|
|
const container = 'whatever';
|
|
|
|
const ul = {opts: {}};
|
|
|
|
|
|
|
|
vdom.update(container, ul, ul);
|
|
|
|
assert.equal(blueslip.get_test_logs('error').length, 1);
|
|
|
|
|
|
|
|
blueslip.set_test_data(
|
|
|
|
'error',
|
|
|
|
'We need keyed_nodes to render innards.');
|
|
|
|
vdom.render_tag(ul);
|
|
|
|
|
|
|
|
});
|