From b20b6c52e10733720f6e3e2904589049abfcac52 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 8 Oct 2019 11:59:53 -0400
Subject: [PATCH] FIX: Do not reset original scroll position in iOS to zero

This avoids scrolling to the top of a post when toggling focus to the composer textarea
---
 app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 27865f5c349..1fb53180459 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -140,7 +140,9 @@ function positioningWorkaround($fixedElement) {
       .find(".select-kit > button.is-focused")
       .removeClass("is-focused");
 
-    originalScrollTop = $(window).scrollTop();
+    if ($(window).scrollTop() > 0) {
+      originalScrollTop = $(window).scrollTop();
+    }
 
     setTimeout(function() {
       if (iOSWithVisualViewport()) {