@devexpress/dx-react-grid-bootstrap3 - npm Package Compare versions

Comparing version 1.0.0-alpha.6 to 1.0.0-alpha.7

dist/dx-react-grid-bootstrap3.es.js

 /**
  * Bundle of @devexpress/dx-react-grid-bootstrap3
- * Generated: 2017-07-24
- * Version: 1.0.0-alpha.6
+ * Generated: 2017-08-07
+ * Version: 1.0.0-alpha.7
  * License: https://js.devexpress.com/Licensing
@@ -12,3 +12,3 @@ */
 import { Pager, Pagination } from 'react-bootstrap';
-import { firstRowOnPage, lastRowOnPage } from '@devexpress/dx-grid-core';
+import { firstRowOnPage, getTableRowColumnsWithColSpan, lastRowOnPage } from '@devexpress/dx-grid-core';
 import { DragSource, combineTemplates } from '@devexpress/dx-react-core';
@@ -199,2 +199,3 @@
       style: {
+        cursor: 'move',
         position: 'fixed',
@@ -521,15 +522,19 @@ zIndex: 1000,
     ),
-    '\xA0',
-    allowUngroupingByClick && React.createElement('i', {
-      className: 'glyphicon glyphicon-remove',
-      style: {
-        top: '0',
-        fontSize: '9px',
-        margin: '-5px',
-        padding: '5px'
-      },
-      onClick: function onClick() {
-        return groupByColumn({ columnName: column.name });
-      }
-    })
+    allowUngroupingByClick && React.createElement(
+      'span',
+      null,
+      '\xA0',
+      React.createElement('i', {
+        className: 'glyphicon glyphicon-remove',
+        style: {
+          top: '0',
+          fontSize: '9px',
+          margin: '-5px',
+          padding: '5px'
+        },
+        onClick: function onClick() {
+          return groupByColumn({ columnName: column.name });
+        }
+      })
+    )
   );
@@ -761,9 +766,3 @@ };
 };
-TableSelectAllCell.defaultProps = {
-  style: null,
-  allSelected: false,
-  someSelected: false,
-  selectionAvailable: false,
-  toggleAll: function toggleAll() {}
-};
+
 TableSelectAllCell.propTypes = {
@@ -777,2 +776,10 @@ style: PropTypes.shape(),
 
+TableSelectAllCell.defaultProps = {
+  style: null,
+  allSelected: false,
+  someSelected: false,
+  selectionAvailable: false,
+  toggleAll: function toggleAll() {}
+};
+
 var TableSelectCell = function TableSelectCell(_ref) {
@@ -1387,3 +1394,3 @@ var style = _ref.style,
               </div>
-          );*/
+          ); */
         }
