bug(edit: data frame): If the cell's value is null, edit value shou…

…ld be `""` (#1551)
posit-dev · Jul 18, 2024 · 57afa2b · 57afa2b
1 parent 5112115
commit 57afa2b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 9 deletions.
diff --git a/js/data-frame/cell.tsx b/js/data-frame/cell.tsx
@@ -62,9 +62,8 @@ const isShinyHtml = (x: any): x is CellHtmlValue => {
 };
 type CellValue = string | CellHtmlValue | null;
 const getCellValueText = (cellValue: CellValue) => {
-  if (isShinyHtml(cellValue)) {
-    return cellValue.obj.html;
-  }
+  if (isShinyHtml(cellValue)) return cellValue.obj.html;
+  if (cellValue === null) return "";
   return cellValue as string;
 };
 

diff --git a/shiny/www/py-shiny/data-frame/data-frame.js b/shiny/www/py-shiny/data-frame/data-frame.js
diff --git a/shiny/www/py-shiny/data-frame/data-frame.js.map b/shiny/www/py-shiny/data-frame/data-frame.js.map
diff --git a/...me/html_columns_df/df_organization/app.py → ...y/components/data_frame/df_methods/app.py b/...me/html_columns_df/df_organization/app.py → ...y/components/data_frame/df_methods/app.py
diff --git a/...f/df_organization/test_df_organization.py → .../data_frame/df_methods/test_df_methods.py b/...f/df_organization/test_df_organization.py → .../data_frame/df_methods/test_df_methods.py
@@ -7,9 +7,7 @@
 
 
 @pytest.mark.parametrize("tab_name", ["pandas", "polars"])
-def test_dataframe_organization_methods(
-    page: Page, local_app: ShinyAppProc, tab_name: str
-) -> None:
+def test_dataframe_methods(page: Page, local_app: ShinyAppProc, tab_name: str) -> None:
 
     page.goto(local_app.url)
 

diff --git a/...ponents/data_frame/html_columns_df/app.py → ...components/data_frame/html_columns/app.py b/...ponents/data_frame/html_columns_df/app.py → ...components/data_frame/html_columns/app.py
diff --git a/tests/playwright/shiny/components/data_frame/html_columns/test_edit_cell_content.py b/tests/playwright/shiny/components/data_frame/html_columns/test_edit_cell_content.py
@@ -0,0 +1,27 @@
+import pytest
+from playwright.sync_api import Page
+from utils.deploy_utils import skip_if_not_chrome
+
+from shiny.playwright import controller
+from shiny.run import ShinyAppProc
+
+
+@skip_if_not_chrome
+@pytest.mark.parametrize("df_type", ["pandas", "polars"])
+def test_edit_cell_content_is_not_null(
+    page: Page, local_app: ShinyAppProc, df_type: str
+) -> None:
+    page.goto(local_app.url)
+
+    data_frame = controller.OutputDataFrame(page, f"{df_type}_df")
+
+    tab = controller.NavsetCardUnderline(page, "tab")
+    tab.set(df_type)
+
+    data_frame.expect_cell("", row=0, col=14)
+    empty_cell = data_frame.cell_locator(row=0, col=14)
+    empty_cell.dblclick()
+    textarea = empty_cell.locator("textarea")
+    textarea.wait_for()
+    cur_value = textarea.input_value()
+    assert cur_value == ""
diff --git a/...rame/html_columns_df/test_html_columns.py → ...a_frame/html_columns/test_html_columns.py b/...rame/html_columns_df/test_html_columns.py → ...a_frame/html_columns/test_html_columns.py
diff --git a/...data_frame/html_columns_df/tabbing/app.py → ...hiny/components/data_frame/tabbing/app.py b/...data_frame/html_columns_df/tabbing/app.py → ...hiny/components/data_frame/tabbing/app.py
diff --git a/...e/html_columns_df/tabbing/test_tabbing.py → ...onents/data_frame/tabbing/test_tabbing.py b/...e/html_columns_df/tabbing/test_tabbing.py → ...onents/data_frame/tabbing/test_tabbing.py