From e9d20bcefbc203316e3098aa00a250ac7bc0d169 Mon Sep 17 00:00:00 2001
From: Erik Demaine <edemaine@mit.edu>
Date: Thu, 21 Apr 2022 14:07:13 -0400
Subject: [PATCH] Improve message header clicking behavior (#598)

* Avoid calling `preventDefault` when a subitem gets clicked.
  This was breaking the Replace File button.
* Ignore clicks that were part of a text selection drag
---
 CHANGELOG.md          |  6 ++++++
 client/message.coffee | 21 ++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6e6762..b0aae60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ To see every change with descriptions aimed at developers, see
 As a continuously updated web app, Coauthor uses dates
 instead of version numbers.
 
+## 2022-04-21
+
+* Fix "Replace File" button and improve behavior of clicking on message header
+  to highlight corresponding item in Table of Contents.
+  [[#598](https://github.com/edemaine/coauthor/issues/598)]
+
 ## 2022-04-11
 
 * Hovering over a message highlights the corresponding item
diff --git a/client/message.coffee b/client/message.coffee
index b7daeec..8f24346 100644
--- a/client/message.coffee
+++ b/client/message.coffee
@@ -1969,6 +1969,19 @@ Submessage.displayName = 'Submessage'
 
 messageInView = new ReactiveDict
 
+## Maintain whether selection changed nontrivially recently, which causes
+## the following click to be ignored by showTOC.
+skipClick = false
+document.addEventListener 'selectionchange', ->
+  selection = document.getSelection()
+  for i in [0...selection.rangeCount]
+    range = selection.getRangeAt i
+    unless range.startContainer == range.endContainer and
+           range.startOffset == range.endOffset
+      skipClick = true
+      return
+window.addEventListener 'click', -> skipClick = false
+
 submessageCount = 0
 export WrappedSubmessage = React.memo ({message, read}) ->
   here = useTracker ->
@@ -2400,7 +2413,6 @@ export WrappedSubmessage = React.memo ({message, read}) ->
   ## Scroll the table of contents (if visible) to align with this message (if
   ## possible), and pulse the table of contents item (for when not possible).
   showTOC = (e) ->
-    e.preventDefault()
     ## Find corresponding table of contents entry
     toc = document.querySelector 'nav.contents'
     return unless toc?  # not in a view with table of contents
@@ -2416,8 +2428,11 @@ export WrappedSubmessage = React.memo ({message, read}) ->
         item.classList.remove 'hover'
         tocHoverIndicator()
       when 'click'
-        ## Ignore propagated click events e.g. from Action dropdown button.
-        return unless e.target.className.startsWith 'panel-heading'
+        return if skipClick  # ignore selecting clicks
+        ## Ignore propagated click events e.g. from Action dropdown button
+        ## or from Replace File hidden <input>.
+        return unless /panel-heading|panel-title/.test e.target.className
+        e.preventDefault()
         ## Scroll to align TOC item with message header
         toc.scroll
           top: itemTop - msgTop - 9  # fudge factor