Merge pull request #24 from cynkra/23-add-plugin-patch

fix #23

Author: DivadNojnarg

CRAN-SUBMISSION

@@ -1,3 +1,3 @@
 Version: 0.1.0
-Date: 2025-07-03 09:32:36 UTC
-SHA: 3da178dd8286995549966ed1af73341a4f80e748
+Date: 2025-07-07 14:24:39 UTC
+SHA: 32a0bdfc931ad9d339a8e33d92920f8b63515cd4

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: g6R
 Title: Graph Visualisation Engine Widget for R and 'shiny' Apps
-Version: 0.1.1
+Version: 0.2.0
 Authors@R: 
     c(
     person("David", "Granjon", , "[email protected]", role = c("aut", "cre")),

NEWS.md

@@ -1,6 +1,7 @@
-# g6R 0.1.1
+# g6R 0.2.0
 
-- Fix internal typo in JS function when an error was caught in the graph.
+- Fix [#23](<https://github.com/cynkra/g6R/issues/23>): graph has to be re-rendered after dynamic plugin addition so that new elements like `hull` are drawn.
+- Fix [#22](<https://github.com/cynkra/g6R/issues/22>): internal typo in JS function when an error was caught in the graph.
 - Add `input$<graph_ID>-contextmenu` to extract the type and id of element which was clicked in the context menu.
 This can be listened to from the Shiny server function.
 

R/plugins.R

@@ -193,9 +193,9 @@ background <- function(
 #' Creates a configuration object for the bubble-sets plugin in G6.
 #' This plugin creates bubble-like contours around groups of specified elements.
 #'
-#' @param members Member elements, including nodes and edges (character vector, required).
+#' @param members Member elements, including nodes and edges (character/numeric vector, required).
 #' @param key Unique identifier for updates (string, default: NULL).
-#' @param avoidMembers Elements to avoid when drawing contours (character vector, default: NULL).
+#' @param avoidMembers Elements to avoid when drawing contours (character/numeric vector, default: NULL).
 #' @param label Whether to display labels (boolean, default: TRUE).
 #' @param labelPlacement Label position (string, default: "bottom").
 #' @param labelBackground Whether to display background (boolean, default: FALSE).
@@ -281,13 +281,27 @@ bubble_sets <- function(
   virtualEdges = NULL,
   ...
 ) {
-  # TBD: validate members to it validate real node ids who exist.
   if (label) {
     labelPlacement <- match.arg(labelPlacement)
   }
   # Check for required parameters
-  if (missing(members) || is.null(members) || length(members) == 0) {
-    stop("'members' is required and must contain at least one element ID")
+  if (!is.character(members) && !is.numeric(members) || length(members) == 0) {
+    stop("'members' must be a non-empty character/numeric vector")
+  }
+
+  members <- as.character(members)
+
+  if (
+    !is.null(avoidMembers) &&
+      (!is.character(avoidMembers) &&
+        !is.numeric(avoidMembers) ||
+        length(avoidMembers) == 0)
+  ) {
+    stop("'avoidMembers' must be a character/numeric vector or NULL")
+  }
+
+  if (!is.null(avoidMembers)) {
+    avoidMembers <- as.character(avoidMembers)
   }
 
   # Get argument names
@@ -1095,7 +1109,7 @@ history <- function(
 #' Creates a configuration object for the hull plugin in G6.
 #' This plugin creates a hull (convex or concave) that surrounds specified graph elements.
 #'
-#' @param members Elements within the hull, including nodes and edges (character vector, required).
+#' @param members Elements within the hull, including nodes and edges (character/numeric vector, required).
 #' @param key Unique identifier for the plugin (string, default: NULL).
 #' @param concavity Concavity parameter, larger values create less concave hulls (number, default: Infinity).
 #' @param corner Corner type: "rounded", "smooth", or "sharp" (string, default: "rounded").
@@ -1153,9 +1167,10 @@ hull <- function(
   ...
 ) {
   # Validate inputs
-  if (!is.character(members) || length(members) == 0) {
-    stop("'members' must be a non-empty character vector")
+  if (!is.character(members) && !is.numeric(members) || length(members) == 0) {
+    stop("'members' must be a non-empty character/numeric vector")
   }
+  members <- as.character(members)
 
   if (!is.numeric(concavity) || concavity <= 0) {
     stop("'concavity' must be a positive number or Infinity")

inst/examples/dataframe/app.R

@@ -51,9 +51,7 @@ server <- function(input, output, session) {
           )
         )
       ) |>
-      g6_layout(
-        layout = d3_force_layout()
-      ) |>
+      g6_layout() |>
       g6_behaviors(
         "zoom-canvas",
         drag_element_force(fixed = TRUE),
@@ -63,7 +61,6 @@ server <- function(input, output, session) {
       ) |>
       g6_plugins(
         "minimap",
-        "tooltip",
         context_menu()
       )
   })
@@ -72,9 +69,9 @@ server <- function(input, output, session) {
     g6_proxy("graph") |>
       g6_add_plugin(
         hull(
+          members = sample(nodes$id, 10),
           fill = "#F08F56",
           stroke = "#F08F56",
-          members = sample(nodes$id, 10),
           labelText = "hull-a",
           labelPlacement = "top",
           labelBackground = TRUE,

inst/htmlwidgets/g6.js

@@ -21,6 +21,6 @@
   "dependencies": {
     "@antv/g": "^6.1.24",
     "@antv/g-svg": "^2.0.38",
-    "@antv/g6": "^5.0.45"
+    "@antv/g6": "^5.0.49"
   }
 }