Skip to content

Ensure mixins properties are inferred when using tsx #594

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
agubler merged 3 commits into from
Dec 3, 2019
Merged

Ensure mixins properties are inferred when using tsx #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86e9498
Ensure mixins ensure properties are inferred when using tsx
agubler Dec 3, 2019
4d3bcae
fix test
agubler Dec 3, 2019
979912d
make test better
agubler Dec 3, 2019
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
2 changes: 1 addition & 1 deletion src/core/WidgetBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class WidgetBase<P = WidgetProperties, C extends DNode = DNode> implement
* property specifically for typing when using tsx
*/
/* tslint:disable-next-line:variable-name */
public __properties__!: P & WidgetProperties & { __children__?: DNode[] | DNode };
public __properties__!: this['properties'] & WidgetProperties & { __children__?: DNode[] | DNode };

/**
* children array
Expand Down
2 changes: 1 addition & 1 deletion src/core/interfaces.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ export interface WidgetBaseInterface<P = WidgetProperties, C extends DNode = DNo
/**
* property used for typing with tsx
*/
__properties__: P & { __children__?: DNode[] | DNode };
__properties__: this['properties'] & { __children__?: DNode[] | DNode };
}

/**
Expand Down
16 changes: 16 additions & 0 deletions tests/core/unit/vdom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { VNode, DNode, DomVNode, RenderResult } from '../../../src/core/interfac
import { WidgetBase } from '../../../src/core/WidgetBase';
import Registry from '../../../src/core/Registry';
import { I18nMixin } from '../../../src/core/mixins/I18n';
import { ThemedMixin } from '../../../src/core/mixins/Themed';
import icache from '../../../src/core/middleware/icache';
import registry from '../../../src/core/decorators/registry';
import { alwaysRender } from '../../../src/core/decorators/alwaysRender';
Expand Down Expand Up @@ -7060,4 +7061,19 @@ jsdomDescribe('vdom', () => {
r.mount({ domNode: root });
assert.isTrue(stubby.calledOnce);
});

it('infer mixin typings correctly', () => {
class MyWidget extends ThemedMixin(I18nMixin(WidgetBase)) {
render() {
return <div>hello dojo</div>;
}
}
const root: any = document.createElement('div');
const r = renderer(() => <MyWidget theme={{}} classes={{}} locale="en" rtl={true} />);
r.mount({ domNode: root });

assert.strictEqual(root.children[0].getAttribute('lang'), 'en');
assert.strictEqual(root.children[0].getAttribute('dir'), 'rtl');
assert.strictEqual(root.children[0].innerHTML, 'hello dojo');
});
});