Skip to content

Attempted fix for #74 - rendering non scalar values #75

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
bluebill1049 merged 2 commits into from
Apr 8, 2021
Merged

Attempted fix for #74 - rendering non scalar values #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b824b
Attempted fix for #74 - rendering non scalar values
cabbiepete Apr 8, 2021
c53c98d
Lint fixes
cabbiepete Apr 8, 2021
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
35 changes: 25 additions & 10 deletions src/panelTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const PanelTable = ({
}, [collapseAll]);

let value = fieldsValues ? get(fieldsValues, name) : '';
let isValueWrappedInPre = false;

if (!isUndefined(value)) {
if (isObject(value)) {
Expand All @@ -51,6 +52,7 @@ const PanelTable = ({
</code>
</pre>
);
isValueWrappedInPre = true;
} catch {
value = <span>[Nested Object]</span>;
}
Expand Down Expand Up @@ -235,16 +237,29 @@ const PanelTable = ({
...paraGraphDefaultStyle,
}}
>
<p
title={value}
style={{
...paraGraphDefaultStyle,
margin: 0,
padding: 0,
}}
>
{value}
</p>
{!isValueWrappedInPre && (
<p
title={value}
style={{
...paraGraphDefaultStyle,
margin: 0,
padding: 0,
}}
>
{value}
</p>
)}
{isValueWrappedInPre && (
<div
style={{
...paraGraphDefaultStyle,
margin: 0,
padding: 0,
}}
>
{value}
</div>
)}
</td>
</tr>
)}
Expand Down