bs4_book: no scroll on x overflow and correct copy btn placement (#1187)

maelle · cderv · web-flow · commit dc872256e297 · 2021-07-06T20:32:52.000+02:00
This follows the work done in pkgdown.

Co-authored-by: christophe dervieux &lt;christophe.dervieux@gmail.com&gt;
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: bookdown
 Type: Package
 Title: Authoring Books and Technical Documents with R Markdown
-Version: 0.22.10
+Version: 0.22.11
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
     person("JJ", "Allaire", role = "ctb"),
diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,8 @@
 - In `bs4_book()`, improvement regarding copy button:
   * It has now a light icon instead of a text with white background (#1192). 
   * It will no more show on output block code when knitr's option is `collapse = FALSE` (#1197).
+  * For code block with very long line, it will now wrap in the code block with no more x-scroll bar, and it will wraps around the copy button icon so that text is not hidden (#1187). 
+  If you want to customize part of the UI to change this default behavior, you can do it using a custom css with `bs4_book()`.
 
 - Fix an issue with `bs4_book()` where text written using [Line Block](https://bookdown.org/yihui/rmarkdown-cookbook/indent-text.html) was not found in search (thanks, @dmklotz, #1141).
 
diff --git a/inst/resources/bs4_book/bs4_book.css b/inst/resources/bs4_book/bs4_book.css
@@ -378,8 +378,9 @@ code {
 
 pre code {
   background-color: transparent;
-  word-break: normal; /* force wide blocks to scroll, not wrap */
-  word-wrap: normal;
+  white-space: pre-wrap;
+  word-break: break-all;
+  overflow-wrap: break-word;
 }
 
 pre, code {
@@ -395,9 +396,7 @@ code a:any-link {
 /* copy button */
 
 pre .copy {
-  position: absolute;
-  top: 0.5rem;
-  right: 0.5rem;
+  float: right;
 }
 
 pre .copy button {
diff --git a/inst/resources/bs4_book/bs4_book.js b/inst/resources/bs4_book/bs4_book.js
@@ -108,14 +108,14 @@ $(document).ready(function() {
   if(ClipboardJS.isSupported()) {
     // Insert copy buttons
     var copyButton = "<div class='copy'><button type='button' class='btn btn-copy' title='Copy to clipboard' aria-label='Copy to clipboard' data-toggle='popover' data-placement='top' data-trigger='hover'><i class='bi'></i></button></div>";
-    $(copyButton).appendTo("pre.sourceCode");
+    $(copyButton).prependTo("pre.sourceCode");
     // Initialize tooltips:
     $('.btn-copy').tooltip({container: 'body', boundary: 'window'});
 
     // Initialize clipboard:
     var clipboard = new ClipboardJS('.btn-copy', {
       text: function(trigger) {
-        return trigger.parentNode.previousSibling.textContent;
+        return trigger.parentNode.nextSibling.textContent;
       }
     });
 
