Merge branch 'master' into combobox-vrt

uber · May 14, 2020 · fa27744 · fa27744
2 parents dee68e4 + f597648
commit fa27744
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/documentation-site/components/yard/config/list-item.ts b/documentation-site/components/yard/config/list-item.ts
@@ -10,7 +10,7 @@ const ListItemConfig: TConfig = {
   componentName: 'ListItem',
   imports: {
     'baseui/list': {
-      named: ['ListItem'],
+      named: ['ListItem', 'ListItemLabel'],
     },
     'baseui/icon': {
       named: ['Check'],
@@ -47,7 +47,7 @@ const ListItemConfig: TConfig = {
       },
     },
     endEnhancer: {
-      value: '() => "Right-Label"',
+      value: '() => <ListItemLabel>End Enhancer</ListItemLabel>',
       type: PropTypes.ReactNode,
       description: 'Right-hand content to render in the list item.',
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baseui",
-  "version": "9.75.1",
+  "version": "9.77.0",
   "description": "A React Component library implementing the Base design language",
   "keywords": [
     "react",
@@ -203,7 +203,7 @@
     "react-is": "^16.8.6",
     "react-movable": "^2.4.0",
     "react-multi-ref": "^1.0.0",
-    "react-range": "^1.6.2",
+    "react-range": "^1.6.3",
     "react-virtualized": "^9.21.1",
     "react-virtualized-auto-sizer": "^1.0.2",
     "react-window": "^1.8.5",

diff --git a/src/layer/index.js b/src/layer/index.js
@@ -5,7 +5,7 @@ This source code is licensed under the MIT license found in the
 LICENSE file in the root directory of this source tree.
 */
 // @flow
-export {default as LayersManager} from './layers-manager.js';
+export {default as LayersManager, LayersContext} from './layers-manager.js';
 export {default as Layer} from './layer.js';
 export {default as TetherBehavior} from './tether.js';
 export {TETHER_PLACEMENT} from './constants.js';

diff --git a/src/tree-view/tree-view.js b/src/tree-view/tree-view.js
@@ -48,7 +48,9 @@ export default function TreeView(props: TreeViewPropsT) {
   const focusTreeItem = (id: TreeNodeIdT | null) => {
     if (!id) return;
     setSelectedNodeId(id);
-    treeItemRefs.current[id].current.focus();
+
+    const node = treeItemRefs.current[id].current;
+    if (node) node.focus();
   };
 
   const onKeyDown = (e: KeyboardEvent, node: TreeNodeT<>) => {

diff --git a/yarn.lock b/yarn.lock
@@ -16781,10 +16781,10 @@ react-proptype-conditional-require@^1.0.4:
   resolved "https://registry.yarnpkg.com/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz#69c2d5741e6df5e08f230f36bbc2944ee1222555"
   integrity sha1-acLVdB5t9eCPIw82u8KUTuEiJVU=
 
-react-range@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/react-range/-/react-range-1.6.2.tgz#bcfcb3024e6b37d094fda2bcb81f14e7cbba91d5"
-  integrity sha512-8WBzsk0SRv1YD2Xjx+CQT3g7bIKu17xWAg9KwSpBmMoRCP93HZ+VNq/4q2rz92m7SncfGXeVYCNgDWpa4bo5jQ==
+react-range@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/react-range/-/react-range-1.6.3.tgz#b92aafbd6178db9822d92e05820fd5a3b1ed167d"
+  integrity sha512-uPK13KEwDcs2OTJPptD393O8yq9qutJRi06TgGH3M10v3kSJmk8UDzNlq/CPOJ1mxUurmLgsLv2Cz5/GvyV3gQ==
 
 react-simple-code-editor@^0.10.0:
   version "0.10.0"