Skip to content
Open
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
22 changes: 22 additions & 0 deletions src/__tests__/autobind-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,26 @@ describe('autobind', () => {
expect(bar.getThis).toNotBe(Foo.prototype.getThis);
expect(invoke(bar.getThis)).toBe(bar);
});

it('should NOT bind class accessors', () => {
class Foo {
constructor() {
autobind(this, Foo.prototype);
}

get getAccessor() {
throw 'Accesor called';
}

set setAccessor(val) {
this.value = val;
}
}
try {
let foo = new Foo();
expect(foo).toNotBe(undefined);
} catch (e) {
expect(e).toBe(undefined);
}
});
});
12 changes: 12 additions & 0 deletions src/autobind.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,24 @@ function isFunction(item) {
return (typeof item === 'function');
}

function isAccessor(proto: ?Object, name: String) {
let desc = Object.getOwnPropertyDescriptor(proto, name);
if (!!desc && (typeof desc.get === 'function' || typeof desc.set === 'function')) {
return true;
}

return false;
}

export default function autobind(instance: Object, proto: ?Object) {
if (proto == null) {
proto = Object.getPrototypeOf(instance);
}
let propertyNames = Object.getOwnPropertyNames(proto);
for (let name of propertyNames) {
if (isAccessor(proto, name)) {
continue;
}
let value = proto[name];
if (isFunction(value) && !isExcluded(name)) {
instance[name] = proto[name].bind(instance);
Expand Down