Skip to content

21 hover font color #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TammoReinders merged 6 commits into from
May 19, 2026
Merged

21 hover font color #22

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be32b85
mod_graph.R:
stjeske Feb 19, 2026
e366dd3
fix notes in devtools::check()
stjeske May 8, 2026
a8adcb4
mod_bubble.R:
stjeske May 8, 2026
8e56547
update renv files
stjeske May 12, 2026
af0f9c4
comment out not used functions
stjeske May 12, 2026
95d0aa1
Potential fix for pull request finding
stjeske May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 93 additions & 31 deletions R/mod_bubble.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,51 +387,113 @@ mod_bubble_server <- function(input, output, session,
"left:", left_px, "px; top:", top_px, "px; border: 0px;"
)

res_and_color <- cbind(results()$sge[results()$sge$nfactors >= key()[1] & results()$sge$nfactors <= key()[2],], font.col = color())
res_and_color <- cbind(results()$sge[results()$sge$nfactors >= key()[1] & results()$sge$nfactors <= key()[2],], font.col = color())
tmp <- res_and_color[res_and_color$SGID %in% point$ID, ]

tmp$text <- apply(
tmp[, results()$factors],
1,
function(x){paste(paste0(names(which(x != "Not used")),":", x[which(x != "Not used")]), collapse = ", ")}
)
tmp2 <- tmp %>%
# tmp2 <- tmp %>%
# dplyr::mutate(
# text2 = paste0("ID:", SGID,", ", .data$text),
# text3 =paste("<p>",
# ifelse(nrow(tmp) > 1,
# paste0("<b style = 'color: ",
# ColorPoints() ,
# "'> List of: ",nrow(tmp)," </b></br> <ul>"),
# paste0("")
# ),
# ifelse(nrow(tmp) > 1,
# paste(
# "<li> <b style = 'color: ",font.col,"'> SGID:", SGID, ", ",x() ,":", !!rlang::sym(x()),", ",y() ,":",!!rlang::sym(y()),
# "</br>", .data$text, "</b> </li><br>"
# ,collapse = ""
# ),
# paste(
# "<b style = 'color: ",font.col,"'> SGID:", SGID, ", ",x() ,":", !!rlang::sym(x()),", ",y() ,":",!!rlang::sym(y()),
# "</br>", .data$text, "</b><br>"
# ,collapse = ""
# )
# ),
# ifelse(nrow(tmp) > 1,"</ul>",""),
# "</p>",
# collapse ="")
# )

tmp2 <- tmp %>%
dplyr::select(SGID, !!rlang::sym(x()), !!rlang::sym(y()),!!rlang::sym(y2()), .data$text, font.col) %>%
dplyr::mutate(
text2 = paste0("ID:", SGID,", ", .data$text),
text3 =paste("<p>",
ifelse(nrow(tmp) > 1,
paste0("<b style = 'color: ",
ColorPoints() ,
"'> List of: ",nrow(tmp)," </b></br> <ul>"),
paste0("")
),
ifelse(nrow(tmp) > 1,
paste(
"<li> <b style = 'color: ",font.col,"'> SGID:", SGID, ", ",x() ,":", !!rlang::sym(x()),", ",y() ,":",!!rlang::sym(y()),
"</br>", .data$text, "</b> </li><br>"
,collapse = ""
),
paste(
"<b style = 'color: ",font.col,"'> SGID:", SGID, ", ",x() ,":", !!rlang::sym(x()),", ",y() ,":",!!rlang::sym(y()),
"</br>", .data$text, "</b><br>"
,collapse = ""
)
),
ifelse(nrow(tmp) > 1,"</ul>",""),
"</p>",
collapse ="")
)
if(length(tmp2$text3)!= 0) {

background_color = dplyr::case_when(
substr(ColorPoints(),1,7) != substr(font.col, 1,7) ~ substr(font.col, 1,7),
substr(ColorPoints(),1,7) == substr(font.col, 1,7) ~ ""
),
) %>%
dplyr::rowwise() %>%
dplyr::mutate(
font.col2 = dplyr::case_when(
substr(ColorPoints(),1,7) != substr(font.col, 1,7) ~ font_color(font.col),
substr(ColorPoints(),1,7) == substr(font.col, 1,7) ~ substr(font.col,1,7)
)
) %>%
dplyr::ungroup() %>%
dplyr::mutate(
html_text = paste0(
"<p style = 'color: ",
.data$font.col2,
"; background-color:",
.data$background_color,
"; border-color: #000; border-style: solid; border-width: 0.1px",
";'> ",
Comment on lines +428 to +448
y(),
":",
!!rlang::sym(y()),
", ",
y2(),
":",
!!rlang::sym(y2()),
", ",
"</br>",
x(),
":",
!!rlang::sym(x()),
", ",
"</br>",
tmp$text,
"</p>"
)
) %>%
dplyr::arrange(dplyr::desc(.data$background_color))

