Skip to content

Commit 2830759

Browse files
committed
fixes
1 parent fb22b0d commit 2830759

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/components/JsonViewer/JsonViewer.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ interface JsonViewerProps {
3737
maxValueWidth?: number;
3838
toolbarClassName?: string;
3939
withClipboardButton?: Omit<ClipboardButtonProps, 'size' | 'view'>;
40-
value: any;
40+
value: ReactUnipikaProps['value'];
4141
scrollContainerRef: React.RefObject<HTMLElement>;
4242
}
4343

@@ -136,6 +136,7 @@ export function JsonViewer({
136136
caseInsensitiveSearch={!caseSensitiveSearch}
137137
initiallyCollapsed={collapsedInitially}
138138
scrollContainerRef={scrollContainerRef}
139+
showContainerSize
139140
/>
140141
</div>
141142
);

src/containers/Tenant/Diagnostics/TopicData/TopicMessageDetails/components/TopicMessage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export function TopicMessage({offset, size, message, scrollContainerRef}: TopicM
6161
key={String(isFullscreen)}
6262
collapsedInitially
6363
value={preparedMessage}
64-
maxValueWidth={50}
6564
toolbarClassName={b('json-viewer-toolbar')}
6665
scrollContainerRef={scrollContainerRef}
6766
/>

src/containers/Tenant/Query/QueryResult/components/QueryJSONViewer/QueryJSONViewer.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22

33
import {JsonViewer} from '../../../../../../components/JsonViewer/JsonViewer';
44
import {cn} from '../../../../../../utils/cn';
5+
import {useTypedSelector} from '../../../../../../utils/hooks';
56

67
import './QueryJSONViewer.scss';
78

@@ -12,11 +13,16 @@ interface QueryJSONViewerProps {
1213
}
1314

1415
export function QueryJSONViewer({data}: QueryJSONViewerProps) {
15-
const scrollRef = React.useRef(null);
16+
const scrollRef = React.useRef<HTMLDivElement>(null);
17+
const isFullscreen = useTypedSelector((state) => state.fullscreen);
1618
return (
1719
<div className={b()}>
1820
<div className={b('tree')} ref={scrollRef}>
19-
<JsonViewer value={data} scrollContainerRef={scrollRef} />
21+
<JsonViewer
22+
value={data}
23+
scrollContainerRef={scrollRef} // key is used to reset JsonViewer state to collapsed due to performance issues on close fullscreen mode if nodes quantity is big enough https://github.com/ydb-platform/ydb-embedded-ui/issues/2265
24+
key={String(isFullscreen)}
25+
/>
2026
</div>
2127
</div>
2228
);

0 commit comments

Comments
 (0)