@jetbrains/ring-ui-built 7.0.66 → 7.0.71

package/components/tab-trap/tab-trap.js

@@ -1,24 +1,19 @@
-import { a as _objectWithoutProperties, b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { forwardRef, useRef, useImperativeHandle, useCallback, useEffect } from 'react';
 import { isNodeInVisiblePartOfPage } from '../global/dom.js';
-import 'core-js/modules/es.regexp.exec.js';
 
 var styles = {"trapButton":"ring-tab-trap-trapButton"};
 
-const _excluded = ["children", "trapDisabled", "autoFocusFirst", "focusBackOnClose", "focusBackOnExit"];
 const FOCUSABLE_ELEMENTS = 'input, button, select, textarea, a[href], *[tabindex]:not([data-trap-button]):not([data-scrollable-container])';
 // eslint-disable-next-line @typescript-eslint/no-shadow
-const TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
-  let {
-      children,
-      trapDisabled = false,
-      autoFocusFirst = true,
-      focusBackOnClose = true,
-      focusBackOnExit = false
-    } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded);
+const TabTrap = /*#__PURE__*/forwardRef(function TabTrap({
+  children,
+  trapDisabled = false,
+  autoFocusFirst = true,
+  focusBackOnClose = true,
+  focusBackOnExit = false,
+  ...restProps
+}, ref) {
   const nodeRef = useRef(null);
   const trapButtonNodeRef = useRef(null);
   const previousFocusedNodeRef = useRef(null);
@@ -46,15 +41,13 @@ const TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
     if (autoFocusFirst) {
       focusFirst();
     } else if (!trapDisabled) {
-      var _nodeRef$current, _nodeRef$current2;
-      const previousFocusedElementIsInContainer = previousFocusedNodeRef.current && ((_nodeRef$current = nodeRef.current) === null || _nodeRef$current === void 0 ? void 0 : _nodeRef$current.contains(previousFocusedNodeRef.current));
+      const previousFocusedElementIsInContainer = previousFocusedNodeRef.current && nodeRef.current?.contains(previousFocusedNodeRef.current);
       // The component wrapped in TabTrap can already have a focused element (e.g. Date Picker),
       // so we need to check if it does. If so, we don't need to focus anything.
-      const currentlyFocusedElementIsInContainer = (_nodeRef$current2 = nodeRef.current) === null || _nodeRef$current2 === void 0 ? void 0 : _nodeRef$current2.contains(document.activeElement);
+      const currentlyFocusedElementIsInContainer = nodeRef.current?.contains(document.activeElement);
       if (!nodeRef.current || !previousFocusedElementIsInContainer && !currentlyFocusedElementIsInContainer) {
-        var _trapButtonNodeRef$cu;
         trapWithoutFocusRef.current = true;
-        (_trapButtonNodeRef$cu = trapButtonNodeRef.current) === null || _trapButtonNodeRef$cu === void 0 || _trapButtonNodeRef$cu.focus();
+        trapButtonNodeRef.current?.focus();
       }
     }
     return () => {
@@ -75,8 +68,7 @@ const TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
       }
     }
   }
-  function focusElement() {
-    let first = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  function focusElement(first = true) {
     const node = nodeRef.current;
     if (!node) {
       return;
@@ -101,7 +93,6 @@ const TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
     }
   }
   function handleBlurIfWithoutFocus(event) {
-    var _nodeRef$current3;
     if (!trapWithoutFocusRef.current) {
       return;
     }
@@ -110,21 +101,21 @@ const TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
     if (!newFocused) {
       return;
     }
-    if (newFocused instanceof Element && (_nodeRef$current3 = nodeRef.current) !== null && _nodeRef$current3 !== void 0 && _nodeRef$current3.contains(newFocused)) {
+    if (newFocused instanceof Element && nodeRef.current?.contains(newFocused)) {
       return;
     }
     focusLast();
   }
   if (trapDisabled) {
-    return jsx("div", _objectSpread2(_objectSpread2({
-      ref: nodeRef
-    }, restProps), {}, {
+    return jsx("div", {
+      ref: nodeRef,
+      ...restProps,
       children: children
-    }));
+    });
   }
-  return jsxs("div", _objectSpread2(_objectSpread2({
-    ref: nodeRef
-  }, restProps), {}, {
+  return jsxs("div", {
+    ref: nodeRef,
+    ...restProps,
     children: [jsx("div", {
       // It never actually stays focused
       // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
@@ -141,7 +132,7 @@ const TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
       onFocus: focusBackOnExit ? restoreFocus : focusFirst,
       "data-trap-button": true
     })]
-  }));
+  });
 });
 
 export { FOCUSABLE_ELEMENTS, TabTrap as default };

