Merge branch 'master' into titles

Author: jasongrout

ipywidgets/widgets/widget_selectioncontainer.py

@@ -10,16 +10,16 @@
 from .widget_box import Box
 from .widget import register
 from .widget_core import CoreWidget
-from traitlets import Unicode, Dict, CInt, TraitError, validate
+from traitlets import Unicode, Dict, CInt, TraitError, validate, observe
 from .trait_types import TypedTuple
 
-
 class _SelectionContainer(Box, CoreWidget):
     """Base class used to display multiple child widgets."""
     titles = TypedTuple(trait=Unicode(), help="Titles of the pages").tag(sync=True)
     selected_index = CInt(
         help="""The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.""",
-        allow_none=True
+        allow_none=True,
+        default_value=None
     ).tag(sync=True)
 
     @validate('selected_index')
@@ -29,6 +29,11 @@ def _validated_index(self, proposal):
         else:
             raise TraitError('Invalid selection: index out of bounds')
 
+    @observe('children')
+    def _observe_children(self, change):
+        if self.selected_index is not None and len(change.new) < self.selected_index:
+            self.selected_index = None
+
 @register
 class Accordion(_SelectionContainer):
     """Displays children each on a separate accordion page."""
@@ -42,6 +47,10 @@ class Tab(_SelectionContainer):
     _view_name = Unicode('TabView').tag(sync=True)
     _model_name = Unicode('TabModel').tag(sync=True)
 
+    def __init__(self, **kwargs):
+        if 'children' in kwargs and 'selected_index' not in kwargs and len(kwargs['children']) > 0:
+            kwargs['selected_index'] = 0
+        super(Tab, self).__init__(**kwargs)
 
 @register
 class Stacked(_SelectionContainer):

packages/controls/src/widget_selectioncontainer.ts

@@ -31,8 +31,8 @@ export class SelectionContainerModel extends BoxModel {
     return {
       ...super.defaults(),
       _model_name: 'SelectionContainerModel',
-      selected_index: 0,
-      titles: []
+      selected_index: null,
+      _titles: []
     };
   }
 }

packages/schema/jupyterwidgetmodels.latest.md

@@ -77,7 +77,7 @@ Attribute        | Type             | Default          | Help
 `box_style`      | string (one of `'success'`, `'info'`, `'warning'`, `'danger'`, `''`) | `''`             | Use a predefined styling for the box.
 `children`       | array of reference to Widget widget | `[]`             | List of widget children
 `layout`         | reference to Layout widget | reference to new instance | 
-`selected_index` | `null` or number (integer) | `0`              | The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.
+`selected_index` | `null` or number (integer) | `null`           | The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.
 `tabbable`       | `null` or boolean | `null`           | Is widget tabbable?
 `titles`         | array of string  | `[]`             | Titles of the pages
 `tooltip`        | `null` or string | `null`           | A tooltip caption.
@@ -955,7 +955,7 @@ Attribute        | Type             | Default          | Help
 `box_style`      | string (one of `'success'`, `'info'`, `'warning'`, `'danger'`, `''`) | `''`             | Use a predefined styling for the box.
 `children`       | array of reference to Widget widget | `[]`             | List of widget children
 `layout`         | reference to Layout widget | reference to new instance | 
-`selected_index` | `null` or number (integer) | `0`              | The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.
+`selected_index` | `null` or number (integer) | `null`           | The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.
 `tabbable`       | `null` or boolean | `null`           | Is widget tabbable?
 `titles`         | array of string  | `[]`             | Titles of the pages
 `tooltip`        | `null` or string | `null`           | A tooltip caption.
@@ -974,7 +974,7 @@ Attribute        | Type             | Default          | Help
 `box_style`      | string (one of `'success'`, `'info'`, `'warning'`, `'danger'`, `''`) | `''`             | Use a predefined styling for the box.
 `children`       | array of reference to Widget widget | `[]`             | List of widget children
 `layout`         | reference to Layout widget | reference to new instance | 
-`selected_index` | `null` or number (integer) | `0`              | The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.
+`selected_index` | `null` or number (integer) | `null`           | The index of the selected page. This is either an integer selecting a particular sub-widget, or None to have no widgets selected.
 `tabbable`       | `null` or boolean | `null`           | Is widget tabbable?
 `titles`         | array of string  | `[]`             | Titles of the pages
 `tooltip`        | `null` or string | `null`           | A tooltip caption.