Skip to content

Commit 7654311

Browse files
authored
Fix: Do not show preview sidebar if hasSidebar is false (#67)
Also do not show owner and uploader if those values are missing.
1 parent 2fe09b9 commit 7654311

4 files changed

Lines changed: 21 additions & 15 deletions

File tree

src/components/ContentPreview/ContentPreview.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class ContentPreview extends PureComponent<DefaultProps, Props, State> {
8888
locale: DEFAULT_PREVIEW_LOCALE,
8989
version: DEFAULT_PREVIEW_VERSION,
9090
hasSidebar: false,
91-
showSidebar: false,
91+
showSidebar: true,
9292
hasHeader: false,
9393
onLoad: noop,
9494
onNavigate: noop
@@ -417,7 +417,8 @@ class ContentPreview extends PureComponent<DefaultProps, Props, State> {
417417
<Measure bounds onResize={this.onResize}>
418418
{({ measureRef }) => <div ref={measureRef} className='bcpr-content' />}
419419
</Measure>
420-
{showSidebar &&
420+
{hasSidebar &&
421+
showSidebar &&
421422
<Sidebar
422423
file={file}
423424
getPreviewer={this.getPreviewer}

src/components/FileProperties/FileProperties.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,22 @@ const FileProperties = ({ file, getLocalizedMessage }: Props) => {
2020
const { name: uploader = '' } = created_by || {};
2121
return (
2222
<dl>
23-
<dt>
24-
{getLocalizedMessage('buik.item.owner')}
25-
</dt>
26-
<dd>
27-
{owner}
28-
</dd>
29-
<dt>
30-
{getLocalizedMessage('buik.item.uploader')}
31-
</dt>
32-
<dd>
33-
{uploader}
34-
</dd>
23+
{!!owner &&
24+
<dt>
25+
{getLocalizedMessage('buik.item.owner')}
26+
</dt>}
27+
{!!owner &&
28+
<dd>
29+
{owner}
30+
</dd>}
31+
{!!uploader &&
32+
<dt>
33+
{getLocalizedMessage('buik.item.uploader')}
34+
</dt>}
35+
{!!uploader &&
36+
<dd>
37+
{uploader}
38+
</dd>}
3539
<dt>
3640
{getLocalizedMessage('buik.item.created')}
3741
</dt>

src/components/Timeline/Timeline.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
.buik-timeline-label img {
2525
border-radius: 100%;
26+
filter: brightness(1.5);
2627
height: 30px;
2728
vertical-align: middle;
2829
width: 30px;

test/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
window.onload = function() {
2323
const { ContentExplorer } = Box;
2424
const explorer = new ContentExplorer();
25-
explorer.show('0', 'dcs5EcLt7cxE7IH7dpZ8af6zfwL1JKDE', {
25+
explorer.show('0', 'YJVDFYupIRpy1osehfEvmd7YgQDu0Gmq', {
2626
hasPreviewSidebar: true
2727
});
2828
}

0 commit comments

Comments
 (0)