package/components/table/cell.js

@@ -1,19 +1,18 @@
-import { b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
 import { jsx } from 'react/jsx-runtime';
 import { PureComponent } from 'react';
 import classNames from 'classnames';
 import joinDataTestAttributes from '../global/data-tests.js';
 import { s as style } from '../_helpers/table.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 
 class Cell extends PureComponent {
   render() {
     const classes = classNames(style.cell, this.props.className);
-    return jsx("td", _objectSpread2(_objectSpread2({}, this.props), {}, {
+    return jsx("td", {
+      ...this.props,
       className: classes,
       "data-test": joinDataTestAttributes('ring-table-cell', this.props['data-test']),
       children: this.props.children
-    }));
+    });
   }
 }
 

package/components/table/disable-hover-hoc.js

@@ -1,32 +1,12 @@
-import { _ as _defineProperty, b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx } from 'react/jsx-runtime';
 import { PureComponent } from 'react';
 
 function disableHoverHOC(ComposedComponent) {
-  var _DisableHover;
-  return _DisableHover = class DisableHover extends PureComponent {
-    constructor() {
-      super(...arguments);
-      _defineProperty(this, "state", {
-        disabledHover: false
-      });
-      _defineProperty(this, "onMouseMove", () => {
-        if (this.state.disabledHover) {
-          this.setState({
-            disabledHover: false
-          });
-        }
-      });
-      _defineProperty(this, "onKeyDown", e => {
-        const metaKeys = [16, 17, 18, 19, 20, 91]; // eslint-disable-line @typescript-eslint/no-magic-numbers
-        if (!this.state.disabledHover && !metaKeys.includes(e.keyCode)) {
-          this.setState({
-            disabledHover: true
-          });
-        }
-      });
-    }
+  return class DisableHover extends PureComponent {
+    static defaultProps = ComposedComponent.defaultProps;
+    state = {
+      disabledHover: false
+    };
     componentDidMount() {
       document.addEventListener('mousemove', this.onMouseMove);
       document.addEventListener('keydown', this.onKeyDown, true);
@@ -35,12 +15,28 @@ function disableHoverHOC(ComposedComponent) {
       document.removeEventListener('mousemove', this.onMouseMove);
       document.removeEventListener('keydown', this.onKeyDown, true);
     }
+    onMouseMove = () => {
+      if (this.state.disabledHover) {
+        this.setState({
+          disabledHover: false
+        });
+      }
+    };
+    onKeyDown = e => {
+      const metaKeys = [16, 17, 18, 19, 20, 91]; // eslint-disable-line @typescript-eslint/no-magic-numbers
+      if (!this.state.disabledHover && !metaKeys.includes(e.keyCode)) {
+        this.setState({
+          disabledHover: true
+        });
+      }
+    };
     render() {
-      return jsx(ComposedComponent, _objectSpread2(_objectSpread2({}, this.props), {}, {
+      return jsx(ComposedComponent, {
+        ...this.props,
         disabledHover: this.state.disabledHover
-      }));
+      });
     }
-  }, _defineProperty(_DisableHover, "defaultProps", ComposedComponent.defaultProps), _DisableHover;
+  };
 }
 
 export { disableHoverHOC as default };

package/components/table/header-cell.js

@@ -1,5 +1,3 @@
-import { _ as _defineProperty, a as _objectWithoutProperties, b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { PureComponent } from 'react';
 import classNames from 'classnames';
@@ -11,44 +9,40 @@ import { s as style } from '../_helpers/table.js';
 import 'util-deprecate';
 import '../icon/icon.constants.js';
 import '../_helpers/icon-svg.js';
-import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.replace.js';
 import '../global/memoize.js';
 
-const _excluded = ["className", "column", "onSort", "sortKey", "sortOrder", "data-test"];
 class HeaderCell extends PureComponent {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "sortable", void 0);
-    _defineProperty(this, "sorted", void 0);
-    _defineProperty(this, "onClick", () => {
-      if (this.sortable) {
-        const {
-          column,
-          onSort,
-          sortOrder
-        } = this.props;
-        onSort({
-          column,
-          order: !(this.sorted && sortOrder)
-        });
-      }
-    });
-  }
+  static defaultProps = {
+    onSort: () => {}
+  };
+  sortable;
+  sorted;
+  onClick = () => {
+    if (this.sortable) {
+      const {
+        column,
+        onSort,
+        sortOrder
+      } = this.props;
+      onSort({
+        column,
+        order: !(this.sorted && sortOrder)
+      });
+    }
+  };
   onChildrenClick(e) {
     e.stopPropagation();
   }
   render() {
-    const _this$props = this.props,
-      {
-        className,
-        column,
-        onSort,
-        sortKey,
-        sortOrder,
-        'data-test': dataTest
-      } = _this$props,
-      restProps = _objectWithoutProperties(_this$props, _excluded);
+    const {
+      className,
+      column,
+      onSort,
+      sortKey,
+      sortOrder,
+      'data-test': dataTest,
+      ...restProps
+    } = this.props;
     this.sortable = column.sortable === true;
     this.sorted = sortKey === column.id;
     const glyph = this.sorted ? chevron12pxDown : sortableIcon;
@@ -59,7 +53,8 @@ class HeaderCell extends PureComponent {
       [style.sortedUp]: sortOrder && this.sorted,
       [style.cellRight]: column.rightAlign
     });
-    return jsxs("th", _objectSpread2(_objectSpread2({}, restProps), {}, {
+    return jsxs("th", {
+      ...restProps,
       className: classes,
       onClick: this.onClick,
       "data-test": joinDataTestAttributes('ring-table-header-cell', dataTest),
@@ -74,11 +69,8 @@ class HeaderCell extends PureComponent {
           className: style.icon
         })
       })]
-    }));
+    });
   }
 }
