Skip to content
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

Jump to bottom

fix: dashboards bar does not resize to 1 row [DHIS2-11097] #1761

Merged
merged 9 commits into from
May 11, 2021
Merged

fix: dashboards bar does not resize to 1 row [DHIS2-11097] #1761

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a87b4b7
fix: updating rows needs to happen in an effect
jenniferarnesen May 11, 2021
6594775
Merge branch 'master' into fix/cbar-not-resizing-to-one-row
jenniferarnesen May 11, 2021
d95b582
Merge branch 'master' into fix/cbar-not-resizing-to-one-row
martinkrulltott May 11, 2021
220bf94
fix: disable flaky cypress test
jenniferarnesen May 11, 2021
82ae0b5
Merge branch 'fix/cbar-not-resizing-to-one-row' of github.com:dhis2/d…
jenniferarnesen May 11, 2021
86b0631
fix: disable more flaky tests
jenniferarnesen May 11, 2021
f5f027b
Merge branch 'master' into fix/cbar-not-resizing-to-one-row
jenniferarnesen May 11, 2021
299081d
fix: quick check of view mode before moving to next test
jenniferarnesen May 11, 2021
ebaeebb
Merge branch 'fix/cbar-not-resizing-to-one-row' of github.com:dhis2/d…
jenniferarnesen May 11, 2021
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
7 changes: 4 additions & 3 deletions src/pages/view/DashboardsBar/DashboardsBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ const DashboardsBar = ({
onExpandedChanged,
}) => {
const [dragging, setDragging] = useState(false)
const [mouseYPos, setMouseYPos] = useState(0)
const userRowsChanged = useRef(false)
const ref = createRef()
const { height } = useWindowDimensions()

const rootElement = document.documentElement

const adjustRows = mouseYPos => {
useEffect(() => {
const newRows = Math.max(
MIN_ROW_COUNT,
getRowsFromHeight(mouseYPos - 52) // don't rush the transition to a bigger row count
Expand All @@ -44,7 +45,7 @@ const DashboardsBar = ({
updateUserRows(Math.min(newRows, MAX_ROW_COUNT))
userRowsChanged.current = true
}
}
}, [mouseYPos])

useEffect(() => {
rootElement.style.setProperty('--user-rows-count', userRows)
Expand Down Expand Up @@ -102,7 +103,7 @@ const DashboardsBar = ({
/>
<DragHandle
setDragging={setDragging}
onHeightChanged={adjustRows}
onHeightChanged={setMouseYPos}
/>
</div>
<div className={cx(classes.spacer)} />
Expand Down