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
4 changes: 2 additions & 2 deletions packages/dendriform/src/Dendriform.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ export class Dendriform<V,P extends Plugins = undefined> {
const renderer = aIsRenderer ? a : b;
const deps = aIsRenderer ? b : c;
const form = aIsRenderer ? this : this.branch(a);
return <Branch renderer={() => renderer(form)} deps={deps} />;
return <Branch key={form.id} renderer={() => renderer(form)} deps={deps} />;
}

renderAll<K1 extends Key<V>, K2 extends keyof Val<V,K1>, K3 extends keyof Val<Val<V,K1>,K2>, K4 extends keyof Val<Val<Val<V,K1>,K2>,K3>, W extends Val<Val<Val<V,K1>,K2>,K3>[K4]>(path: [K1, K2, K3, K4], renderer: Renderer<Dendriform<BranchableChild<W>,P>>, deps?: unknown[]): React.ReactElement;
Expand All @@ -988,7 +988,7 @@ export class Dendriform<V,P extends Plugins = undefined> {
});
};

return <Branch renderer={containerRenderer} deps={deps} />;
return <Branch key={form.id} renderer={containerRenderer} deps={deps} />;
}
}

Expand Down
25 changes: 25 additions & 0 deletions packages/dendriform/test/Dendriform.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ type MyComponentProps<V> = {
form: Dendriform<V>;
};

type MyComponentIndexProps<V> = {
foo: number;
bar?: number;
form: Dendriform<V>;
index: number;
};

type NotSetTestValue = {
foo?: string;
bar?: string;
Expand Down Expand Up @@ -1121,6 +1128,24 @@ describe(`Dendriform`, () => {
expect(renderer).toHaveBeenCalledTimes(2);
});

test(`should render one level with changing form`, () => {
const form = new Dendriform(['A','B','C']);

const renderer = jest.fn(form => <div className="branch">{form.value}</div>);

const MyComponent = (props: MyComponentIndexProps<string[]>) => {
return props.form.render(props.index, renderer, [props.foo]);
};

const wrapper = mount(<MyComponent form={form} foo={1} bar={1} index={0} />);

expect(renderer).toHaveBeenCalledTimes(1);

// should update if base form change
wrapper.setProps({foo: 1, bar: 1, form, index: 1});
expect(renderer).toHaveBeenCalledTimes(2);
});

test(`should render multiple levels with deps`, () => {
const form = new Dendriform([[['A','B']]]);

Expand Down