-_defineProperty(HeaderCell, "defaultProps", {
-  onSort: () => {}
-});
 
 export { HeaderCell as default };

package/components/table/header.js

@@ -1,5 +1,3 @@
-import { _ as _defineProperty, b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { PureComponent } from 'react';
 import classNames from 'classnames';
@@ -13,8 +11,6 @@ import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon.constants.js';
 import '../_helpers/icon-svg.js';
-import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.replace.js';
 import '../global/memoize.js';
 import '../global/compose-refs.js';
 import 'memoize-one';
@@ -24,15 +20,22 @@ import '@jetbrains/icons/chevron-12px-down';
 import '../global/data-tests.js';
 
 class Header extends PureComponent {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "id", getUID('table-header-'));
-    _defineProperty(this, "onCheckboxFocus", event => {
-      event.currentTarget.blur();
-    });
-  }
-  createCells() {
-    let widths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  static defaultProps = {
+    selectable: true,
+    draggable: false,
+    checked: true,
+    sticky: true,
+    topStickOffset: '0px',
+    onSort: () => {},
+    onCheckboxChange: () => {},
+    sortKey: 'id',
+    sortOrder: true
+  };
+  id = getUID('table-header-');
+  onCheckboxFocus = event => {
+    event.currentTarget.blur();
+  };
+  createCells(widths = []) {
     const {
       selectable,
       draggable,
@@ -66,11 +69,11 @@ class Header extends PureComponent {
         sortOrder,
         style: columnStyle
       };
-      return jsx(HeaderCell, _objectSpread2(_objectSpread2({
-        "data-test": column.id
-      }, props), {}, {
+      return jsx(HeaderCell, {
+        "data-test": column.id,
+        ...props,
         children: index === 0 && (draggable || selectable) && metaColumn
-      }), column.id);
+      }, column.id);
     });
   }
   render() {
@@ -106,16 +109,5 @@ class Header extends PureComponent {
     });
   }
 }
-_defineProperty(Header, "defaultProps", {
-  selectable: true,
-  draggable: false,
-  checked: true,
-  sticky: true,
-  topStickOffset: '0px',
-  onSort: () => {},
-  onCheckboxChange: () => {},
-  sortKey: 'id',
-  sortOrder: true
-});
 
 export { Header as default };

package/components/table/multitable.js

