TreeView merge fix

Author: AJIXuMuK

src/webparts/controlsTest/components/ControlsTest.tsx

@@ -39,7 +39,7 @@ import { GridLayout } from '../../../GridLayout';
 import { ComboBoxListItemPicker } from '../../../';
 import { TreeView, ITreeItem, TreeItemActionsDisplayMode, TreeViewSelectionMode } from '../../../controls/treeView';
 import { IIconProps } from 'office-ui-fabric-react/lib/Icon';
-import { IconPicker} from '../../../controls/iconPicker';
+import { IconPicker } from '../../../controls/iconPicker';
 import { ISize } from 'office-ui-fabric-react/lib/Utilities';
 
 // Used to render document cards
@@ -116,6 +116,98 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
     <div id="5" key="5">Donec orci lorem, imperdiet eu nisi sit amet, condimentum scelerisque tortor. Etiam nec lacinia dui. Duis non turpis neque. Sed pellentesque a erat et accumsan. Pellentesque elit odio, elementum nec placerat nec, ornare in tortor. Suspendisse gravida magna maximus mollis facilisis. Duis odio libero, finibus ac suscipit sed, aliquam et diam. Aenean posuere lacus ex. Donec dapibus, sem ac luctus ultrices, justo libero tempor eros, vitae lacinia ex ante non dolor. Curabitur condimentum, ligula id pharetra dictum, libero libero ullamcorper nunc, eu blandit sem arcu ut felis. Nullam lacinia dapibus auctor.</div>
   ];
 
+  private skypeCheckIcon: IIconProps = { iconName: 'SkypeCheck' };
+  private treeitems = [
+    {
+      key: "R1",
+      label: "Root",
+      subLabel: "This is a sub label for node",
+      iconProps: this.skypeCheckIcon,
+      actions: [{
+        title: "Get item",
+        iconProps: {
+          iconName: 'Warning',
+          style: {
+            color: 'salmon',
+          },
+        },
+        id: "GetItem",
+        actionCallback: async (treeItem: ITreeItem) => {
+          console.log(treeItem);
+        }
+      }],
+      children: [
+        {
+          key: "1",
+          label: "Parent 1",
+          selectable: false,
+          children: [
+            {
+              key: "3",
+              label: "Child 1",
+              subLabel: "This is a sub label for node",
+              actions: [{
+                title: "Share",
+                iconProps: {
+                  iconName: 'Share'
+                },
+                id: "GetItem",
+                actionCallback: async (treeItem: ITreeItem) => {
+                  console.log(treeItem);
+                }
+              }],
+              children: [
+                {
+                  key: "gc1",
+                  label: "Grand Child 1",
+                  actions: [{
+                    title: "Get Grand Child item",
+                    iconProps: {
+                      iconName: 'Mail'
+                    },
+                    id: "GetItem",
+                    actionCallback: async (treeItem: ITreeItem) => {
+                      console.log(treeItem);
+                    }
+                  }]
+                }
+              ]
+            },
+            {
+              key: "4",
+              label: "Child 2",
+              iconProps: this.skypeCheckIcon
+            }
+          ]
+        },
+        {
+          key: "2",
+          label: "Parent 2"
+        },
+        {
+          key: "5",
+          label: "Parent 3",
+          disabled: true
+        },
+        {
+          key: "6",
+          label: "Parent 4",
+          selectable: true
+        }
+      ]
+    },
+    {
+      key: "R2",
+      label: "Root 2",
+      children: [
+        {
+          key: "8",
+          label: "Parent 5"
+        }
+      ]
+    }
+  ];
+
   constructor(props: IControlsTestProps) {
     super(props);
 
@@ -716,8 +808,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
                   onSelectedItem={this.listItemPickerDataSelected} />
 
               </div>
-            <div>Icon Picker</div>
-            <div><IconPicker onSave={(value)=>{console.log(value)}} buttonLabel="Icon Picker"></IconPicker></div>
+              <div>Icon Picker</div>
+              <div><IconPicker onSave={(value) => { console.log(value); }} buttonLabel="Icon Picker"></IconPicker></div>
 
               <div className="ms-font-m">ComboBoxListItemPicker:
 
@@ -955,21 +1047,21 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
             defaultSelectedKeys={['R2', '6']}
             onExpandCollapse={this.onExpandCollapseTree}
             onSelect={this.onItemSelected}
-            // onRenderItem={this.renderCustomTreeItem}
-            />
-            
+          // onRenderItem={this.renderCustomTreeItem}
+          />
+
         </div>
 
-          <div>
-            <Pagination
-             currentPage={3}
-             onChange={(page) => (this._getPage(page))}
-             totalPages={13}
-             //limiter={3}
-             // hideFirstPageJump
-             //hideLastPageJump
-             //limiterIcon={"NumberedListText"}
-            />
+        <div>
+          <Pagination
+            currentPage={3}
+            onChange={(page) => (this._getPage(page))}
+            totalPages={13}
+          //limiter={3}
+          // hideFirstPageJump
+          //hideLastPageJump
+          //limiterIcon={"NumberedListText"}
+          />
         </div>
       </div>
     );
