Skip to content

Commit

Permalink
Persist overlay overflow in conversation list
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanHahn-Signal committed Oct 7, 2021
1 parent a537204 commit e346fb1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
6 changes: 5 additions & 1 deletion ts/components/ConversationList.tsx
Expand Up @@ -340,7 +340,11 @@ export const ConversationList: React.FC<PropsType> = ({
rowHeight={calculateRowHeight}
rowRenderer={renderRow}
scrollToIndex={scrollToRowIndex}
style={{ overflow: scrollable ? 'overlay' : 'hidden' }}
style={{
// See `<Timeline>` for an explanation of this `any` cast.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
overflowY: scrollable ? ('overlay' as any) : 'hidden',
}}
tabIndex={-1}
width={width}
/>
Expand Down
11 changes: 10 additions & 1 deletion ts/components/conversation/Timeline.tsx
Expand Up @@ -1365,7 +1365,16 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
scrollToIndex={scrollToIndex}
tabIndex={-1}
width={width}
style={{ overflow: 'overlay' }}
style={{
// `overlay` is [a nonstandard value][0] so it's not supported. See [this
// issue][1].
//
// [0]: https://developer.mozilla.org/en-US/docs/Web/CSS/overflow#values
// [1]: https://github.com/frenic/csstype/issues/62#issuecomment-937238313
//
// eslint-disable-next-line @typescript-eslint/no-explicit-any
overflowY: 'overlay' as any,
}}
/>
);
}}
Expand Down

0 comments on commit e346fb1

Please sign in to comment.