Skip to content
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
10 changes: 9 additions & 1 deletion src/Incorporator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@ export default class Incorporator extends PureComponent<Props, State> {
const handlers = scope.getSelectorHandlers(this.selector);
for (const evType of Object.keys(handlers)) {
const onFoo = `on${evType[0].toUpperCase()}${evType.slice(1)}`;
props[onFoo] = (ev: any) => handlers[evType]._n(ev);
const existingHandler =
typeof props[onFoo] === 'function' ? props[onFoo] : undefined;
const evHandler = (ev: any) => handlers[evType]._n(ev);
props[onFoo] = existingHandler
? (ev: any) => {
evHandler(ev);
return existingHandler(ev);
}
: evHandler;
}
return props;
}
Expand Down
47 changes: 47 additions & 0 deletions test/conversion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,53 @@ describe('Conversion', function () {
setTimeout(check, 150);
});


it('respects handler set on react component', (done) => {
let onPressCalled = 0;
function main(sources: {react: ReactSource}) {
const inc = Symbol();
const inc$ = sources.react.select(inc).events('press');
const count$ = inc$.fold((acc: number, x: any) => acc + 1, 0);
const vdom$ = count$.map((i: number) =>
h(
Touchable,
{
sel: inc,
onPress: () => {
onPressCalled++;
},
},
[h('div', [h('h1', {}, '' + i)])]
)
);
return {react: vdom$};
}

let turn = 0;
const RootComponent = makeCycleReactComponent(() => {
const source = new ReactSource();
const sink = main({react: source}).react;
return {source, sink};
});
const r = renderer.create(createElement(RootComponent));
const root = r.root;
const check = () => {
const to = root.findByType(Touchable);
const view = to.props.children;
const text = view.props.children;
assert.strictEqual(text.props.children, `${turn}`);
to.instance.press();
turn++;
if (turn === 3) {
assert.strictEqual(onPressCalled, 3)
done();
}
};
setTimeout(check, 50);
setTimeout(check, 100);
setTimeout(check, 150);
});

it('output React component routes props to sources.react.props()', (done) => {
function main(sources: {react: ReactSource}) {
sources.react.props().addListener({
Expand Down