NoRedInk/noredink-ui
1
1
Fork 0
mirror of https://github.com/NoRedInk/noredink-ui.git synced 2024-09-21 12:19:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjust the positioning algorithm to add more space between balloons

Browse Source
This commit is contained in:
Tessa Kelly 2022-12-19 16:21:08 -07:00
parent 8d724a297c
commit e4f3e5ca3d
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nri/Ui/Block/V2.elm
View File

@ -157,9 +157,11 @@ getLabelPositions ids labelMeasurementsById =
|> List.sortBy (Tuple.second >> .labelContent >> .element >> .width)
|> List.foldl
(\( idString, e ) ( height, acc ) ->
( height + e.labelContent.element.height
( height + e.labelContent.element.height + 4
, ( idString
, { totalHeight = height + e.labelContent.element.height + 8, arrowHeight = height }
, { totalHeight = height + e.labelContent.element.height
, arrowHeight = height
}
)
:: acc
)

52
tests/Spec/Nri/Ui/Block.elm
View File

@ -115,7 +115,7 @@ getLabelPositionsSpec =
)
|> Expect.equal
(Dict.singleton "a"
{ totalHeight = startingHeight + defaultArrowHeight + balloonOffset
{ totalHeight = startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
@ -146,13 +146,13 @@ getLabelPositionsSpec =
)
|> Expect.equal
([ ( "a"
, { totalHeight = aStartingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = aStartingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "b"
, { totalHeight = aStartingHeight + bStartingHeight + defaultArrowHeight + balloonOffset
, arrowHeight = aStartingHeight + defaultArrowHeight
, arrowHeight = aStartingHeight + defaultArrowHeight + balloonOffset
}
)
]
@ -191,12 +191,12 @@ getLabelPositionsSpec =
)
|> Expect.equal
([ ( "a"
, { totalHeight = aStartingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = aStartingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "b"
, { totalHeight = bStartingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = bStartingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
@ -236,21 +236,19 @@ getLabelPositionsSpec =
, { totalHeight = 2 * startingHeight + defaultArrowHeight + balloonOffset
, arrowHeight =
-- A is positioned on top of B.
-- So its arrow height is the total height of b minus the positioning offset
startingHeight + defaultArrowHeight
startingHeight + defaultArrowHeight + balloonOffset
}
)
, ( "b"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "c"
, { totalHeight = 3 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 3 * startingHeight + defaultArrowHeight + 2 * balloonOffset
, arrowHeight =
-- C is positioned on top of A.
-- So its arrow height is the total height of A minus the positioning offset
2 * startingHeight + defaultArrowHeight
2 * startingHeight + defaultArrowHeight + 2 * balloonOffset
}
)
]
@ -287,20 +285,20 @@ getLabelPositionsSpec =
|> Expect.equal
([ ( "a"
, -- A is positioned in its default position.
{ totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
{ totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, -- B is positioned under C
( "b"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, -- C is positioned over B
( "c"
, { totalHeight = 2 * startingHeight + defaultArrowHeight + balloonOffset
, arrowHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
}
)
]
@ -340,10 +338,10 @@ getLabelPositionsSpec =
|> Dict.fromList
)
|> Expect.equal
([ ( "prepositionId", { arrowHeight = 8, totalHeight = 40 } )
, ( "directObjectId", { arrowHeight = 32, totalHeight = 64 } )
, ( "subjectId", { arrowHeight = 8, totalHeight = 40 } )
, ( "editorsNoteId", { arrowHeight = 8, totalHeight = 40 } )
([ ( "prepositionId", { arrowHeight = 8, totalHeight = 32 } )
, ( "directObjectId", { arrowHeight = 36, totalHeight = 60 } )
, ( "subjectId", { arrowHeight = 8, totalHeight = 32 } )
, ( "editorsNoteId", { arrowHeight = 8, totalHeight = 32 } )
]
|> Dict.fromList
)
@ -369,12 +367,12 @@ getLabelPositionsSpec =
)
|> Expect.equal
([ ( "a"
, { totalHeight = startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "b"
, { totalHeight = startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
@ -415,16 +413,16 @@ getLabelPositionsSpec =
, arrowHeight =
-- A is positioned on top of B.
-- So its arrow height is the total height of b minus the positioning offset
startingHeight + defaultArrowHeight
startingHeight + defaultArrowHeight + balloonOffset
}
)
, ( "b"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "c"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight =
-- C is on a new line, so it goes back to default positioning.
defaultArrowHeight
@ -463,17 +461,17 @@ getLabelPositionsSpec =
)
|> Expect.equal
([ ( "a"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "b"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
, ( "c"
, { totalHeight = 1 * startingHeight + defaultArrowHeight + balloonOffset
, { totalHeight = 1 * startingHeight + defaultArrowHeight
, arrowHeight = defaultArrowHeight
}
)
@ -485,7 +483,7 @@ getLabelPositionsSpec =
balloonOffset : Float
balloonOffset =
8
4
defaultArrowHeight : Float