Skip to content

Commit df0780b

Browse files
BelfordZP0lip
authored andcommitted
fix: combiners with differing types render nothing for some children (#222)
* fix: combiners with differing types render nothing for some children * fix: prettier updates
1 parent 58dfd15 commit df0780b

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

src/__stories__/Combiners.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,8 @@ OneOfMulti.args = { schema: oneOfWithMultiTypesSchema, renderRootTreeLines: true
3636
export const ArrayOneOf2 = Template.bind({});
3737
ArrayOneOf2.args = { schema: oneOfWithArraySchema2 as JSONSchema4, renderRootTreeLines: true };
3838

39+
export const OneOfMulti = Template.bind({});
40+
OneOfMulti.args = { schema: oneOfWithMultiTypesSchema, renderRootTreeLines: true };
41+
3942
export const ObjectAnyOf = Template.bind({});
4043
ObjectAnyOf.args = { schema: anyOfObject as JSONSchema4 };

src/__tests__/__snapshots__/index.spec.tsx.snap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,13 @@ exports[`HTML Output given array with oneOf containing items, should merge it co
330330
</div>
331331
<div>(one of)</div>
332332
</div>
333+
<div data-id=\\"b55b1e932485c\\">
334+
<div>
335+
<div>
336+
<div><span>array[string]</span></div>
337+
</div>
338+
</div>
339+
</div>
333340
</div>
334341
</div>
335342
</div>

src/components/SchemaRow/TopLevelSchemaRow.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ export const TopLevelSchemaRow = ({
8888
currentNestingLevel={nestingLevel}
8989
parentNodeId={nodeId}
9090
/>
91+
) : combiner ? (
92+
<SchemaRow schemaNode={selectedChoice.type} nestingLevel={nestingLevel} />
9193
) : null}
9294
</>
9395
);

0 commit comments

Comments
 (0)