@@ -1548,4 +1555,3 @@ }
       var tableRow = function tableRow(row, position) {
-        var colspan = row.colspan;
-        var columnLength = colspan !== undefined ? colspan + 1 : columns.length;
+        var columnsWithColSpan = getTableRowColumnsWithColSpan(columns, row.colSpanStart);
         return React.createElement(VirtualBox, {
@@ -1557,5 +1563,6 @@ rootTag: 'tr',
           direction: 'horizontal',
-          itemCount: columnLength,
+          itemCount: columnsWithColSpan.length,
           itemInfo: function itemInfo(columnIndex) {
-            var size = columnIndex !== colspan ? columnWidths[columnIndex] : columns.slice(colspan).reduce(function (accum, column) {
+            var columnWithColSpan = columnsWithColSpan[columnIndex];
+            var size = !columnWithColSpan.colspan ? columnWidths[columnIndex] : columns.slice(columnIndex).reduce(function (accum, column) {
               return accum + columnWidths[columns.indexOf(column)];
@@ -1570,3 +1577,3 @@ }, 0);
           itemTemplate: function itemTemplate(columnIndex, _, style) {
-            return cellTemplate({ row: row, column: columns[columnIndex], style: style });
+            return cellTemplate({ row: row, column: columnsWithColSpan[columnIndex].original, style: style });
           }
@@ -1852,3 +1859,3 @@ });
             WebkitUserSelect: 'none'
-          } : {}, allowDragging ? { cursor: 'move' } : {}, allowSorting ? { cursor: 'pointer' } : {}, dragging || column.isDraft ? { opacity: 0.3 } : null, style),
+          } : {}, allowSorting || allowDragging ? { cursor: 'pointer' } : null, dragging || column.isDraft ? { opacity: 0.3 } : null, style),
           onClick: function onClick(e) {
@@ -1935,10 +1942,11 @@ if (!allowSorting) return;
       value = _ref.value,
-      onValueChange = _ref.onValueChange;
+      onValueChange = _ref.onValueChange,
+      style = _ref.style;
   return React.createElement(
     'td',
     {
-      style: {
+      style: _extends({
         verticalAlign: 'middle',
         padding: '1px'
-      }
+      }, style)
     },
@@ -1948,3 +1956,3 @@ React.createElement('input', {
       className: 'form-control',
-      value: value || '',
+      value: value,
       onChange: function onChange(e) {
@@ -1958,8 +1966,11 @@ return onValueChange(e.target.value);
 EditCell.propTypes = {
-  column: PropTypes.object.isRequired,
+  column: PropTypes.object,
   value: PropTypes.any,
-  onValueChange: PropTypes.func.isRequired
+  onValueChange: PropTypes.func.isRequired,
+  style: PropTypes.object
 };
 EditCell.defaultProps = {
-  value: undefined
+  column: {},
+  value: '',
+  style: {}
 };
@@ -1966,0 +1977,0 @@

dist/dx-react-grid-bootstrap3.umd.js

 /**
  * Bundle of @devexpress/dx-react-grid-bootstrap3
- * Generated: 2017-07-24
- * Version: 1.0.0-alpha.6
+ * Generated: 2017-08-07
+ * Version: 1.0.0-alpha.7
  * License: https://js.devexpress.com/Licensing
@@ -200,2 +200,3 @@ */
       style: {
+        cursor: 'move',
         position: 'fixed',
@@ -522,15 +523,19 @@ zIndex: 1000,
     ),
-    '\xA0',
-    allowUngroupingByClick && React.createElement('i', {
-      className: 'glyphicon glyphicon-remove',
-      style: {
-        top: '0',
-        fontSize: '9px',
-        margin: '-5px',
-        padding: '5px'
-      },
-      onClick: function onClick() {
-        return groupByColumn({ columnName: column.name });
-      }
-    })
+    allowUngroupingByClick && React.createElement(
+      'span',
+      null,
+      '\xA0',
+      React.createElement('i', {
+        className: 'glyphicon glyphicon-remove',
+        style: {
+          top: '0',
+          fontSize: '9px',
+          margin: '-5px',
+          padding: '5px'
+        },
+        onClick: function onClick() {
+          return groupByColumn({ columnName: column.name });
+        }
+      })
+    )
   );
@@ -762,9 +767,3 @@ };
 };
-TableSelectAllCell.defaultProps = {
-  style: null,
-  allSelected: false,
-  someSelected: false,
-  selectionAvailable: false,
-  toggleAll: function toggleAll() {}
-};
+
 TableSelectAllCell.propTypes = {
@@ -778,2 +777,10 @@ style: PropTypes.shape(),
 
+TableSelectAllCell.defaultProps = {
+  style: null,
+  allSelected: false,
+  someSelected: false,
+  selectionAvailable: false,
+  toggleAll: function toggleAll() {}
+};
+
 var TableSelectCell = function TableSelectCell(_ref) {
@@ -1388,3 +1395,3 @@ var style = _ref.style,
               </div>
-          );*/
+          ); */
         }
@@ -1549,4 +1556,3 @@ }
       var tableRow = function tableRow(row, position) {
-        var colspan = row.colspan;
-        var columnLength = colspan !== undefined ? colspan + 1 : columns.length;
+        var columnsWithColSpan = _devexpress_dxGridCore.getTableRowColumnsWithColSpan(columns, row.colSpanStart);
         return React.createElement(VirtualBox, {
@@ -1558,5 +1564,6 @@ rootTag: 'tr',
           direction: 'horizontal',
-          itemCount: columnLength,
+          itemCount: columnsWithColSpan.length,
           itemInfo: function itemInfo(columnIndex) {
-            var size = columnIndex !== colspan ? columnWidths[columnIndex] : columns.slice(colspan).reduce(function (accum, column) {
+            var columnWithColSpan = columnsWithColSpan[columnIndex];
+            var size = !columnWithColSpan.colspan ? columnWidths[columnIndex] : columns.slice(columnIndex).reduce(function (accum, column) {
               return accum + columnWidths[columns.indexOf(column)];
@@ -1571,3 +1578,3 @@ }, 0);
           itemTemplate: function itemTemplate(columnIndex, _, style) {
-            return cellTemplate({ row: row, column: columns[columnIndex], style: style });
+            return cellTemplate({ row: row, column: columnsWithColSpan[columnIndex].original, style: style });
           }
@@ -1853,3 +1860,3 @@ });
             WebkitUserSelect: 'none'
-          } : {}, allowDragging ? { cursor: 'move' } : {}, allowSorting ? { cursor: 'pointer' } : {}, dragging || column.isDraft ? { opacity: 0.3 } : null, style),
+          } : {}, allowSorting || allowDragging ? { cursor: 'pointer' } : null, dragging || column.isDraft ? { opacity: 0.3 } : null, style),
           onClick: function onClick(e) {
@@ -1936,10 +1943,11 @@ if (!allowSorting) return;
       value = _ref.value,
-      onValueChange = _ref.onValueChange;
+      onValueChange = _ref.onValueChange,
+      style = _ref.style;
   return React.createElement(
     'td',
     {
-      style: {
+      style: _extends({
         verticalAlign: 'middle',
         padding: '1px'
-      }
+      }, style)
     },
@@ -1949,3 +1957,3 @@ React.createElement('input', {
       className: 'form-control',
-      value: value || '',
+      value: value,
       onChange: function onChange(e) {
@@ -1959,8 +1967,11 @@ return onValueChange(e.target.value);
 EditCell.propTypes = {
-  column: PropTypes.object.isRequired,
+  column: PropTypes.object,
   value: PropTypes.any,
-  onValueChange: PropTypes.func.isRequired
+  onValueChange: PropTypes.func.isRequired,
+  style: PropTypes.object
 };
 EditCell.defaultProps = {
-  value: undefined
+  column: {},
+  value: '',
+  style: {}
 };
@@ -1967,0 +1978,0 @@

package.json

 {
   "name": "@devexpress/dx-react-grid-bootstrap3",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.7",
   "description": "Bootstrap 3 templates for DevExtreme React Grid component",
@@ -59,6 +59,6 @@ "author": {
   "devDependencies": {
-    "@devexpress/dx-grid-core": "1.0.0-alpha.6",
-    "@devexpress/dx-react-core": "1.0.0-alpha.6",
-    "@devexpress/dx-react-grid": "1.0.0-alpha.6",
-    "@devexpress/dx-testing": "1.0.0-alpha.5",
+    "@devexpress/dx-grid-core": "1.0.0-alpha.7",
+    "@devexpress/dx-react-core": "1.0.0-alpha.7",
+    "@devexpress/dx-react-grid": "1.0.0-alpha.7",
+    "@devexpress/dx-testing": "1.0.0-alpha.7",
     "babel-cli": "^6.24.1",
@@ -98,5 +98,5 @@ "babel-core": "^6.25.0",
   "peerDependencies": {
-    "@devexpress/dx-grid-core": "1.0.0-alpha.6",
-    "@devexpress/dx-react-core": "1.0.0-alpha.6",
-    "@devexpress/dx-react-grid": "1.0.0-alpha.6",
+    "@devexpress/dx-grid-core": "1.0.0-alpha.7",
+    "@devexpress/dx-react-core": "1.0.0-alpha.7",
+    "@devexpress/dx-react-grid": "1.0.0-alpha.7",
     "react": "^15.5.4",
@@ -103,0 +103,0 @@ "react-bootstrap": "^0.31.0"

README.md

 # DevExtreme React Grid Bootstrap3
 
-A template suite used to customize the React Grid with Bootstrap3 rendering.
+A template suite used to render the React Grid based on Bootstrap 3 components.
 
 ## Installation
 
-Install the main dx-react-grid package with its dependencies and templates for Bootstrap 3:
+Install the main dx-react-grid package with its dependencies and Bootstrap 3 templates:
 
@@ -37,7 +37,7 @@ ```
 
-Make sure that [React-Boostrap](https://react-bootstrap.github.io) dependencies are installed and configured. Check the React-Bootstrap's [Getting Started](https://react-bootstrap.github.io/getting-started.html) article for configuration details. 
+Make sure that [React-Boostrap](https://react-bootstrap.github.io) dependencies are installed and properly configured. Check the React-Bootstrap's [Getting Started](https://react-bootstrap.github.io/getting-started.html) article for configuration details. 
 
 ## Getting started
 
-This package provides components and plugins implementing Bootstrap 3 rendering for the React Grid, which you can use instead of the ones provided by the original React Grid package.
+This package provides components and plugins implementing Bootstrap 3 rendering for the React Grid, which you can use instead of the original React Grid package ones.
 
@@ -66,8 +66,6 @@ See [demos](https://devexpress.github.io/devextreme-reactive/react/grid/demos/) for more information.
 
-Each plugin has properties with the 'Template' postfix. Components passed to such properties are templates.
+The templates are defined via properties that end with the 'Template' postfix which accept a rendering function. Assign a custom function to the required property to override the default rendering function. The custom function should return `undefined` if you need to invoke the default behavior under certain conditions.
 
-You can override templates by passing your component or rendering function, or return `undefined` from your custom template to render a UI item with a built-in template.
-
 ## License
 
 [DevExtreme licensing](https://js.devexpress.com/licensing/).

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

305053

increased by0.47%

Lines of code

3863

increased by0.47%

Worsened metrics

Number of lines in readme file

70

decreased by-2.78%

No dependency changes