Skip to content

surplus: faster clear via rAF, O(1) select row, update to latest S-array #168

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

Merged
krausest merged 2 commits into from
May 14, 2017
Merged

surplus: faster clear via rAF, O(1) select row, update to latest S-array #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfdebe1
surplus: faster clear via rAF, O(1) select row, update to latest S-array
adamhaile Apr 28, 2017
82ab318
surplus: revert rAF clear; bump s-js version to one w/o try-finally i…
adamhaile May 4, 2017
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
4 changes: 2 additions & 2 deletions surplus-v0.4.0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"url": "https://github.com/curveship/js-framework-benchmark.git"
},
"dependencies": {
"s-js": "^0.4.0",
"s-array": "^0.4.2",
"s-js": "^0.4.1",
"s-array": "^0.4.5",
"surplus": "^0.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion surplus-v0.4.0/src/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class Row {

export class Store {
data = SArray<Row>([]);
selected = S.data<number | undefined>(undefined);
selected = S.value<number | undefined>(undefined);
id = 1;

buildData(count = 1000) {
Expand Down
53 changes: 36 additions & 17 deletions surplus-v0.4.0/src/view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import { App } from './controller';

Surplus;

const USE_NON_KEYED_TBODY = location.search.indexOf('keyed') === -1;
const
USE_NAIVE_TBODY = location.search.indexOf('naive') !== -1,
USE_KEYED_TBODY = location.search.indexOf('keyed') !== -1;

type RowTr = HTMLTableRowElement & { _id : HTMLTableCellElement, _label : HTMLAnchorElement };

Expand All @@ -18,10 +20,10 @@ export let AppView = (app : App) =>
<div className="col-md-6">
<div className="row">
<div className="col-sm-6 smallpad">
<button type="button" className="btn btn-primary btn-block" id="run" onClick={e => app.run(!USE_NON_KEYED_TBODY)}>Create 1,000 rows</button>
<button type="button" className="btn btn-primary btn-block" id="run" onClick={e => app.run(USE_KEYED_TBODY)}>Create 1,000 rows</button>
</div>
<div className="col-sm-6 smallpad">
<button type="button" className="btn btn-primary btn-block" id="runlots" onClick={e => app.runLots(!USE_NON_KEYED_TBODY)}>Create 10,000 rows</button>
<button type="button" className="btn btn-primary btn-block" id="runlots" onClick={e => app.runLots(USE_KEYED_TBODY)}>Create 10,000 rows</button>
</div>
<div className="col-sm-6 smallpad">
<button type="button" className="btn btn-primary btn-block" id="add" onClick={e => app.add()}>Append 1,000 rows</button>
Expand All @@ -41,29 +43,46 @@ export let AppView = (app : App) =>
</div>
<table className="table table-hover table-striped test-data"
onClick = {(e : any) => e.target.matches('.delete') ? app.delete(rowId(e)) : app.select(rowId(e))}>
{ USE_NON_KEYED_TBODY ? TBodyNonKeyed(app) : TBodyKeyed(app) }
{ USE_NAIVE_TBODY ? TBodyNaive(app) : USE_KEYED_TBODY ? TBodyKeyed(app) : TBodyNonKeyed(app) }
</table>
<span className="preloadicon glyphicon glyphicon-remove"></span>
</div>,
rowId = ({target: el} : {target : HTMLElement}) => {
while (el.tagName !== 'TR') el = el.parentElement!;
return +el.childNodes[0].textContent!;
},
TBodyNaive = (app : App) =>
<tbody>
{app.store.data.mapSample(row =>
<tr className={app.store.selected() === row.id ? 'danger' : ''}>
<td className="col-md-1">{row.id}</td>
<td className="col-md-4">
<a>{row.label()}</a>
</td>
<td className="col-md-1"><a><span className="glyphicon glyphicon-remove delete"></span></a></td>
<td className="col-md-6"></td>
</tr>
)}
</tbody>,
TBodyKeyed = (app : App) => {
let trs = app.store.data.mapSample(row =>
<tr>
<td className="col-md-1" innerText={row.id}></td>
<td className="col-md-4">
<a innerText={row.label()}></a>
</td>
<td className="col-md-1"><a><span className="glyphicon glyphicon-remove delete"></span></a></td>
<td className="col-md-6"></td>
</tr>);
const index = {} as { [id : number] : HTMLTableRowElement | undefined},
trs = app.store.data.mapSample(row =>
<tr ref={index[row.id]!}>
<td className="col-md-1" innerText={row.id}></td>
<td className="col-md-4">
<a innerText={row.label()}></a>
</td>
<td className="col-md-1"><a><span className="glyphicon glyphicon-remove delete"></span></a></td>
<td className="col-md-6"></td>
</tr>,
row => index[row.id] = undefined);

S.on(app.store.selected, () => {
let sel = app.store.selected(), data = app.store.data();
trs().forEach((tr, i) => tr.className = data[i].id === sel ? 'danger' : '');
});
S.on(app.store.selected, (tr? : HTMLTableRowElement) => {
if (tr) tr.className = '';
tr = index[app.store.selected()!];
if (tr) tr.className = 'danger';
return tr;
}, undefined);

return <tbody>{trs}</tbody>;
},
Expand Down