Skip to content

feat: support displayObjectSize #102

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.

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
merged 1 commit into from
Oct 6, 2022
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
9 changes: 9 additions & 0 deletions docs/pages/full/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ const IndexPage: React.FC = () => {
const [theme, setTheme] = useState<JsonViewerTheme>('light')
const [src, setSrc] = useState(() => example)
const [displayDataTypes, setDisplayDataTypes] = useState(true)
const [displayObjectSize, setDisplayObjectSize] = useState(true)
const [editable, setEditable] = useState(true)
useEffect(() => {
const loop = () => {
Expand Down Expand Up @@ -152,6 +153,13 @@ const IndexPage: React.FC = () => {
/>}
label='DisplayDataTypes'
/>
<FormControlLabel
control={<Switch
checked={displayObjectSize}
onChange={event => setDisplayObjectSize(event.target.checked)}
/>}
label='DisplayObjectSize'
/>
<TextField
label='indentWidth'
value={indent}
Expand Down Expand Up @@ -205,6 +213,7 @@ const IndexPage: React.FC = () => {
indentWidth={indent}
theme={theme}
displayDataTypes={displayDataTypes}
displayObjectSize={displayObjectSize}
groupArraysAfterLength={groupArraysAfterLength}
keyRenderer={KeyRenderer}
valueTypes={[
Expand Down
52 changes: 32 additions & 20 deletions src/components/DataTypes/Object.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export const PreObjectType: React.FC<DataItemProps<object>> = (props) => {
() => props.inspect ? inspectMetadata(props.value) : '',
[props.inspect, props.value]
)
const displayObjectSize = useJsonViewerStore(store => store.displayObjectSize)
const isTrap = useIsCycleReference(props.path, props.value)
return (
<Box
Expand All @@ -49,16 +50,21 @@ export const PreObjectType: React.FC<DataItemProps<object>> = (props) => {
}}
>
{isArray ? arrayLb : objectLb}
<Box
component='span'
sx={{
pl: 0.5,
fontStyle: 'italic',
color: metadataColor
}}
>
{sizeOfValue}
</Box>
{displayObjectSize
? (
<Box
component='span'
sx={{
pl: 0.5,
fontStyle: 'italic',
color: metadataColor
}}
>
{sizeOfValue}
</Box>
)
: null}

{isTrap && !props.inspect
? (
<>
Expand All @@ -78,23 +84,29 @@ export const PreObjectType: React.FC<DataItemProps<object>> = (props) => {
export const PostObjectType: React.FC<DataItemProps<object>> = (props) => {
const metadataColor = useJsonViewerStore(store => store.colorspace.base04)
const isArray = useMemo(() => Array.isArray(props.value), [props.value])
const displayObjectSize = useJsonViewerStore(store => store.displayObjectSize)
const sizeOfValue = useMemo(
() => !props.inspect ? inspectMetadata(props.value) : '',
[props.inspect, props.value]
)
return (
<Box component='span' className='data-object-end'>
{isArray ? arrayRb : objectRb}
<Box
component='span'
sx={{
pl: 0.5,
fontStyle: 'italic',
color: metadataColor
}}
>
{sizeOfValue}
</Box>
{displayObjectSize
? (
<Box
component='span'
sx={{
pl: 0.5,
fontStyle: 'italic',
color: metadataColor
}}
>
{sizeOfValue}
</Box>
)
: null
}
</Box>
)
}
Expand Down
1 change: 1 addition & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const JsonViewerInner: React.FC<JsonViewerProps> = (props) => {
useSetIfNotUndefinedEffect('enableClipboard', props.enableClipboard)
useSetIfNotUndefinedEffect('rootName', props.rootName)
useSetIfNotUndefinedEffect('displayDataTypes', props.displayDataTypes)
useSetIfNotUndefinedEffect('displayObjectSize', props.displayObjectSize)
useEffect(() => {
if (props.theme === 'light') {
api.setState({
Expand Down
4 changes: 3 additions & 1 deletion src/stores/JsonViewerStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export type JsonViewerState<T = unknown> = {
value: T
onChange: JsonViewerOnChange
keyRenderer: JsonViewerKeyRenderer
displayObjectSize: boolean
}

export type JsonViewerActions = {
Expand Down Expand Up @@ -63,7 +64,8 @@ export const createJsonViewerStore = <T = unknown> (props: JsonViewerProps<T>) =
inspectCache: {},
hoverPath: null,
colorspace: lightColorspace,
value: props.value
value: props.value,
displayObjectSize: props.displayObjectSize ?? true
},
(set, get) => ({
getInspectCache: (path, nestedIndex) => {
Expand Down
7 changes: 7 additions & 0 deletions src/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,11 @@ export type JsonViewerProps<T = unknown> = {
* @default 'light'
*/
theme?: JsonViewerTheme

/**
* Whether display the size of array and object
*
* @default true
*/
displayObjectSize?: boolean
}
7 changes: 7 additions & 0 deletions tests/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,13 @@ describe('render <JsonViewer/> with props', () => {
})
})

it('render with displayObjectSize', async () => {
const selection = [true, false]
selection.forEach(displayObjectSize => {
render(<JsonViewer value={['string1', 'string2']} displayObjectSize={displayObjectSize}/>)
})
})

it('render with dataTypes', async () => {
render(<JsonViewer value={undefined} valueTypes={[]}/>)
render(<JsonViewer value={undefined} valueTypes={[
Expand Down