diff options
| -rw-r--r-- | app/javascript/mastodon/components/status.js | 9 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
3 files changed, 6 insertions, 11 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index 6b9fdd2af..0d7f6deb1 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -107,17 +107,12 @@ export default class Status extends ImmutablePureComponent { this.height = getRectFromEntry(entry).height; } - // Edge 15 doesn't support isIntersecting, but we can infer it - // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12156111/ - // https://github.com/WICG/IntersectionObserver/issues/211 - const isIntersecting = (typeof entry.isIntersecting === 'boolean') ? - entry.isIntersecting : entry.intersectionRect.height > 0; this.setState((prevState) => { - if (prevState.isIntersecting && !isIntersecting) { + if (prevState.isIntersecting && !entry.isIntersecting) { scheduleIdleTask(this.hideIfNotIntersecting); } return { - isIntersecting: isIntersecting, + isIntersecting: entry.isIntersecting, isHidden: false, }; }); diff --git a/package.json b/package.json index 132d7017d..9afb51285 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "glob": "^7.1.1", "http-link-header": "^0.8.0", "immutable": "^3.8.1", - "intersection-observer": "^0.3.2", + "intersection-observer": "^0.4.0", "intl": "^1.2.5", "intl-relativeformat": "^2.0.0", "is-nan": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 0f895f3b6..5b3df43c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3608,9 +3608,9 @@ interpret@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" -intersection-observer@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.3.2.tgz#9ed30021c08b29e9e8565c8d512ed84515727433" +intersection-observer@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.4.0.tgz#e7c3580be96fc1698170250b500da986c59824fb" intl-format-cache@^2.0.5: version "2.0.5" |