Skip to content
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

[BUGFIX] Fix reactivity of dynamic attributes #1272

Merged
merged 1 commit into from
Feb 16, 2021
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
37 changes: 36 additions & 1 deletion packages/@glimmer/integration-tests/test/attributes-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { normalizeProperty } from '@glimmer/runtime';
import { assertElement, hasAttribute, jitSuite, RenderTest, test } from '..';
import { assertElement, hasAttribute, jitSuite, RenderTest, test, tracked } from '..';
import { Namespace, SimpleElement } from '@simple-dom/interface';
import { castToBrowser, expect } from '@glimmer/util';

export class AttributesTests extends RenderTest {
static suiteName = 'Attributes';
Expand Down Expand Up @@ -239,6 +240,40 @@ export class AttributesTests extends RenderTest {
this.assertStableNodes();
}

@test
'handles successive updates to the same value'() {
class Model {
@tracked value = '';
}

let model = new Model();

this.render('<input value={{this.model.value}} />', { model });
this.assert.equal(this.readDOMAttr('value'), '');
this.assertStableRerender();

let inputElement = castToBrowser(
expect(this.element.firstChild, 'expected input to exist'),
'input'
);

inputElement.value = 'bar';
this.assert.equal(this.readDOMAttr('value'), 'bar');

model.value = 'foo';
this.rerender();
this.assert.equal(this.readDOMAttr('value'), 'foo');
this.assertStableNodes();

inputElement.value = 'bar';
this.assert.equal(this.readDOMAttr('value'), 'bar');

model.value = 'foo';
this.rerender();
this.assert.equal(this.readDOMAttr('value'), 'foo');
this.assertStableNodes();
}

@test
'input[checked] prop updates when set to undefined'() {
this.registerHelper('if', (params) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ function setDeferredAttr(
.elements()
.setDynamicAttribute(name, valueForRef(value), trusting, namespace);
if (!isConstRef(value)) {
vm.updateWith(new UpdateDynamicAttributeOpcode(value, attribute));
vm.updateWith(new UpdateDynamicAttributeOpcode(value, attribute, vm.env));
}
}
}
Expand Down
35 changes: 21 additions & 14 deletions packages/@glimmer/runtime/lib/compiled/opcodes/dom.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Reference, valueForRef, isConstRef } from '@glimmer/reference';
import { Reference, valueForRef, isConstRef, createComputeRef } from '@glimmer/reference';
import { Revision, Tag, valueForTag, validateTag, consumeTag } from '@glimmer/validator';
import {
check,
Expand All @@ -8,7 +8,7 @@ import {
CheckNode,
CheckMaybe,
} from '@glimmer/debug';
import { Op, Option, InternalModifierManager } from '@glimmer/interfaces';
import { Op, Option, Environment, InternalModifierManager } from '@glimmer/interfaces';
import { $t0 } from '@glimmer/vm';
import { ModifierDefinition } from '../../modifier/interfaces';
import { APPEND_OPCODES, UpdatingOpcode } from '../../opcodes';
Expand Down Expand Up @@ -159,27 +159,34 @@ APPEND_OPCODES.add(Op.DynamicAttr, (vm, { op1: _name, op2: trusting, op3: _names
let attribute = vm.elements().setDynamicAttribute(name, value, !!trusting, namespace);

if (!isConstRef(reference)) {
vm.updateWith(new UpdateDynamicAttributeOpcode(reference, attribute));
vm.updateWith(new UpdateDynamicAttributeOpcode(reference, attribute, vm.env));
}
});

export class UpdateDynamicAttributeOpcode extends UpdatingOpcode {
public type = 'patch-element';

public lastValue: unknown;
private updateRef: Reference;

constructor(private reference: Reference<unknown>, private attribute: DynamicAttribute) {
constructor(reference: Reference<unknown>, attribute: DynamicAttribute, env: Environment) {
super();
this.lastValue = valueForRef(reference);
}

evaluate(vm: UpdatingVM) {
let { attribute, reference, lastValue } = this;
let currentValue = valueForRef(reference);
let initialized = false;

if (currentValue !== lastValue) {
attribute.update(currentValue, vm.env);
this.lastValue = currentValue;
}
this.updateRef = createComputeRef(() => {
let value = valueForRef(reference);

if (initialized === true) {
attribute.update(value, env);
} else {
initialized = true;
}
});

valueForRef(this.updateRef);
}

evaluate() {
valueForRef(this.updateRef);
}
}