Fix html table class tweaking (#912)

Closes #868. Fixes #910.
r-lib · Nov 21, 2018 · 44460e6 · 44460e6
1 parent 7b21c86
commit 44460e6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # pkgdown 1.2.0.9000
 
+* Tweaking of HTML table classes was fixed (@yonicd, #912)
+
 * Restore accidentally removed `docsearch.css` file.
 
 # pkgdown 1.2.0

diff --git a/R/html-tweak.R b/R/html-tweak.R
@@ -83,7 +83,7 @@ tweak_tables <- function(html) {
 }
 
 prepend_class <- function(x, class = "table") {
-  if (length(x) == 0) {
+  if (!('class' %in% names(x))) {
     c(class = class)
   } else {
     c(class = paste(class, x[["class"]]))

diff --git a/tests/testthat/test-html-tweak.R b/tests/testthat/test-html-tweak.R
@@ -28,6 +28,21 @@ test_that("multiple tables with existing classes are prepended", {
     expect_equal(c("table a", "table b", "table"))
 })
 
+test_that("multiple tables with existing classes are prepended and attributes", {
+  html <- xml2::read_html(
+    '<body>
+    <table style="width:100%;" class="a"></table>
+    <table class="b"></table>
+    <table></table>
+    </body>'
+  )
+  expect_silent(tweak_tables(html))
+  html %>%
+    xml2::xml_find_all(".//table") %>%
+    xml2::xml_attr("class") %>%
+    expect_equal(c("table a", "table b", "table"))
+})
+
 test_that("tables get class='table' prepended to existing classes", {
   html <- xml2::read_html("<body><table class = 'foo bar'>\n</table></body>")
   tweak_tables(html)

diff --git a/vignettes/test/table.Rmd b/vignettes/test/table.Rmd
@@ -0,0 +1,8 @@
+---
+title: "Test: Table"
+output: html_document
+---
+
+| col 1 | col 2 | col 3 | col 4 |
+|:---------------|:-----------|:-------:|:---------:|
+| Brightness     | Total brightness, total reflectance, spectral intensity | $$y = x^2$$ | test |