Support nullable types (#101)

* Compute the default value for 'order' after that of 'showIndex'

* Add support for nullable types

* Version 1.3.0

Author: mwouts

docs/changelog.md

@@ -5,15 +5,18 @@ ITables ChangeLog
 ------------------
 
 **Changed**
-- The order of rows is preserved by default (unless you explicitly pass an `order` parameter).
+- The order of rows is preserved by default (unless you explicitly pass an `order` parameter) ([#99](https://github.com/mwouts/itables/issues/99)).
+
+**Fixed**
+- Nullable types (bool, int) are now supported ([#98](https://github.com/mwouts/itables/issues/98))
 
 
 1.2.0 (2022-08-15)
 ------------------
 
 **Added**
-- New `to_html_datatable` function to export a DataFrame to an HTML div (#88)
-- We have added examples on how to use `itables` in [Shiny](https://shiny.rstudio.com/py/) for Python (#86)
+- New `to_html_datatable` function to export a DataFrame to an HTML div ([#88](https://github.com/mwouts/itables/issues/88))
+- We have added examples on how to use `itables` in [Shiny](https://shiny.rstudio.com/py/) for Python ([#86](https://github.com/mwouts/itables/issues/86))
 
 
 1.1.3 (2022-08-11)

docs/sample_dataframes.md

@@ -30,12 +30,30 @@ init_notebook_mode(all_interactive=True)
 show(dict_of_test_dfs["empty"])
 ```
 
+## bool
+
+```{code-cell}
+show(dict_of_test_dfs["bool"])
+```
+
+## Nullable boolean
+
+```{code-cell}
+show(dict_of_test_dfs["nullable_boolean"])
+```
+
 ## int
 
 ```{code-cell}
 show(dict_of_test_dfs["int"])
 ```
 
+## Nullable integer
+
+```{code-cell}
+show(dict_of_test_dfs["nullable_int"])
+```
+
 ## float
 
 ```{code-cell}

itables/javascript.py

@@ -122,7 +122,10 @@ def _formatted_values(df):
             except ValueError:
                 pass
 
-    return formatted_df.values.tolist()
+    rows = formatted_df.values.tolist()
+
+    # Replace pd.NA with None
+    return [[cell if cell is not pd.NA else None for cell in row] for row in rows]
 
 
 def _table_header(
@@ -250,20 +253,6 @@ def to_html_datatable(df=None, tableId=None, connected=True, **kwargs):
 
     df = downsample(df, max_rows=maxRows, max_columns=maxColumns, max_bytes=maxBytes)
 
-    # Unless an 'order' parameter is given, we preserve the current order of rows #99
-    order = kwargs.pop("order", None)
-
-    if order is None:
-        order = []
-
-        if showIndex:
-            if df.index.is_monotonic_increasing:
-                order = [[i, "asc"] for i, _ in enumerate(df.index.names)]
-            elif df.index.is_monotonic_decreasing:
-                order = [[i, "desc"] for i, _ in enumerate(df.index.names)]
-
-    kwargs["order"] = order
-
     footer = kwargs.pop("footer")
     column_filters = kwargs.pop("column_filters")
     if column_filters == "header":
@@ -296,6 +285,20 @@ def to_html_datatable(df=None, tableId=None, connected=True, **kwargs):
     if not showIndex:
         df = df.set_index(pd.RangeIndex(len(df.index)))
 
+    # Unless an 'order' parameter is given, we preserve the current order of rows #99
+    order = kwargs.pop("order", None)
+
+    if order is None:
+        order = []
+
+        if showIndex:
+            if df.index.is_monotonic_increasing:
+                order = [[i, "asc"] for i, _ in enumerate(df.index.names)]
+            elif df.index.is_monotonic_decreasing:
+                order = [[i, "desc"] for i, _ in enumerate(df.index.names)]
+
+    kwargs["order"] = order
+
     table_header = _table_header(
         df, tableId, showIndex, classes, style, tags, footer, column_filters
     )

itables/sample_dfs.py

@@ -43,9 +43,27 @@ def get_dict_of_test_dfs(N=100, M=100):
 
     return {
         "empty": pd.DataFrame(),
+        "bool": pd.DataFrame(
+            [[True, True, False, False], [True, False, True, False]],
+            columns=list("abcd"),
+        ),
+        "nullable_boolean": pd.DataFrame(
+            [
+                [True, True, False, None],
+                [True, False, None, False],
+                [None, False, True, False],
+            ],
+            columns=list("abcd"),
+            dtype="boolean",
+        ),
         "int": pd.DataFrame(
             [[-1, 2, -3, 4, -5], [6, -7, 8, -9, 10]], columns=list("abcde")
         ),
+        "nullable_int": pd.DataFrame(
+            [[-1, 2, -3], [4, -5, 6], [None, 7, None]],
+            columns=list("abc"),
+            dtype="Int64",
+        ),
         "float": pd.DataFrame(
             {
                 "int": [0.0, 1],

itables/version.py

@@ -1,3 +1,3 @@
 """ITables' version number"""
 
-__version__ = "1.3.0-dev"
+__version__ = "1.3.0"