@jetbrains/ring-ui-built 7.0.0-beta.1 → 7.0.0-beta.3

package/components/global/composeRefs.js

@@ -1,26 +1,19 @@
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
 import memoizeOne from 'memoize-one';
-import deprecate from 'util-deprecate';
 
 function composeRefs() {
   for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
     refs[_key] = arguments[_key];
   }
-  return function (value) {
-    return refs.forEach(function (ref) {
-      if (typeof ref === 'function') {
-        ref(value);
-      } else if (ref != null) {
-        ref.current = value;
-      }
-    });
-  };
+  return value => refs.forEach(ref => {
+    if (typeof ref === 'function') {
+      ref(value);
+    } else if (ref != null) {
+      ref.current = value;
+    }
+  });
 }
-// TODO remove export in 7.0, composeRefs should be used only in createComposedRef and in useComposedRefs in the future
-var composeRefs$1 = deprecate(composeRefs, 'composeRefs is deprecated and will be removed in 7.0. Use createComposedRef instead.');
 function createComposedRef() {
   return memoizeOne(composeRefs);
 }
 
-export { createComposedRef, composeRefs$1 as default };
+export { createComposedRef };

package/components/global/controls-height.js

@@ -6,8 +6,8 @@ var ControlsHeight;
   ControlsHeight["M"] = "M";
   ControlsHeight["L"] = "L";
 })(ControlsHeight || (ControlsHeight = {}));
