Skip to content

Commit 155e001

Browse files
authored
feat: remove unused white space (#247)
1 parent 00a8eda commit 155e001

File tree

2 files changed

+37
-26
lines changed

2 files changed

+37
-26
lines changed

src/components/SlideItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class SlideItem extends React.Component<SlideItemProps, SlideItemState> {
102102
attributes={attributes}
103103
selectable
104104
>
105-
<div style={{ height: '100px' }} ref={this.overviewViewportRef} />
105+
{(this.overviewViewportRef.current != null) && <div style={{ height: '100px' }} ref={this.overviewViewportRef} />}
106106
</Description>
107107
</Menu.Item>
108108
)

src/components/SlideViewer.tsx

Lines changed: 36 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3670,21 +3670,25 @@ class SlideViewer extends React.Component<SlideViewerProps, SlideViewerState> {
36703670
>
36713671
<Space align='start' direction='vertical'>
36723672
<InputNumber
3673-
placeholder={(
3673+
placeholder={
36743674
'[' +
36753675
`${this.state.validXCoordinateRange[0]}` +
36763676
', ' +
36773677
`${this.state.validXCoordinateRange[1]}` +
36783678
']'
3679-
)}
3679+
}
36803680
prefix='X Coordinate [mm]'
36813681
onChange={this.handleXCoordinateSelection}
36823682
onPressEnter={this.handleXCoordinateSelection}
36833683
controls={false}
36843684
addonAfter={
36853685
this.state.isSelectedXCoordinateValid
3686-
? <CheckOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3687-
: <StopOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3686+
? (
3687+
<CheckOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3688+
)
3689+
: (
3690+
<StopOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3691+
)
36883692
}
36893693
/>
36903694
<InputNumber
@@ -3701,8 +3705,12 @@ class SlideViewer extends React.Component<SlideViewerProps, SlideViewerState> {
37013705
controls={false}
37023706
addonAfter={
37033707
this.state.isSelectedYCoordinateValid
3704-
? <CheckOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3705-
: <StopOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3708+
? (
3709+
<CheckOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3710+
)
3711+
: (
3712+
<StopOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3713+
)
37063714
}
37073715
/>
37083716
<InputNumber
@@ -3713,8 +3721,12 @@ class SlideViewer extends React.Component<SlideViewerProps, SlideViewerState> {
37133721
controls={false}
37143722
addonAfter={
37153723
this.state.isSelectedMagnificationValid
3716-
? <CheckOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3717-
: <StopOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3724+
? (
3725+
<CheckOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3726+
)
3727+
: (
3728+
<StopOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
3729+
)
37183730
}
37193731
/>
37203732
</Space>
@@ -3749,24 +3761,23 @@ class SlideViewer extends React.Component<SlideViewerProps, SlideViewerState> {
37493761
forceSubMenuRender
37503762
onOpenChange={() => {
37513763
// Give menu item time to render before updating viewer size
3752-
setTimeout(
3753-
() => {
3754-
if (this.labelViewer != null) {
3755-
this.labelViewer.resize()
3756-
}
3757-
},
3758-
100
3759-
)
3764+
setTimeout(() => {
3765+
if (this.labelViewer != null) {
3766+
this.labelViewer.resize()
3767+
}
3768+
}, 100)
37603769
}}
37613770
>
3762-
<Menu.SubMenu key='label' title='Slide label'>
3763-
<Menu.Item style={{ height: '100%' }} key='image'>
3764-
<div
3765-
style={{ height: '220px' }}
3766-
ref={this.labelViewportRef}
3767-
/>
3768-
</Menu.Item>
3769-
</Menu.SubMenu>
3771+
{this.labelViewportRef.current != null && (
3772+
<Menu.SubMenu key='label' title='Slide label'>
3773+
<Menu.Item style={{ height: '100%' }} key='image'>
3774+
<div
3775+
style={{ height: '220px' }}
3776+
ref={this.labelViewportRef}
3777+
/>
3778+
</Menu.Item>
3779+
</Menu.SubMenu>
3780+
)}
37703781
{specimenMenu}
37713782
{equipmentMenu}
37723783
{opticalPathMenu}
@@ -3798,7 +3809,7 @@ class SlideViewer extends React.Component<SlideViewerProps, SlideViewerState> {
37983809
</Menu>
37993810
</Layout.Sider>
38003811
{this.state.isHoveredRoiTooltipVisible &&
3801-
(this.state.hoveredRoiAttributes.length > 0)
3812+
this.state.hoveredRoiAttributes.length > 0
38023813
? (
38033814
<HoveredRoiTooltip
38043815
xPosition={this.state.hoveredRoiTooltipX}

0 commit comments

Comments
 (0)