Skip to content

Commit 3d87de7

Browse files
finally fix scrolling bug
1 parent ae9fade commit 3d87de7

4 files changed

Lines changed: 12 additions & 15 deletions

File tree

src/player/modules/ViewVideo/module.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ FrameTrail.defineModule('ViewVideo', function(FrameTrail){
638638
PlayerContainer.style.marginBottom = '';
639639
}
640640

641+
641642
};
642643

643644

src/player/modules/ViewVideo/style.css

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -233,28 +233,21 @@ body.userinactive .mainContainer:not([data-edit-mode="overlays"]):not([data-edit
233233
position: relative;
234234
width: 100%;
235235
order: 0;
236-
flex: 0 1 clamp(200px, calc(100vh * 0.6 - 40px), 450px);
237-
min-height: clamp(200px, calc(100vh * 0.6 - 40px), 450px);
236+
flex: 0 0 0px;
237+
min-height: 0;
238238
align-self: auto;
239239
background: transparent;
240240
z-index: 2;
241241
overflow: hidden;
242-
/* Keep invisible by default — revealed only when slidePosition is top/bottom.
243-
The 210ms delay on visibility lets the exit slide animation finish
244-
before the area is hidden again. The 210ms slightly exceeds the
245-
slideArea's 200ms margin-top transition so the content is visible throughout. */
246242
visibility: hidden;
247-
transition: margin-top 500ms, visibility 0s 210ms;
248-
}
249-
250-
.viewVideo.slide-pos-top .areaTopDetails {
251-
visibility: visible;
252-
transition: margin-top 500ms; /* show immediately; no visibility delay */
243+
transition: margin-top 500ms;
253244
}
254245

246+
.viewVideo.slide-pos-top .areaTopDetails,
255247
.viewVideo.slide-pos-bottom .areaBottomDetails {
248+
flex: 0 1 clamp(200px, calc(100vh * 0.6 - 40px), 450px);
249+
min-height: clamp(200px, calc(100vh * 0.6 - 40px), 450px);
256250
visibility: visible;
257-
transition: margin-top 500ms; /* show immediately */
258251
}
259252

260253
/* LayoutArea Sizes */

src/player/types/ContentView/style.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
height: 100%;
431431
background: var(--secondary-bg-color);
432432
box-sizing: border-box;
433+
overflow: clip;
433434
display: none;
434435
}
435436

src/player/types/ContentView/type.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,12 @@ FrameTrail.defineType(
399399
var _detailEls = self.contentViewDetailsContainer.querySelectorAll('.collectionElement');
400400
if (_detailEls[_idx]) _detailEls[_idx].classList.add('open');
401401

402-
self.updateCollectionSlider(true);
403-
404402
FrameTrail.module('ViewVideo').shownDetails = self.whichArea;
405403

404+
requestAnimationFrame(function() {
405+
self.updateCollectionSlider(true);
406+
});
407+
406408
var annoData = contentItem.data;
407409
FrameTrail.triggerEvent('userAction', {
408410
action: 'AnnotationOpen',

0 commit comments

Comments
 (0)