Remove button_style pass-through property, clean up upload widget

Author: SylvainCorlay

docs/source/examples/Widget List.ipynb

@@ -1431,19 +1431,10 @@
    ],
    "source": [
     "widgets.FileUpload(\n",
-    "    # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept\n",
-    "    # eg. '.txt', '.pdf', 'image/*', 'image/*,.pdf'\n",
-    "    accept='', # default\n",
-    "    # True to accept multiple files upload else False\n",
-    "    multiple=False, # default\n",
-    "    # True to disable the button else False to enable it\n",
-    "    disabled=False, # default\n",
-    "    # CSS transparently passed to button (a button element overlays the input[type=file] element for better styling)\n",
-    "    # e.g. 'color: darkblue; background-color: lightsalmon; width: 180px;'\n",
-    "    style_button='', # default\n",
-    "    # to compress data from browser to kernel\n",
-    "    # compress level from 1 to 9 incl. - 0 for no compression\n",
-    "    compress_level=0 # default\n",
+    "    accept='',  # Accepted file extension e.g. '.txt', '.pdf', 'image/*', 'image/*,.pdf'\n",
+    "    multiple=False,  # True to accept multiple files upload else False\n",
+    "    disabled=False,\n",
+    "    compress_level=0  # Compression level from 1 to 9 incl. - 0 for no compression\n",
     ")"
    ]
   },
