Comparing version 3.1.2 to 3.2.1
@@ -66,3 +66,4 @@ import { ActionType } from './enums'; | ||
}); }; | ||
export var showLoading = function () { return ({ | ||
export var showLoading = function (text) { return ({ | ||
text: text, | ||
type: ActionType.ShowLoading, | ||
@@ -69,0 +70,0 @@ }); }; |
@@ -82,3 +82,4 @@ import { ActionType } from './enums'; | ||
export const showLoading = () => ({ | ||
export const showLoading = (text?: string) => ({ | ||
text, | ||
type: ActionType.ShowLoading, | ||
@@ -85,0 +86,0 @@ }); |
import * as React from 'react'; | ||
var Loading = function (props) { | ||
var enabled = props.enabled; | ||
var enabled = props.enabled, text = props.text; | ||
if (enabled) { | ||
return (React.createElement("div", { className: 'ka-loading' }, | ||
React.createElement("div", { className: 'ka-loading-icon' }))); | ||
React.createElement("div", { className: 'ka-loading-icon' }), | ||
text && (React.createElement("div", { className: 'ka-loading-text' }, text)))); | ||
} | ||
@@ -8,0 +9,0 @@ return (React.createElement(React.Fragment, null)); |
@@ -45,3 +45,3 @@ var __assign = (this && this.__assign) || function () { | ||
React.createElement(TableBody, __assign({}, props, { childAttributes: childAttributes, columns: preparedOptions.columns, data: preparedOptions.groupedData, dispatch: dispatch, editableCells: editableCells, editingMode: editingMode, groupColumnsCount: preparedOptions.groupColumnsCount, groupedColumns: preparedOptions.groupedColumns, groupsExpanded: groupsExpanded, selectedRows: selectedRows }))), | ||
React.createElement(Loading, { enabled: isLoadingActive }))); | ||
React.createElement(Loading, __assign({}, loading)))); | ||
}; |
{ | ||
"name": "ka-table", | ||
"version": "3.1.2", | ||
"version": "3.2.1", | ||
"license": "MIT", | ||
@@ -5,0 +5,0 @@ "repository": "github:komarovalexander/ka-table", |
@@ -27,9 +27,13 @@ var __assign = (this && this.__assign) || function () { | ||
var kaReducer = function (state, action) { | ||
var columns = state.columns, _a = state.data, data = _a === void 0 ? [] : _a, _b = state.editableCells, editableCells = _b === void 0 ? [] : _b, groupsExpanded = state.groupsExpanded, rowKeyField = state.rowKeyField, _c = state.selectedRows, selectedRows = _c === void 0 ? [] : _c, virtualScrolling = state.virtualScrolling; | ||
var columns = state.columns, _a = state.data, data = _a === void 0 ? [] : _a, _b = state.editableCells, editableCells = _b === void 0 ? [] : _b, groupsExpanded = state.groupsExpanded, loading = state.loading, rowKeyField = state.rowKeyField, _c = state.selectedRows, selectedRows = _c === void 0 ? [] : _c, virtualScrolling = state.virtualScrolling; | ||
switch (action.type) { | ||
case ActionType.HideLoading: { | ||
return __assign(__assign({}, state), { loading: { enabled: false } }); | ||
return __assign(__assign({}, state), { loading: __assign(__assign({}, loading), { enabled: false }) }); | ||
} | ||
case ActionType.ShowLoading: { | ||
return __assign(__assign({}, state), { loading: { enabled: true } }); | ||
var newLoading = __assign(__assign({}, loading), { enabled: true }); | ||
if (action.text !== undefined) { | ||
newLoading.text = action.text; | ||
} | ||
return __assign(__assign({}, state), { loading: newLoading }); | ||
} | ||
@@ -36,0 +40,0 @@ case ActionType.OpenEditor: { |
@@ -18,2 +18,3 @@ | ||
groupsExpanded, | ||
loading, | ||
rowKeyField, | ||
@@ -26,6 +27,10 @@ selectedRows = [], | ||
case ActionType.HideLoading: { | ||
return { ...state, loading: { enabled: false } }; | ||
return { ...state, loading: {...loading, enabled: false } }; | ||
} | ||
case ActionType.ShowLoading: { | ||
return { ...state, loading: { enabled: true } }; | ||
const newLoading = {...loading, enabled: true }; | ||
if (action.text !== undefined) { | ||
newLoading.text = action.text; | ||
} | ||
return { ...state, loading: newLoading }; | ||
} | ||
@@ -32,0 +37,0 @@ case ActionType.OpenEditor: { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
203589
3944