html_text <- paste(
"<p>",
paste(
tmp2$html_text
),
"</p>",
collapse ="")


shiny::wellPanel(
style = style,
shiny::p(
shiny::p(
shiny::HTML(
as.character(tmp2$text3[1])
as.character(html_text)
)
)
)
}
# if(length(tmp2$text3)!= 0) {

# shiny::wellPanel(
# style = style,
# shiny::p(
# shiny::HTML(
# as.character(tmp2$text3[1])
# )
# )
# )
# }
# point <- point[1,]
#
# tmp1 <- colnames(results()$sge[which(results()$sge$SGID == point$ID), results()$factors])[which(results()$sge[which(results()$sge$SGID == point$ID), results()$factors] != "Not used")]
Expand Down
119 changes: 72 additions & 47 deletions R/mod_graph.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ mod_graph_server <- function(
alpha_funnel = 0.1
) {

xmin <- xmax <- point_color <- memorizedText <- SGID <- text <- font.col <- NULL
xmin <- xmax <- point_color <- memorizedText <- SGID <- text <- font.col <- font_color2 <- font.col2 <- background_color <- NULL
ns <- session$ns

#### graph ####
Expand Down Expand Up @@ -323,7 +323,11 @@ mod_graph_server <- function(
!!rlang::sym(y()) <= YRange[2]
)

data$font_color2 <- unlist(lapply(data$point_color,font_color))
data_tmp <- data



p <- ggplot2::ggplot(
data %>% dplyr::arrange(plyr::desc(point_color)),
ggplot2::aes(
Expand Down Expand Up @@ -381,16 +385,16 @@ mod_graph_server <- function(
)
} else {

data <- data %>%
dplyr::mutate(
point_color =
dplyr::case_when(
.data$outlier == TRUE ~ point_color,
.data$outlier == FALSE & data$point_color == ColorPoints() ~ point_color,
.data$outlier == FALSE & data$point_color != ColorPoints() ~ point_color,
is.na(.data$outlier) ~ point_color
)
)
# data <- data %>%
# dplyr::mutate(
# point_color =
# dplyr::case_when(
# .data$outlier == TRUE ~ point_color,
# .data$outlier == FALSE & data$point_color == ColorPoints() ~ point_color,
# .data$outlier == FALSE & data$point_color != ColorPoints() ~ point_color,
# is.na(.data$outlier) ~ point_color
# )
# )
}
}
if (is.null(subTitle) && xlabel()){
Expand Down Expand Up @@ -439,13 +443,14 @@ mod_graph_server <- function(
}

if (!exclude_funnel()) {

p <- p +
ggrepel::geom_label_repel(
colour = "white",
colour =data %>%
dplyr::arrange(plyr::desc(point_color)) %>%
dplyr::pull(font_color2),
fill = data %>%
dplyr::arrange(plyr::desc(point_color)) %>%
dplyr::pull(point_color),
dplyr::pull(point_color) ,
max.overlaps = Inf,
min.segment.length = 0,
size = 5#,
Expand All @@ -454,7 +459,9 @@ mod_graph_server <- function(
} else {
p <- p +
ggrepel::geom_label_repel(
colour = "white",
colour = data_tmp %>%
dplyr::arrange(plyr::desc(point_color)) %>%
dplyr::pull(font_color2),
#fill = "#424242",
fill = data_tmp %>%
dplyr::arrange(plyr::desc(point_color)) %>%
Expand Down Expand Up @@ -748,7 +755,8 @@ mod_graph_server <- function(
grDevices::col2rgb(ColorBGplot())[1],",",
grDevices::col2rgb(ColorBGplot())[2],",",
grDevices::col2rgb(ColorBGplot())[3],",0.95); ",
"left:", left_px, "px; top:", top_px, "px; border: 0px;"
"left:", left_px, "px; top:", top_px, "px;
border: 1px solid #ffffff;"
)
Comment on lines -752 to 760


Expand All @@ -764,44 +772,61 @@ mod_graph_server <- function(
function(x){paste(paste0(names(which(x != "Not used")),":", x[which(x != "Not used")]), collapse = ", ")}
)
}
tmp2 <- tmp %>%

tmp2 <- tmp %>%
dplyr::select(SGID, !!rlang::sym(x()), !!rlang::sym(y()), text, font.col) %>%
dplyr::mutate(
text2 = paste0("ID:", SGID,", ", text),
text3 =paste("<p>",
ifelse(nrow(tmp) > 1,
paste0("<b style = 'color: ",
ColorPoints() ,
"'> List of: ",nrow(tmp)," </b></br> <ul>"),
paste0("")
),
ifelse(nrow(tmp) > 1,
paste(
"<li> <b style = 'color: ",font.col,"'> SGID:", SGID, ", ",x() ,":", !!rlang::sym(x()),", ",y() ,":",!!rlang::sym(y()),
"</br>", text, "</b> </li><br>"
,collapse = ""
),
paste(
"<b style = 'color: ",font.col,"'> SGID:", SGID, ", ",x() ,":", !!rlang::sym(x()),", ",y() ,":",!!rlang::sym(y()),
"</br>", text, "</b><br>"
,collapse = ""
)
),
ifelse(nrow(tmp) > 1,"</ul>",""),
"</p>",
collapse ="")
)
if(length(tmp2$text3)!= 0) {

background_color = dplyr::case_when(
substr(ColorPoints(),1,7) != substr(font.col, 1,7) ~ substr(font.col, 1,7),
substr(ColorPoints(),1,7) == substr(font.col, 1,7) ~ ""
),
) %>%
dplyr::rowwise() %>%
dplyr::mutate(
font.col2 = dplyr::case_when(
substr(ColorPoints(),1,7) != substr(font.col, 1,7) ~ font_color(font.col),
substr(ColorPoints(),1,7) == substr(font.col, 1,7) ~ substr(font.col,1,7)
Comment thread
stjeske marked this conversation as resolved.
Outdated
)
) %>%
dplyr::ungroup() %>%
dplyr::mutate(
html_text = paste0(
"<p style = 'color: ",
font.col2,
"; background-color:",
background_color,
"; border-color: #000; border-style: solid; border-width: 0.1px",
";'> ",
x(),
":",
Comment on lines +779 to +801
!!rlang::sym(x()),
", ",
y(),
":",
!!rlang::sym(y()),
"</br>",
tmp$text,
"</p>"
)
) %>%
dplyr::arrange(dplyr::desc(background_color))

html_text <- paste(
"<p>",
paste(
tmp2$html_text
),
"</p>",
collapse ="")

shiny::wellPanel(
style = style,
shiny::p(
shiny::p(
shiny::HTML(
as.character(tmp2$text3[1])
as.character(html_text)
)
)
)
}

})

return(
Expand Down
Loading