Merge pull request #8 from Lodin/fix/optional-options

Allow calling recomputeTree without arguments

Author: Lodin

.babelrc.js

@@ -5,6 +5,7 @@ const isLib = BUILD_TYPE === 'lib';
 module.exports = api => ({
   plugins: [
     [require('@babel/plugin-proposal-class-properties'), {loose: true}],
+    [require('@babel/plugin-proposal-optional-chaining'), {loose: true}],
     ...(isLib
       ? []
       : [

__stories__/FixedSizeTree.story.tsx

@@ -60,7 +60,7 @@ const defaultButtonStyle = {fontFamily: 'Courier New'};
 
 function* treeWalker(
   refresh: boolean,
-): IterableIterator<FixedSizeNodeData<ExtendedData> | string | symbol> {
+): Generator<FixedSizeNodeData<ExtendedData> | string | symbol, void, boolean> {
   const stack: StackElement[] = [];
 
   stack.push({
@@ -94,9 +94,9 @@ function* treeWalker(
   }
 }
 
-const Node: React.FunctionComponent<
-  FixedSizeNodeComponentProps<ExtendedData>
-> = ({data: {isLeaf, name, nestingLevel}, isOpen, style, toggle}) => (
+const Node: React.FunctionComponent<FixedSizeNodeComponentProps<
+  ExtendedData
+>> = ({data: {isLeaf, name, nestingLevel}, isOpen, style, toggle}) => (
   <div
     style={{
       ...style,

__stories__/VariableSizeTree.story.tsx

@@ -58,9 +58,9 @@ const rootNode = createNode();
 const defaultGapStyle = {marginLeft: 10};
 const defaultButtonStyle = {fontFamily: 'Courier New'};
 
-const Node: React.FunctionComponent<
-  VariableSizeNodeComponentProps<ExtendedData>
-> = ({
+const Node: React.FunctionComponent<VariableSizeNodeComponentProps<
+  ExtendedData
+>> = ({
   height,
   data: {isLeaf, name, nestingLevel},
   isOpen,
@@ -116,7 +116,11 @@ const TreePresenter: React.FunctionComponent<TreePresenterProps> = ({
   const treeWalker = React.useCallback(
     function*(
       refresh: boolean,
-    ): IterableIterator<VariableSizeNodeData<ExtendedData> | string | symbol> {
+    ): Generator<
+      VariableSizeNodeData<ExtendedData> | string | symbol,
+      void,
+      boolean
+    > {
       const stack: StackElement[] = [];
 
       stack.push({
@@ -154,9 +158,7 @@ const TreePresenter: React.FunctionComponent<TreePresenterProps> = ({
   );
 
   React.useEffect(() => {
-    if (tree.current) {
-      tree.current!.recomputeTree({refreshNodes: true, useDefaultHeight: true});
-    }
+    tree.current?.recomputeTree({refreshNodes: true, useDefaultHeight: true});
   }, [itemSize]);
 
   return (

__tests__/FixedSizeTree.spec.tsx

@@ -26,9 +26,9 @@ type ExtendedData = {
 };
 
 describe('FixedSizeTree', () => {
-  const Node: React.FunctionComponent<
-    FixedSizeNodeComponentProps<ExtendedData>
-  > = () => null;
+  const Node: React.FunctionComponent<FixedSizeNodeComponentProps<
+    ExtendedData
+  >> = () => null;
 
   let component: ReactWrapper<
     FixedSizeTreeProps<ExtendedData>,
@@ -41,7 +41,10 @@ describe('FixedSizeTree', () => {
 
   beforeEach(() => {
     tree = {
-      children: [{id: 'foo-2', name: 'Foo #2'}, {id: 'foo-3', name: 'Foo #3'}],
+      children: [
+        {id: 'foo-2', name: 'Foo #2'},
+        {id: 'foo-3', name: 'Foo #3'},
+      ],
       id: 'foo-1',
       name: 'Foo #1',
     };
@@ -196,7 +199,7 @@ describe('FixedSizeTree', () => {
           name: 'Foo #1',
         };
 
-        await treeInstance.recomputeTree({refreshNodes: false});
+        await treeInstance.recomputeTree();
         component.update(); // update the wrapper to get the latest changes
 
         expect(component.find(FixedSizeList).prop('itemData')).toMatchObject({

__tests__/VariableSizeTree.spec.tsx

@@ -26,9 +26,9 @@ type ExtendedData = {
 };
 
 describe('VariableSizeTree', () => {
-  const Node: React.FunctionComponent<
-    VariableSizeNodeComponentProps<ExtendedData>
-  > = () => null;
+  const Node: React.FunctionComponent<VariableSizeNodeComponentProps<
+    ExtendedData
+  >> = () => null;
 
   let component: ReactWrapper<
     VariableSizeTreeProps<ExtendedData>,
@@ -42,7 +42,10 @@ describe('VariableSizeTree', () => {
 
   beforeEach(() => {
     tree = {
-      children: [{id: 'foo-2', name: 'Foo #2'}, {id: 'foo-3', name: 'Foo #3'}],
+      children: [
+        {id: 'foo-2', name: 'Foo #2'},
+        {id: 'foo-3', name: 'Foo #3'},
+      ],
       id: 'foo-1',
       name: 'Foo #1',
     };
@@ -212,7 +215,7 @@ describe('VariableSizeTree', () => {
           name: 'Foo #1',
         };
 
-        await treeInstance.recomputeTree({refreshNodes: false});
+        await treeInstance.recomputeTree();
         component.update(); // update the wrapper to get the latest changes
 
         expect(component.find(VariableSizeList).prop('itemData')).toMatchObject(