tabColour accepts wb_colour() (#500)

* tabColour accepts wb_colour()

* use is_wbColour

* update NEWS

Author: JanMarvin

NEWS.md

@@ -6,6 +6,8 @@
 
 * `writeData()` calls `force(x)` to evaluate the object before options are set ([#264](https://github.com/ycphs/openxlsx/issues/264))
 
+* `tabColour` in `wb_add_worksheet()` now allows passing `wb_colour()`. [500](https://github.com/JanMarvin/openxlsx2/pull/500)
+
 ## Fixes
 
 * Reading of files with frozen panes and more than one section node was restored. [495](https://github.com/JanMarvin/openxlsx2/pull/495)
@@ -23,7 +25,6 @@
 * Do not export `write_data2()` anymore. This was used in development in the early stages of the package and should not be used directly anymore.
 
 
-
 ***************************************************************************
 
 

R/class-workbook.R

@@ -380,7 +380,11 @@ wbWorkbook <- R6::R6Class(
       )
 
       if (!is.null(tabColour)) {
-        tabColour <- validateColour(tabColour, "Invalid tabColour in add_worksheet.")
+        if (is_wbColour(tabColour)) {
+          tabColour <- as.character(tabColour)
+        } else {
+          tabColour <- validateColour(tabColour, "Invalid tabColour in add_chartsheet.")
+        }
       }
 
       if (!is.numeric(zoom)) {
@@ -526,7 +530,11 @@ wbWorkbook <- R6::R6Class(
       }
 
       if (!is.null(tabColour)) {
-        tabColour <- validateColour(tabColour, "Invalid tabColour in add_worksheet.")
+        if (is_wbColour(tabColour)) {
+          tabColour <- as.character(tabColour)
+        } else {
+          tabColour <- validateColour(tabColour, "Invalid tabColour in add_worksheet.")
+        }
       }
 
       if (!is.numeric(zoom)) {

tests/testthat/test-class-color.R

@@ -15,3 +15,15 @@ test_that("get()", {
   expect_equal(exp, got)
 
 })
+
+test_that("tabColour can be wb_colour()", {
+  expect_silent(
+    wb_workbook()$
+      # wb_colour
+      add_worksheet(tabColour = wb_colour("green"))$
+      add_chartsheet(tabColour = wb_colour("green"))$
+      # colour name
+      add_worksheet(tabColour = "green")$
+      add_chartsheet(tabColour = "green")
+  )
+})