-var ControlsHeightContext = /*#__PURE__*/createContext(ControlsHeight.M);
-var globalControlsHeight = ControlsHeight.M;
+const ControlsHeightContext = /*#__PURE__*/createContext(ControlsHeight.M);
+let globalControlsHeight = ControlsHeight.M;
 // This can be used if React Context is not applicable, for example for alertService or Auth dialog
 function configureGlobalControlsHeight(value) {
   globalControlsHeight = value;

package/components/global/create-stateful-context.js

@@ -1,18 +1,17 @@
-import { i as _slicedToArray } from '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/web.dom-collections.iterator.js';
 import { memo, createContext, useState, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { jsx } from 'react/jsx-runtime';
 
 function createStatefulContext(initialValue) {
-  var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var ValueContext = /*#__PURE__*/createContext(initialValue);
-  var UpdateContext = /*#__PURE__*/createContext(function () {});
+  let name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  const ValueContext = /*#__PURE__*/createContext(initialValue);
+  const UpdateContext = /*#__PURE__*/createContext(() => {});
   function Provider(_ref) {
-    var children = _ref.children;
-    var _useState = useState(initialValue),
-      _useState2 = _slicedToArray(_useState, 2),
-      value = _useState2[0],
-      update = _useState2[1];
+    let {
+      children
+    } = _ref;
+    const [value, update] = useState(initialValue);
     return /*#__PURE__*/jsx(ValueContext.Provider, {
       value: value,
       children: /*#__PURE__*/jsx(UpdateContext.Provider, {
@@ -26,16 +25,18 @@ function createStatefulContext(initialValue) {
   };
   Provider.displayName = "".concat(name, "Provider");
   function useUpdate(value, skipUpdate) {
-    var update = useContext(UpdateContext);
-    useEffect(function () {
+    const update = useContext(UpdateContext);
+    useEffect(() => {
       if (!skipUpdate) {
         update(value);
       }
     }, [update, value, skipUpdate]);
   }
   function Updater(_ref2) {
-    var value = _ref2.value,
-      skipUpdate = _ref2.skipUpdate;
+    let {
+      value,
+      skipUpdate
+    } = _ref2;
     useUpdate(value, skipUpdate);
     return null;
   }

package/components/global/data-tests.js

@@ -1,29 +1,24 @@
-import { j as _toConsumableArray, i as _slicedToArray } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.reduce.js';
-import 'core-js/modules/es.object.entries.js';
-import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/web.dom-collections.iterator.js';
 
 function expandMap(attrsMap) {
-  return Object.entries(attrsMap).reduce(function (result, _ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      key = _ref2[0],
-      value = _ref2[1];
-    return value ? [].concat(_toConsumableArray(result), [key]) : result;
+  return Object.entries(attrsMap).reduce((result, _ref) => {
+    let [key, value] = _ref;
+    return value ? [...result, key] : result;
   }, []);
 }
 function joinDataTestAttributes() {
   for (var _len = arguments.length, attrs = new Array(_len), _key = 0; _key < _len; _key++) {
     attrs[_key] = arguments[_key];
   }
-  return attrs.reduce(function (result, attr) {
+  return attrs.reduce((result, attr) => {
     if (!attr) {
       return result;
     }
     if (typeof attr === 'object') {
-      return [].concat(_toConsumableArray(result), _toConsumableArray(expandMap(attr)));
+      return [...result, ...expandMap(attr)];
     }
-    return [].concat(_toConsumableArray(result), [attr]);
+    return [...result, attr];
   }, []).join(' ');
 }
 

package/components/global/dom.js

@@ -1,26 +1,18 @@
-import { i as _slicedToArray, b as _createClass, e as _classCallCheck, _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.array.filter.js';
-import 'core-js/modules/es.array.iterator.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.object.entries.js';
-import 'core-js/modules/es.object.to-string.js';
+import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.set.js';
-import 'core-js/modules/es.string.split.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 
 /**
  * @name DOM
  */
-var getStyles = window.getComputedStyle.bind(window);
+const getStyles = window.getComputedStyle.bind(window);
 function isMounted(node) {
   if (node === document) {
     return true;
   }
   return node instanceof Node && document.documentElement.contains(node.parentNode);
 }
-var rectStub = {
+const rectStub = {
   top: 0,
   right: 0,
   bottom: 0,
@@ -30,13 +22,14 @@ var rectStub = {
 };
 function getRect(node) {
   if (node instanceof Range || node != null && isMounted(node)) {
-    var _node$getBoundingClie = node.getBoundingClientRect(),
-      top = _node$getBoundingClie.top,
-      right = _node$getBoundingClie.right,
-      bottom = _node$getBoundingClie.bottom,
-      left = _node$getBoundingClie.left,
-      width = _node$getBoundingClie.width,
-      height = _node$getBoundingClie.height;
+    const {
+      top,
+      right,
+      bottom,
+      left,
+      width,
+      height
+    } = node.getBoundingClientRect();
     return {
       top,
       right,
@@ -59,11 +52,12 @@ function getWindowWidth() {
   return window.innerWidth;
 }
 function isNodeInVisiblePartOfPage(node) {
-  var _getRect = getRect(node),
-    top = _getRect.top,
-    bottom = _getRect.bottom,
-    left = _getRect.left,
-    right = _getRect.right;
+  const {
+    top,
+    bottom,
+    left,
+    right
+  } = getRect(node);
   return !(bottom < 0 || right < 0 || getWindowHeight() - top < 0 || getWindowWidth() - left < 0);
 }
 function getDocumentScrollTop() {
@@ -72,74 +66,47 @@ function getDocumentScrollTop() {
 function getDocumentScrollLeft() {
   return document.documentElement && document.documentElement.scrollLeft || document.body.scrollLeft;
 }
-var applyMethodToClasses = function applyMethodToClasses(method) {
-  return function (classList) {
-    var classes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    classes.split(/\s+/g).filter(function (className) {
-      return !!className;
-    }).forEach(function (className) {
-      return classList[method](className);
-    });
-  };
-};
-var addClasses = applyMethodToClasses('add');
-var removeClasses = applyMethodToClasses('remove');
-var toggleClasses = function toggleClasses(classList, classes) {
-  return Object.entries(classes).forEach(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      className = _ref2[0],
-      on = _ref2[1];
-    return classList.toggle(className, on);
-  });
+const applyMethodToClasses = method => function (classList) {
+  let classes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  classes.split(/\s+/g).filter(className => !!className).forEach(className => classList[method](className));
 };
+const addClasses = applyMethodToClasses('add');
+const removeClasses = applyMethodToClasses('remove');
+const toggleClasses = (classList, classes) => Object.entries(classes).forEach(_ref => {
+  let [className, on] = _ref;
+  return classList.toggle(className, on);
+});
 function setRootStyleProperties() {
-  var properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var rootStyle = document.documentElement.style;
-  Object.entries(properties).forEach(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-      key = _ref4[0],
-      value = _ref4[1];
+  let properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const rootStyle = document.documentElement.style;
+  Object.entries(properties).forEach(_ref2 => {
+    let [key, value] = _ref2;
     rootStyle.setProperty(key, value);
   });
 }
 function resetRootStyleProperties() {
-  var properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var rootStyle = document.documentElement.style;
-  Object.keys(properties).forEach(function (key) {
-    return rootStyle.removeProperty(key);
-  });
+  let properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const rootStyle = document.documentElement.style;
+  Object.keys(properties).forEach(key => rootStyle.removeProperty(key));
 }
-var Listeners = /*#__PURE__*/function () {
-  function Listeners() {
-    _classCallCheck(this, Listeners);
+class Listeners {
+  constructor() {
     _defineProperty(this, "_all", new Set());
   }
-  return _createClass(Listeners, [{
-    key: "add",
-    value: function add(el, event, handler, options) {
-      el.addEventListener(event, handler, options);
-      var dispatchFn = function dispatchFn() {
-        return el.removeEventListener(event, handler, options);
-      };
-      this._all.add(dispatchFn);
-      return dispatchFn;
-    }
-  }, {
-    key: "remove",
-    value: function remove(fn) {
-      fn();
-      this._all.delete(fn);
-    }
-  }, {
-    key: "removeAll",
-    value: function removeAll() {
-      var _this = this;
-      this._all.forEach(function (fn) {
-        return _this.remove(fn);
-      });
-    }
-  }]);
-}();
+  add(el, event, handler, options) {
+    el.addEventListener(event, handler, options);
+    const dispatchFn = () => el.removeEventListener(event, handler, options);
+    this._all.add(dispatchFn);
+    return dispatchFn;
+  }
+  remove(fn) {
+    fn();
+    this._all.delete(fn);
+  }
+  removeAll() {
+    this._all.forEach(fn => this.remove(fn));
+  }
+}
 // Synthetic events from Combokeys#trigger are plain objects
 function preventDefault(e) {
   if (e.preventDefault) {

package/components/global/focus-sensor-hoc.js

@@ -1,152 +1,145 @@
-import { d as _objectSpread2, c as _objectWithoutProperties, a as _inherits, b as _createClass, e as _classCallCheck, f as _callSuper, _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.array.concat.js';
+import { b as _objectSpread2, a as _objectWithoutProperties, _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/web.dom-collections.iterator.js';
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { refObject } from './prop-types.js';
 import { createComposedRef } from './composeRefs.js';
 import { jsx } from 'react/jsx-runtime';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
 import 'memoize-one';
-import 'util-deprecate';
 
-var _excluded = ["innerRef", "focused", "onFocusReset", "onFocusRestore"],
+const _excluded = ["innerRef", "focused", "onFocusReset", "onFocusRestore"],
   _excluded2 = ["autofocus", "focused", "onFocus", "onBlur", "innerRef", "scrollOnTableFocus"];
 function extractPropTypes(_ref) {
-  var propTypes = _ref.propTypes;
+  let {
+    propTypes
+  } = _ref;
   if (propTypes == null) {
     return propTypes;
   }
-  propTypes.innerRef;
-    propTypes.focused;
-    propTypes.onFocusReset;
-    propTypes.onFocusRestore;
-    var restPropTypes = _objectWithoutProperties(propTypes, _excluded);
+  const restPropTypes = _objectWithoutProperties(propTypes, _excluded);
   return restPropTypes;
 }
 function focusSensorHOC(ComposedComponent) {
-  var FocusSensor = /*#__PURE__*/function (_Component) {
-    function FocusSensor() {
-      var _this;
-      _classCallCheck(this, FocusSensor);
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      _this = _callSuper(this, FocusSensor, [].concat(args));
-      _defineProperty(_this, "state", {
-        focused: _this.props.focused
+  class FocusSensor extends Component {
+    constructor() {
+      super(...arguments);
+      _defineProperty(this, "state", {
+        focused: this.props.focused
       });
-      _defineProperty(_this, "node", void 0);
-      _defineProperty(_this, "_skipNextCapture", false);
-      _defineProperty(_this, "onRefUpdate", function (node) {
+      _defineProperty(this, "node", void 0);
+      _defineProperty(this, "_skipNextCapture", false);
+      _defineProperty(this, "onRefUpdate", node => {
         if (node) {
-          _this.node = node;
+          this.node = node;
         }
       });
-      _defineProperty(_this, "composedRef", createComposedRef());
-      _defineProperty(_this, "onFocusCapture", function (_ref2) {
+      _defineProperty(this, "composedRef", createComposedRef());
+      _defineProperty(this, "onFocusCapture", _ref2 => {
         var _this$node;
-        var target = _ref2.target;
-        if (_this._skipNextCapture) {
-          _this._skipNextCapture = false;
+        let {
+          target
+        } = _ref2;
+        if (this._skipNextCapture) {
+          this._skipNextCapture = false;
           return;
         }
-        var focused = target instanceof Node && ((_this$node = _this.node) === null || _this$node === void 0 ? void 0 : _this$node.contains(target));
-        if (focused && !_this.state.focused) {
+        const focused = target instanceof Node && ((_this$node = this.node) === null || _this$node === void 0 ? void 0 : _this$node.contains(target));
+        if (focused && !this.state.focused) {
           var _this$props$onFocus, _this$props;
-          _this.setState({
+          this.setState({
             focused: true
           });
-          (_this$props$onFocus = (_this$props = _this.props).onFocus) === null || _this$props$onFocus === void 0 || _this$props$onFocus.call(_this$props);
+          (_this$props$onFocus = (_this$props = this.props).onFocus) === null || _this$props$onFocus === void 0 || _this$props$onFocus.call(_this$props);
         }
       });
-      _defineProperty(_this, "onBlurCapture", function (_ref3) {
-        var target = _ref3.target;
-        var _this2 = _this,
-          focused = _this2.state.focused,
-          node = _this2.node;
+      _defineProperty(this, "onBlurCapture", _ref3 => {
+        let {
+          target
+        } = _ref3;
+        const {
+          state: {
+            focused
+          },
+          node
+        } = this;
         if (focused) {
-          setTimeout(function () {
-            var blurred = target instanceof Node && (node === null || node === void 0 ? void 0 : node.contains(target)) && !node.contains(document.activeElement);
+          setTimeout(() => {
+            const blurred = target instanceof Node && (node === null || node === void 0 ? void 0 : node.contains(target)) && !node.contains(document.activeElement);
             if (blurred) {
               var _this$props$onBlur, _this$props2;
-              _this.setState({
+              this.setState({
                 focused: false
               });
-              (_this$props$onBlur = (_this$props2 = _this.props).onBlur) === null || _this$props$onBlur === void 0 || _this$props$onBlur.call(_this$props2);
+              (_this$props$onBlur = (_this$props2 = this.props).onBlur) === null || _this$props$onBlur === void 0 || _this$props$onBlur.call(_this$props2);
             }
           }, 1);
         }
       });
-      _defineProperty(_this, "onFocusRestore", function () {
+      _defineProperty(this, "onFocusRestore", () => {
         var _this$node2;
-        _this._skipNextCapture = true;
-        (_this$node2 = _this.node) === null || _this$node2 === void 0 || _this$node2.focus({
-          preventScroll: !_this.props.scrollOnTableFocus
+        this._skipNextCapture = true;
+        (_this$node2 = this.node) === null || _this$node2 === void 0 || _this$node2.focus({
+          preventScroll: !this.props.scrollOnTableFocus
         });
       });
-      _defineProperty(_this, "onFocusReset", function () {
+      _defineProperty(this, "onFocusReset", () => {
         var _this$node3;
-        (_this$node3 = _this.node) === null || _this$node3 === void 0 || _this$node3.blur();
+        (_this$node3 = this.node) === null || _this$node3 === void 0 || _this$node3.blur();
       });
-      return _this;
     }
-    _inherits(FocusSensor, _Component);
-    return _createClass(FocusSensor, [{
-      key: "componentDidMount",
-      value: function componentDidMount() {
-        var _this$props3 = this.props,
-          autofocus = _this$props3.autofocus,
-          scrollOnTableFocus = _this$props3.scrollOnTableFocus,
-          node = this.node;
-        node === null || node === void 0 || node.setAttribute('tabindex', '0');
-        if (node != null) {
-          node.style.outline = 'none';
-        }
-        document.addEventListener('focus', this.onFocusCapture, true);
-        document.addEventListener('blur', this.onBlurCapture, true);
-        if (autofocus) {
-          node === null || node === void 0 || node.focus({
-            preventScroll: !scrollOnTableFocus
-          });
-        }
-      }
-    }, {
-      key: "componentDidUpdate",
-      value: function componentDidUpdate(prevProps) {
-        var focused = this.props.focused;
-        if (focused && !prevProps.focused) {
-          this.onFocusRestore();
-        } else if (!focused && prevProps.focused) {
-          this.onFocusReset();
-        }
+    componentDidMount() {
+      const {
+        props: {
+          autofocus,
+          scrollOnTableFocus
+        },
+        node
+      } = this;
+      node === null || node === void 0 || node.setAttribute('tabindex', '0');
+      if (node != null) {
+        node.style.outline = 'none';
       }
-    }, {
-      key: "componentWillUnmount",
-      value: function componentWillUnmount() {
-        document.removeEventListener('focus', this.onFocusCapture, true);
-        document.removeEventListener('blur', this.onBlurCapture, true);
+      document.addEventListener('focus', this.onFocusCapture, true);
+      document.addEventListener('blur', this.onBlurCapture, true);
+      if (autofocus) {
+        node === null || node === void 0 || node.focus({
+          preventScroll: !scrollOnTableFocus
+        });
       }
-    }, {
-      key: "render",
-      value: function render() {
-        var _this$props4 = this.props;
-          _this$props4.autofocus;
-          _this$props4.focused;
-          _this$props4.onFocus;
-          _this$props4.onBlur;
-          var innerRef = _this$props4.innerRef;
-          _this$props4.scrollOnTableFocus;
-          var rest = _objectWithoutProperties(_this$props4, _excluded2);
-        return /*#__PURE__*/jsx(ComposedComponent, _objectSpread2(_objectSpread2({}, rest), {}, {
-          innerRef: this.composedRef(innerRef, this.onRefUpdate),
-          focused: this.state.focused,
-          onFocusReset: this.onFocusReset,
-          onFocusRestore: this.onFocusRestore
-        }));
+    }
+    componentDidUpdate(prevProps) {
+      const {
+        focused
+      } = this.props;
+      if (focused && !prevProps.focused) {
+        this.onFocusRestore();
+      } else if (!focused && prevProps.focused) {
+        this.onFocusReset();
       }
-    }]);
-  }(Component);
+    }
+    componentWillUnmount() {
+      document.removeEventListener('focus', this.onFocusCapture, true);
+      document.removeEventListener('blur', this.onBlurCapture, true);
+    }
+    render() {
+      const _this$props3 = this.props,
+        {
+          autofocus,
+          focused,
+          onFocus,
+          onBlur,
+          innerRef,
+          scrollOnTableFocus
+        } = _this$props3,
+        rest = _objectWithoutProperties(_this$props3, _excluded2);
+      return /*#__PURE__*/jsx(ComposedComponent, _objectSpread2(_objectSpread2({}, rest), {}, {
+        innerRef: this.composedRef(innerRef, this.onRefUpdate),
+        focused: this.state.focused,
+        onFocusReset: this.onFocusReset,
+        onFocusRestore: this.onFocusRestore
+      }));
+    }
+  }
   FocusSensor.propTypes = _objectSpread2(_objectSpread2({}, extractPropTypes(ComposedComponent)), {}, {
     focused: PropTypes.bool,
     autofocus: PropTypes.bool,
@@ -158,8 +151,8 @@ function focusSensorHOC(ComposedComponent) {
     focused: false,
     autofocus: false,
     scrollOnTableFocus: true,
-    onFocus: function onFocus() {},
-    onBlur: function onBlur() {}
+    onFocus: () => {},
+    onBlur: () => {}
   });
   return FocusSensor;
 }

package/components/global/fuzzy-highlight.js

@@ -1,33 +1,22 @@
-import { k as _createForOfIteratorHelper } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.array.concat.js';
-import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.regexp.exec.js';
+import 'core-js/modules/web.dom-collections.iterator.js';
 
 /** https://github.com/bevacqua/fuzzysearch + highlighting with Markdown */
 function fuzzyHighlight(needle, haystack) {
-  var caseSensitive = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var ndl = caseSensitive ? needle : needle.toLowerCase();
-  var hstck = caseSensitive ? haystack : haystack.toLowerCase();
-  var result = function result(matched) {
-    var matches = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var highlight = haystack;
+  let caseSensitive = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  const ndl = caseSensitive ? needle : needle.toLowerCase();
+  const hstck = caseSensitive ? haystack : haystack.toLowerCase();
+  const result = function (matched) {
+    let matches = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    let highlight = haystack;
     if (matches.length > 0) {
       highlight = '';
-      var prevMatch = {
+      let prevMatch = {
         to: 0
       };
-      var _iterator = _createForOfIteratorHelper(matches),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var match = _step.value;
-          highlight += "".concat(haystack.slice(prevMatch.to, match.from), "**").concat(haystack.slice(match.from, match.to), "**");
-          prevMatch = match;
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+      for (const match of matches) {
+        highlight += "".concat(haystack.slice(prevMatch.to, match.from), "**").concat(haystack.slice(match.from, match.to), "**");
+        prevMatch = match;
       }
       highlight += haystack.slice(prevMatch.to);
     }
@@ -37,30 +26,30 @@ function fuzzyHighlight(needle, haystack) {
       highlight
     };
   };
-  var hlen = hstck.length;
-  var nlen = ndl.length;
+  const hlen = hstck.length;
+  const nlen = ndl.length;
   if (nlen > hlen) {
     return result(false);
   }
   if (nlen === hlen) {
-    var matched = ndl === hstck;
+    const matched = ndl === hstck;
     return result(matched, matched ? [{
       from: 0,
       to: haystack.length
     }] : []);
   }
-  var on = false;
-  var j = 0;
-  var matches = [];
-  var from = 0;
+  let on = false;
+  let j = 0;
+  const matches = [];
+  let from = 0;
   /* eslint-disable no-labels */
-  outer: for (var i = 0; i < nlen; i++) {
-    var nch = ndl[i];
+  outer: for (let i = 0; i < nlen; i++) {
+    const nch = ndl[i];
     while (j < hlen) {
-      var hch = hstck[j];
-      var match = hch === nch;
+      const hch = hstck[j];
+      const match = hch === nch;
       // Don't turn highlight on for space characters
-      var nextOn = match && /\S/.test(hch);
+      const nextOn = match && /\S/.test(hch);
       if (nextOn && !on) {
         from = j;
       } else if (!nextOn && on) {