@splunk/react-ui 5.0.0-beta.5 → 5.0.0-rc.2

package/JSONTree.js

@@ -6,7 +6,7 @@
         /***/ (e, n, r) => {
             // EXPORTS
             r.d(n, {
-                default: () => /* reexport */ re
+                default: () => /* reexport */ ee
             });
             // UNUSED EXPORTS: TreeItem
             // EXTERNAL MODULE: external "react"
@@ -15,38 +15,32 @@
             // EXTERNAL MODULE: external "prop-types"
                         var a = r(23);
             var l =  r.n(a);
-            // EXTERNAL MODULE: external "@splunk/ui-utils/keyboard"
-                        var i = r(5295);
             // CONCATENATED MODULE: ./src/Tree/TreeContext.tsx
-            var u =  (0, t.createContext)({
+            var i =  (0, t.createContext)({
                 defaultIndent: true
             });
-            /* harmony default export */            const c = u;
+            /* harmony default export */            const u = i;
             // EXTERNAL MODULE: external "styled-components"
-                        var f = r(232);
-            var d =  r.n(f);
+                        var c = r(232);
+            var d =  r.n(c);
             // EXTERNAL MODULE: external "@splunk/themes"
-                        var s = r(3563);
+                        var f = r(3563);
             // CONCATENATED MODULE: ./src/Tree/TreeItemStyles.ts
-            var v = d().span.withConfig({
-                displayName: "TreeItemStyles__StyledTreeItemContent",
-                componentId: "ie7zrw-0"
-            })([ "font-family:inherit;" ]);
-            var p = d().span.withConfig({
+            var s = d().span.withConfig({
                 displayName: "TreeItemStyles__StyledTreeItemNode",
-                componentId: "ie7zrw-1"
-            })([ "&:focus{box-shadow:", ";outline:0;&:active{box-shadow:none;}}" ], s.variables.focusShadow);
+                componentId: "ie7zrw-0"
+            })([ "padding:", ";&:focus{box-shadow:", ";outline:0;&:active{box-shadow:none;}}" ], f.variables.spacingXSmall, f.variables.focusShadowInset);
             // CONCATENATED MODULE: ./src/Tree/TreeStyles.ts
-            var y = d().ul.withConfig({
+            var v = d().ul.withConfig({
                 displayName: "TreeStyles__StyledUnorderedList",
                 componentId: "sc-13pokwt-0"
-            })([ "", ";color:inherit;font-family:inherit;list-style:none;white-space:inherit;", ";" ], s.mixins.reset("ul"), (function(e) {
+            })([ "", ";color:inherit;font-family:inherit;list-style:none;white-space:inherit;", ";" ], f.mixins.reset("ul"), (function(e) {
                 var n = e.$defaultIndent;
-                return n && (0, f.css)([ "padding-inline-start:", ";" ], s.variables.spacingXXXLarge);
+                return n && (0, c.css)([ "padding-inline-start:", ";" ], f.variables.spacingXXXLarge);
             }));
             // CONCATENATED MODULE: ./src/Tree/TreeItem.tsx
-            function m() {
-                return m = Object.assign ? Object.assign.bind() : function(e) {
+            function p() {
+                return p = Object.assign ? Object.assign.bind() : function(e) {
                     for (var n = 1; n < arguments.length; n++) {
                         var r = arguments[n];
                         for (var t in r) {
@@ -54,29 +48,29 @@
                         }
                     }
                     return e;
-                }, m.apply(null, arguments);
+                }, p.apply(null, arguments);
             }
-            function b(e, n) {
-                return k(e) || w(e, n) || g(e, n) || h();
+            function y(e, n) {
+                return S(e) || g(e, n) || b(e, n) || m();
             }
-            function h() {
+            function m() {
                 throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
             }
-            function g(e, n) {
+            function b(e, n) {
                 if (e) {
-                    if ("string" == typeof e) return S(e, n);
+                    if ("string" == typeof e) return h(e, n);
                     var r = {}.toString.call(e).slice(8, -1);
-                    return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? S(e, n) : void 0;
+                    return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? h(e, n) : void 0;
                 }
             }
-            function S(e, n) {
+            function h(e, n) {
                 (null == n || n > e.length) && (n = e.length);
                 for (var r = 0, t = Array(n); r < n; r++) {
                     t[r] = e[r];
                 }
                 return t;
             }
-            function w(e, n) {
+            function g(e, n) {
                 var r = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
                 if (null != r) {
                     var t, o, a, l, i = [], u = !0, c = !1;
@@ -98,12 +92,12 @@
                     return i;
                 }
             }
-            function k(e) {
+            function S(e) {
                 if (Array.isArray(e)) return e;
             }
-            function x(e, n) {
+            function w(e, n) {
                 if (null == e) return {};
-                var r, t, o = O(e, n);
+                var r, t, o = k(e, n);
                 if (Object.getOwnPropertySymbols) {
                     var a = Object.getOwnPropertySymbols(e);
                     for (t = 0; t < a.length; t++) {
@@ -112,7 +106,7 @@
                 }
                 return o;
             }
-            function O(e, n) {
+            function k(e, n) {
                 if (null == e) return {};
                 var r = {};
                 for (var t in e) {
@@ -123,7 +117,7 @@
                 }
                 return r;
             }
-            var I = {
+            var x = {
                 id: l().string,
                 children: l().node,
                 content: l().node,
@@ -136,120 +130,120 @@
                 open: l().bool,
                 toggle: l().node
             };
-            function E(e) {
-                var n = e.id, r = e.children, a = e.content, l = e.customIndent, i = e.endAdornment, u = e.labelledBy, f = e.onFocus, d = e.onKeyDown, s = e.onToggle, h = e.open, g = h === void 0 ? true : h, S = e.toggle, w = x(e, [ "id", "children", "content", "customIndent", "endAdornment", "labelledBy", "onFocus", "onKeyDown", "onToggle", "open", "toggle" ]);
-                var k = (0, t.useContext)(c), O = k.defaultIndent, I = O === void 0 ? true : O, E = k.onItemKeyDown, j = k.onItemClick, C = k.removeNode, A = k.setNode, T = k.itemPaths, P = k.focusedItemId;
-                var R = (0, t.useState)(g), K = b(R, 2), _ = K[0], N = K[1];
+            function O(e) {
+                var n = e.id, r = e.children, a = e.content, l = e.customIndent, i = e.endAdornment, c = e.labelledBy, d = e.onFocus, f = e.onKeyDown, m = e.onToggle, b = e.open, h = b === void 0 ? true : b, g = e.toggle, S = w(e, [ "id", "children", "content", "customIndent", "endAdornment", "labelledBy", "onFocus", "onKeyDown", "onToggle", "open", "toggle" ]);
+                var k = (0, t.useContext)(u), x = k.defaultIndent, O = x === void 0 ? true : x, I = k.onItemKeyDown, E = k.onItemClick, j = k.removeNode, C = k.setNode, A = k.itemPaths, T = k.focusedItemId;
+                var P = (0, t.useState)(h), R = y(P, 2), K = R[0], _ = R[1];
  // make first tree item tabbable
-                                var D = (0, t.useState)((T === null || T === void 0 ? void 0 : T.get("".concat(n))) === "0" ? 0 : -1), V = b(D, 2), L = V[0], q = V[1];
+                                var D = (0, t.useState)((A === null || A === void 0 ? void 0 : A.get("".concat(n))) === "0" ? 0 : -1), N = y(D, 2), V = N[0], L = N[1];
                 var F = (0, t.useRef)(null);
-                var M = (0, t.useRef)(null);
-                var $ = t.Children.toArray(r).filter(t.isValidElement);
-                $.forEach((function(e, r) {
+                var q = (0, t.useRef)(null);
+                var M = t.Children.toArray(r).filter(t.isValidElement);
+                M.forEach((function(e, r) {
                     if (e.props.id) {
-                        if (_ && A) {
-                            A("".concat(e.props.id), "".concat(T === null || T === void 0 ? void 0 : T.get("".concat(n)), "-").concat(r));
-                        } else if (C) {
-                            C(e.props.id);
+                        if (K && C) {
+                            C("".concat(e.props.id), "".concat(A === null || A === void 0 ? void 0 : A.get("".concat(n)), "-").concat(r));
+                        } else if (j) {
+                            j(e.props.id);
                         }
                     }
                 }));
-                var J = function e(n, r) {
-                    N(n);
-                    s === null || s === void 0 ? void 0 : s(n, r);
+                var $ = function e(n, r) {
+                    _(n);
+                    m === null || m === void 0 ? void 0 : m(n, r);
                 };
-                var B = function e(r) {
-                    j === null || j === void 0 ? void 0 : j(r, n);
+                var J = function e(r) {
+                    E === null || E === void 0 ? void 0 : E(r, n);
                 };
-                var U = function e(n) {
+                var B = function e(n) {
                     var r;
                     n.stopPropagation();
                     F === null || F === void 0 ? void 0 : (r = F.current) === null || r === void 0 ? void 0 : r.focus();
-                    f === null || f === void 0 ? void 0 : f(n);
+                    d === null || d === void 0 ? void 0 : d(n);
                 };
-                var G = function e() {
-                    if ((T === null || T === void 0 ? void 0 : T.get("".concat(n))) === "0") {
-                        q(0);
+                var U = function e() {
+                    if ((A === null || A === void 0 ? void 0 : A.get("".concat(n))) === "0") {
+                        L(0);
                     }
                 };
                 (0, t.useEffect)((function() {
-                    if (P === n) {
+                    if (T === n) {
                         var e;
-                        M === null || M === void 0 ? void 0 : (e = M.current) === null || e === void 0 ? void 0 : e.focus();
+                        q === null || q === void 0 ? void 0 : (e = q.current) === null || e === void 0 ? void 0 : e.focus();
                     }
-                }), [ P, M ]);
+                }), [ T, q ]);
                 var X = function e(n) {
                     n.stopPropagation();
                 };
-                var z = function e(r) {
+                var G = function e(r) {
                     r.stopPropagation();
                     // Used to ensure first item in Tree is tab navigable, i.e. in JSONTree when focus is manually set to the root item,
                     // this allows user to tab backwards to previous item. Tab index is reset to 0 onBlur.
-                                        if (r.shiftKey && r.key === "Tab" && (T === null || T === void 0 ? void 0 : T.get("".concat(n))) === "0") {
-                        q(-1);
+                                        if (r.shiftKey && r.key === "Tab" && (A === null || A === void 0 ? void 0 : A.get("".concat(n))) === "0") {
+                        L(-1);
                     }
-                    E === null || E === void 0 ? void 0 : E(r, n, _, $, J);
-                    d === null || d === void 0 ? void 0 : d(r);
+                    I === null || I === void 0 ? void 0 : I(r, n, K, M, $);
+                    f === null || f === void 0 ? void 0 : f(r);
                 };
                 var H = function e() {
-                    if (!S) {
+                    if (!g) {
                         return undefined;
                     }
                     
-                    return (0, t.cloneElement)(S, {
+                    return (0, t.cloneElement)(g, {
                         onClick: function e(n) {
                             var r, t;
-                            J(!_, n);
-                            B(n);
-                            (r = (t = S.props).onClick) === null || r === void 0 ? void 0 : r.call(t, n);
+                            $(!K, n);
+                            J(n);
+                            (r = (t = g.props).onClick) === null || r === void 0 ? void 0 : r.call(t, n);
                         },
-                        "aria-expanded": _
+                        "aria-expanded": K
                     });
                 };
                 
-                return o().createElement("li", m({}, w, {
-                    ref: M,
-                    tabIndex: L,
-                    onBlur: G,
-                    onFocus: U,
-                    onKeyDown: z,
+                return o().createElement("li", p({}, S, {
+                    ref: q,
+                    tabIndex: V,
+                    onBlur: U,
+                    onFocus: B,
+                    onKeyDown: G,
                     role: "treeitem",
-                    "aria-labelledby": u,
-                    "aria-expanded": $.length ? _ : undefined
-                }), l,  o().createElement(p, {
+                    "aria-labelledby": c,
+                    "aria-expanded": M.length ? K : undefined
+                }), l,  o().createElement(s, {
                     ref: F,
                     tabIndex: -1,
                     onFocus: X,
-                    onClick: B
-                },  o().createElement(v, null, a), H(), !_ && i), _ &&  o().createElement(o().Fragment, null,  o().createElement(y, {
+                    onClick: J
+                }, a, H(), !K && i), K &&  o().createElement(o().Fragment, null,  o().createElement(v, {
                     role: "group",
-                    $defaultIndent: I
+                    $defaultIndent: O
                 }, r), i));
             }
-            E.propTypes = I;
-            /* harmony default export */            const j = E;
+            O.propTypes = x;
+            /* harmony default export */            const I = O;
             // CONCATENATED MODULE: ./src/Tree/treeUtils.ts
-            function C(e, n) {
-                return K(e) || R(e, n) || T(e, n) || A();
+            function E(e, n) {
+                return P(e) || T(e, n) || C(e, n) || j();
             }
-            function A() {
+            function j() {
                 throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
             }
-            function T(e, n) {
+            function C(e, n) {
                 if (e) {
-                    if ("string" == typeof e) return P(e, n);
+                    if ("string" == typeof e) return A(e, n);
                     var r = {}.toString.call(e).slice(8, -1);
-                    return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? P(e, n) : void 0;
+                    return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? A(e, n) : void 0;
                 }
             }
-            function P(e, n) {
+            function A(e, n) {
                 (null == n || n > e.length) && (n = e.length);
                 for (var r = 0, t = Array(n); r < n; r++) {
                     t[r] = e[r];
                 }
                 return t;
             }
-            function R(e, n) {
+            function T(e, n) {
                 var r = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
                 if (null != r) {
                     var t, o, a, l, i = [], u = !0, c = !1;
@@ -271,145 +265,145 @@
                     return i;
                 }
             }
-            function K(e) {
+            function P(e) {
                 if (Array.isArray(e)) return e;
             }
             /**
  * A helper function to get first key in Map that matches given value
- */            function _(e, n) {
+ */            function R(e, n) {
                 var r;
                 var t = Array.from(e.entries());
                 return (r = t.find((function(e) {
-                    var r = C(e, 2), t = r[1];
+                    var r = E(e, 2), t = r[1];
                     return t === n;
                 }))) === null || r === void 0 ? void 0 : r[0];
             }
             /**
  * A helper function to get parent path of current item path
- */            function N(e) {
+ */            function K(e) {
                 // remove last index number of the current item path string to get parent
                 return e.split("-").slice(0, -1).join("-");
             }
             /**
  * A helper function to get next path of current item path in same level
- */            function D(e, n) {
+ */            function _(e, n) {
                 return e === null || e === void 0 ? void 0 : e.replace(/([^-]*)$/, "".concat(n + 1));
             }
             /**
  * A helper function to get the last index number of an item path string
- */            function V(e) {
+ */            function D(e) {
                 var n = e.split("-").pop();
                 if (!n) {
                     return 0;
                 }
                 return parseInt(n, 10) || 0;
             }
-            function L(e, n) {
+            function N(e, n) {
                 var r = e.get(n);
                 if (!r) {
                     return n;
                 }
-                var t = N(r);
-                return _(e, t) || n;
+                var t = K(r);
+                return R(e, t) || n;
             }
             /**
  * A helper function for getNextTreeItem
- */            function q(e, n) {
-                var r = N(n);
+ */            function V(e, n) {
+                var r = K(n);
                 if (!r) {
-                    return _(e, n);
+                    return R(e, n);
                 }
                 // get next node in the parent level
-                                var t = V(r);
-                var o = D(r, t);
-                var a = _(e, o);
+                                var t = D(r);
+                var o = _(r, t);
+                var a = R(e, o);
                 if (a) {
                     return a;
                 }
                 // continue getting parents until find next node or reach root
-                                return q(e, o);
+                                return V(e, o);
             }
-            function F(e, n) {
+            function L(e, n) {
                 var r = e.get(n);
                 if (!r) {
                     return n;
                 }
                 // case where next tree item is the first visible child
-                                var t = _(e, "".concat(r, "-0"));
+                                var t = R(e, "".concat(r, "-0"));
                 if (t) {
                     return t;
                 }
                 // case where next tree item is the next node in the same level
-                                var o = V(r);
-                var a = D(r, o);
-                var l = _(e, a);
+                                var o = D(r);
+                var a = _(r, o);
+                var l = R(e, a);
                 if (l) {
                     return l;
                 }
                 // case where next tree item is a higher level or does not exist
-                                return q(e, r) || n;
+                                return V(e, r) || n;
             }
             /**
  * A helper function for getPrevTreeItem
- */            function M(e, n) {
-                var r = _(e, "".concat(n, "-0"));
+ */            function F(e, n) {
+                var r = R(e, "".concat(n, "-0"));
                 if (!r) {
-                    return _(e, n);
+                    return R(e, n);
                 }
-                var t = _(e, n);
+                var t = R(e, n);
                 var o = "".concat(n, "-0");
                 // get the last child in current node, and continue to find its children recursively
                                 while (t) {
-                    var a = V(o);
-                    var l = D(o, a);
-                    t = _(e, l);
+                    var a = D(o);
+                    var l = _(o, a);
+                    t = R(e, l);
                     if (t) {
                         o = l;
                     }
                 }
-                return M(e, o);
+                return F(e, o);
             }
-            function $(e, n) {
+            function q(e, n) {
                 var r = e.get(n);
                 if (!r) {
                     return n;
                 }
-                var t = V(r);
+                var t = D(r);
                 // case where current is first child of parent or root item
                                 if (t === 0) {
-                    return L(e, n);
+                    return N(e, n);
                 }
                 // case where previous tree item is or is a child of previous node in same level
                                 var o = r.replace(/[^-]+$/, "".concat(t - 1));
-                return M(e, o) || n;
+                return F(e, o) || n;
             }
-            function J(e) {
-                return _(e, "0");
+            function M(e) {
+                return R(e, "0");
             }
-            function B(e) {
+            function $(e) {
                 var n = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "0";
-                var r = _(e, n);
+                var r = R(e, n);
                 var t = n;
                 // find last child in current node
                                 while (r) {
-                    var o = V(t);
-                    r = _(e, D(t, o));
+                    var o = D(t);
+                    r = R(e, _(t, o));
                     if (r) {
-                        t = D(t, o);
+                        t = _(t, o);
                     }
                 }
                 // check if last child has children
-                                var a = _(e, "".concat(t, "-0"));
+                                var a = R(e, "".concat(t, "-0"));
                 if (!a) {
-                    return _(e, t);
+                    return R(e, t);
                 }
                 // continue to find its last child recursively
                                 t = "".concat(t, "-0");
-                return B(e, t);
+                return $(e, t);
             }
             // CONCATENATED MODULE: ./src/Tree/Tree.tsx
-            function U() {
-                return U = Object.assign ? Object.assign.bind() : function(e) {
+            function J() {
+                return J = Object.assign ? Object.assign.bind() : function(e) {
                     for (var n = 1; n < arguments.length; n++) {
                         var r = arguments[n];
                         for (var t in r) {
@@ -417,29 +411,29 @@
                         }
                     }
                     return e;
-                }, U.apply(null, arguments);
+                }, J.apply(null, arguments);
             }
-            function G(e, n) {
-                return Q(e) || W(e, n) || z(e, n) || X();
+            function B(e, n) {
+                return z(e) || H(e, n) || X(e, n) || U();
             }
-            function X() {
+            function U() {
                 throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
             }
-            function z(e, n) {
+            function X(e, n) {
                 if (e) {
-                    if ("string" == typeof e) return H(e, n);
+                    if ("string" == typeof e) return G(e, n);
                     var r = {}.toString.call(e).slice(8, -1);
-                    return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? H(e, n) : void 0;
+                    return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? G(e, n) : void 0;
                 }
             }
-            function H(e, n) {
+            function G(e, n) {
                 (null == n || n > e.length) && (n = e.length);
                 for (var r = 0, t = Array(n); r < n; r++) {
                     t[r] = e[r];
                 }
                 return t;
             }
-            function W(e, n) {
+            function H(e, n) {
                 var r = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
                 if (null != r) {
                     var t, o, a, l, i = [], u = !0, c = !1;
@@ -461,12 +455,12 @@
                     return i;
                 }
             }
-            function Q(e) {
+            function z(e) {
                 if (Array.isArray(e)) return e;
             }
-            function Y(e, n) {
+            function W(e, n) {
                 if (null == e) return {};
-                var r, t, o = Z(e, n);
+                var r, t, o = Q(e, n);
                 if (Object.getOwnPropertySymbols) {
                     var a = Object.getOwnPropertySymbols(e);
                     for (t = 0; t < a.length; t++) {
@@ -475,7 +469,7 @@
                 }
                 return o;
             }
-            function Z(e, n) {
+            function Q(e, n) {
                 if (null == e) return {};
                 var r = {};
                 for (var t in e) {
@@ -486,114 +480,109 @@
                 }
                 return r;
             }
-            var ee = {
+            var Y = {
                 children: l().node,
                 defaultIndent: l().bool
             };
-            function ne(e) {
-                var n = e.children, r = e.defaultIndent, a = r === void 0 ? true : r, l = Y(e, [ "children", "defaultIndent" ]);
-                var u = (0, t.useState)(), f = G(u, 2), d = f[0], s = f[1];
-                var v = new Map;
+            function Z(e) {
+                var n = e.children, r = e.defaultIndent, a = r === void 0 ? true : r, l = W(e, [ "children", "defaultIndent" ]);
+                var i = (0, t.useState)(), c = B(i, 2), d = c[0], f = c[1];
+                var s = new Map;
                 var p = function e(n, r, t, o, a) {
                     n.stopPropagation();
-                    var l = (0, i.keycode)(n.nativeEvent);
-                    var u = t && (o === null || o === void 0 ? void 0 : o.length);
-                    switch (l) {
-                      case "up":
+                    var l = t && (o === null || o === void 0 ? void 0 : o.length);
+                    switch (n.key) {
+                      case "ArrowUp":
                         n.preventDefault();
-                        s($(v, r));
+                        f(q(s, r));
                         break;
 
-                      case "down":
+                      case "ArrowDown":
                         n.preventDefault();
-                        s(F(v, r));
+                        f(L(s, r));
                         break;
 
-                      case "left":
+                      case "ArrowLeft":
                         n.preventDefault();
-                        if (u) {
+                        if (l) {
                             a(false, n);
                         } else {
-                            s(L(v, r));
+                            f(N(s, r));
                         }
                         break;
 
-                      case "right":
+                      case "ArrowRight":
                         n.preventDefault();
-                        if (u) {
-                            s(F(v, r));
+                        if (l) {
+                            f(L(s, r));
                         } else {
                             a(true, n);
                         }
                         break;
 
-                      case "home":
+                      case "Home":
                         n.preventDefault();
-                        s(J(v));
+                        f(M(s));
                         break;
 
-                      case "end":
+                      case "End":
                         n.preventDefault();
-                        s(B(v));
+                        f($(s));
                         break;
 
-                      case "enter":
+                      case "Enter":
                         n.preventDefault();
-                        a(!u, n);
+                        a(!l, n);
                         break;
 
                       default:
  // do nothing
                                         }
                 };
-                var m = function e(n, r) {
+                var y = function e(n, r) {
                     n.preventDefault();
-                    s(r);
+                    f(r);
                 };
-                var b = function e(n) {
-                    v["delete"](n);
+                var m = function e(n) {
+                    s["delete"](n);
                 };
-                var h = function e(n, r) {
-                    v.set(n, r);
+                var b = function e(n, r) {
+                    s.set(n, r);
                 };
-                var g = t.Children.toArray(n).filter(t.isValidElement);
-                g.forEach((function(e, n) {
-                    if (e.props.id && h) {
-                        h("".concat(e.props.id), "".concat(n));
+                var h = t.Children.toArray(n).filter(t.isValidElement);
+                h.forEach((function(e, n) {
+                    if (e.props.id && b) {
+                        b("".concat(e.props.id), "".concat(n));
                     }
                 }));
-                var S = (0, t.useMemo)((function() {
+                var g = (0, t.useMemo)((function() {
                     return {
                         defaultIndent: a,
                         onItemKeyDown: p,
-                        onItemClick: m,
-                        removeNode: b,
-                        setNode: h,
-                        itemPaths: v,
+                        onItemClick: y,
+                        removeNode: m,
+                        setNode: b,
+                        itemPaths: s,
                         focusedItemId: d
                     };
-                }), [ a, d, v, p, b, h ]);
+                }), [ a, d, s, p, m, b ]);
                 
-                return o().createElement(c.Provider, {
-                    value: S
-                },  o().createElement(y, U({
+                return o().createElement(u.Provider, {
+                    value: g
+                },  o().createElement(v, J({
                     role: "tree",
                     $defaultIndent: a
                 }, l), n));
             }
-            ne.propTypes = ee;
-            ne.TreeItem = j;
-            /* harmony default export */            const re = ne;
+            Z.propTypes = Y;
+            Z.TreeItem = I;
+            /* harmony default export */            const ee = Z;
         } // CONCATENATED MODULE: ./src/Tree/index.ts
         /***/ ,
         /***/ 3563: 
         /***/ e => {
             e.exports = require("@splunk/themes");
             /***/        },
-        /***/ 5295: 
-        /***/ e => {
-            e.exports = require("@splunk/ui-utils/keyboard");
-            /***/        },
         /***/ 23: 
         /***/ e => {
             e.exports = require("prop-types");
@@ -692,7 +681,7 @@
         r.r(t);
         // EXPORTS
                 r.d(t, {
-            default: () => /* reexport */ Oe
+            default: () => /* reexport */ je
         });
         // EXTERNAL MODULE: external "react"
                 var e = r(9497);
@@ -707,19 +696,19 @@
                 var u = r(232);
         var c =  r.n(u);
         // EXTERNAL MODULE: external "@splunk/themes"
-                var f = r(3563);
+                var d = r(3563);
         // CONCATENATED MODULE: ./src/JSONTree/JSONTreeStyles.ts
-        var d = (0, u.css)([ "", ";", ";color:", ";" ], f.mixins.reset("block"), f.mixins.typography({
+        var f = (0, u.css)([ "", ";", ";color:", ";" ], d.mixins.reset("block"), d.mixins.typography({
             family: "monospace"
-        }), f.variables.syntaxGray);
+        }), d.variables.syntaxGray);
         var s = c().code.withConfig({
             displayName: "JSONTreeStyles__StyledScrollCode",
             componentId: "vrdt21-0"
-        })([ "", ";overflow-x:auto;white-space:nowrap;" ], d);
+        })([ "", ";overflow-x:auto;white-space:nowrap;" ], f);
         var v = c().code.withConfig({
             displayName: "JSONTreeStyles__StyledWrapCode",
             componentId: "vrdt21-1"
-        })([ "", ";white-space:pre-wrap;" ], d);
+        })([ "", ";white-space:pre-wrap;" ], f);
         // CONCATENATED MODULE: external "lodash/fill"
         const p = require("lodash/fill");
         var y =  r.n(p);
@@ -743,13 +732,11 @@
         var j =  r.n(E);
         // CONCATENATED MODULE: external "@splunk/ui-utils/i18n"
         const C = require("@splunk/ui-utils/i18n");
-        // EXTERNAL MODULE: external "@splunk/ui-utils/keyboard"
-                var A = r(5295);
         // EXTERNAL MODULE: ./src/Tree/index.ts + 6 modules
-                var T = r(4610);
+                var A = r(4610);
         // CONCATENATED MODULE: ./src/JSONTree/JSONTreeItem.tsx
-        function P() {
-            return P = Object.assign ? Object.assign.bind() : function(e) {
+        function T() {
+            return T = Object.assign ? Object.assign.bind() : function(e) {
                 for (var n = 1; n < arguments.length; n++) {
                     var r = arguments[n];
                     for (var t in r) {
@@ -757,22 +744,22 @@
                     }
                 }
                 return e;
-            }, P.apply(null, arguments);
+            }, T.apply(null, arguments);
         }
-        function R(e, n) {
-            return V(e) || D(e, n) || _(e, n) || K();
+        function P(e, n) {
+            return N(e) || D(e, n) || K(e, n) || R();
         }
-        function K() {
+        function R() {
             throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
         }
-        function _(e, n) {
+        function K(e, n) {
             if (e) {
-                if ("string" == typeof e) return N(e, n);
+                if ("string" == typeof e) return _(e, n);
                 var r = {}.toString.call(e).slice(8, -1);
-                return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? N(e, n) : void 0;
+                return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? _(e, n) : void 0;
             }
         }
-        function N(e, n) {
+        function _(e, n) {
             (null == n || n > e.length) && (n = e.length);
             for (var r = 0, t = Array(n); r < n; r++) {
                 t[r] = e[r];
@@ -801,12 +788,12 @@
                 return i;
             }
         }
-        function V(e) {
+        function N(e) {
             if (Array.isArray(e)) return e;
         }
-        function L(e, n) {
+        function V(e, n) {
             if (null == e) return {};
-            var r, t, o = q(e, n);
+            var r, t, o = L(e, n);
             if (Object.getOwnPropertySymbols) {
                 var a = Object.getOwnPropertySymbols(e);
                 for (t = 0; t < a.length; t++) {
@@ -815,7 +802,7 @@
             }
             return o;
         }
-        function q(e, n) {
+        function L(e, n) {
             if (null == e) return {};
             var r = {};
             for (var t in e) {
@@ -840,9 +827,9 @@
             representation: a().node,
             value: a().oneOfType([ a().string, a().object, a().array, a().number, a().bool ])
         };
-        function M(r) {
-            var t = r.clickableKeyRef, o = r.clickableValRef, a = r.hasChildren, l = r.indentArray, i = r.index, u = r.initialOpenState, c = r.onFocus, f = r.properties, d = r.propertyDataPath, s = r.propertyElement, v = r.renderExpandLink, p = r.representation, y = r.value, m = L(r, [ "clickableKeyRef", "clickableValRef", "hasChildren", "indentArray", "index", "initialOpenState", "onFocus", "properties", "propertyDataPath", "propertyElement", "renderExpandLink", "representation", "value" ]);
-            var h = (0, e.useState)(u), g = R(h, 2), S = g[0], w = g[1];
+        function q(r) {
+            var t = r.clickableKeyRef, o = r.clickableValRef, a = r.hasChildren, l = r.indentArray, i = r.index, u = r.initialOpenState, c = r.onFocus, d = r.properties, f = r.propertyDataPath, s = r.propertyElement, v = r.renderExpandLink, p = r.representation, y = r.value, m = V(r, [ "clickableKeyRef", "clickableValRef", "hasChildren", "indentArray", "index", "initialOpenState", "onFocus", "properties", "propertyDataPath", "propertyElement", "renderExpandLink", "representation", "value" ]);
+            var h = (0, e.useState)(u), g = P(h, 2), S = g[0], w = g[1];
             var k = function e(n) {
                 w(n);
             };
@@ -854,13 +841,13 @@
             }) : {
                 expandLink: undefined
             }, I = O.expandLink;
-            var E = (f === null || f === void 0 ? void 0 : f.length) && i + 1 < (f === null || f === void 0 ? void 0 : f.length) ? "," : null;
+            var E = (d === null || d === void 0 ? void 0 : d.length) && i + 1 < (d === null || d === void 0 ? void 0 : d.length) ? "," : null;
             
-            return n().createElement(T["default"].TreeItem, P({
+            return n().createElement(A["default"].TreeItem, T({
                 content:  n().createElement(n().Fragment, null, s, a && (b()(y) ? "[" : "{"), !a &&  n().createElement(n().Fragment, null, p, E)),
                 customIndent: l,
                 "data-test": a ? "node" : null,
-                "data-test-path": d,
+                "data-test-path": f,
                 endAdornment: a &&  n().createElement(n().Fragment, null, S && l, b()(y) ? "]" : "}", E),
                 onFocus: function e(n) {
                     c === null || c === void 0 ? void 0 : c(n);
@@ -889,107 +876,113 @@
                 toggle: a ? I : undefined
             }, m), a && p);
         }
-        M.propTypes = F;
+        q.propTypes = F;
+        // CONCATENATED MODULE: external "@splunk/react-ui/ButtonSimple"
+        const M = require("@splunk/react-ui/ButtonSimple");
+        var $ =  r.n(M);
         // CONCATENATED MODULE: external "@splunk/react-ui/Clickable"
-        const $ = require("@splunk/react-ui/Clickable");
-        var J =  r.n($);
+        const J = require("@splunk/react-ui/Clickable");
+        var B =  r.n(J);
         // CONCATENATED MODULE: external "@splunk/react-ui/Tooltip"
-        const B = require("@splunk/react-ui/Tooltip");
-        var U =  r.n(B);
+        const U = require("@splunk/react-ui/Tooltip");
+        var X =  r.n(U);
         // CONCATENATED MODULE: ./src/JSONTree/JSONTreeItemStyles.ts
         var G = {
-            string: f.variables.syntaxTeal,
-            number: f.variables.syntaxBlue,
-            boolean: f.variables.syntaxPurple,
-            null: f.variables.syntaxBrown,
-            object: f.variables.syntaxGray,
-            array: f.variables.syntaxGray
+            string: d.variables.syntaxTeal,
+            number: d.variables.syntaxBlue,
+            boolean: d.variables.syntaxPurple,
+            null: d.variables.syntaxBrown,
+            object: d.variables.syntaxGray,
+            array: d.variables.syntaxGray
         };
-        var X = (0, u.css)([ "word-break:break-word;word-wrap:break-word;" ]);
+        var H = (0, u.css)([ "word-break:break-word;word-wrap:break-word;" ]);
         var z = (0, u.css)([ "white-space:nowrap;" ]);
-        var H = (0, u.css)([ "color:", ";", ";" ], (function(e) {
+        /* Using this magic number to set the height to be at least the minimum target size of 24 by 24 */        var W = (0, 
+        u.css)([ "padding-block:2px;" ]);
+        var Q = (0, u.css)([ "font-family:inherit;&:focus{box-shadow:", ";outline:0;&:active{box-shadow:none;}}&:hover{background-color:", ";}" ], d.variables.focusShadow, d.variables.neutral50);
+        var Y = (0, u.css)([ "color:", ";", ";", "" ], (function(e) {
             var n = e.valueType;
             return G[n];
         }), (function(e) {
             var n = e.overflowType;
-            return n === "wrap" ? X : z;
-        }));
-        var W = c().span.withConfig({
+            return n === "wrap" ? H : z;
+        }), W);
+        var Z = c().span.withConfig({
             displayName: "JSONTreeItemStyles__StyledValue",
             componentId: "o558h3-0"
-        })([ "", "" ], H);
-        var Q = c()(J()).withConfig({
+        })([ "", "" ], Y);
+        var ee = c()(B()).withConfig({
             displayName: "JSONTreeItemStyles__StyledValueInteractiveClickable",
             componentId: "o558h3-1"
-        })([ "", " font-family:inherit;&:focus{box-shadow:0 0 1px 3px ", ";outline:0;&:active{box-shadow:none;}}&:hover{background-color:", ";}" ], H, f.variables.focusColor, f.variables.neutral50);
-        var Y = (0, u.css)([ "color:", ";" ], f.variables.syntaxRed);
-        var Z = c().span.withConfig({
+        })([ "", " ", " min-width:24px;text-align:center;" ], Y, Q);
+        var ne = (0, u.css)([ "", " color:", ";" ], W, d.variables.syntaxRed);
+        var re = c().span.withConfig({
             displayName: "JSONTreeItemStyles__StyledProperty",
             componentId: "o558h3-2"
-        })([ "", "" ], Y);
-        var ee = c()(J()).withConfig({
+        })([ "", "" ], ne);
+        var te = c()(B()).withConfig({
             displayName: "JSONTreeItemStyles__StyledPropertyInteractiveClickable",
             componentId: "o558h3-3"
-        })([ "", " font-family:inherit;&:focus{box-shadow:0 0 1px 3px ", ";outline:0;&:active{box-shadow:none;}}&:hover{background-color:", ";}" ], Y, f.variables.focusColor, f.variables.neutral50);
-        var ne = c()(J()).withConfig({
+        })([ "", " ", "" ], ne, Q);
+        var oe = c()($()).withConfig({
             displayName: "JSONTreeItemStyles__StyledExpandLinkClickable",
             componentId: "o558h3-4"
-        })([ "cursor:pointer;color:", ";font-family:inherit;&:hover{background-color:", ";text-decoration:none;}&:focus{box-shadow:", ";&:active{box-shadow:none;}}" ], f.variables.contentColorAccent, f.variables.actionColorBackgroundSubtleHover, f.variables.focusShadowInset);
-        var re = c()(U()).withConfig({
+        })([ "", ";border:none;border-radius:0;font-family:inherit;padding:1px ", " 3px ", ";&:hover{background-color:", ";text-decoration:none;}&:focus{box-shadow:", ";&:active{box-shadow:none;}}" ], W, d.variables.spacingXSmall, d.variables.spacingXSmall, d.variables.actionColorBackgroundSubtleHover, d.variables.focusShadowInset);
+        var ae = c()(X()).withConfig({
             displayName: "JSONTreeItemStyles__StyledTooltip",
             componentId: "o558h3-5"
-        })([ "font-family:", ";" ], f.variables.monoFontFamily);
+        })([ "font-family:", ";" ], d.variables.monoFontFamily);
         // CONCATENATED MODULE: ./src/JSONTree/renderTreeItems.tsx
-        function te(e) {
+        function le(e) {
             "@babel/helpers - typeof";
-            return te = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(e) {
+            return le = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(e) {
                 return typeof e;
             } : function(e) {
                 return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
-            }, te(e);
+            }, le(e);
         }
-        function oe(e) {
-            return ue(e) || ie(e) || le(e) || ae();
+        function ie(e) {
+            return fe(e) || de(e) || ce(e) || ue();
         }
-        function ae() {
+        function ue() {
             throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
         }
-        function le(e, n) {
+        function ce(e, n) {
             if (e) {
-                if ("string" == typeof e) return ce(e, n);
+                if ("string" == typeof e) return se(e, n);
                 var r = {}.toString.call(e).slice(8, -1);
-                return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? ce(e, n) : void 0;
+                return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? se(e, n) : void 0;
             }
         }
-        function ie(e) {
+        function de(e) {
             if ("undefined" != typeof Symbol && null != e[Symbol.iterator] || null != e["@@iterator"]) return Array.from(e);
         }
-        function ue(e) {
-            if (Array.isArray(e)) return ce(e);
+        function fe(e) {
+            if (Array.isArray(e)) return se(e);
         }
-        function ce(e, n) {
+        function se(e, n) {
             (null == n || n > e.length) && (n = e.length);
             for (var r = 0, t = Array(n); r < n; r++) {
                 t[r] = e[r];
             }
             return t;
         }
-        function fe(r) {
-            var t = r.id, o = r.childKey, a = r.index, l = r.value, i = r.properties, u = r.propertyDataPath, c = r.obj, f = r.renderValue, d = r.renderKey, s = r.getInitialOpenState, v = r.indentArray, p = r.renderExpandLink, y = r.onFocus;
+        function ve(r) {
+            var t = r.id, o = r.childKey, a = r.index, l = r.value, i = r.properties, u = r.propertyDataPath, c = r.obj, d = r.renderValue, f = r.renderKey, s = r.getInitialOpenState, v = r.indentArray, p = r.renderExpandLink, y = r.onFocus;
             var m = (0, e.useRef)(null);
             var h = (0, e.useRef)(null);
-            var S = f({
+            var S = d({
                 key: o,
                 value: l,
                 clickValueRef: m
             }), w = S.representation, k = S.clickableValRef;
-            var O = !b()(c) ? d(o, h) : {
+            var O = !b()(c) ? f(o, h) : {
                 propertyElement: undefined,
                 clickableKeyRef: undefined
             }, I = O.propertyElement, E = O.clickableKeyRef;
             var j = x()(l) && !g()(l) || b()(l) && l.length > 0;
             
-            return n().createElement(M, {
+            return n().createElement(q, {
                 id: t,
                 propertyDataPath: u,
                 propertyElement: I,
@@ -1008,7 +1001,7 @@
                 }
             });
         }
-        function de(r) {
+        function pe(r) {
             var t = r.renderValue, o = r.obj;
             var a = (0, e.useRef)(null);
             var l = t({
@@ -1016,18 +1009,18 @@
                 clickValueRef: a
             }), i = l.representation;
             
-            return n().createElement(T["default"].TreeItem, {
+            return n().createElement(A["default"].TreeItem, {
                 id: "0",
                 "data-test-path": ".",
                 content: i
             });
         }
-        function se(e) {
-            var r = e.defaultOpen, t = r === void 0 ? false : r, o = e.defaultExpanded, a = o === void 0 ? false : o, l = e.expandChildrenOnShiftKey, u = l === void 0 ? false : l, c = e.indent, f = c === void 0 ? 4 : c, d = e.indentLevel, s = d === void 0 ? 1 : d, v = e.obj, p = e.onClickKey, m = e.onClickValue, h = e.overflow, S = h === void 0 ? "scroll" : h, k = e.path, O = k === void 0 ? [] : k, E = e.shift, T = e.updateShift;
-            var P = y()(Array(s), j()(" ", f));
+        function ye(e) {
+            var r = e.defaultOpen, t = r === void 0 ? false : r, o = e.defaultExpanded, a = o === void 0 ? false : o, l = e.expandChildrenOnShiftKey, u = l === void 0 ? false : l, c = e.indent, d = c === void 0 ? 4 : c, f = e.indentLevel, s = f === void 0 ? 1 : f, v = e.obj, p = e.onClickKey, m = e.onClickValue, h = e.overflow, S = h === void 0 ? "scroll" : h, k = e.path, O = k === void 0 ? [] : k, E = e.shift, A = e.updateShift;
+            var T = y()(Array(s), j()(" ", d));
+            var P;
             var R;
-            var K;
-            var _ = function e() {
+            var K = function e() {
                 if (a && E == null) {
                     return true;
                 }
@@ -1036,64 +1029,65 @@
                 }
                 return t;
             };
-            var N = function e(n) {
-                if (u && T != null) {
-                    T(n.shiftKey);
+            var _ = function e(n) {
+                if (u && A != null) {
+                    A(n.shiftKey);
                 }
             };
             var D = function e(n, r) {
                 var t, o;
                 // When rendering a single value key is not present, here we prevent `[undefined]` in path
-                                var a = r !== undefined ? [].concat(oe(O), [ r ]) : oe(O);
+                                var a = r !== undefined ? [].concat(ie(O), [ r ]) : ie(O);
                 var l = ".".concat(a.join("."));
-                (t = K) === null || t === void 0 ? void 0 : (o = t.current) === null || o === void 0 ? void 0 : o.focus();
+                (t = R) === null || t === void 0 ? void 0 : (o = t.current) === null || o === void 0 ? void 0 : o.focus();
                 p === null || p === void 0 ? void 0 : p(n, {
                     key: l,
                     keyPath: a
                 });
             };
-            var V = function e(n, r) {
+            var N = function e(n, r) {
                 var t, o;
                 // When rendering a single value key is not present, here we prevent `[undefined]` in path
-                                var a = r !== undefined ? [].concat(oe(O), [ r ]) : oe(O);
+                                var a = r !== undefined ? [].concat(ie(O), [ r ]) : ie(O);
                 var l = ".".concat(a.join("."));
-                (t = R) === null || t === void 0 ? void 0 : (o = t.current) === null || o === void 0 ? void 0 : o.focus();
+                (t = P) === null || t === void 0 ? void 0 : (o = t.current) === null || o === void 0 ? void 0 : o.focus();
                 m === null || m === void 0 ? void 0 : m(n, {
                     key: l,
                     keyPath: a,
                     value: n.target.textContent
                 });
             };
-            var L = function e(n, r) {
+            var V = function e(n, r) {
                 var t, o;
-                var a = (0, A.keycode)(n.nativeEvent);
-                if (a === "left" && p && ((t = K) === null || t === void 0 ? void 0 : t.current) && !r) {
+                var a = n.key;
+                if (a === "ArrowLeft" && p && ((t = R) === null || t === void 0 ? void 0 : t.current) && !r) {
                     var l;
                     n.stopPropagation();
-                    (l = K.current) === null || l === void 0 ? void 0 : l.focus();
+                    (l = R.current) === null || l === void 0 ? void 0 : l.focus();
                 }
-                if (a === "right" && m && ((o = R) === null || o === void 0 ? void 0 : o.current) && r) {
+                if (a === "ArrowRight" && m && ((o = P) === null || o === void 0 ? void 0 : o.current) && r) {
                     var i;
                     n.stopPropagation();
-                    (i = R.current) === null || i === void 0 ? void 0 : i.focus();
+                    (i = P.current) === null || i === void 0 ? void 0 : i.focus();
                 }
             };
-            var q = function e(r) {
+            var L = function e(r) {
                 var t = r.open, o = r.withTooltip, a = r.expandLinkRef;
                 var l = t ? "[-]" : "[+]";
                 var i = t ? (0, C._)("Collapse all") : (0, C._)("Shift click to expand all");
-                var c =  n().createElement(ne, {
+                var c =  n().createElement(oe, {
+                    appearance: "subtle",
                     elementRef: a,
                     tabIndex: -1,
                     onClick: function e(n) {
-                        N(n);
+                        _(n);
                     },
                     "aria-expanded": t,
                     "data-test": "toggle"
-                }, " ", l, " ");
+                }, l);
                 if (u && o) {
                     return {
-                        expandLink:  n().createElement(re, {
+                        expandLink:  n().createElement(ae, {
                             contentRelationship: "description",
                             openDelay: "secondary",
                             defaultPlacement: "above",
@@ -1124,7 +1118,7 @@
                     // isObject is true for arrays
                     c = b()(t) ? "[]" : "{}";
                 } else {
-                    c = se({
+                    c = ye({
                         defaultOpen: a === true,
                         defaultExpanded: a,
                         expandChildrenOnShiftKey: u,
@@ -1132,27 +1126,27 @@
                         onClickValue: m,
                         overflow: S,
                         obj: t,
-                        path: o !== undefined ? [].concat(oe(O), [ o ]) : oe(O),
+                        path: o !== undefined ? [].concat(ie(O), [ o ]) : ie(O),
                         indentLevel: s + 1,
                         shift: E,
-                        updateShift: T
+                        updateShift: A
                     });
                 }
                 if (i()(c) || w()(c)) {
-                    var f = t === null ? "null" : // TS: bigint, function, symbol are prevented by JSONElement type
-                    te(t);
+                    var d = t === null ? "null" : // TS: bigint, function, symbol are prevented by JSONElement type
+                    le(t);
                     if (m) {
                         return {
-                            representation:  n().createElement(Q, {
+                            representation:  n().createElement(ee, {
                                 elementRef: l,
-                                valueType: f,
+                                valueType: d,
                                 overflowType: S,
                                 onClick: function e(n) {
-                                    R = l;
-                                    V(n, o);
+                                    P = l;
+                                    N(n, o);
                                 },
                                 onKeyDown: function e(n) {
-                                    L(n, false);
+                                    V(n, false);
                                 },
                                 tabIndex: -1
                             }, c),
@@ -1160,8 +1154,8 @@
                         };
                     }
                     return {
-                        representation:  n().createElement(W, {
-                            valueType: f,
+                        representation:  n().createElement(Z, {
+                            valueType: d,
                             overflowType: S
                         }, c)
                     };
@@ -1170,35 +1164,35 @@
                     representation: c
                 };
             };
-            var $ = function e(r, t) {
+            var M = function e(r, t) {
                 if (p) {
                     return {
-                        propertyElement:  n().createElement("span", null,  n().createElement(ee, {
+                        propertyElement:  n().createElement(n().Fragment, null,  n().createElement(te, {
                             elementRef: t,
                             tabIndex: -1,
                             onClick: function e(n) {
-                                K = t;
+                                R = t;
                                 D(n, r);
                             },
                             onKeyDown: function e(n) {
-                                L(n, true);
+                                V(n, true);
                             }
                         }, r), ":", " "),
                         clickableKeyRef: t
                     };
                 }
                 return {
-                    propertyElement:  n().createElement("span", null,  n().createElement(Z, null, r), ":", " ")
+                    propertyElement:  n().createElement(n().Fragment, null,  n().createElement(re, null, r), ":", " ")
                 };
             };
             if (x()(v) && !g()(v) || b()(v) && v.length > 0) {
-                var J = I()(v).map((function(e, r, t) {
+                var $ = I()(v).map((function(e, r, t) {
                     var o = v[e];
  // TS: should be safe based on (recursive) JSONElement type
                                         var a = b()(v) ? parseInt(e, 10) : e;
                     var l = O.length === 0 ? ".".concat(a) : ".".concat(O.join("."), ".").concat(a);
                     
-                    return n().createElement(fe, {
+                    return n().createElement(ve, {
                         id: l,
                         key: l,
                         propertyDataPath: l,
@@ -1208,43 +1202,43 @@
                         properties: t,
                         obj: v,
                         renderValue: F,
-                        renderKey: $,
-                        getInitialOpenState: _,
-                        indentArray: P,
-                        renderExpandLink: q,
+                        renderKey: M,
+                        getInitialOpenState: K,
+                        indentArray: T,
+                        renderExpandLink: L,
                         onFocus: function e(n, r) {
-                            K = n;
-                            R = r;
+                            R = n;
+                            P = r;
                         }
                     });
                 }));
                 if (O.length === 0) {
-                    var B = x()(v) && !g()(v) || b()(v) && v.length > 0;
+                    var J = x()(v) && !g()(v) || b()(v) && v.length > 0;
                     
-                    return n().createElement(M, {
+                    return n().createElement(q, {
                         id: "root",
                         propertyDataPath: ".",
                         key: ".",
-                        hasChildren: B,
+                        hasChildren: J,
                         initialOpenState: t || a,
                         value: v,
                         index: 0,
-                        renderExpandLink: q,
-                        representation: J
+                        renderExpandLink: L,
+                        representation: $
                     });
                 }
-                return J;
+                return $;
             }
             // edge case: a single number/string/boolean being rendered (still valid JSON)
                         
-            return n().createElement(de, {
+            return n().createElement(pe, {
                 obj: v,
                 renderValue: F
             });
         }
         // CONCATENATED MODULE: ./src/JSONTree/JSONTree.tsx
-        function ve() {
-            return ve = Object.assign ? Object.assign.bind() : function(e) {
+        function me() {
+            return me = Object.assign ? Object.assign.bind() : function(e) {
                 for (var n = 1; n < arguments.length; n++) {
                     var r = arguments[n];
                     for (var t in r) {
@@ -1252,29 +1246,29 @@
                     }
                 }
                 return e;
-            }, ve.apply(null, arguments);
+            }, me.apply(null, arguments);
         }
-        function pe(e, n) {
-            return ge(e) || he(e, n) || me(e, n) || ye();
+        function be(e, n) {
+            return ke(e) || we(e, n) || ge(e, n) || he();
         }
-        function ye() {
+        function he() {
             throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
         }
-        function me(e, n) {
+        function ge(e, n) {
             if (e) {
-                if ("string" == typeof e) return be(e, n);
+                if ("string" == typeof e) return Se(e, n);
                 var r = {}.toString.call(e).slice(8, -1);
-                return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? be(e, n) : void 0;
+                return "Object" === r && e.constructor && (r = e.constructor.name), "Map" === r || "Set" === r ? Array.from(e) : "Arguments" === r || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? Se(e, n) : void 0;
             }
         }
-        function be(e, n) {
+        function Se(e, n) {
             (null == n || n > e.length) && (n = e.length);
             for (var r = 0, t = Array(n); r < n; r++) {
                 t[r] = e[r];
             }
             return t;
         }
-        function he(e, n) {
+        function we(e, n) {
             var r = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
             if (null != r) {
                 var t, o, a, l, i = [], u = !0, c = !1;
@@ -1296,12 +1290,12 @@
                 return i;
             }
         }
-        function ge(e) {
+        function ke(e) {
             if (Array.isArray(e)) return e;
         }
-        function Se(e, n) {
+        function xe(e, n) {
             if (null == e) return {};
-            var r, t, o = we(e, n);
+            var r, t, o = Oe(e, n);
             if (Object.getOwnPropertySymbols) {
                 var a = Object.getOwnPropertySymbols(e);
                 for (t = 0; t < a.length; t++) {
@@ -1310,7 +1304,7 @@
             }
             return o;
         }
-        function we(e, n) {
+        function Oe(e, n) {
             if (null == e) return {};
             var r = {};
             for (var t in e) {
@@ -1323,7 +1317,7 @@
         }
         /** @public */
         /** @public */
-        /** @public */        var ke = {
+        /** @public */        var Ie = {
             elementRef: a().oneOfType([ a().func, a().object ]),
             defaultExpanded: a().bool,
             indent: a().number,
@@ -1335,38 +1329,38 @@
         };
         /**
  * Used to visualize a JSON string.
- */        function xe(r) {
-            var t = r.elementRef, o = r.defaultExpanded, a = o === void 0 ? false : o, l = r.indent, u = l === void 0 ? 4 : l, c = r.json, f = r.onClickKey, d = r.onClickValue, p = r.overflow, y = p === void 0 ? "scroll" : p, m = r.expandChildrenOnShiftKey, b = m === void 0 ? true : m, h = Se(r, [ "elementRef", "defaultExpanded", "indent", "json", "onClickKey", "onClickValue", "overflow", "expandChildrenOnShiftKey" ]);
+ */        function Ee(r) {
+            var t = r.elementRef, o = r.defaultExpanded, a = o === void 0 ? false : o, l = r.indent, u = l === void 0 ? 4 : l, c = r.json, d = r.onClickKey, f = r.onClickValue, p = r.overflow, y = p === void 0 ? "scroll" : p, m = r.expandChildrenOnShiftKey, b = m === void 0 ? true : m, h = xe(r, [ "elementRef", "defaultExpanded", "indent", "json", "onClickKey", "onClickValue", "overflow", "expandChildrenOnShiftKey" ]);
             // @docs-props-type JSONTreePropsBase
                         var g = i()(c) ? JSON.parse(c) : c;
             var S = y === "wrap" ? v : s;
-            var w = (0, e.useState)(undefined), k = pe(w, 2), x = k[0], O = k[1];
+            var w = (0, e.useState)(undefined), k = be(w, 2), x = k[0], O = k[1];
             var I = function e(n) {
                 O(n);
             };
             
-            return n().createElement(S, ve({
+            return n().createElement(S, me({
                 "data-language": "language-json",
                 "data-test": "json-tree",
                 ref: t,
                 role: "tree"
-            }, h),  n().createElement(T["default"], {
+            }, h),  n().createElement(A["default"], {
                 defaultIndent: false
-            }, se({
+            }, ye({
                 defaultOpen: true,
                 defaultExpanded: a,
                 expandChildrenOnShiftKey: b,
                 indent: u,
                 obj: g,
-                onClickKey: f,
-                onClickValue: d,
+                onClickKey: d,
+                onClickValue: f,
                 overflow: y,
                 shift: x,
                 updateShift: I
             })));
         }
-        xe.propTypes = ke;
-        /* harmony default export */        const Oe = xe;
+        Ee.propTypes = Ie;
+        /* harmony default export */        const je = Ee;
     }) // CONCATENATED MODULE: ./src/JSONTree/index.ts
     ();
     module.exports = t;