Skip to content

Commit

Permalink
Merge branch 'IPAD-449_scroll-feature-data' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
paulnordlund committed Apr 2, 2024
2 parents 5907808 + 9d8cdec commit 4c1e3f6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 16.20.2
7 changes: 6 additions & 1 deletion src/components/Differential/MetafeaturesTableDynamic.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,11 @@ class MetafeaturesTableDynamic extends Component {
metafeaturesTableData,
metafeaturesLoaded,
} = this.state;

const ratio = this.props.upperPlotsHeight / window.screen.height;
const ratioVh = ratio * 100;
const ratioVhRound = Math.round(ratioVh) - 20;
const ratioVhString = `${ratioVhRound}vh`;
console.log(ratioVhString);
// const { metaFeaturesData } = this.props;
return (
<div className="MetafeaturesTableDiv" id="MetafeaturesTableDynamicDiv">
Expand All @@ -224,6 +228,7 @@ class MetafeaturesTableDynamic extends Component {
disableColumnReorder
// disableFilters={false}
min-height="5vh"
height={ratioVhString}
emptyMessage={'No Feature Data Available'}
disableQuickViewEditing
disableQuickViewMenu
Expand Down
2 changes: 1 addition & 1 deletion src/components/Differential/PlotsDynamic.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class PlotsDynamic extends Component {
// Feature Data needs this to correctly scroll overflow
// 3/4 screen width - volcano div width - padding
const maxDivWidth =
window.screen.width * 0.75 - this.props.volcanoDivWidth - 20;
window.screen.width * 0.75 - this.props.volcanoDivWidth - 50;
return (
<div style={{ maxWidth: maxDivWidth }}>
{Toggle}
Expand Down
2 changes: 2 additions & 0 deletions src/components/Differential/TabSingleFeature.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class TabSingleFeature extends Component {
plotOverlayLoaded,
modelSpecificMetaFeaturesExist,
singleFeaturePlotTypes,
upperPlotsHeight,
} = this.props;
let panes = [];
let dimensions = '';
Expand Down Expand Up @@ -143,6 +144,7 @@ class TabSingleFeature extends Component {
modelSpecificMetaFeaturesExist={
modelSpecificMetaFeaturesExist
}
upperPlotsHeight={upperPlotsHeight}
/>
</Tab.Pane>
),
Expand Down

0 comments on commit 4c1e3f6

Please sign in to comment.