hotfix row and column ordering when griuping converting them to factors

R/methods.R

@@ -323,6 +323,14 @@ heatmap_ <-
 
 		.data |> 
 
+		  # Hotfix for wrong grouping of elements
+		  # https://github.com/stemangiola/tidyHeatmap/issues/116
+		  # We have to find the root cause ASAP
+		  mutate(
+		    !!.column := as.factor(!!.column),
+		    !!.row := as.factor(!!.row)
+		  ) |> 
+
 			# # Check if data is rectangular
 			# ifelse_pipe(
 			# 	!check_if_data_rectangular((.), !!.column, !!.row, !!.value),

R/utilities.R

@@ -715,6 +715,7 @@ get_top_left_annotation = function(.data_, .column, .row, .abundance, annotation
 		ungroup() %>%
 
 		mutate(color = map2(annot, idx,  ~ {
+
 			if(.x %>% class %in% c("factor", "character", "logical")){
 
 				# If is colorRamp 
@@ -723,13 +724,8 @@ get_top_left_annotation = function(.data_, .column, .row, .abundance, annotation
 
 				# If it is a list of colors
 				else
-				    if (is(.x, "factor")) {
-				      color_vector <- palette_annotation$discrete[[.y]] %>% setNames(levels(.x))
-				      color_vector[!is.na(names(color_vector))]
-
-				    } else {
-				      colorRampPalette(palette_annotation$discrete[[.y]])(length(unique(.x))) %>% setNames(unique(.x))
-				    }			
+				    colorRampPalette(palette_annotation$discrete[[.y]])(length(unique(.x))) %>% setNames(unique(.x))
+
 
 			} else if (.x %>% class %in% c("integer", "numerical", "numeric", "double")){