Improve access to option values + use htmltools to create some css code #1868
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -71,25 +71,24 @@ footnote_mark_to_html <- function( | |||||
| font_weight <- "normal" | ||||||
| } | ||||||
|
|
||||||
| htmltools::tags$span( | ||||||
| if (is_sup) { | ||||||
| htmltools::tags$sup(mark, .noWS = "before") | ||||||
| } else { | ||||||
| mark | ||||||
| }, | ||||||
| class = if (is_sup) { | ||||||
| sup_class | ||||||
| } else { | ||||||
| NULL | ||||||
| }, | ||||||
| style = htmltools::css( | ||||||
| `white-space` = "nowrap", | ||||||
| `font-style` = font_style, | ||||||
| `font-weight` = font_weight, | ||||||
| `line-height` = 0 | ||||||
| ), | ||||||
| .noWS = "before-end" | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -237,45 +236,29 @@ coalesce_marks <- function( | |||||
| locname, | ||||||
| delimiter = "," | ||||||
| ) { | ||||||
| fs_ids <- vctrs::vec_slice(fn_tbl$fs_id, fn_tbl$locname == locname) | ||||||
| paste(fs_ids, collapse = delimiter) | ||||||
| } | ||||||
|
|
||||||
| # Get the attributes for the table tag | ||||||
| get_table_defs <- function(data) { | ||||||
|
|
||||||
| boxh <- dt_boxhead_get(data = data) | ||||||
|
|
||||||
| # In the case that column widths are not set for any columns, | ||||||
| # there should not be a `<colgroup>` tag requirement | ||||||
| if (length(unlist(boxh$column_width)) < 1) { | ||||||
| return(list(table_style = NULL, table_colgroups = NULL)) | ||||||
| } | ||||||
|
|
||||||
| # Get the `table-layout` value, which is set in `_options` | ||||||
| table_layout <- dt_options_get_value(data = data, option = "table_layout") | ||||||
|
|
||||||
| # Get the table's width (which or may not have been set) | ||||||
| table_width <- dt_options_get_value(data = data, option = "table_width") | ||||||
|
|
||||||
| # Determine whether the row group is placed in the stub | ||||||
| row_group_as_column <- dt_options_get_value(data = data, option = "row_group_as_column") | ||||||
|
|
||||||
| types <- c("default", "stub", if (row_group_as_column) "row_group" else NULL) | ||||||
|
|
||||||
|
|
@@ -309,14 +292,23 @@ get_table_defs <- function(data) { | |||||
| if (table_width == "auto") { | ||||||
|
|
||||||
| if (all(grepl("px", widths, fixed = TRUE))) { | ||||||
| # FIXME sometimes ends up being 0? #1532 and quarto-dev/quarto-cli#8233 | ||||||
| table_width <- "0px" | ||||||
| } else if (all(grepl("%", widths, fixed = TRUE))) { | ||||||
| table_width <- "100%" | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| if (table_width != "auto") { | ||||||
|
There was a problem hiding this comment. @rich-iannone to fix #1532, should we just have this condition be
Suggested change
If so, I will create a PR after this one is merged and update all snapshots. I did the refactoring here to make the potential fix clearer in the future There was a problem hiding this comment. I like the version that catches the zero-width table! I’d welcome a future PR that addresses that problem. |
||||||
| table_style <- htmltools::css( | ||||||
| `table-layout` = table_layout, | ||||||
| width = table_width | ||||||
| ) | ||||||
| } else { | ||||||
| table_style <- | ||||||
| htmltools::css( | ||||||
| `table-layout` = table_layout | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
| # Create the `<colgroup>` tag | ||||||
|
|
@@ -415,7 +407,7 @@ create_heading_component_h <- function(data) { | |||||
| footnote_title_marks <- | ||||||
| footnote_mark_to_html( | ||||||
| data = data, | ||||||
| mark = footnote_title_marks | ||||||
| ) | ||||||
|
|
||||||
| } else { | ||||||
|
|
@@ -449,7 +441,7 @@ create_heading_component_h <- function(data) { | |||||
| footnote_subtitle_marks <- | ||||||
| footnote_mark_to_html( | ||||||
| data = data, | ||||||
| mark = footnote_subtitle_marks | ||||||
| ) | ||||||
|
|
||||||
| } else { | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that I refactored
coalesce_marks()to return a single string because the resulting data frame (1 col x 1 row) previously was never used, and all code needed to access the fs_id_c variable. e86b842There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a great improvement! Yeah, a vector is all we need.