Skip to content

✨ undefined bind #148

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
Mortaro merged 1 commit into from
Jan 9, 2022
+36 −30
Merged

✨ undefined bind #148

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
34 changes: 17 additions & 17 deletions plugins/bindable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,53 @@ function attachEvent(node) {
const target = node.attributes.source;
let eventName = 'oninput';
let valueName = 'value';
if(node.attributes.type === 'checkbox' || node.attributes.type === 'radio') {
if (node.attributes.type === 'checkbox' || node.attributes.type === 'radio') {
eventName = 'onclick';
valueName = 'checked';
} else if(node.type !== 'input' && node.type !== 'textarea') {
} else if (node.type !== 'input' && node.type !== 'textarea') {
eventName = 'onchange';
}
const originalEvent = node.attributes[eventName];
node.attributes[eventName] = ({event, value}) => {
if(valueName == 'checked') {
node.attributes[eventName] = ({ event, value }) => {
if (valueName == 'checked') {
target[node.attributes.bind] = event.target[valueName];
} else if(target[node.attributes.bind] === true || target[node.attributes.bind] === false) {
} else if (target[node.attributes.bind] === true || target[node.attributes.bind] === false) {
target[node.attributes.bind] = event ? (event.target[valueName] == 'true') : value;
} else if(typeof target[node.attributes.bind] === 'number') {
} else if (typeof target[node.attributes.bind] === 'number') {
target[node.attributes.bind] = parseFloat(event ? event.target[valueName] : value) || 0;
} else {
target[node.attributes.bind] = event ? event.target[valueName] : value;
}
if(originalEvent !== undefined) {
if (originalEvent !== undefined) {
setTimeout(() => {
originalEvent({...node.attributes, event, value});
originalEvent({ ...node.attributes, event, value });
}, 0);
}
}
}

function match(node) {
return (
node !== undefined &&
node.attributes !== undefined &&
node.attributes.bind !== undefined &&
node !== undefined &&
node.attributes !== undefined &&
node.attributes.bind !== undefined &&
node.attributes.source !== undefined
)
}

function transform({node, environment}) {
if(!match(node)) return;
function transform({ node, environment }) {
if (!match(node)) return;
const target = node.attributes.source;
if(node.type === 'textarea') {
if (node.type === 'textarea') {
node.children = [target[node.attributes.bind]];
} else if(node.type === 'input' && node.attributes.type === 'checkbox') {
} else if (node.type === 'input' && node.attributes.type === 'checkbox') {
node.attributes.checked = target[node.attributes.bind];
} else {
node.attributes.value = target[node.attributes.bind];
node.attributes.value = target[node.attributes.bind] || '';
}
node.attributes.name = node.attributes.name || node.attributes.bind;

if(environment.client) {
if (environment.client) {
attachEvent(node);
}
}
Expand Down
27 changes: 14 additions & 13 deletions tests/src/TwoWayBindings.njs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
import Nullstack from 'nullstack';

class TwoWayBindings extends Nullstack {

number = 1;
currency = 100;
boolean = true;
character = 'a';
text = 'aaaa';
object = {count: 1};

object = { count: 1 };
array = ['a', 'b', 'c'];

parse({event, onchange}) {
parse({ event, onchange }) {
const normalized = event.target.value.replace(',', '').padStart(3, '0');
const whole = (parseInt(normalized.slice(0,-2)) || 0).toString();
const whole = (parseInt(normalized.slice(0, -2)) || 0).toString();
const decimal = normalized.slice(normalized.length - 2);
const value = parseFloat(whole+'.'+decimal);
const value = parseFloat(whole + '.' + decimal);
const bringsHappyness = value >= 1000000;
onchange({value, bringsHappyness});
onchange({ value, bringsHappyness });
}

renderCurrencyInput({value, name}) {
renderCurrencyInput({ value, name }) {
const formatted = value.toFixed(2).replace('.', ',');
return <input name={name} value={formatted} oninput={this.parse} />
}

updateCharacter({value}) {
updateCharacter({ value }) {
this.character = this.array[value];
}
render({params}) {

render({ params }) {
return (
<div>
<div data-number={this.number} />
{!this.boolean && <div data-boolean-type={typeof(this.boolean)} />}
{this.number > 1 && <div data-number-type={typeof(this.number)} />}
{!this.boolean && <div data-boolean-type={typeof (this.boolean)} />}
{this.number > 1 && <div data-number-type={typeof (this.number)} />}
<input bind={this.number} oninput={this.updateCharacter} />
<textarea bind={this.text} />
<div data-character={this.character} />
Expand All @@ -47,6 +47,7 @@ class TwoWayBindings extends Nullstack {
</select>
<input bind={this.boolean} type="checkbox" />
<input bind={this.object.count} />
<input bind={this.undeclared} data-undeclared />
{this.array.map((value, index) => (
<input bind={this.array[index]} />
))}
Expand Down
5 changes: 5 additions & 0 deletions tests/src/TwoWayBindings.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ describe('ContextPage', () => {
expect(value).toMatch('a');
});

test('binding to undefined sets the value to an empty string', async () => {
const value = await page.$eval('[data-undeclared]', (element) => element.value);
expect(value).toMatch('');
});

test('checkboxes can be bound', async () => {
const value = await page.$eval('[name="boolean"]', (element) => element.checked);
expect(value).toBeTruthy();
Expand Down