prettify

gregnb · Jul 25, 2020 · 8607bc2 · 8607bc2
1 parent dcadbc6
commit 8607bc2
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 46 deletions.
diff --git a/src/MUIDataTable.js b/src/MUIDataTable.js
@@ -1248,7 +1248,7 @@ class MUIDataTable extends React.Component {
       },
       () => {
         this.setTableAction('sort');
-        
+
         if (this.options.onColumnSortChange) {
           this.options.onColumnSortChange(this.state.sortOrder.name, this.state.sortOrder.direction);
         }
@@ -1728,8 +1728,10 @@ class MUIDataTable extends React.Component {
 
   sortTable(data, col, order, columnSortCompare = null) {
     let hasCustomTableSort = this.options.customSort && !columnSortCompare;
-    let meta = {selectedRows: this.state.selectedRows}; // meta for customSort    
-    let dataSrc = hasCustomTableSort ? this.options.customSort(data, col, order || (this.options.sortDescFirst ? 'desc' : 'asc'), meta ) : data;
+    let meta = { selectedRows: this.state.selectedRows }; // meta for customSort
+    let dataSrc = hasCustomTableSort
+      ? this.options.customSort(data, col, order || (this.options.sortDescFirst ? 'desc' : 'asc'), meta)
+      : data;
 
     // reset the order by index
     let noSortData;

diff --git a/src/components/Popover.js b/src/components/Popover.js
@@ -69,7 +69,7 @@ const Popover = ({ className, trigger, refExit, hide, content, ...providedProps
           aria-label="Close"
           onClick={handleRequestClose}
           className={closeIconClass}
-          style={{ position: 'absolute', right: '4px', top: '4px',zIndex:'1000' }}>
+          style={{ position: 'absolute', right: '4px', top: '4px', zIndex: '1000' }}>
           <CloseIcon />
         </IconButton>
         {content}

diff --git a/src/components/TableResize.js b/src/components/TableResize.js
@@ -179,7 +179,7 @@ class TableResize extends React.Component {
       };
 
       const isLastColumn = (id, finalCells) => {
-        let len = (selectableRows === 'none') ? 1 : 2;
+        let len = selectableRows === 'none' ? 1 : 2;
         return id === finalCells.length - len;
       };
 

diff --git a/test/MUIDataTable.test.js b/test/MUIDataTable.test.js
@@ -507,10 +507,14 @@ describe('<MUIDataTable />', function() {
   });
 
   it('should correctly sort', () => {
-    const columns = [{
-      name: 'Name',
-      options: {}
-    }, 'Company', 'Location'];
+    const columns = [
+      {
+        name: 'Name',
+        options: {},
+      },
+      'Company',
+      'Location',
+    ];
 
     const data = [
       { Name: 'Joe James', Company: 'Test Corp', Location: 'Las Cruces' },
@@ -531,20 +535,30 @@ describe('<MUIDataTable />', function() {
       { data: ['Bob Herm', 'Test Corp', 'Albuquerque'], dataIndex: 2 },
     ]);
 
-    const wrapper = mount(
-      <MUIDataTable columns={columns} data={data} options={{}} />,
-    );
-
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    const wrapper = mount(<MUIDataTable columns={columns} data={data} options={{}} />);
+
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD1 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD2 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD3 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD4 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
     assert.deepEqual(fetchedDD1, displayData1);
@@ -554,12 +568,16 @@ describe('<MUIDataTable />', function() {
   });
 
   it('should correctly sort when sortThirdClickReset is true', () => {
-    const columns = [{
-      name: 'Name',
-      options: {
-        sortThirdClickReset: true
-      }
-    }, 'Company', 'Location'];
+    const columns = [
+      {
+        name: 'Name',
+        options: {
+          sortThirdClickReset: true,
+        },
+      },
+      'Company',
+      'Location',
+    ];
 
     const data = [
       { Name: 'Joe James', Company: 'Test Corp', Location: 'Las Cruces' },
@@ -586,20 +604,30 @@ describe('<MUIDataTable />', function() {
       { data: ['James Houston', 'Test Corp', 'Santa Fe'], dataIndex: 3 },
     ]);
 
-    const wrapper = mount(
-      <MUIDataTable columns={columns} data={data} options={{}} />,
-    );
-
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    const wrapper = mount(<MUIDataTable columns={columns} data={data} options={{}} />);
+
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD1 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD2 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD3 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD4 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
     assert.deepEqual(fetchedDD1, displayData1);
@@ -609,13 +637,17 @@ describe('<MUIDataTable />', function() {
   });
 
   it('should correctly sort when sortDescFirst and sortThirdClickReset are true', () => {
-    const columns = [{
-      name: 'Name',
-      options: {
-        sortDescFirst: true,
-        sortThirdClickReset: true
-      }
-    }, 'Company', 'Location'];
+    const columns = [
+      {
+        name: 'Name',
+        options: {
+          sortDescFirst: true,
+          sortThirdClickReset: true,
+        },
+      },
+      'Company',
+      'Location',
+    ];
 
     const data = [
       { Name: 'Joe James', Company: 'Test Corp', Location: 'Las Cruces' },
@@ -642,20 +674,30 @@ describe('<MUIDataTable />', function() {
       { data: ['James Houston', 'Test Corp', 'Santa Fe'], dataIndex: 3 },
     ]);
 
-    const wrapper = mount(
-      <MUIDataTable columns={columns} data={data} options={{}} />,
-    );
-
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    const wrapper = mount(<MUIDataTable columns={columns} data={data} options={{}} />);
+
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD1 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD2 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD3 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
-    wrapper.find('[data-testid="headcol-0"]').at(0).simulate('click');
+    wrapper
+      .find('[data-testid="headcol-0"]')
+      .at(0)
+      .simulate('click');
     const fetchedDD4 = JSON.stringify(wrapper.childAt(0).state('displayData'));
 
     assert.deepEqual(fetchedDD1, displayData1);