Close #23: allow date_input() and date_range_input() to handle ISO-formatted strings

Author: cpsievert

shiny/ui_toolkit/input_date.py

@@ -1,6 +1,6 @@
 import json
 from datetime import date
-from typing import Optional
+from typing import Optional, List, Union
 
 from htmltools import tags, Tag, div, span, TagAttrArg, TagChildArg, css
 
@@ -13,26 +13,21 @@
 def input_date(
     id: str,
     label: TagChildArg,
-    value: Optional[date] = None,
-    min: Optional[date] = None,
-    max: Optional[date] = None,
+    value: Optional[Union[date, str]] = None,
+    min: Optional[Union[date, str]] = None,
+    max: Optional[Union[date, str]] = None,
     format: str = "yyyy-mm-dd",
     startview: str = "month",
     weekstart: int = 0,
     language: str = "en",
     width: Optional[str] = None,
     autoclose: bool = True,
-    datesdisabled: Optional[str] = None,
-    daysofweekdisabled: Optional[str] = None,
+    datesdisabled: Optional[List[str]] = None,
+    daysofweekdisabled: Optional[List[int]] = None,
 ) -> Tag:
-    # TODO: needed?
-    # value = dateYMD(value, "value")
-    # min = dateYMD(min, "min")
-    # max = dateYMD(max, "max")
-    # datesdisabled = dateYMD(datesdisabled, "datesdisabled")
     return div(
         shiny_input_label(id, label),
-        date_input_tag(
+        _date_input_tag(
             id=id,
             value=value,
             min=min,
@@ -54,10 +49,10 @@ def input_date(
 def input_date_range(
     id: str,
     label: TagChildArg,
-    start: Optional[date] = None,
-    end: Optional[date] = None,
-    min: Optional[date] = None,
-    max: Optional[date] = None,
+    start: Optional[Union[date, str]] = None,
+    end: Optional[Union[date, str]] = None,
+    min: Optional[Union[date, str]] = None,
+    max: Optional[Union[date, str]] = None,
     format: str = "yyyy-mm-dd",
     startview: str = "month",
     weekstart: int = 0,
@@ -66,15 +61,10 @@ def input_date_range(
     width: Optional[str] = None,
     autoclose: bool = True,
 ) -> Tag:
-    # TODO: needed?
-    # start = dateYMD(start, "start")
-    # end = dateYMD(end, "end")
-    # min = dateYMD(min, "min")
-    # max = dateYMD(max, "max")
     return div(
         shiny_input_label(id, label),
         div(
-            date_input_tag(
+            _date_input_tag(
                 id=id,
                 value=start,
                 min=min,
@@ -90,7 +80,7 @@ def input_date_range(
                 span(separator, class_="input-group-text"),
                 class_="input-group-addon input-group-prepend input-group-append",
             ),
-            date_input_tag(
+            _date_input_tag(
                 id=id,
                 value=end,
                 min=min,
@@ -110,11 +100,11 @@ def input_date_range(
     )
 
 
-def date_input_tag(
+def _date_input_tag(
     id: str,
-    value: Optional[date],
-    min: Optional[date],
-    max: Optional[date],
+    value: Optional[Union[date, str]],
+    min: Optional[Union[date, str]],
+    max: Optional[Union[date, str]],
     format: str,
     startview: str,
     weekstart: int,
@@ -134,9 +124,17 @@ def date_input_tag(
         data_date_week_start=weekstart,
         data_date_format=format,
         data_date_start_view=startview,
-        data_min_date=min,
-        data_max_date=max,
-        data_initial_date=value,
+        data_min_date=_as_date_attr(min),
+        data_max_date=_as_date_attr(max),
+        data_initial_date=_as_date_attr(value),
         data_date_autoclose="true" if autoclose else "false",
         **kwargs,
     )
+
+
+def _as_date_attr(x: Optional[Union[date, str]]) -> Optional[str]:
+    if x is None:
+        return None
+    if isinstance(x, date):
+        return str(x)
+    return str(date.fromisoformat(x))

shiny/ui_toolkit/input_update.py

@@ -11,6 +11,7 @@
 from htmltools import TagChildArg
 
 from .input_check_radio import ChoicesArg, _generate_options
+from .input_date import _as_date_attr
 from .input_select import SelectChoicesArg, _normalize_choices, _render_choices
 from .input_slider import SliderValueArg, SliderStepArg, _slider_type, _as_numeric
 from ..utils import drop_none
@@ -118,18 +119,18 @@ def update_date(
     id: str,
     *,
     label: Optional[str] = None,
-    value: Optional[date] = None,
-    min: Optional[date] = None,
-    max: Optional[date] = None,
+    value: Optional[Union[date, str]] = None,
+    min: Optional[Union[date, str]] = None,
+    max: Optional[Union[date, str]] = None,
     session: Optional[Session] = None,
 ) -> None:
 
     session = _require_active_session(session)
     msg = {
         "label": label,
-        "value": str(value),
-        "min": str(min),
-        "max": str(max),
+        "value": _as_date_attr(value),
+        "min": _as_date_attr(min),
+        "max": _as_date_attr(max),
     }
     session.send_input_message(id, drop_none(msg))
 
@@ -138,19 +139,19 @@ def update_date_range(
     id: str,
     *,
     label: Optional[str] = None,
-    start: Optional[date] = None,
-    end: Optional[date] = None,
-    min: Optional[date] = None,
-    max: Optional[date] = None,
+    start: Optional[Union[date, str]] = None,
+    end: Optional[Union[date, str]] = None,
+    min: Optional[Union[date, str]] = None,
+    max: Optional[Union[date, str]] = None,
     session: Optional[Session] = None,
 ) -> None:
     session = _require_active_session(session)
-    value = {"start": str(start), "end": str(end)}
+    value = {"start": _as_date_attr(start), "end": _as_date_attr(end)}
     msg = {
         "label": label,
         "value": drop_none(value),
-        "min": str(min),
-        "max": str(max),
+        "min": _as_date_attr(min),
+        "max": _as_date_attr(max),
     }
     session.send_input_message(id, drop_none(msg))