copy header/footer code (#751)

* copy header/footer code

* fix test

R/class-worksheet.R

@@ -179,17 +179,25 @@ wbWorksheet <- R6::R6Class(
         tabColor <- character()
       }
 
+      # TODO this could probably be moved to the hf assignment
+      oddHeader   <- headerFooterSub(odd_header)
+      oddFooter   <- headerFooterSub(odd_footer)
+      evenHeader  <- headerFooterSub(even_header)
+      evenFooter  <- headerFooterSub(even_footer)
+      firstHeader <- headerFooterSub(first_header)
+      firstFooter <- headerFooterSub(first_footer)
+
       hf <- list(
-        oddHeader   = na_to_null(odd_header),
-        oddFooter   = na_to_null(odd_footer),
-        evenHeader  = na_to_null(even_header),
-        evenFooter  = na_to_null(even_footer),
-        firstHeader = na_to_null(first_header),
-        firstFooter = na_to_null(first_footer)
+        oddHeader   = naToNULLList(oddHeader),
+        oddFooter   = naToNULLList(oddFooter),
+        evenHeader  = naToNULLList(evenHeader),
+        evenFooter  = naToNULLList(evenFooter),
+        firstHeader = naToNULLList(firstHeader),
+        firstFooter = naToNULLList(firstFooter)
       )
 
       if (all(lengths(hf) == 0)) {
-        hf <- list()
+        hf <- NULL
       }
 
       # only add if printGridLines not TRUE. The openxml default is TRUE

tests/testthat/test-loading_workbook.R

@@ -258,10 +258,10 @@ test_that("test headerFooter", {
   # Load workbook and save again
   wb2 <- wb_load(tmp1)
 
-  expect_equal(wb$worksheets[[1]]$headerFooter,
+  expect_equal(lapply(wb$worksheets[[1]]$headerFooter, unlist),
                wb2$worksheets[[1]]$headerFooter)
 
-  expect_equal(wb$worksheets[[2]]$headerFooter,
+  expect_equal(lapply(wb$worksheets[[2]]$headerFooter, unlist),
                wb2$worksheets[[2]]$headerFooter)
 
 })