Merge pull request #45 from mccarthy-m-g/housekeeping

Housekeeping

NEWS.md

@@ -2,6 +2,8 @@
 
 - Included five new colour palette sets with the package: Cartography palettes (`discrete_palettes`, `sequential_palettes`, `diverging_palettes`), Performance palettes (`performance_palettes`), and Palmer penguins palettes (`penguin_palettes`).
 
+- When plotting colour palettes with `plot()`, the order of facets now matches the order of palettes in `pal_palette()` objects.
+
 # palettes 0.2.1
 
 This is a small patch release that applies some internal fixes for the `scale_()` functions, due to a breaking change in ggplot2 v3.5.0 that deprecated the `scale_name` argument in `ggplot2::continuous_scale()`, `ggplot2::discrete_scale()` and `ggplot2::binned_scale()`. The "gt" vignette has also been updated to reflect changes to the `gt::data_color()` function in gt v0.9.0.

R/plot.R

@@ -74,6 +74,10 @@ plot_colour <- function(
 
   x <- pal_ramp(x, n, direction, space, interpolate)
   x <- tibble::as_tibble(x)
+  # The order of palettes in pal_palette() objects should be preserved.
+  if ("palette" %in% colnames(x)) {
+    x$palette <- factor(x$palette, levels = unique(x$palette))
+  }
   # When the same colour is repeated in a pal_colour() or pal_palette() object
   # it needs a unique position identifier in order to be plotted in the same
   # order as it appears in the vector.

vignettes/articles/made-with-palettes.Rmd

@@ -13,15 +13,16 @@ library(gt)
 library(fontawesome)
 
 palettes:::made_with_palettes |>
-  rename(description = title) |>
+  rename(description = title, links = gh_url) |>
   gt(id = "one") |>
   cols_label(
     package = md("**Package**"),
+    links = md("**Links**"),
     description = md("**Description**"),
     authors = md("**Author**")
   ) |>
   fmt_url(
-    columns = gh_url,
+    columns = links,
     label = html(fontawesome::fa("github")),
     color = "#0d6efd",
     show_underline = FALSE
@@ -34,30 +35,42 @@ palettes:::made_with_palettes |>
   ) |>
   sub_missing() |>
   cols_merge(
-    columns = c(package, gh_url, cran_url),
-    pattern = "{2} \u2002 {3} \u2002 {1}"
+    columns = c(links, cran_url),
+    pattern = "{1} \u2006 {2}"
   ) |>
   # cols_width(
   #   package ~ pct(25),
   #   title ~ pct(40),
   #   authors ~ pct(35)
   # ) |>
+  tab_style(
+    style = cell_text(whitespace = "nowrap"),
+    locations = cells_body(columns = links)
+  ) |>
   tab_options(
     table.width = pct(100),
     table.font.size = "100%"
   ) |>
   opt_css(
     css = "
+    table {
+      hyphens: none !important;
+    }
+    
     #one [id='<strong>Package</strong>'] {
-      width: 25%;
+      width: 20%;
     }
     
     #one [id='<strong>Description</strong>'] {
-      width: 50%;
+      width: 40%;
     }
     
     #one [id='<strong>Author</strong>'] {
-      width: 25%;
+      width: 20%;
+    }
+    
+    #one [id='<strong>Links</strong>'] {
+      width: 20%;
     }
     
     #one svg {