From 613b994f9da7a1428d1685e06979d671095b3c64 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 2 Jun 2020 00:21:31 -0600
Subject: [PATCH] Revert "Prevent PersistedElements overflowing scrolled areas"

---
 res/css/views/rooms/_AppsDrawer.scss          |  4 --
 .../views/elements/PersistedElement.js        | 58 +------------------
 src/components/views/rooms/AuxPanel.js        | 11 +---
 3 files changed, 3 insertions(+), 70 deletions(-)

diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index e4743f189e..1b1bab67bc 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -96,10 +96,6 @@ $AppsDrawerBodyHeight: 273px;
     height: $AppsDrawerBodyHeight;
 }
 
-.mx_AppTile_persistedWrapper > div {
-    height: 100%;
-}
-
 .mx_AppTile_mini .mx_AppTile_persistedWrapper {
     height: 114px;
 }
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 06f025f236..7f9bfdebf4 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -156,70 +156,16 @@ export default class PersistedElement extends React.Component {
         child.style.display = visible ? 'block' : 'none';
     }
 
-    /*
-     * Clip element bounding rectangle to that of the parent elements.
-     * This is not a full visibility check, but prevents the persisted
-     * element from overflowing parent containers when inside a scrolled
-     * area.
-     */
-    _getClippedBoundingClientRect(element) {
-        let parentElement = element.parentElement;
-        let rect = element.getBoundingClientRect();
-
-        rect = new DOMRect(rect.left, rect.top, rect.width, rect.height);
-
-        while (parentElement) {
-            const parentRect = parentElement.getBoundingClientRect();
-
-            if (parentRect.left > rect.left) {
-                rect.width = rect.width - (parentRect.left - rect.left);
-                rect.x = parentRect.x;
-            }
-
-            if (parentRect.top > rect.top) {
-                rect.height = rect.height - (parentRect.top - rect.top);
-                rect.y = parentRect.y;
-            }
-
-            if (parentRect.right < rect.right) {
-                rect.width = rect.width - (rect.right - parentRect.right);
-            }
-
-            if (parentRect.bottom < rect.bottom) {
-                rect.height = rect.height - (rect.bottom - parentRect.bottom);
-            }
-
-            parentElement = parentElement.parentElement;
-        }
-
-        if (rect.width < 0) rect.width = 0;
-        if (rect.height < 0) rect.height = 0;
-
-        return rect;
-    }
-
     updateChildPosition(child, parent) {
         if (!child || !parent) return;
 
         const parentRect = parent.getBoundingClientRect();
-        const clipRect = this._getClippedBoundingClientRect(parent);
-
-        Object.assign(child.parentElement.style, {
-            position: 'absolute',
-            top: clipRect.top + 'px',
-            left: clipRect.left + 'px',
-            width: clipRect.width + 'px',
-            height: clipRect.height + 'px',
-            overflow: "hidden",
-        });
-
         Object.assign(child.style, {
             position: 'absolute',
-            top: (parentRect.top - clipRect.top) + 'px',
-            left: (parentRect.left - clipRect.left) + 'px',
+            top: parentRect.top + 'px',
+            left: parentRect.left + 'px',
             width: parentRect.width + 'px',
             height: parentRect.height + 'px',
-            overflow: "hidden",
         });
     }
 
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 1ac68e4b12..d6a3b156d5 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -141,15 +141,6 @@ export default createReactClass({
         return counters;
     },
 
-    _onScroll: function(rect) {
-        if (this.props.onResize) {
-            this.props.onResize();
-        }
-
-        /* Force refresh of PersistedElements which may be partially hidden */
-        window.dispatchEvent(new Event('resize'));
-    },
-
     render: function() {
         const CallView = sdk.getComponent("voip.CallView");
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
@@ -274,7 +265,7 @@ export default createReactClass({
         }
 
         return (
-            <AutoHideScrollbar className={classes} style={style} onScroll={this._onScroll}>
+            <AutoHideScrollbar className={classes} style={style} >
                 { stateViews }
                 { appsDrawer }
                 { fileDropTarget }