Skip to content

Commit

Permalink
Merge d778b1c into 250adf5
Browse files Browse the repository at this point in the history
  • Loading branch information
lbebber authored Sep 6, 2019
2 parents 250adf5 + d778b1c commit 38b1516
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Fix iOS issue where `sticky` would not work.

## [2.21.6] - 2019-09-04
### Changed
Expand Down
3 changes: 1 addition & 2 deletions react/components/StickyRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ const StickyRow: FunctionComponent<Props> = ({ children, sticky, zIndex }) => {
const { offset, onResize } = useContext(RowContext)

const stickyStyle: CSSProperties = {
position: 'sticky',
top: offset,
zIndex,
}

return (
<div
style={sticky ? stickyStyle : undefined}
className={sticky && !zIndex ? 'z-999' : ''}
className={sticky ? `sticky ${!zIndex ? 'z-999' : ''}` : ''}
>
{children}

Expand Down

0 comments on commit 38b1516

Please sign in to comment.