Merge pull request #198 from renkun-ken/fix-view-single-row

Fix dataview_table handling single row data
REditorSupport · Jan 24, 2020 · 84a77c1 · 84a77c1
2 parents 15ef9ca + 6d5e8b0
commit 84a77c1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/R/init.R b/R/init.R
@@ -118,13 +118,14 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
             } else {
               rownames <- seq_len(nrow(data))
             }
-            data <- cbind(rownames, data, stringsAsFactors = FALSE)
+            data <- cbind(" " = rownames, data, stringsAsFactors = FALSE)
             colnames <- c(" ", colnames)
             types <- vapply(data, dataview_data_type,
               character(1L), USE.NAMES = FALSE)
             data <- vapply(data, function(x) {
               trimws(format(x))
             }, character(nrow(data)), USE.NAMES = FALSE)
+            dim(data) <- c(length(rownames), length(colnames))
           } else if (is.matrix(data)) {
             if (is.factor(data)) {
               data <- format(data)
@@ -142,13 +143,14 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
             data <- trimws(format(data))
             if (is.null(rownames)) {
               types <- c("num", types)
-              colnames <- c(" ", colnames)
-              data <- cbind(" " = seq_len(nrow(data)), data)
+              rownames <- seq_len(nrow(data))
             } else {
               types <- c("string", types)
-              colnames <- c(" ", colnames)
-              data <- cbind(" " = trimws(rownames), data)
+              rownames <- trimws(rownames)
             }
+            dim(data) <- c(length(rownames), length(colnames))
+            colnames <- c(" ", colnames)
+            data <- cbind(rownames, data)
           } else {
             stop("data must be data.frame or matrix")
           }