diff --git a/resources/js/Components/DataTable/DataTable.jsx b/resources/js/Components/DataTable/DataTable.jsx index f25592e85..2b0f71496 100644 --- a/resources/js/Components/DataTable/DataTable.jsx +++ b/resources/js/Components/DataTable/DataTable.jsx @@ -29,7 +29,7 @@ export default class DataTable extends Component { -
+ {this.tableRows(vnode.children)} @@ -126,11 +126,11 @@ export default class DataTable extends Component { } showProgress() { - $(this.element).find('.mdc-data-table__progress-indicator mwc-linear-progress').get(0).open(); + $(this.element).addClass('mdc-data-table--in-progress').find('.mdc-data-table__progress-indicator mwc-linear-progress').get(0).open(); } hideProgress() { - $(this.element).find('.mdc-data-table__progress-indicator mwc-linear-progress').get(0).open(); + $(this.element).removeClass('mdc-data-table--in-progress').find('.mdc-data-table__progress-indicator mwc-linear-progress').get(0).open(); } onColumnClicked(event: Event) { diff --git a/resources/js/Components/DataTable/TableCell.jsx b/resources/js/Components/DataTable/TableCell.jsx index 0352410bc..167d3b5e2 100644 --- a/resources/js/Components/DataTable/TableCell.jsx +++ b/resources/js/Components/DataTable/TableCell.jsx @@ -14,7 +14,7 @@ export default class TableCell extends Component { }); if ((!vnode.children || vnode.children.length === 0) && this.attrs.get('type') === 'checkbox') { - vnode.children =