update aframe, mdc

support/client/lib/vwf/model/aframe/aframe-master.js

@@ -65315,7 +65315,7 @@ registerComponent('laser-controls', {
     },
 
     'oculus-go-controls': {
-      cursor: {downEvents: ['trackpaddown'], upEvents: ['trackpadup']},
+      cursor: {downEvents: ['trackpaddown', 'triggerdown'], upEvents: ['trackpadup', 'triggerup']},
       raycaster: {origin: {x: 0, y: 0.0005, z: 0}}
     },
 
@@ -69394,15 +69394,29 @@ var EYES_TO_ELBOW = {x: 0.175, y: -0.3, z: -0.03};
 // Vector from eyes to elbow (divided by user height).
 var FOREARM = {x: 0, y: 0, z: -0.175};
 
+// Due to unfortunate name collision, add empty touches array to avoid Daydream error.
+var EMPTY_DAYDREAM_TOUCHES = {touches: []};
+
+var EVENTS = {
+  AXISMOVE: 'axismove',
+  BUTTONCHANGED: 'buttonchanged',
+  BUTTONDOWN: 'buttondown',
+  BUTTONUP: 'buttonup',
+  TOUCHSTART: 'touchstart',
+  TOUCHEND: 'touchend'
+};
+
 /**
  * Tracked controls component.
  * Wrap the gamepad API for pose and button states.
  * Select the appropriate controller and apply pose to the entity.
  * Observe button states and emit appropriate events.
  *
- * @property {number} controller - Index of controller in array returned by Gamepad API. Only used if hand property is not set.
+ * @property {number} controller - Index of controller in array returned by Gamepad API.
+ *  Only used if hand property is not set.
  * @property {string} id - Selected controller among those returned by Gamepad API.
- * @property {number} hand - If multiple controllers found with id, choose the one with the given value for hand. If set, we ignore 'controller' property
+ * @property {number} hand - If multiple controllers found with id, choose the one with the
+ *  given value for hand. If set, we ignore 'controller' property
  */
 module.exports.Component = registerComponent('tracked-controls', {
   schema: {
@@ -69428,6 +69442,8 @@ module.exports.Component = registerComponent('tracked-controls', {
     this.controllerEuler = new THREE.Euler();
 
     this.updateGamepad();
+
+    this.buttonEventDetails = {};
   },
 
   tick: function (time, delta) {
@@ -69585,6 +69601,9 @@ module.exports.Component = registerComponent('tracked-controls', {
       if (!this.buttonStates[id]) {
         this.buttonStates[id] = {pressed: false, touched: false, value: 0};
       }
+      if (!this.buttonEventDetails[id]) {
+        this.buttonEventDetails[id] = {id: id, state: this.buttonStates[id]};
+      }
 
       buttonState = controller.buttons[id];
       this.handleButton(id, buttonState);
@@ -69601,11 +69620,12 @@ module.exports.Component = registerComponent('tracked-controls', {
    * @returns {boolean} Whether button has changed in any way.
    */
   handleButton: function (id, buttonState) {
-    var changed = this.handlePress(id, buttonState) |
-                  this.handleTouch(id, buttonState) |
-                  this.handleValue(id, buttonState);
+    var changed;
+    changed = this.handlePress(id, buttonState) |
+              this.handleTouch(id, buttonState) |
+              this.handleValue(id, buttonState);
     if (!changed) { return false; }
-    this.el.emit('buttonchanged', {id: id, state: buttonState});
+    this.el.emit(EVENTS.BUTTONCHANGED, this.buttonEventDetails[id], false);
     return true;
   },
 
@@ -69634,7 +69654,7 @@ module.exports.Component = registerComponent('tracked-controls', {
     for (i = 0; i < controllerAxes.length; i++) {
       this.axis.push(controllerAxes[i]);
     }
-    this.el.emit('axismove', this.axisMoveEventDetail);
+    this.el.emit(EVENTS.AXISMOVE, this.axisMoveEventDetail, false);
     return true;
   },
 
@@ -69652,8 +69672,8 @@ module.exports.Component = registerComponent('tracked-controls', {
     // Not changed.
     if (buttonState.pressed === previousButtonState.pressed) { return false; }
 
-    evtName = buttonState.pressed ? 'down' : 'up';
-    this.el.emit('button' + evtName, {id: id, state: buttonState});
+    evtName = buttonState.pressed ? EVENTS.BUTTONDOWN : EVENTS.BUTTONUP;
+    this.el.emit(evtName, this.buttonEventDetails[id], false);
     previousButtonState.pressed = buttonState.pressed;
     return true;
   },
@@ -69672,9 +69692,8 @@ module.exports.Component = registerComponent('tracked-controls', {
     // Not changed.
     if (buttonState.touched === previousButtonState.touched) { return false; }
 
-    evtName = buttonState.touched ? 'start' : 'end';
-    // Due to unfortunate name collision, add empty touches array to avoid Daydream error.
-    this.el.emit('touch' + evtName, {id: id, state: buttonState}, true, {touches: []});
+    evtName = buttonState.touched ? EVENTS.TOUCHSTART : EVENTS.TOUCHEND;
+    this.el.emit(evtName, this.buttonEventDetails[id], false, EMPTY_DAYDREAM_TOUCHES);
     previousButtonState.touched = buttonState.touched;
     return true;
   },
@@ -76373,7 +76392,7 @@ _dereq_('./core/a-mixin');
 _dereq_('./extras/components/');
 _dereq_('./extras/primitives/');
 
-console.log('A-Frame Version: 0.8.2 (Date 2018-05-10, Commit #e4e40b0)');
+console.log('A-Frame Version: 0.8.2 (Date 2018-05-21, Commit #a8b9b4a)');
 console.log('three Version:', pkg.dependencies['three']);
 console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);
 
@@ -77953,6 +77972,9 @@ var extend = _dereq_('object-assign');
 
 var warn = debug('utils:coordinates:warn');
 
+// Order of coordinates parsed by coordinates.parse.
+var COORDINATE_KEYS = ['x', 'y', 'z', 'w'];
+
 // Coordinate string regex. Handles negative, positive, and decimals.
 var regex = /^\s*((-?\d*\.{0,1}\d+(e-?\d+)?)\s+){2,3}(-?\d*\.{0,1}\d+(e-?\d+)?)\s*$/;
 module.exports.regex = regex;
@@ -77970,26 +77992,34 @@ function parse (value, defaultVec) {
   var vec;
 
   if (value && value instanceof Object) {
-    if (defaultVec) {
-      value.x = value.x === undefined ? defaultVec.x : value.x;
-      value.y = value.y === undefined ? defaultVec.y : value.y;
-      value.z = value.z === undefined ? defaultVec.z : value.z;
-      value.w = value.w === undefined ? defaultVec.w : value.w;
-    }
-    return vecParseFloat(value);
+    var x = value.x === undefined ? defaultVec && defaultVec.x : value.x;
+    var y = value.y === undefined ? defaultVec && defaultVec.y : value.y;
+    var z = value.z === undefined ? defaultVec && defaultVec.z : value.z;
+    var w = value.w === undefined ? defaultVec && defaultVec.w : value.w;
+    if (x !== undefined) value.x = parseIfString(x);
+    if (y !== undefined) value.y = parseIfString(y);
+    if (z !== undefined) value.z = parseIfString(z);
+    if (w !== undefined) value.w = parseIfString(w);
+    return value;
   }
 
   if (value === null || value === undefined) {
     return typeof defaultVec === 'object' ? extend({}, defaultVec) : defaultVec;
   }
 
-  coordinate = value.trim().replace(/\s+/g, ' ').split(' ');
+  coordinate = value.trim().split(/\s+/g);
+
   vec = {};
-  vec.x = coordinate[0] || defaultVec && defaultVec.x;
-  vec.y = coordinate[1] || defaultVec && defaultVec.y;
-  vec.z = coordinate[2] || defaultVec && defaultVec.z;
-  vec.w = coordinate[3] || defaultVec && defaultVec.w;
-  return vecParseFloat(vec);
+  COORDINATE_KEYS.forEach(function (key, i) {
+    if (coordinate[i]) {
+      vec[key] = parseFloat(coordinate[i], 10);
+    } else {
+      var defaultVal = defaultVec && defaultVec[key];
+      if (defaultVal === undefined) { return; }
+      vec[key] = parseIfString(defaultVal);
+    }
+  });
+  return vec;
 }
 module.exports.parse = parse;
 
@@ -78019,18 +78049,11 @@ module.exports.isCoordinate = function (value) {
   return isCoordinates(value);
 };
 
-function vecParseFloat (vec) {
-  var key;
-  for (key in vec) {
-    if (vec[key] === undefined) {
-      delete vec[key];
-      continue;
-    }
-    if (vec[key].constructor === String) {
-      vec[key] = parseFloat(vec[key], 10);
-    }
+function parseIfString (val) {
+  if (val.constructor === String) {
+    return parseFloat(val, 10);
   }
-  return vec;
+  return val;
 }
 
 /**

support/client/lib/vwf/view/editor-new.js

@@ -745,12 +745,10 @@ define([
             let stateListElement = function (item) {
 
                 let liEl = {
-                    $type: "li",
-                    class: "mdc-list-item",
-                    role: "option",
+                    $type: "option",
                     id: "",
-                    tabindex: "0",
                     applicationpath: "",
+                    value: "no_saves",
                     $components: [
                         {
                             $text: "no saves"
@@ -775,11 +773,9 @@ define([
 
                 if (item.latestsave) {
                     liEl = {
-                        $type: "li",
-                        class: "mdc-list-item",
-                        role: "option",
-                        tabindex: "0",
+                        $type: "option",
                         id: item.savename,
+                        value: item.savename,
                         applicationpath: item.applicationpath,
                         $components: [
                             {
@@ -791,11 +787,9 @@ define([
                 }
                 else {
                     liEl = {
-                        $type: "li",
-                        class: "mdc-list-item",
-                        role: "option",
-                        tabindex: "0",
+                        $type: "option",
                         id: item.savename,
+                        value: item.savename,
                         revision: item.revision,
                         applicationpath: item.applicationpath,
                         $components: [
@@ -1050,8 +1044,6 @@ define([
                                                     
                                                     $type: "div",
                                                     class: "mdc-select",
-                                                    tabindex: "0",
-                                                    role: "listbox",
                                                     id: "loadselect",
                                                     $init: function () {
 
@@ -1060,9 +1052,9 @@ define([
                                                       // var MDCSelect = mdc.select.MDCSelect;
                                                       let selector = document.querySelector('#loadselect');
                                                         let select = new mdc.select.MDCSelect(document.querySelector('#loadselect'));
-                                                        this.addEventListener('MDCSelect:change', () => {
+                                                        select.listen('change', () => {
                                                             //this._selectedState = select.value;
-                                                            document.querySelector('#loadStateButton')._selectedState = select.selectedOptions[0];
+                                                            document.querySelector('#loadStateButton')._selectedState = select.nativeControl_[select.selectedIndex];
                                                             //console.log(select.value);
                                                             //.selectedOptions[0]
                                                         });
@@ -1073,37 +1065,27 @@ define([
 
                                                     },
                                                     $components: [
+                                                        {
+                                                            $type: "select",
+                                                            class: "mdc-select__native-control",
+                                                            $components: this._saveStates.map(stateListElement)
+                                                        },
+
                                                         {   
-                                                            $type: "div",
-                                                            class: "mdc-select__surface",
+                                                            $type: "label",
+                                                            class: "mdc-floating-label",
                                                             $components: [
                                                                 {
-                                                                    $type: "div",
-                                                                    class: "mdc-select__label",
                                                                     $text: "Select..."
-                                                                },
-                                                                {
-                                                                    $type: "div",
-                                                                    class: "mdc-select__selected-text"
-                                                                },
-                                                                {
-                                                                    $type: "div",
-                                                                    class: "mdc-select__bottom-line"
                                                                 }
                                                             ]
                                                         },
-                                                       
                                                         {
                                                             $type: "div",
-                                                            class: "mdc-menu mdc-select__menu",
-                                                            $components: [
-                                                                {
-                                                                    $type: "ul",
-                                                                    class: "mdc-list mdc-menu__items",
-                                                                    $components: this._saveStates.map(stateListElement)
-                                                                }
-                                                            ]
+                                                            class: "mdc-line-ripple"
                                                         }
+                                                       
+                                                       
 
                                                     ]
                                                 }

support/client/lib/vwf/view/lib/mdc/dist/material-components-web.css

@@ -77,7 +77,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   padding: 0 8px 0 8px;
   display: inline-flex;
@@ -342,7 +342,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   display: flex;
   flex-direction: column;
@@ -713,7 +713,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity; }
   .mdc-checkbox::before, .mdc-checkbox::after {
     position: absolute;
@@ -1063,7 +1063,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   border-radius: 16px;
   background-color: #e0e0e0;
@@ -1865,7 +1865,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   box-shadow: 0px 3px 5px -1px rgba(0, 0, 0, 0.2), 0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12);
   display: inline-flex;
@@ -2021,8 +2021,11 @@
   line-height: 1.15rem;
   cursor: text; }
   [dir="rtl"] .mdc-floating-label, .mdc-floating-label[dir="rtl"] {
+    /* @noflip */
     right: 0;
+    /* @noflip */
     left: auto;
+    /* @noflip */
     -webkit-transform-origin: right top;
             transform-origin: right top; }
 
@@ -2291,7 +2294,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   color: rgba(0, 0, 0, 0.87);
   /* @alternate */
@@ -3509,7 +3512,7 @@
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity; }
   :not(.mdc-list--non-interactive) > .mdc-list-item::before, :not(.mdc-list--non-interactive) > .mdc-list-item::after {
     position: absolute;
@@ -3828,7 +3831,7 @@ a.mdc-list-item {
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   display: inline-block;
   position: relative;
@@ -4031,7 +4034,7 @@ a.mdc-list-item {
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   position: relative;
   outline: none;
@@ -4244,7 +4247,7 @@ a.mdc-list-item {
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   height: 56px;
   border-radius: 4px 4px 0 0;
@@ -4408,7 +4411,7 @@ a.mdc-list-item {
   height: 48px;
   cursor: pointer;
   touch-action: pan-x;
-  -webkit-tap-highlight-color: transparent; }
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
   .mdc-slider:not(.mdc-slider--disabled) .mdc-slider__track {
     background-color: #018786;
     /* @alternate */
@@ -4800,6 +4803,9 @@ a.mdc-list-item {
     .mdc-switch__native-control:checked {
       -webkit-transform: translateX(14px);
               transform: translateX(14px); }
+      [dir="rtl"] .mdc-switch__native-control:checked, .mdc-switch__native-control:checked[dir="rtl"] {
+        -webkit-transform: translateX(-14px);
+                transform: translateX(-14px); }
 
 .mdc-switch__native-control:enabled:not(:checked) ~ .mdc-switch__background::before {
   background-color: #000; }
@@ -4850,10 +4856,13 @@ a.mdc-list-item {
 
 .mdc-switch__knob {
   box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  /* @noflip */
+  left: 0;
+  /* @noflip */
+  right: initial;
   display: block;
   position: absolute;
   top: -3px;
-  left: 0;
   width: 20px;
   height: 20px;
   -webkit-transform: translateX(0);
@@ -4863,6 +4872,11 @@ a.mdc-list-item {
   transition: transform 90ms cubic-bezier(0.4, 0, 0.2, 1), background-color 90ms cubic-bezier(0.4, 0, 0.2, 1), -webkit-transform 90ms cubic-bezier(0.4, 0, 0.2, 1);
   border-radius: 50%;
   z-index: 1; }
+  [dir="rtl"] .mdc-switch__knob, .mdc-switch__knob[dir="rtl"] {
+    /* @noflip */
+    left: initial;
+    /* @noflip */
+    right: 0; }
   .mdc-switch__knob::before {
     position: absolute;
     top: -14px;
@@ -4888,6 +4902,9 @@ a.mdc-list-item {
 .mdc-switch__native-control:checked ~ .mdc-switch__background .mdc-switch__knob {
   -webkit-transform: translateX(14px);
           transform: translateX(14px); }
+  [dir="rtl"] .mdc-switch__native-control:checked ~ .mdc-switch__background .mdc-switch__knob, .mdc-switch__native-control:checked ~ .mdc-switch__background .mdc-switch__knob[dir="rtl"] {
+    -webkit-transform: translateX(-14px);
+            transform: translateX(-14px); }
   .mdc-switch__native-control:checked ~ .mdc-switch__background .mdc-switch__knob::before {
     opacity: .15; }
 
@@ -4920,7 +4937,7 @@ a.mdc-list-item {
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   display: table-cell;
   position: relative;
@@ -5147,7 +5164,6 @@ a.mdc-list-item {
   margin: 0;
   transition: opacity 180ms cubic-bezier(0.4, 0, 0.2, 1);
   opacity: 0;
-  font-size: .75rem;
   will-change: opacity; }
   .mdc-text-field + .mdc-text-field-helper-text {
     margin-bottom: 8px; }
@@ -5327,7 +5343,7 @@ a.mdc-list-item {
   --mdc-ripple-fg-scale: 1;
   --mdc-ripple-fg-translate-end: 0;
   --mdc-ripple-fg-translate-start: 0;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   will-change: transform, opacity;
   border-radius: 4px 4px 0 0;
   display: inline-flex;
@@ -6440,7 +6456,7 @@ a.mdc-list-item {
     --mdc-ripple-fg-scale: 1;
     --mdc-ripple-fg-translate-end: 0;
     --mdc-ripple-fg-translate-start: 0;
-    -webkit-tap-highlight-color: transparent;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     will-change: transform, opacity;
     display: flex;
     position: relative;
@@ -6687,7 +6703,7 @@ a.mdc-list-item {
     --mdc-ripple-fg-scale: 1;
     --mdc-ripple-fg-translate-end: 0;
     --mdc-ripple-fg-translate-start: 0;
-    -webkit-tap-highlight-color: transparent;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     will-change: transform, opacity;
     display: flex;
     position: relative;
@@ -6894,7 +6910,7 @@ a.mdc-list-item {
   .mdc-top-app-bar--prominent .mdc-top-app-bar__title {
     padding-bottom: 6px; }
   .mdc-top-app-bar--fixed-adjust {
-    margin-top: 56px; } }
+    padding-top: 56px; } }
 
 .mdc-typography {
   font-family: Roboto, sans-serif;

support/client/lib/vwf/view/lib/mdc/dist/material-components-web.js

@@ -7684,6 +7684,7 @@ var MDCDialogFoundation = function (_MDCFoundation) {
     key: 'close',
     value: function close() {
       this.isOpen_ = false;
+      this.enableScroll_();
       this.adapter_.deregisterSurfaceInteractionHandler('click', this.dialogClickHandler_);
       this.adapter_.deregisterDocumentKeydownHandler(this.documentKeydownHandler_);
       this.adapter_.deregisterInteractionHandler('click', this.componentClickHandler_);
@@ -7734,8 +7735,6 @@ var MDCDialogFoundation = function (_MDCFoundation) {
         this.adapter_.removeClass(MDCDialogFoundation.cssClasses.ANIMATING);
         if (this.isOpen_) {
           this.adapter_.trapFocusOnSurface();
-        } else {
-          this.enableScroll_();
         };
       };
     }
@@ -7843,12 +7842,9 @@ var listeningFocusTrap = null;
 
 function focusTrap(element, userOptions) {
   var tabbableNodes = [];
-  var firstTabbableNode = null;
-  var lastTabbableNode = null;
   var nodeFocusedBeforeActivation = null;
   var active = false;
   var paused = false;
-  var tabEvent = null;
 
   var container = (typeof element === 'string')
     ? document.querySelector(element)
@@ -8026,10 +8022,6 @@ function focusTrap(element, userOptions) {
     e.stopImmediatePropagation();
     // Checking for a blur method here resolves a Firefox issue (#15)
     if (typeof e.target.blur === 'function') e.target.blur();
-
-    if (tabEvent) {
-      readjustFocus(tabEvent);
-    }
   }
 
   function checkKey(e) {
@@ -8043,14 +8035,11 @@ function focusTrap(element, userOptions) {
   }
 
   function handleTab(e) {
-    updateTabbableNodes();
-
-    if (e.target.hasAttribute('tabindex') && Number(e.target.getAttribute('tabindex')) < 0) {
-      return tabEvent = e;
-    }
-
     e.preventDefault();
+    updateTabbableNodes();
     var currentFocusIndex = tabbableNodes.indexOf(e.target);
+    var lastTabbableNode = tabbableNodes[tabbableNodes.length - 1];
+    var firstTabbableNode = tabbableNodes[0];
 
     if (e.shiftKey) {
       if (e.target === firstTabbableNode || tabbableNodes.indexOf(e.target) === -1) {
@@ -8066,14 +8055,6 @@ function focusTrap(element, userOptions) {
 
   function updateTabbableNodes() {
     tabbableNodes = tabbable(container);
-    firstTabbableNode = tabbableNodes[0];
-    lastTabbableNode = tabbableNodes[tabbableNodes.length - 1];
-  }
-
-  function readjustFocus(e) {
-    if (e.shiftKey) return tryFocus(lastTabbableNode);
-
-    tryFocus(firstTabbableNode);
   }
 }
 
@@ -8083,8 +8064,6 @@ function isEscapeEvent(e) {
 
 function tryFocus(node) {
   if (!node || !node.focus) return;
-  if (node === document.activeElement)  return;
-
   node.focus();
   if (node.tagName.toLowerCase() === 'input') {
     node.select();
@@ -8098,16 +8077,13 @@ module.exports = focusTrap;
 /* 55 */
 /***/ (function(module, exports) {
 
-module.exports = function(el, options) {
-  options = options || {};
-
-  var elementDocument = el.ownerDocument || el;
+module.exports = function(el) {
   var basicTabbables = [];
   var orderedTabbables = [];
 
   // A node is "available" if
   // - it's computed style
-  var isUnavailable = createIsUnavailable(elementDocument);
+  var isUnavailable = createIsUnavailable();
 
   var candidateSelectors = [
     'input',
@@ -8118,32 +8094,18 @@ module.exports = function(el, options) {
     '[tabindex]',
   ];
 
-  var candidates = el.querySelectorAll(candidateSelectors.join(','));
-
-  if (options.includeContainer) {
-    var matches = Element.prototype.matches || Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;
-
-    if (
-      candidateSelectors.some(function(candidateSelector) {
-        return matches.call(el, candidateSelector);
-      })
-    ) {
-      candidates = Array.prototype.slice.apply(candidates);
-      candidates.unshift(el);
-    }
-  }
+  var candidates = el.querySelectorAll(candidateSelectors);
 
-  var candidate, candidateIndexAttr, candidateIndex;
+  var candidate, candidateIndex;
   for (var i = 0, l = candidates.length; i < l; i++) {
     candidate = candidates[i];
-    candidateIndexAttr = parseInt(candidate.getAttribute('tabindex'), 10)
-    candidateIndex = isNaN(candidateIndexAttr) ? candidate.tabIndex : candidateIndexAttr;
+    candidateIndex = parseInt(candidate.getAttribute('tabindex'), 10) || candidate.tabIndex;
 
     if (
       candidateIndex < 0
       || (candidate.tagName === 'INPUT' && candidate.type === 'hidden')
       || candidate.disabled
-      || isUnavailable(candidate, elementDocument)
+      || isUnavailable(candidate)
     ) {
       continue;
     }
@@ -8152,7 +8114,6 @@ module.exports = function(el, options) {
       basicTabbables.push(candidate);
     } else {
       orderedTabbables.push({
-        index: i,
         tabIndex: candidateIndex,
         node: candidate,
       });
@@ -8161,7 +8122,7 @@ module.exports = function(el, options) {
 
   var tabbableNodes = orderedTabbables
     .sort(function(a, b) {
-      return a.tabIndex === b.tabIndex ? a.index - b.index : a.tabIndex - b.tabIndex;
+      return a.tabIndex - b.tabIndex;
     })
     .map(function(a) {
       return a.node
@@ -8172,7 +8133,7 @@ module.exports = function(el, options) {
   return tabbableNodes;
 }
 
-function createIsUnavailable(elementDocument) {
+function createIsUnavailable() {
   // Node cache must be refreshed on every check, in case
   // the content of the element has changed
   var isOffCache = [];
@@ -8183,14 +8144,14 @@ function createIsUnavailable(elementDocument) {
   // "off" state, so we need to recursively check parents.
 
   function isOff(node, nodeComputedStyle) {
-    if (node === elementDocument.documentElement) return false;
+    if (node === document.documentElement) return false;
 
     // Find the cached node (Array.prototype.find not available in IE9)
     for (var i = 0, length = isOffCache.length; i < length; i++) {
       if (isOffCache[i][0] === node) return isOffCache[i][1];
     }
 
-    nodeComputedStyle = nodeComputedStyle || elementDocument.defaultView.getComputedStyle(node);
+    nodeComputedStyle = nodeComputedStyle || window.getComputedStyle(node);
 
     var result = false;
 
@@ -8206,9 +8167,9 @@ function createIsUnavailable(elementDocument) {
   }
 
   return function isUnavailable(node) {
-    if (node === elementDocument.documentElement) return false;
+    if (node === document.documentElement) return false;
 
-    var computedStyle = elementDocument.defaultView.getComputedStyle(node);
+    var computedStyle = window.getComputedStyle(node);
 
     if (isOff(node, computedStyle)) return true;
 
@@ -18496,7 +18457,9 @@ var MDCTopAppBar = function (_MDCComponent) {
 
       // Get all icons in the toolbar and instantiate the ripples
       var icons = [].slice.call(this.root_.querySelectorAll(__WEBPACK_IMPORTED_MODULE_3__constants__["c" /* strings */].ACTION_ITEM_SELECTOR));
-      icons.push(this.navIcon_);
+      if (this.navIcon_) {
+        icons.push(this.navIcon_);
+      }
 
       this.iconRipples_ = icons.map(function (icon) {
         var ripple = rippleFactory(icon);