QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-18 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into integration/sprint-26

Browse Source 
# Conflicts:
#	src/qqq/utils/qqq/ValueUtils.tsx
This commit is contained in:
Tim Chamberlain
2023-05-05 13:03:33 -05:00
parent 06c78d4dec 97d499b0b6
commit f1adf3aa5e
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qqq/utils/qqq/ValueUtils.tsx
View File

@ -456,7 +456,7 @@ function CodeViewer({name, mode, code}: {name: string; mode: string; code: strin
};
return (
<>
<Box component="span">
{mode == "json" && code && <Button onClick={() => formatJson()}>{isFormatted ? "Reset Format" : "Format JSON"}</Button>}
{code && <Button onClick={() => toggleSize()}>{isExpanded ? "Collapse" : "Expand"}</Button>}
{errorMessage}
@ -471,10 +471,11 @@ function CodeViewer({name, mode, code}: {name: string; mode: string; code: strin
readOnly
highlightActiveLine={false}
width="100%"
style={{border: "1px solid gray", marginBottom: "1rem"}}
showPrintMargin={false}
height={isExpanded ? "80vh" : code ? "200px" : "50px"}
/>
</>);
</Box>);
}
////////////////////////////////////////////////////////////////////////////////////////////////