Updated Parameter mappings (#999)

holoviz · Jan 23, 2020 · fec865f · fec865f
1 parent eaecd6b
commit fec865f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/panel/param.py b/panel/param.py
@@ -29,13 +29,13 @@
 from .viewable import Layoutable
 from .widgets import (
     Button, Checkbox, ColorPicker, DataFrame, DatetimeInput, DateRangeSlider,
-    FloatSlider, IntSlider, LiteralInput, MultiSelect, RangeSlider,
-    Select, StaticText, TextInput, Toggle, Widget
+    FileSelector, FloatSlider, IntSlider, LiteralInput, MultiSelect,
+    RangeSlider, Select, StaticText, TextInput, Toggle, Widget
 )
 from .widgets.button import _ButtonBase
 
 
-def FileSelector(pobj):
+def SingleFileSelector(pobj):
     """
     Determines whether to use a TextInput or Select widget for FileSelector
     """
@@ -104,22 +104,26 @@ class Param(PaneBase):
     _unpack = True
 
     _mapping = {
-        param.Action:         Button,
-        param.Boolean:        Checkbox,
-        param.Color:          ColorPicker,
-        param.Date:           DatetimeInput,
-        param.DateRange:      DateRangeSlider,
-        param.DataFrame:      DataFrame,
-        param.Dict:           LiteralInput,
-        param.FileSelector:   FileSelector,
-        param.Integer:        IntSlider,
-        param.ListSelector:   MultiSelect,
-        param.Number:         FloatSlider,
-        param.ObjectSelector: Select,
-        param.Parameter:      LiteralInput,
-        param.Range:          RangeSlider,
-        param.Selector:       Select,
-        param.String:         TextInput,
+        param.Action:            Button,
+        param.Boolean:           Checkbox,
+        param.Color:             ColorPicker,
+        param.Date:              DatetimeInput,
+        param.DateRange:         DateRangeSlider,
+        param.CalendarDateRange: DateRangeSlider,
+        param.DataFrame:         DataFrame,
+        param.Dict:              LiteralInput,
+        param.FileSelector:      SingleFileSelector,
+        param.Filename:          TextInput,
+        param.Foldername:        TextInput,
+        param.Integer:           IntSlider,
+        param.MultiFileSelector: FileSelector,
+        param.ListSelector:      MultiSelect,
+        param.Number:            FloatSlider,
+        param.ObjectSelector:    Select,
+        param.Parameter:         LiteralInput,
+        param.Range:             RangeSlider,
+        param.Selector:          Select,
+        param.String:            TextInput,
     }
 
     _rerender_params = []

diff --git a/panel/widgets/select.py b/panel/widgets/select.py
@@ -424,6 +424,10 @@ def _update_value(self):
         self._lists[True].value = []
         self._lists[False].options = unselected
         self._lists[False].value = []
+        if len(self._lists[True].options) and self._selected[-1] is not self._lists[True]:
+            self._selected[-1] = self._lists[True]
+        elif self._selected[-1] is not self._placeholder:
+            self._selected[-1] = self._placeholder
 
     @param.depends('options', watch=True)
     def _update_options(self):