@@ -1,106 +1,7 @@
-import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx } from 'react/jsx-runtime';
 import { PureComponent, Children, cloneElement } from 'react';
 
 class MultiTable extends PureComponent {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "onUpPress", () => {
-      const {
-        children: tables
-      } = this.props;
-      const tableIndex = tables.findIndex(_ref => {
-        let {
-          props: {
-            selection
-          }
-        } = _ref;
-        return selection.getFocused();
-      });
-      const currentTable = tables[tableIndex].props;
-      const prevTable = tables[tableIndex - 1] ? tables[tableIndex - 1].props : null;
-      let newSelection = currentTable.selection.moveUp();
-      if (newSelection) {
-        var _currentTable$onSelec;
-        (_currentTable$onSelec = currentTable.onSelect) === null || _currentTable$onSelec === void 0 || _currentTable$onSelec.call(currentTable, newSelection);
-      } else if (prevTable) {
-        var _currentTable$onSelec2;
-        (_currentTable$onSelec2 = currentTable.onSelect) === null || _currentTable$onSelec2 === void 0 || _currentTable$onSelec2.call(currentTable, currentTable.selection.resetFocus());
-        newSelection = prevTable.selection.moveUp();
-        if (newSelection) {
-          var _prevTable$onSelect;
-          (_prevTable$onSelect = prevTable.onSelect) === null || _prevTable$onSelect === void 0 || _prevTable$onSelect.call(prevTable, newSelection);
-        }
-      }
-      return false;
-    });
-    _defineProperty(this, "onDownPress", () => {
-      const {
-        children: tables
-      } = this.props;
-      const tableIndex = tables.findIndex(_ref2 => {
-        let {
-          props: {
-            selection
-          }
-        } = _ref2;
-        return selection.getFocused();
-      });
-      const currentTable = tables[tableIndex].props;
-      const nextTable = tables[tableIndex + 1] ? tables[tableIndex + 1].props : null;
-      let newSelection = currentTable.selection.moveDown();
-      if (newSelection) {
-        var _currentTable$onSelec3;
-        (_currentTable$onSelec3 = currentTable.onSelect) === null || _currentTable$onSelec3 === void 0 || _currentTable$onSelec3.call(currentTable, newSelection);
-      } else if (nextTable) {
-        var _currentTable$onSelec4;
-        (_currentTable$onSelec4 = currentTable.onSelect) === null || _currentTable$onSelec4 === void 0 || _currentTable$onSelec4.call(currentTable, currentTable.selection.resetFocus());
-        newSelection = nextTable.selection.moveDown();
-        if (newSelection) {
-          var _nextTable$onSelect;
-          (_nextTable$onSelect = nextTable.onSelect) === null || _nextTable$onSelect === void 0 || _nextTable$onSelect.call(nextTable, newSelection);
-        }
-      }
-      return false;
-    });
-    _defineProperty(this, "onEscPress", () => {
-      const {
-        children
-      } = this.props;
-      Children.forEach(children, _ref3 => {
-        let {
-          props: {
-            selection,
-            onSelect
-          }
-        } = _ref3;
-        onSelect === null || onSelect === void 0 || onSelect(selection.reset());
-      });
-    });
-    _defineProperty(this, "onCmdAPress", () => {
-      const {
-        children
-      } = this.props;
-      Children.forEach(children, _ref4 => {
-        let {
-          props: {
-            selection,
-            onSelect
-          }
-        } = _ref4;
-        onSelect === null || onSelect === void 0 || onSelect(selection.selectAll());
-      });
-      return false;
-    });
-    _defineProperty(this, "shortcuts", {
-      up: this.onUpPress,
-      down: this.onDownPress,
-      esc: this.onEscPress,
-      'command+a': this.onCmdAPress,
-      'ctrl+a': this.onCmdAPress
-    });
-  }
   componentDidUpdate(prevProps) {
     if (prevProps.children) {
       const prevSelections = prevProps.children.map(element => element.props.selection);
@@ -109,11 +10,90 @@ class MultiTable extends PureComponent {
       const currentSelections = this.props.children.map(element => element.props.selection);
       const currentFocused = currentSelections.filter(selection => selection.getFocused());
       if (currentFocused.includes(prevFocused)) {
-        var _prevProps$children$p, _prevProps$children$p2;
-        (_prevProps$children$p = (_prevProps$children$p2 = prevProps.children[prevFocusedIndex].props).onSelect) === null || _prevProps$children$p === void 0 || _prevProps$children$p.call(_prevProps$children$p2, prevFocused.resetFocus());
+        prevProps.children[prevFocusedIndex].props.onSelect?.(prevFocused.resetFocus());
       }
     }
   }
+  onUpPress = () => {
+    const {
+      children: tables
+    } = this.props;
+    const tableIndex = tables.findIndex(({
+      props: {
+        selection
+      }
+    }) => selection.getFocused());
+    const currentTable = tables[tableIndex].props;
+    const prevTable = tables[tableIndex - 1] ? tables[tableIndex - 1].props : null;
+    let newSelection = currentTable.selection.moveUp();
+    if (newSelection) {
+      currentTable.onSelect?.(newSelection);
+    } else if (prevTable) {
+      currentTable.onSelect?.(currentTable.selection.resetFocus());
+      newSelection = prevTable.selection.moveUp();
+      if (newSelection) {
+        prevTable.onSelect?.(newSelection);
+      }
+    }
+    return false;
+  };
+  onDownPress = () => {
+    const {
+      children: tables
+    } = this.props;
+    const tableIndex = tables.findIndex(({
+      props: {
+        selection
+      }
+    }) => selection.getFocused());
+    const currentTable = tables[tableIndex].props;
+    const nextTable = tables[tableIndex + 1] ? tables[tableIndex + 1].props : null;
+    let newSelection = currentTable.selection.moveDown();
+    if (newSelection) {
+      currentTable.onSelect?.(newSelection);
+    } else if (nextTable) {
+      currentTable.onSelect?.(currentTable.selection.resetFocus());
+      newSelection = nextTable.selection.moveDown();
+      if (newSelection) {
+        nextTable.onSelect?.(newSelection);
+      }
+    }
+    return false;
+  };
+  onEscPress = () => {
+    const {
+      children
+    } = this.props;
+    Children.forEach(children, ({
+      props: {
+        selection,
+        onSelect
+      }
+    }) => {
+      onSelect?.(selection.reset());
+    });
+  };
+  onCmdAPress = () => {
+    const {
+      children
+    } = this.props;
+    Children.forEach(children, ({
+      props: {
+        selection,
+        onSelect
+      }
+    }) => {
+      onSelect?.(selection.selectAll());
+    });
+    return false;
+  };
+  shortcuts = {
+    up: this.onUpPress,
+    down: this.onDownPress,
+    esc: this.onEscPress,
+    'command+a': this.onCmdAPress,
+    'ctrl+a': this.onCmdAPress
+  };
   render() {
     return jsx("div", {
       "data-test": 'ring-multitable',

package/components/table/row-with-focus-sensor.js

@@ -1,5 +1,3 @@
-import { _ as _defineProperty, b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx } from 'react/jsx-runtime';
 import { PureComponent } from 'react';
 import focusSensorHOC from '../global/focus-sensor-hoc.js';
@@ -17,8 +15,6 @@ import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon.constants.js';
 import '../_helpers/icon-svg.js';
-import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.replace.js';
 import '../global/memoize.js';
 import '../control-help/control-help.js';
 import '../button/button.js';
@@ -41,7 +37,6 @@ import 'sniffr';
 import '../global/data-tests.js';
 import '../tab-trap/tab-trap.js';
 import '../popup/position.js';
-import 'core-js/modules/es.array.sort.js';
 import '../popup/popup.consts.js';
 import '../popup/popup.target.js';
 import '../popup/position-css.js';
@@ -51,34 +46,28 @@ import '../_helpers/table.js';
 
 const getContainer = () => focusSensorHOC(Row);
 class RowWithFocusSensorCallbacks extends PureComponent {
-  constructor() {
-    super(...arguments);
-    // https://stackoverflow.com/a/53882322/6304152
-    _defineProperty(this, "RowWithFocusSensor", getContainer());
-    _defineProperty(this, "onFocus", () => {
-      var _this$props$onFocus, _this$props;
-      (_this$props$onFocus = (_this$props = this.props).onFocus) === null || _this$props$onFocus === void 0 || _this$props$onFocus.call(_this$props, this.props.item);
-    });
-    _defineProperty(this, "onSelect", (item, selected) => {
-      var _this$props$onSelect, _this$props2;
-      (_this$props$onSelect = (_this$props2 = this.props).onSelect) === null || _this$props$onSelect === void 0 || _this$props$onSelect.call(_this$props2, item, selected);
-    });
-    _defineProperty(this, "onCollapse", () => {
-      var _this$props$onCollaps, _this$props3;
-      (_this$props$onCollaps = (_this$props3 = this.props).onCollapse) === null || _this$props$onCollaps === void 0 || _this$props$onCollaps.call(_this$props3, this.props.item);
-    });
-    _defineProperty(this, "onExpand", () => {
-      var _this$props$onExpand, _this$props4;
-      (_this$props$onExpand = (_this$props4 = this.props).onExpand) === null || _this$props$onExpand === void 0 || _this$props$onExpand.call(_this$props4, this.props.item);
-    });
-  }
+  // https://stackoverflow.com/a/53882322/6304152
+  RowWithFocusSensor = getContainer();
+  onFocus = () => {
+    this.props.onFocus?.(this.props.item);
+  };
+  onSelect = (item, selected) => {
+    this.props.onSelect?.(item, selected);
+  };
+  onCollapse = () => {
+    this.props.onCollapse?.(this.props.item);
+  };
+  onExpand = () => {
+    this.props.onExpand?.(this.props.item);
+  };
   render() {
-    return jsx(this.RowWithFocusSensor, _objectSpread2(_objectSpread2({}, this.props), {}, {
+    return jsx(this.RowWithFocusSensor, {
+      ...this.props,
       onFocus: this.onFocus,
       onSelect: this.onSelect,
       onCollapse: this.onCollapse,
       onExpand: this.onExpand
-    }));
+    });
   }
 }