Skip to content

Bug 2008722 - Directly use the pixel-based size for the SplitPane resize. #9150

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.

Sign up for GitHub

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

Open
arai-a wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug 2008722 - Directly use the pixel-based size for the SplitPane resize. #9150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 37 additions & 22 deletions ui/job-view/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,18 @@ class App extends React.Component {
}

static getSplitterDimensions(hasSelectedJob) {
const defaultPushListPct = hasSelectedJob ? 100 - DEFAULT_DETAILS_PCT : 100;
// calculate the height of the details panel to use if it has not been
// resized by the user.
const defaultDetailsHeight =
defaultPushListPct < 100
? (DEFAULT_DETAILS_PCT / 100) * getWindowHeight()
: 0;

if (hasSelectedJob) {
const defaultDetailsHeight =
(DEFAULT_DETAILS_PCT / 100) * getWindowHeight();
const defaultPushListHeight = getWindowHeight() - defaultDetailsHeight;
return {
defaultPushListHeight,
defaultDetailsHeight,
};
}
return {
defaultPushListPct,
defaultDetailsHeight,
defaultPushListHeight: getWindowHeight(),
defaultDetailsHeight: 0,
};
}

Expand Down Expand Up @@ -377,7 +378,8 @@ class App extends React.Component {

handleSplitChange(latestSplitSize) {
this.setState({
latestSplitPct: (latestSplitSize / getWindowHeight()) * 100,
latestSplitSize,
latestWindowHeight: getWindowHeight(),
});
}

Expand All @@ -386,9 +388,10 @@ class App extends React.Component {
user,
isFieldFilterVisible,
serverChangedDelayed,
defaultPushListPct,
defaultPushListHeight,
defaultDetailsHeight,
latestSplitPct,
latestSplitSize,
latestWindowHeight,
serverChanged,
currentRepo,
repoName,
Expand All @@ -412,14 +415,26 @@ class App extends React.Component {
// we resize. Therefore, we must calculate the new
// height of the DetailsPanel based on the current height of the PushList.
// Reported this upstream: https://github.com/tomkp/react-split-pane/issues/282
const pushListPct =
latestSplitPct === undefined || !hasSelectedJob
? defaultPushListPct
: latestSplitPct;
const detailsHeight =
latestSplitPct === undefined || !hasSelectedJob
? defaultDetailsHeight
: getWindowHeight() * (1 - latestSplitPct / 100);

let detailsHeight = 0;
let pushListHeight = 0;
if (
hasSelectedJob &&
latestSplitSize !== undefined &&
latestWindowHeight !== undefined
) {
if (latestWindowHeight === getWindowHeight()) {
pushListHeight = latestSplitSize;
detailsHeight = latestWindowHeight - latestSplitSize;
} else {
pushListHeight =
getWindowHeight() * (latestSplitSize / latestWindowHeight);
detailsHeight = getWindowHeight() - pushListHeight;
}
} else {
pushListHeight = defaultPushListHeight;
detailsHeight = defaultDetailsHeight;
}
const filterBarFilters = Object.entries(filterModel.urlParams).reduce(
(acc, [field, value]) =>
HIDDEN_URL_PARAMS.includes(field) || matchesDefaults(field, value)
Expand Down Expand Up @@ -452,7 +467,7 @@ class App extends React.Component {
/>
<SplitPane
split="horizontal"
size={`${pushListPct}%`}
size={pushListHeight}
onChange={(size) => this.handleSplitChange(size)}
>
<div className="d-flex flex-column w-100">
Expand Down