@splunk/react-ui 4.42.0 → 5.0.0-beta.2

package/JSONTree.js

@@ -23,26 +23,26 @@
             });
             /* harmony default export */            const c = u;
             // EXTERNAL MODULE: external "styled-components"
-                        var f = n(232);
-            var d =  n.n(f);
+                        var d = n(232);
+            var f =  n.n(d);
             // EXTERNAL MODULE: external "@splunk/themes"
                         var s = n(3563);
             // CONCATENATED MODULE: ./src/Tree/TreeItemStyles.ts
-            var v = d().span.withConfig({
+            var v = f().span.withConfig({
                 displayName: "TreeItemStyles__StyledTreeItemContent",
                 componentId: "ie7zrw-0"
             })([ "font-family:inherit;" ]);
-            var p = d().span.withConfig({
+            var p = f().span.withConfig({
                 displayName: "TreeItemStyles__StyledTreeItemNode",
                 componentId: "ie7zrw-1"
             })([ "&:focus{box-shadow:", ";outline:0;&:active{box-shadow:none;}}" ], s.variables.focusShadow);
             // CONCATENATED MODULE: ./src/Tree/TreeStyles.ts
-            var y = d().ul.withConfig({
+            var y = f().ul.withConfig({
                 displayName: "TreeStyles__StyledUnorderedList",
                 componentId: "sc-13pokwt-0"
             })([ "", ";font-family:inherit;list-style:none;white-space:inherit;", ";" ], s.mixins.reset("ul"), (function(e) {
                 var r = e.$defaultIndent;
-                return r && (0, f.css)([ "padding-left:", ";" ], s.variables.spacingXXXLarge);
+                return r && (0, d.css)([ "padding-left:", ";" ], s.variables.spacingXXXLarge);
             }));
             // CONCATENATED MODULE: ./src/Tree/TreeItem.tsx
             function m() {
@@ -57,7 +57,7 @@
                 }, m.apply(null, arguments);
             }
             function b(e, r) {
-                return k(e) || w(e, r) || g(e, r) || h();
+                return w(e) || k(e, r) || g(e, r) || h();
             }
             function h() {
                 throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
@@ -76,7 +76,7 @@
                 }
                 return t;
             }
-            function w(e, r) {
+            function k(e, r) {
                 var n = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
                 if (null != n) {
                     var t, o, a, i, l = [], u = !0, c = !1;
@@ -98,7 +98,7 @@
                     return l;
                 }
             }
-            function k(e) {
+            function w(e) {
                 if (Array.isArray(e)) return e;
             }
             function O(e, r) {
@@ -137,11 +137,11 @@
                 toggle: i().node
             };
             function C(e) {
-                var r = e.id, n = e.children, a = e.content, i = e.customIndent, l = 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 = O(e, [ "id", "children", "content", "customIndent", "endAdornment", "labelledBy", "onFocus", "onKeyDown", "onToggle", "open", "toggle" ]);
-                var k = (0, t.useContext)(c), x = k.defaultIndent, I = x === void 0 ? true : x, C = k.onItemKeyDown, j = k.onItemClick, E = 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];
+                var r = e.id, n = e.children, a = e.content, i = e.customIndent, l = e.endAdornment, u = e.labelledBy, d = e.onFocus, f = e.onKeyDown, s = e.onToggle, h = e.open, g = h === void 0 ? true : h, S = e.toggle, k = O(e, [ "id", "children", "content", "customIndent", "endAdornment", "labelledBy", "onFocus", "onKeyDown", "onToggle", "open", "toggle" ]);
+                var w = (0, t.useContext)(c), x = w.defaultIndent, I = x === void 0 ? true : x, C = w.onItemKeyDown, E = w.onItemClick, j = w.removeNode, A = w.setNode, T = w.itemPaths, P = w.focusedItemId;
+                var R = (0, t.useState)(g), K = b(R, 2), _ = K[0], D = K[1];
  // make first tree item tabbable
-                                var D = (0, t.useState)((T === null || T === void 0 ? void 0 : T.get("".concat(r))) === "0" ? 0 : -1), V = b(D, 2), L = V[0], q = V[1];
+                                var N = (0, t.useState)((T === null || T === void 0 ? void 0 : T.get("".concat(r))) === "0" ? 0 : -1), V = b(N, 2), L = V[0], q = V[1];
                 var F = (0, t.useRef)(null);
                 var M = (0, t.useRef)(null);
                 var $ = t.Children.toArray(n).filter(t.isValidElement);
@@ -149,23 +149,23 @@
                     if (e.props.id) {
                         if (_ && A) {
                             A("".concat(e.props.id), "".concat(T === null || T === void 0 ? void 0 : T.get("".concat(r)), "-").concat(n));
-                        } else if (E) {
-                            E(e.props.id);
+                        } else if (j) {
+                            j(e.props.id);
                         }
                     }
                 }));
                 var J = function e(r, n) {
-                    N(r);
+                    D(r);
                     s === null || s === void 0 ? void 0 : s(r, n);
                 };
                 var U = function e(n) {
-                    j === null || j === void 0 ? void 0 : j(n, r);
+                    E === null || E === void 0 ? void 0 : E(n, r);
                 };
                 var B = function e(r) {
                     var n;
                     r.stopPropagation();
                     F === null || F === void 0 ? void 0 : (n = F.current) === null || n === void 0 ? void 0 : n.focus();
-                    f === null || f === void 0 ? void 0 : f(r);
+                    d === null || d === void 0 ? void 0 : d(r);
                 };
                 var H = function e() {
                     if ((T === null || T === void 0 ? void 0 : T.get("".concat(r))) === "0") {
@@ -189,7 +189,7 @@
                         q(-1);
                     }
                     C === null || C === void 0 ? void 0 : C(n, r, _, $, J);
-                    d === null || d === void 0 ? void 0 : d(n);
+                    f === null || f === void 0 ? void 0 : f(n);
                 };
                 var W = function e() {
                     if (!S) {
@@ -207,7 +207,7 @@
                     });
                 };
                 
-                return o().createElement("li", m({}, w, {
+                return o().createElement("li", m({}, k, {
                     ref: M,
                     tabIndex: L,
                     onBlur: H,
@@ -227,9 +227,9 @@
                 }, n), l));
             }
             C.propTypes = I;
-            /* harmony default export */            const j = C;
+            /* harmony default export */            const E = C;
             // CONCATENATED MODULE: ./src/Tree/treeUtils.ts
-            function E(e, r) {
+            function j(e, r) {
                 return K(e) || R(e, r) || T(e, r) || A();
             }
             function A() {
@@ -280,19 +280,19 @@
                 var n;
                 var t = Array.from(e.entries());
                 return (n = t.find((function(e) {
-                    var n = E(e, 2), t = n[1];
+                    var n = j(e, 2), t = n[1];
                     return t === r;
                 }))) === null || n === void 0 ? void 0 : n[0];
             }
             /**
  * A helper function to get parent path of current item path
- */            function N(e) {
+ */            function D(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, r) {
+ */            function N(e, r) {
                 return e === null || e === void 0 ? void 0 : e.replace(/([^-]*)$/, "".concat(r + 1));
             }
             /**
@@ -309,19 +309,19 @@
                 if (!n) {
                     return r;
                 }
-                var t = N(n);
+                var t = D(n);
                 return _(e, t) || r;
             }
             /**
  * A helper function for getNextTreeItem
  */            function q(e, r) {
-                var n = N(r);
+                var n = D(r);
                 if (!n) {
                     return _(e, r);
                 }
                 // get next node in the parent level
                                 var t = V(n);
-                var o = D(n, t);
+                var o = N(n, t);
                 var a = _(e, o);
                 if (a) {
                     return a;
@@ -341,7 +341,7 @@
                 }
                 // case where next tree item is the next node in the same level
                                 var o = V(n);
-                var a = D(n, o);
+                var a = N(n, o);
                 var i = _(e, a);
                 if (i) {
                     return i;
@@ -361,7 +361,7 @@
                 // get the last child in current node, and continue to find its children recursively
                                 while (t) {
                     var a = V(o);
-                    var i = D(o, a);
+                    var i = N(o, a);
                     t = _(e, i);
                     if (t) {
                         o = i;
@@ -393,9 +393,9 @@
                 // find last child in current node
                                 while (n) {
                     var o = V(t);
-                    n = _(e, D(t, o));
+                    n = _(e, N(t, o));
                     if (n) {
-                        t = D(t, o);
+                        t = N(t, o);
                     }
                 }
                 // check if last child has children
@@ -492,11 +492,12 @@
             };
             function re(e) {
                 var r = e.children, n = e.defaultIndent, a = n === void 0 ? true : n, i = Y(e, [ "children", "defaultIndent" ]);
-                var u = (0, t.useState)(), f = H(u, 2), d = f[0], s = f[1];
+                var u = (0, t.useState)(), d = H(u, 2), f = d[0], s = d[1];
                 var v = new Map;
                 var p = function e(r, n, t, o, a) {
-                    var i = (0, l.keycode)(r.nativeEvent);
                     r.stopPropagation();
+                    var i = (0, l.keycode)(r.nativeEvent);
+                    var u = t && (o === null || o === void 0 ? void 0 : o.length);
                     switch (i) {
                       case "up":
                         r.preventDefault();
@@ -510,7 +511,7 @@
 
                       case "left":
                         r.preventDefault();
-                        if (t && (o === null || o === void 0 ? void 0 : o.length)) {
+                        if (u) {
                             a(false, r);
                         } else {
                             s(L(v, n));
@@ -519,7 +520,7 @@
 
                       case "right":
                         r.preventDefault();
-                        if (t && (o === null || o === void 0 ? void 0 : o.length)) {
+                        if (u) {
                             s(F(v, n));
                         } else {
                             a(true, r);
@@ -536,6 +537,11 @@
                         s(U(v));
                         break;
 
+                      case "enter":
+                        r.preventDefault();
+                        a(!u, r);
+                        break;
+
                       default:
  // do nothing
                                         }
@@ -564,9 +570,9 @@
                         removeNode: b,
                         setNode: h,
                         itemPaths: v,
-                        focusedItemId: d
+                        focusedItemId: f
                     };
-                }), [ a, d, v, p, b, h ]);
+                }), [ a, f, v, p, b, h ]);
                 
                 return o().createElement(c.Provider, {
                     value: S
@@ -576,7 +582,7 @@
                 }, i), r));
             }
             re.propTypes = ee;
-            re.TreeItem = j;
+            re.TreeItem = E;
             /* harmony default export */            const ne = re;
         } // CONCATENATED MODULE: ./src/Tree/index.ts
         /***/ ,
@@ -701,19 +707,19 @@
                 var u = n(232);
         var c =  n.n(u);
         // EXTERNAL MODULE: external "@splunk/themes"
-                var f = n(3563);
+                var d = n(3563);
         // CONCATENATED MODULE: ./src/JSONTree/JSONTreeStyles.ts
-        var d = (0, u.css)([ "", ";", ";" ], f.mixins.reset("block"), f.mixins.typography({
+        var f = (0, u.css)([ "", ";", ";" ], d.mixins.reset("block"), d.mixins.typography({
             family: "monospace"
         }));
         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 =  n.n(p);
@@ -725,18 +731,18 @@
         var g =  n.n(h);
         // CONCATENATED MODULE: external "lodash/isNumber"
         const S = require("lodash/isNumber");
-        var w =  n.n(S);
+        var k =  n.n(S);
         // CONCATENATED MODULE: external "lodash/isObject"
-        const k = require("lodash/isObject");
-        var O =  n.n(k);
+        const w = require("lodash/isObject");
+        var O =  n.n(w);
         // CONCATENATED MODULE: external "lodash/keys"
         const x = require("lodash/keys");
         var I =  n.n(x);
         // CONCATENATED MODULE: external "lodash/repeat"
         const C = require("lodash/repeat");
-        var j =  n.n(C);
+        var E =  n.n(C);
         // CONCATENATED MODULE: external "@splunk/ui-utils/i18n"
-        const E = require("@splunk/ui-utils/i18n");
+        const j = require("@splunk/ui-utils/i18n");
         // EXTERNAL MODULE: external "@splunk/ui-utils/keyboard"
                 var A = n(5295);
         // EXTERNAL MODULE: ./src/Tree/index.ts + 6 modules
@@ -754,26 +760,26 @@
             }, P.apply(null, arguments);
         }
         function R(e, r) {
-            return V(e) || D(e, r) || _(e, r) || K();
+            return V(e) || N(e, r) || _(e, r) || K();
         }
         function K() {
             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, r) {
             if (e) {
-                if ("string" == typeof e) return N(e, r);
+                if ("string" == typeof e) return D(e, r);
                 var n = {}.toString.call(e).slice(8, -1);
-                return "Object" === n && e.constructor && (n = e.constructor.name), "Map" === n || "Set" === n ? Array.from(e) : "Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n) ? N(e, r) : void 0;
+                return "Object" === n && e.constructor && (n = e.constructor.name), "Map" === n || "Set" === n ? Array.from(e) : "Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n) ? D(e, r) : void 0;
             }
         }
-        function N(e, r) {
+        function D(e, r) {
             (null == r || r > e.length) && (r = e.length);
             for (var n = 0, t = Array(r); n < r; n++) {
                 t[n] = e[n];
             }
             return t;
         }
-        function D(e, r) {
+        function N(e, r) {
             var n = null == e ? null : "undefined" != typeof Symbol && e[Symbol.iterator] || e["@@iterator"];
             if (null != n) {
                 var t, o, a, i, l = [], u = !0, c = !1;
@@ -835,10 +841,10 @@
             value: a().oneOfType([ a().string, a().object, a().array, a().number, a().bool ])
         };
         function M(n) {
-            var t = n.clickableKeyRef, o = n.clickableValRef, a = n.hasChildren, i = n.indentArray, l = n.index, u = n.initialOpenState, c = n.onFocus, f = n.properties, d = n.propertyDataPath, s = n.propertyElement, v = n.renderExpandLink, p = n.representation, y = n.value, m = L(n, [ "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];
-            var k = function e(r) {
-                w(r);
+            var t = n.clickableKeyRef, o = n.clickableValRef, a = n.hasChildren, i = n.indentArray, l = n.index, u = n.initialOpenState, c = n.onFocus, d = n.properties, f = n.propertyDataPath, s = n.propertyElement, v = n.renderExpandLink, p = n.representation, y = n.value, m = L(n, [ "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], k = g[1];
+            var w = function e(r) {
+                k(r);
             };
             var O = (0, e.useRef)(null);
             var x = v ? v({
@@ -848,13 +854,13 @@
             }) : {
                 expandLink: undefined
             }, I = x.expandLink;
-            var C = (f === null || f === void 0 ? void 0 : f.length) && l + 1 < (f === null || f === void 0 ? void 0 : f.length) ? "," : null;
+            var C = (d === null || d === void 0 ? void 0 : d.length) && l + 1 < (d === null || d === void 0 ? void 0 : d.length) ? "," : null;
             
             return r().createElement(T["default"].TreeItem, P({
                 content:  r().createElement(r().Fragment, null, s, a && (b()(y) ? "[" : "{"), !a &&  r().createElement(r().Fragment, null, p, C)),
                 customIndent: i,
                 "data-test": a ? "node" : null,
-                "data-test-path": d,
+                "data-test-path": f,
                 endAdornment: a &&  r().createElement(r().Fragment, null, S && i, b()(y) ? "]" : "}", C),
                 onFocus: function e(r) {
                     c === null || c === void 0 ? void 0 : c(r);
@@ -877,7 +883,7 @@
                         n.focus();
                     }
                 },
-                onToggle: k,
+                onToggle: w,
                 open: u,
                 tabIndex: 0,
                 toggle: a ? I : undefined
@@ -892,11 +898,11 @@
         var B =  n.n(U);
         // CONCATENATED MODULE: ./src/JSONTree/JSONTreeItemStyles.ts
         var H = {
-            string: f.variables.syntaxTeal,
-            number: f.variables.syntaxBlue,
-            boolean: f.variables.syntaxPurple,
-            null: f.variables.syntaxBrown,
-            object: f.variables.contentColorDefault
+            string: d.variables.syntaxTeal,
+            number: d.variables.syntaxBlue,
+            boolean: d.variables.syntaxPurple,
+            null: d.variables.syntaxBrown,
+            object: d.variables.contentColorDefault
         };
         var X = (0, u.css)([ "word-break:break-word;word-wrap:break-word;" ]);
         var z = (0, u.css)([ "white-space:nowrap;" ]);
@@ -914,17 +920,17 @@
         var Q = c()(J()).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:", ";}" ], W, f.variables.focusColor, (0, 
-        f.pick)({
-            enterprise: f.variables.backgroundColorHover,
-            prisma: f.variables.interactiveColorOverlayHover
+        })([ "", " font-family:inherit;&:focus{box-shadow:0 0 1px 3px ", ";outline:0;&:active{box-shadow:none;}}&:hover{background-color:", ";}" ], W, d.variables.focusColor, (0, 
+        d.pick)({
+            enterprise: d.variables.backgroundColorHover,
+            prisma: d.variables.interactiveColorOverlayHover
         }));
-        var Y = (0, u.css)([ "font-weight:bold;color:", ";" ], (0, f.pick)({
+        var Y = (0, u.css)([ "font-weight:bold;color:", ";" ], (0, d.pick)({
             enterprise: {
                 dark: "#ec9f98",
-                light: f.variables.syntaxRed
+                light: d.variables.syntaxRed
             },
-            prisma: f.variables.syntaxRed
+            prisma: d.variables.syntaxRed
         }));
         var Z = c().span.withConfig({
             displayName: "JSONTreeItemStyles__StyledProperty",
@@ -933,31 +939,31 @@
         var ee = c()(J()).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, (0, 
-        f.pick)({
-            enterprise: f.variables.backgroundColorHover,
-            prisma: f.variables.interactiveColorOverlayHover
+        })([ "", " font-family:inherit;&:focus{box-shadow:0 0 1px 3px ", ";outline:0;&:active{box-shadow:none;}}&:hover{background-color:", ";}" ], Y, d.variables.focusColor, (0, 
+        d.pick)({
+            enterprise: d.variables.backgroundColorHover,
+            prisma: d.variables.interactiveColorOverlayHover
         }));
         var re = c()(J()).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;}}", "" ], (0, 
-        f.pick)({
+        d.pick)({
             enterprise: {
-                dark: f.variables.accentColorL20,
-                light: f.variables.accentColorD20
+                dark: d.variables.accentColorL20,
+                light: d.variables.accentColorD20
             },
-            prisma: f.variables.interactiveColorPrimary
-        }), (0, f.pick)({
-            enterprise: f.variables.backgroundColorHover,
-            prisma: f.variables.interactiveColorOverlayHover
-        }), f.variables.focusShadowInset, (0, f.pick)({
-            prisma: (0, u.css)([ "border-radius:", ";" ], f.variables.borderRadius)
+            prisma: d.variables.interactiveColorPrimary
+        }), (0, d.pick)({
+            enterprise: d.variables.backgroundColorHover,
+            prisma: d.variables.interactiveColorOverlayHover
+        }), d.variables.focusShadowInset, (0, d.pick)({
+            prisma: (0, u.css)([ "border-radius:", ";" ], d.variables.borderRadius)
         }));
         var ne = c()(B()).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) {
             "@babel/helpers - typeof";
@@ -993,41 +999,41 @@
             }
             return t;
         }
-        function fe(n) {
-            var t = n.id, o = n.childKey, a = n.index, i = n.value, l = n.properties, u = n.propertyDataPath, c = n.obj, f = n.renderValue, d = n.renderKey, s = n.getInitialOpenState, v = n.indentArray, p = n.renderExpandLink, y = n.onFocus;
+        function de(n) {
+            var t = n.id, o = n.childKey, a = n.index, i = n.value, l = n.properties, u = n.propertyDataPath, c = n.obj, d = n.renderValue, f = n.renderKey, s = n.getInitialOpenState, v = n.indentArray, p = n.renderExpandLink, y = n.onFocus;
             var m = (0, e.useRef)(null);
             var h = (0, e.useRef)(null);
-            var S = f({
+            var S = d({
                 key: o,
                 value: i,
                 clickValueRef: m
-            }), w = S.representation, k = S.clickableValRef;
-            var x = !b()(c) ? d(o, h) : {
+            }), k = S.representation, w = S.clickableValRef;
+            var x = !b()(c) ? f(o, h) : {
                 propertyElement: undefined,
                 clickableKeyRef: undefined
             }, I = x.propertyElement, C = x.clickableKeyRef;
-            var j = O()(i) && !g()(i) || b()(i) && i.length > 0;
+            var E = O()(i) && !g()(i) || b()(i) && i.length > 0;
             
             return r().createElement(M, {
                 id: t,
                 propertyDataPath: u,
                 propertyElement: I,
-                hasChildren: j,
+                hasChildren: E,
                 initialOpenState: s(),
-                representation: w,
+                representation: k,
                 indentArray: v,
                 value: i,
                 index: a,
                 properties: l,
                 renderExpandLink: p,
                 clickableKeyRef: C,
-                clickableValRef: k,
+                clickableValRef: w,
                 onFocus: function e() {
-                    y(C, k);
+                    y(C, w);
                 }
             });
         }
-        function de(n) {
+        function fe(n) {
             var t = n.renderValue, o = n.obj;
             var a = (0, e.useRef)(null);
             var i = t({
@@ -1042,27 +1048,25 @@
             });
         }
         function se(e) {
-            var n = e.defaultOpen, t = n === void 0 ? false : n, o = e.expandChildren, a = o === void 0 ? false : o, i = e.expandChildrenOnShiftKey, u = i === void 0 ? false : i, 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, x = k === void 0 ? [] : k, C = e.shift, T = e.updateShift;
-            var P = y()(Array(s), j()(" ", f));
+            var n = e.defaultOpen, t = n === void 0 ? false : n, o = e.defaultExpanded, a = o === void 0 ? false : o, i = e.expandChildrenOnShiftKey, u = i === void 0 ? false : i, 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, w = e.path, x = w === void 0 ? [] : w, C = e.shift, T = e.updateShift;
+            var P = y()(Array(s), E()(" ", d));
             var R;
             var K;
             var _ = function e() {
-                if (a === true) {
-                    return t;
+                if (a && C == null) {
+                    return true;
                 }
-                if (a === "withShiftModifier" || u) {
+                if (u) {
                     return !!C;
                 }
-                return false;
+                return t;
             };
-            var N = function e(r) {
-                if (a === "withShiftModifier" || u) {
-                    if (T != null) {
-                        T(r.shiftKey);
-                    }
+            var D = function e(r) {
+                if (u && T != null) {
+                    T(r.shiftKey);
                 }
             };
-            var D = function e(r, n) {
+            var N = function e(r, n) {
                 var t, o;
                 // When rendering a single value key is not present, here we prevent `[undefined]` in path
                                 var a = n !== undefined ? [].concat(oe(x), [ n ]) : oe(x);
@@ -1102,12 +1106,12 @@
             var q = function e(n) {
                 var t = n.open, o = n.withTooltip, a = n.expandLinkRef;
                 var i = t ? "[-]" : "[+]";
-                var l = t ? (0, E._)("Collapse all") : (0, E._)("Shift click to expand all");
+                var l = t ? (0, j._)("Collapse all") : (0, j._)("Shift click to expand all");
                 var c =  r().createElement(re, {
                     elementRef: a,
                     tabIndex: -1,
                     onClick: function e(r) {
-                        N(r);
+                        D(r);
                     },
                     "aria-expanded": t,
                     "data-test": "toggle"
@@ -1118,7 +1122,7 @@
                             contentRelationship: "description",
                             openDelay: "secondary",
                             defaultPlacement: "above",
-                            content: (0, E._)(l)
+                            content: (0, j._)(l)
                         }, c),
                         expandLinkRef: a
                     };
@@ -1147,7 +1151,7 @@
                 } else {
                     c = se({
                         defaultOpen: a === true,
-                        expandChildren: a,
+                        defaultExpanded: a,
                         expandChildrenOnShiftKey: u,
                         onClickKey: p,
                         onClickValue: m,
@@ -1159,14 +1163,14 @@
                         updateShift: T
                     });
                 }
-                if (l()(c) || w()(c)) {
-                    var f = t === null ? "null" : // TS: bigint, function, symbol are prevented by JSONElement type
+                if (l()(c) || k()(c)) {
+                    var d = t === null ? "null" : // TS: bigint, function, symbol are prevented by JSONElement type
                     te(t);
                     if (m) {
                         return {
                             representation:  r().createElement(Q, {
                                 elementRef: i,
-                                valueType: f,
+                                valueType: d,
                                 overflowType: S,
                                 onClick: function e(r) {
                                     R = i;
@@ -1182,7 +1186,7 @@
                     }
                     return {
                         representation:  r().createElement(G, {
-                            valueType: f,
+                            valueType: d,
                             overflowType: S
                         }, c)
                     };
@@ -1199,7 +1203,7 @@
                             tabIndex: -1,
                             onClick: function e(r) {
                                 K = t;
-                                D(r, n);
+                                N(r, n);
                             },
                             onKeyDown: function e(r) {
                                 L(r, true);
@@ -1219,7 +1223,7 @@
                                         var a = b()(v) ? parseInt(e, 10) : e;
                     var i = x.length === 0 ? ".".concat(a) : ".".concat(x.join("."), ".").concat(a);
                     
-                    return r().createElement(fe, {
+                    return r().createElement(de, {
                         id: i,
                         key: i,
                         propertyDataPath: i,
@@ -1247,7 +1251,7 @@
                         propertyDataPath: ".",
                         key: ".",
                         hasChildren: U,
-                        initialOpenState: t,
+                        initialOpenState: t || a,
                         value: v,
                         index: 0,
                         renderExpandLink: q,
@@ -1258,7 +1262,7 @@
             }
             // edge case: a single number/string/boolean being rendered (still valid JSON)
                         
-            return r().createElement(de, {
+            return r().createElement(fe, {
                 obj: v,
                 renderValue: F
             });
@@ -1322,7 +1326,7 @@
         }
         function Se(e, r) {
             if (null == e) return {};
-            var n, t, o = we(e, r);
+            var n, t, o = ke(e, r);
             if (Object.getOwnPropertySymbols) {
                 var a = Object.getOwnPropertySymbols(e);
                 for (t = 0; t < a.length; t++) {
@@ -1331,7 +1335,7 @@
             }
             return o;
         }
-        function we(e, r) {
+        function ke(e, r) {
             if (null == e) return {};
             var n = {};
             for (var t in e) {
@@ -1344,9 +1348,9 @@
         }
         /** @public */
         /** @public */
-        /** @public */        var ke = {
+        /** @public */        var we = {
             elementRef: a().oneOfType([ a().func, a().object ]),
-            expandChildren: a().oneOfType([ a().bool, a().oneOf([ "withShiftModifier" ]) ]),
+            defaultExpanded: a().bool,
             indent: a().number,
             json: a().oneOfType([ a().string, a().object, a().array, a().number, a().bool ]).isRequired,
             onClickKey: a().func,
@@ -1357,11 +1361,11 @@
         /**
  * Used to visualize a JSON string.
  */        function Oe(n) {
-            var t = n.elementRef, o = n.expandChildren, a = o === void 0 ? false : o, i = n.indent, u = i === void 0 ? 4 : i, c = n.json, f = n.onClickKey, d = n.onClickValue, p = n.overflow, y = p === void 0 ? "scroll" : p, m = n.expandChildrenOnShiftKey, b = m === void 0 ? false : m, h = Se(n, [ "elementRef", "expandChildren", "indent", "json", "onClickKey", "onClickValue", "overflow", "expandChildrenOnShiftKey" ]);
+            var t = n.elementRef, o = n.defaultExpanded, a = o === void 0 ? false : o, i = n.indent, u = i === void 0 ? 4 : i, c = n.json, d = n.onClickKey, f = n.onClickValue, p = n.overflow, y = p === void 0 ? "scroll" : p, m = n.expandChildrenOnShiftKey, b = m === void 0 ? true : m, h = Se(n, [ "elementRef", "defaultExpanded", "indent", "json", "onClickKey", "onClickValue", "overflow", "expandChildrenOnShiftKey" ]);
             // @docs-props-type JSONTreePropsBase
                         var g = l()(c) ? JSON.parse(c) : c;
             var S = y === "wrap" ? v : s;
-            var w = (0, e.useState)(undefined), k = pe(w, 2), O = k[0], x = k[1];
+            var k = (0, e.useState)(undefined), w = pe(k, 2), O = w[0], x = w[1];
             var I = function e(r) {
                 x(r);
             };
@@ -1375,18 +1379,18 @@
                 defaultIndent: false
             }, se({
                 defaultOpen: true,
-                expandChildren: a,
+                defaultExpanded: a,
                 expandChildrenOnShiftKey: b,
                 indent: u,
                 obj: g,
-                onClickKey: f,
-                onClickValue: d,
+                onClickKey: d,
+                onClickValue: f,
                 overflow: y,
                 shift: O,
                 updateShift: I
             })));
         }
-        Oe.propTypes = ke;
+        Oe.propTypes = we;
         /* harmony default export */        const xe = Oe;
     }) // CONCATENATED MODULE: ./src/JSONTree/index.ts
     ();