@@ -1749,9 +1740,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "ipywidgets",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "ipywidgets"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -1763,7 +1754,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.3"
   },
   "widgets": {
    "application/vnd.jupyter.widget-state+json": {

ipywidgets/widgets/tests/test_widget_upload.py

@@ -16,17 +16,14 @@ def test_construction(self):
         assert uploader.accept == ''
         assert not uploader.multiple
         assert not uploader.disabled
-        assert uploader.style_button == ''
         assert uploader.compress_level == 0
 
     def test_construction_with_params(self):
         uploader = FileUpload(accept='.txt',
                               multiple=True,
                               disabled=True,
-                              style_button='color: red',
                               compress_level=9)
         assert uploader.accept == '.txt'
         assert uploader.multiple
         assert uploader.disabled
-        assert uploader.style_button == 'color: red'
         assert uploader.compress_level == 9

ipywidgets/widgets/widget.py

@@ -113,7 +113,6 @@ def _separate_buffers(substate, path, buffer_paths, buffers):
         raise ValueError("expected state to be a list or dict, not %r" % substate)
     return substate
 
-
 def _remove_buffers(state):
     """Return (state_without_buffers, buffer_paths, buffers) for binary message parts
 
@@ -283,6 +282,7 @@ def reg(widget):
     else:
         return reg(name)
 
+
 class Widget(LoggingHasTraits):
     #-------------------------------------------------------------------------
     # Class attributes
@@ -351,7 +351,6 @@ def get_manager_state(drop_defaults=False, widgets=None):
             state[widget.model_id] = widget._get_embed_state(drop_defaults=drop_defaults)
         return {'version_major': 2, 'version_minor': 0, 'state': state}
 
-
     def _get_embed_state(self, drop_defaults=False):
         state = {
             'model_name': self._model_name,
@@ -610,6 +609,7 @@ def __repr__(self):
     #-------------------------------------------------------------------------
     # Support methods
     #-------------------------------------------------------------------------
+
     @contextmanager
     def _lock_property(self, **properties):
         """Lock a property-value pair.

ipywidgets/widgets/widget_upload.py

@@ -7,13 +7,14 @@
 """
 
 import zlib
-from traitlets import observe, validate, Unicode, Dict, List, Int, Bool, Bytes, TraitError
+from traitlets import observe, validate, default, Unicode, Dict, List, Int, Bool, Bytes, TraitError, CaselessStrEnum
 
 from .widget_description import DescriptionWidget
 from .valuewidget import ValueWidget
 from .widget_core import CoreWidget
-from .widget import register
-from .trait_types import bytes_serialization
+from .widget_button import ButtonStyle
+from .widget import register, widget_serialization
+from .trait_types import bytes_serialization, InstanceDict
 
 
 def content_from_json(value, widget):
@@ -36,81 +37,42 @@ class FileUpload(DescriptionWidget, ValueWidget, CoreWidget):
     """
     _model_name = Unicode('FileUploadModel').tag(sync=True)
     _view_name = Unicode('FileUploadView').tag(sync=True)
-
-    _counter = Int(0).tag(sync=True)
-
-    help = 'Type of files the input accepts. None for all. See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept'
-    accept = Unicode(help=help).tag(sync=True)
-
-    help = 'If true, allow for multiple files upload, else only accept one'
-    multiple = Bool(False, help=help).tag(sync=True)
-
-    help = 'Enable or disable button'
-    disabled = Bool(False, help=help).tag(sync=True)
-
-    help = 'Optional style for button (label element)'
-    style_button = Unicode('', help=help).tag(sync=True)
-
-    help = 'Compress level: from 1 to 9 - 0 for no compression'
-    compress_level = Int(0, help=help).tag(sync=True)
-
-    help = 'List of file metadata'
-    li_metadata = List(Dict, help=help).tag(sync=True)
-
-    help = 'List of file content (bytes)'
-    li_content = List(Bytes, help=help).tag(sync=True, from_json=content_from_json)
-
-    help = 'Error message'
-    error = Unicode('', help=help).tag(sync=True)
-
-    value = Dict({}).tag(sync=False)
-
-    def __init__(self,
-                 accept='',
-                 multiple=False,
-                 disabled=False,
-                 style_button='',
-                 compress_level=0,
-                 ):
-        """
-        Instantiate widget
-        """
-
-        if accept is None:
-            accept = ''
-
-        if style_button is None:
-            style_button = ''
-
-        self._counter = 0
-        self.accept = accept
-        self.disabled = disabled
-        self.multiple = multiple
-        self.style_button = style_button
-        self.compress_level = compress_level
-        self.value = {}
-
-        super(FileUpload, self).__init__()
+    _counter = Int().tag(sync=True)
+
+    accept = Unicode(help='File types to accept, empty string for all').tag(sync=True)
+    multiple = Bool(help='If True, allow for multiple files upload').tag(sync=True)
+    disabled = Bool(help='Enable or disable button').tag(sync=True)
+    icon = Unicode('upload', help="Font-awesome icon name, without the 'fa-' prefix.").tag(sync=True)
+    button_style = CaselessStrEnum(
+        values=['primary', 'success', 'info', 'warning', 'danger', ''], default_value='',
+        help="""Use a predefined styling for the button.""").tag(sync=True)
+    style = InstanceDict(ButtonStyle).tag(sync=True, **widget_serialization)
+    compress_level = Int(help='Compression level: from 0 to 9 - 0 for no compression').tag(sync=True)
+    li_metadata = List(Dict, help='List of file metadata').tag(sync=True)
+    li_content = List(Bytes, help='List of file content (bytes)').tag(sync=True, from_json=content_from_json)
+    error = Unicode(help='Error message').tag(sync=True)
+
+    value = Dict(read_only=True)
 
     @validate('compress_level')
     def _valid_compress_level(self, proposal):
-        if proposal['value'] not in range(10):
+        if proposal.value not in range(10):
             raise TraitError('compress_level must be an int from 0 to 9 incl.')
-        return proposal['value']
+        return proposal.value
 
     @observe('_counter')
     def on_incr_counter(self, change):
         """
         counter increment triggers the update of trait value
         """
         res = {}
-
         msg = 'Error: length of li_metadata and li_content must be equal'
         assert len(self.li_metadata) == len(self.li_content), msg
-
-        for metadata, content in zip(self.li_metadata,
-                                     self.li_content):
+        for metadata, content in zip(self.li_metadata, self.li_content):
             name = metadata['name']
             res[name] = {'metadata': metadata, 'content': content}
+        self.set_trait('value', res)
 
-        self.value = res
+    @default('description')
+    def _default_description(self):
+        return 'Upload'

packages/controls/css/widgets-base.css

@@ -258,12 +258,23 @@
     background-color: var(--jp-error-color0);
 }
 
-/* Widget Button*/
+/* Widget Button, Widget Toggle Button */
 
 .widget-button, .widget-toggle-button {
     width: var(--jp-widgets-inline-width-short);
 }
 
+/* Widget Upload */
+
+.widget-upload {
+    width: var(--jp-widgets-inline-width-short);
+}
+
+.widget-upload button {
+    width: 100%;
+    height: 100%;
+}
+
 /* Widget Label Styling */
 
 /* Override Bootstrap label css */