@@ -982,14 +1074,6 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
   private onItemSelected(items: ITreeItem[]) {
     console.log("items selected: " + items.length);
   }
-        
-  private _getPage(page: number){
-    console.log('Page:', page);
-  }
-
-  private _onFolderSelect = (folder: IFolder): void => {
-    console.log('selected folder', folder);
-  }
 
   private renderCustomTreeItem(item: ITreeItem): JSX.Element {
     return (
@@ -1003,97 +1087,9 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
     );
   }
 
-  private skypeCheckIcon: IIconProps = { iconName: 'SkypeCheck' };
-  private treeitems = [
-    {
-      key: "R1",
-      label: "Root",
-      subLabel: "This is a sub label for node",
-      iconProps: this.skypeCheckIcon,
-      actions: [{
-        title: "Get item",
-        iconProps: {
-          iconName: 'Warning',
-          style: {
-            color: 'salmon',
-          },
-        },
-        id: "GetItem",
-        actionCallback: async (treeItem: ITreeItem) => {
-          console.log(treeItem);
-        }
-      }],
-      children: [
-        {
-          key: "1",
-          label: "Parent 1",
-          selectable: false,
-          children: [
-            {
-              key: "3",
-              label: "Child 1",
-              subLabel: "This is a sub label for node",
-              actions: [{
-                title: "Share",
-                iconProps: {
-                  iconName: 'Share'
-                },
-                id: "GetItem",
-                actionCallback: async (treeItem: ITreeItem) => {
-                  console.log(treeItem);
-                }
-              }],
-              children: [
-                {
-                  key: "gc1",
-                  label: "Grand Child 1",
-                  actions: [{
-                    title: "Get Grand Child item",
-                    iconProps: {
-                      iconName: 'Mail'
-                    },
-                    id: "GetItem",
-                    actionCallback: async (treeItem: ITreeItem) => {
-                      console.log(treeItem);
-                    }
-                  }]
-                }
-              ]
-            },
-            {
-              key: "4",
-              label: "Child 2",
-              iconProps: this.skypeCheckIcon
-            }
-          ]
-        },
-        {
-          key: "2",
-          label: "Parent 2"
-        },
-        {
-          key: "5",
-          label: "Parent 3",
-          disabled: true
-        },
-        {
-          key: "6",
-          label: "Parent 4",
-          selectable: true
-        }
-      ]
-    },
-    {
-      key: "R2",
-      label: "Root 2",
-      children: [
-        {
-          key: "8",
-          label: "Parent 5"
-        }
-      ]
-    }
-  ];
+  private _getPage(page: number) {
+    console.log('Page:', page);
+  }
 
   private _onFolderSelect = (folder: IFolder): void => {
     console.log('selected folder', folder);