xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #595 from vector-im/dbkr/fix_spotlight_scroll

Browse source 
Fix scroll bug in spotlight view
This commit is contained in:
David Baker 2022-09-22 14:49:27 +01:00 committed by GitHub
commit b84c36eb2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/video-grid/VideoGrid.tsx
View file

@ -660,6 +660,8 @@ function getSubGridPositions(
return newTilePositions; return newTilePositions;
} }
// Sets the 'order' property on tiles based on the layout param and
// other properties of the tiles, eg. 'focused' and 'presenter'
function reorderTiles(tiles: Tile[], layout: Layout) { function reorderTiles(tiles: Tile[], layout: Layout) {
if (layout === "freedom" && tiles.length === 2) { if (layout === "freedom" && tiles.length === 2) {
// 1:1 layout // 1:1 layout
@ -904,12 +906,12 @@ export function VideoGrid({
return { return {
x: x:
tilePosition.x + tilePosition.x +
(layout === "spotlight" && tileIndex !== 0 && isMobile (layout === "spotlight" && tile.order !== 0 && isMobile
? scrollPosition ? scrollPosition
: 0), : 0),
y: y:
tilePosition.y + tilePosition.y +
(layout === "spotlight" && tileIndex !== 0 && !isMobile (layout === "spotlight" && tile.order !== 0 && !isMobile
? scrollPosition ? scrollPosition
: 0), : 0),
width: tilePosition.width, width: tilePosition.width,