x25 17.4.1 → 17.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Loader/LoaderRender.d.ts +2 -0
- package/Loader/LoaderRender.js +7 -7
- package/Loader/LoaderRender.js.map +1 -1
- package/Loader/index.d.ts +28 -7
- package/Loader/index.js +57 -23
- package/Loader/index.js.map +1 -1
- package/Modal/ModalWindow.js +5 -2
- package/Modal/ModalWindow.js.map +1 -1
- package/package.json +1 -1
package/Loader/LoaderRender.d.ts
CHANGED
package/Loader/LoaderRender.js
CHANGED
|
@@ -51,16 +51,16 @@ var createLoadGenericData = function (_a) {
|
|
|
51
51
|
var response;
|
|
52
52
|
return __generator(this, function (_a) {
|
|
53
53
|
switch (_a.label) {
|
|
54
|
-
case 0: return [4 /*yield*/, superagent_1.default.
|
|
54
|
+
case 0: return [4 /*yield*/, (superagent_1.default.
|
|
55
55
|
get(typeof url === "string" ? url : url(token)).
|
|
56
|
-
type("json")];
|
|
56
|
+
type("json"))];
|
|
57
57
|
case 1:
|
|
58
58
|
response = _a.sent();
|
|
59
59
|
return [2 /*return*/, normalizeResult(response)];
|
|
60
60
|
}
|
|
61
61
|
});
|
|
62
62
|
}); }), LoaderRender = function (props) {
|
|
63
|
-
var children = props.children, token = props.token, shouldFetch = (0, react_redux_1.useSelector)(function (state) { return selectors.shouldFetch(state, token); }), isFetching = (0, react_redux_1.useSelector)(function (state) { return selectors.isFetching(state, token); }), hasError = (0, react_redux_1.useSelector)(function (state) { return selectors.hasError(state, token); }), dispatch = (0, react_redux_1.useDispatch)(), performFetch = function () {
|
|
63
|
+
var children = props.children, token = props.token, shouldFetch = (0, react_redux_1.useSelector)(function (state) { return selectors.shouldFetch(state, token); }), isFetching = (0, react_redux_1.useSelector)(function (state) { return selectors.isFetching(state, token); }), hasError = (0, react_redux_1.useSelector)(function (state) { return selectors.hasError(state, token); }), hasBeenFetched = (0, react_redux_1.useSelector)(function (state) { return selectors.hasBeenFetched(state, token); }), doNotShowLoading = props.keepShowingDataIfHasBeenFetched && hasBeenFetched, dispatch = (0, react_redux_1.useDispatch)(), performFetch = function () {
|
|
64
64
|
dispatch(createAction(token));
|
|
65
65
|
};
|
|
66
66
|
react_1.default.useEffect(function () {
|
|
@@ -68,11 +68,11 @@ var createLoadGenericData = function (_a) {
|
|
|
68
68
|
performFetch();
|
|
69
69
|
}
|
|
70
70
|
}, [shouldFetch, hasError, isFetching]);
|
|
71
|
-
if (hasError) {
|
|
72
|
-
return react_1.default.createElement(Messages_1.LargeErrorMessage, { message: utility_1.words.ThereWasAProblem, onRetry: performFetch });
|
|
71
|
+
if (!doNotShowLoading && hasError) {
|
|
72
|
+
return (props.sm ? (react_1.default.createElement(Messages_1.ErrorMessage, { message: utility_1.words.ThereWasAProblem, onRetry: performFetch })) : (react_1.default.createElement(Messages_1.LargeErrorMessage, { message: utility_1.words.ThereWasAProblem, onRetry: performFetch })));
|
|
73
73
|
}
|
|
74
|
-
if (isFetching) {
|
|
75
|
-
return react_1.default.createElement(Messages_1.LoadingMessage, { message: utility_1.words.LoadingData });
|
|
74
|
+
if (!doNotShowLoading && isFetching) {
|
|
75
|
+
return react_1.default.createElement(Messages_1.LoadingMessage, { message: utility_1.words.LoadingData, sm: props.sm });
|
|
76
76
|
}
|
|
77
77
|
return children;
|
|
78
78
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoaderRender.js","sourceRoot":"","sources":["../../src/Loader/LoaderRender.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;
|
|
1
|
+
{"version":3,"file":"LoaderRender.js","sourceRoot":"","sources":["../../src/Loader/LoaderRender.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAS1B,4CAAoD;AACpD,2CAAuD;AACvD,0DAAoC;AACpC,wCAA8E;AAC9E,sCAAmC;AAYnC,IACE,qBAAqB,GAAG,UAAC,EAAgE;QAA9D,GAAG,SAAA,EAAE,GAAG,SAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA;IAC7D,IACE,YAAY,GAAG,IAAA,0BAAgB,EAAC,GAAG,EAAE,UAAO,KAAc;;;;wBAE3C,qBAAM,CACf,oBAAU;wBACR,GAAG,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;wBAC/C,IAAI,CAAC,MAAM,CAAC,CACf,EAAA;;oBAJD,QAAQ,GAAG,SAIV;oBAEH,sBAAO,eAAe,CAAC,QAAQ,CAAC,EAAC;;;SAClC,CACO,EACR,YAAY,GAAG,UAAC,KAAgB;QAE1B,IAAA,QAAQ,GAAY,KAAK,SAAjB,EAAE,KAAK,GAAK,KAAK,MAAV,EACjB,WAAW,GAAG,IAAA,yBAAW,EAAC,UAAC,KAAW,IAAK,OAAA,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,EAAnC,CAAmC,CAAC,EAC/E,UAAU,GAAG,IAAA,yBAAW,EAAC,UAAC,KAAW,IAAK,OAAA,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,EAAlC,CAAkC,CAAC,EAC7E,QAAQ,GAAG,IAAA,yBAAW,EAAC,UAAC,KAAW,IAAK,OAAA,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAhC,CAAgC,CAAC,EACzE,cAAc,GAAG,IAAA,yBAAW,EAAC,UAAC,KAAW,IAAK,OAAA,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,EAAtC,CAAsC,CAAC,EAErF,gBAAgB,GAAG,KAAK,CAAC,+BAA+B,IAAI,cAAc,EAE1E,QAAQ,GAAG,IAAA,yBAAW,GAAE,EACxB,YAAY,GAAG;YACb,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC;QAEJ,eAAK,CAAC,SAAS,CAAC;YACd,IAAI,WAAW,EAAE;gBACf,YAAY,EAAE,CAAC;aAChB;QACH,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QAExC,IAAI,CAAC,gBAAgB,IAAI,QAAQ,EAAE;YACjC,OAAO,CACL,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CACT,8BAAC,uBAAY,IAAC,OAAO,EAAE,eAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,GAAI,CACzE,CAAC,CAAC,CAAC,CACF,8BAAC,4BAAiB,IAAC,OAAO,EAAE,eAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,GAAI,CAC9E,CACF,CAAC;SACH;QAED,IAAI,CAAC,gBAAgB,IAAI,UAAU,EAAE;YACnC,OAAO,8BAAC,yBAAc,IAAC,OAAO,EAAE,eAAK,CAAC,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,GAAI,CAAC;SACrE;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEJ,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEJ,kBAAe,qBAAqB,CAAC"}
|
package/Loader/index.d.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import Immutable from "immutable";
|
|
2
2
|
import { CreateGenericOptions } from "./LoaderRender";
|
|
3
3
|
declare type State = Immutable.Map<string, any>;
|
|
4
|
+
declare type Options = {
|
|
5
|
+
location?: string;
|
|
6
|
+
};
|
|
4
7
|
export declare const createLoader: ({ key, url, normalizeResult }: CreateGenericOptions) => {
|
|
5
8
|
key: string;
|
|
6
9
|
selectors: {
|
|
@@ -158,6 +161,7 @@ export declare const createLoader: ({ key, url, normalizeResult }: CreateGeneric
|
|
|
158
161
|
clearCache: () => void;
|
|
159
162
|
};
|
|
160
163
|
getData: (state: State) => Immutable.Map<string, any>;
|
|
164
|
+
hasBeenFetched: (state: State, token: string) => boolean;
|
|
161
165
|
getItem: ((state: {
|
|
162
166
|
readonly size: number;
|
|
163
167
|
set: (key: string, value: any) => State;
|
|
@@ -619,23 +623,40 @@ export declare const createLoader: ({ key, url, normalizeResult }: CreateGeneric
|
|
|
619
623
|
isFetching: (state: State, token: string) => boolean;
|
|
620
624
|
};
|
|
621
625
|
actions: {
|
|
622
|
-
|
|
626
|
+
clearAll: () => {
|
|
623
627
|
type: string;
|
|
624
628
|
};
|
|
625
|
-
|
|
629
|
+
clearToken: (token: string) => {
|
|
626
630
|
type: string;
|
|
627
|
-
payload:
|
|
631
|
+
payload: {
|
|
632
|
+
token: string;
|
|
633
|
+
};
|
|
628
634
|
};
|
|
629
|
-
|
|
635
|
+
addItem: (payload: any, options: Options) => {
|
|
630
636
|
type: string;
|
|
631
|
-
payload:
|
|
637
|
+
payload: {
|
|
638
|
+
Data: any;
|
|
639
|
+
location?: string | undefined;
|
|
640
|
+
};
|
|
632
641
|
};
|
|
633
|
-
|
|
642
|
+
modifyItem: (payload: any, options: Options) => {
|
|
634
643
|
type: string;
|
|
635
|
-
payload:
|
|
644
|
+
payload: {
|
|
645
|
+
Data: any;
|
|
646
|
+
location?: string | undefined;
|
|
647
|
+
};
|
|
648
|
+
};
|
|
649
|
+
deleteItem: (payload: any, options: Options) => {
|
|
650
|
+
type: string;
|
|
651
|
+
payload: {
|
|
652
|
+
Data: any;
|
|
653
|
+
location?: string | undefined;
|
|
654
|
+
};
|
|
636
655
|
};
|
|
637
656
|
};
|
|
638
657
|
Load: (props: {
|
|
658
|
+
sm?: boolean | undefined;
|
|
659
|
+
keepShowingDataIfHasBeenFetched?: boolean | undefined;
|
|
639
660
|
readonly children: any;
|
|
640
661
|
token: string;
|
|
641
662
|
}) => any;
|
package/Loader/index.js
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
15
|
};
|
|
@@ -11,16 +22,23 @@ var immutable_1 = __importDefault(require("immutable"));
|
|
|
11
22
|
var reselect_1 = require("reselect");
|
|
12
23
|
var utility_1 = require("../utility");
|
|
13
24
|
var LoaderRender_1 = __importDefault(require("./LoaderRender"));
|
|
14
|
-
var
|
|
25
|
+
var findLocation = function (payload) {
|
|
26
|
+
var location = payload.location, Data = payload.Data;
|
|
27
|
+
return (immutable_1.default.
|
|
28
|
+
List(["data"]).
|
|
29
|
+
merge(immutable_1.default.List(location ? String(location).split(",") : [])).
|
|
30
|
+
push(String(Data.get("ID"))).
|
|
31
|
+
toJS());
|
|
32
|
+
}, initialStatusState = immutable_1.default.Map({
|
|
15
33
|
errorMessage: utility_1.noError,
|
|
16
34
|
fetched: false,
|
|
17
|
-
fetching:
|
|
35
|
+
fetching: false,
|
|
18
36
|
}), statusReducer = "status", initialState = immutable_1.default.Map((_a = {},
|
|
19
37
|
_a[statusReducer] = immutable_1.default.Map(),
|
|
20
38
|
_a.data = immutable_1.default.Map(),
|
|
21
39
|
_a)), pending = function (state, _a) {
|
|
22
40
|
var arg = _a.meta.arg;
|
|
23
|
-
return (state.mergeIn([statusReducer, arg], initialStatusState));
|
|
41
|
+
return (state.mergeIn([statusReducer, arg], initialStatusState.set("fetching", true)));
|
|
24
42
|
}, rejected = function (state, _a) {
|
|
25
43
|
var arg = _a.meta.arg;
|
|
26
44
|
return (state.mergeDeepIn([statusReducer, arg], immutable_1.default.Map({
|
|
@@ -29,10 +47,23 @@ var initialStatusState = immutable_1.default.Map({
|
|
|
29
47
|
})));
|
|
30
48
|
}, setItem = function (state, _a) {
|
|
31
49
|
var payload = _a.payload;
|
|
32
|
-
return (state.setIn(
|
|
50
|
+
return (state.setIn(findLocation(payload), payload.Data));
|
|
33
51
|
}, deleteItemReducer = function (state, _a) {
|
|
34
52
|
var payload = _a.payload;
|
|
35
|
-
return state.deleteIn(
|
|
53
|
+
return (state.deleteIn(findLocation(payload)));
|
|
54
|
+
}, clearToken = function (state, _a) {
|
|
55
|
+
var token = _a.payload.token;
|
|
56
|
+
return (state.mergeDeepIn([statusReducer, token], initialStatusState));
|
|
57
|
+
}, fulfilled = function (state, _a) {
|
|
58
|
+
var meta = _a.meta, payload = _a.payload;
|
|
59
|
+
return (state.
|
|
60
|
+
setIn([statusReducer, meta.arg], (immutable_1.default.Map({
|
|
61
|
+
fetched: true,
|
|
62
|
+
fetching: false,
|
|
63
|
+
error: utility_1.noError,
|
|
64
|
+
hasBeenFetched: true,
|
|
65
|
+
}))).
|
|
66
|
+
mergeDeepIn(["data"], payload));
|
|
36
67
|
};
|
|
37
68
|
var createLoader = function (_a) {
|
|
38
69
|
var key = _a.key, url = _a.url, normalizeResult = _a.normalizeResult;
|
|
@@ -44,15 +75,11 @@ var createLoader = function (_a) {
|
|
|
44
75
|
case "".concat(key, "/rejected"):
|
|
45
76
|
return rejected(state, action);
|
|
46
77
|
case "".concat(key, "/fulfilled"):
|
|
47
|
-
return (state
|
|
48
|
-
setIn([statusReducer, action.meta.arg], (immutable_1.default.Map({
|
|
49
|
-
fetched: true,
|
|
50
|
-
fetching: false,
|
|
51
|
-
error: utility_1.noError,
|
|
52
|
-
}))).
|
|
53
|
-
mergeDeepIn(["data"], action.payload));
|
|
78
|
+
return fulfilled(state, action);
|
|
54
79
|
case "".concat(key, "/clear-all"):
|
|
55
80
|
return initialState;
|
|
81
|
+
case "".concat(key, "/clear-token"):
|
|
82
|
+
return clearToken(state, action);
|
|
56
83
|
case "".concat(key, "/add"):
|
|
57
84
|
case "".concat(key, "/modify"):
|
|
58
85
|
return setItem(state, action);
|
|
@@ -61,22 +88,28 @@ var createLoader = function (_a) {
|
|
|
61
88
|
default:
|
|
62
89
|
return state;
|
|
63
90
|
}
|
|
64
|
-
}, addItem = function (payload) { return ({
|
|
91
|
+
}, addItem = function (payload, options) { return ({
|
|
65
92
|
type: "".concat(key, "/add"),
|
|
66
|
-
payload: payload,
|
|
67
|
-
}); }, modifyItem = function (payload) { return ({
|
|
93
|
+
payload: __assign(__assign({}, options), { Data: payload }),
|
|
94
|
+
}); }, modifyItem = function (payload, options) { return ({
|
|
68
95
|
type: "".concat(key, "/modify"),
|
|
69
|
-
payload: payload,
|
|
70
|
-
}); }, deleteItem = function (payload) { return ({
|
|
96
|
+
payload: __assign(__assign({}, options), { Data: payload }),
|
|
97
|
+
}); }, deleteItem = function (payload, options) { return ({
|
|
71
98
|
type: "".concat(key, "/delete"),
|
|
72
|
-
payload: payload,
|
|
73
|
-
}); },
|
|
74
|
-
!isFetched &&
|
|
75
|
-
error === utility_1.noError); }), isFetched = (0, reselect_1.createSelector)(getFetchedSelector, getError, function (isFetchedState, error) { return isFetchedState && error === utility_1.noError; }), hasError = (0, reselect_1.createSelector)(getError, function (error) { return error !== utility_1.noError; }), clearAllAction = function () { return ({
|
|
99
|
+
payload: __assign(__assign({}, options), { Data: payload }),
|
|
100
|
+
}); }, clearAllAction = function () { return ({
|
|
76
101
|
type: "".concat(key, "/clear-all"),
|
|
77
|
-
}); },
|
|
102
|
+
}); }, clearTokenAction = function (token) { return ({
|
|
103
|
+
type: "".concat(key, "/clear-token"),
|
|
104
|
+
payload: {
|
|
105
|
+
token: token,
|
|
106
|
+
},
|
|
107
|
+
}); }, isFetching = function (state, token) { return (state.getIn([key, statusReducer, token, "fetching"]) || false); }, hasBeenFetched = function (state, token) { return (state.getIn([key, statusReducer, token, "hasBeenFetched"]) || false); }, getFetchedSelector = function (state, token) { return (state.getIn([key, statusReducer, token, "fetched"]) || false); }, getError = function (state, token) { return (state.getIn([key, statusReducer, token, "errorMessage"]) || utility_1.noError); }, getData = function (state) { return (state.getIn([key, "data"]) || immutable_1.default.Map()); }, getItem = (0, reselect_1.createSelector)(getData, function (state, id) { return String(id); }, function (data, id) { return (data.get(id)); }), shouldFetch = (0, reselect_1.createSelector)(isFetching, getFetchedSelector, getError, function (isFetchingValue, isFetched, error) { return (!isFetchingValue &&
|
|
108
|
+
!isFetched &&
|
|
109
|
+
error === utility_1.noError); }), isFetched = (0, reselect_1.createSelector)(getFetchedSelector, getError, function (isFetchedState, error) { return isFetchedState && error === utility_1.noError; }), hasError = (0, reselect_1.createSelector)(getError, function (error) { return error !== utility_1.noError; }), selectors = {
|
|
78
110
|
shouldFetch: shouldFetch,
|
|
79
111
|
getData: getData,
|
|
112
|
+
hasBeenFetched: hasBeenFetched,
|
|
80
113
|
getItem: getItem,
|
|
81
114
|
isFetched: isFetched,
|
|
82
115
|
hasError: hasError,
|
|
@@ -87,7 +120,8 @@ var createLoader = function (_a) {
|
|
|
87
120
|
key: key,
|
|
88
121
|
selectors: selectors,
|
|
89
122
|
actions: {
|
|
90
|
-
|
|
123
|
+
clearAll: clearAllAction,
|
|
124
|
+
clearToken: clearTokenAction,
|
|
91
125
|
addItem: addItem,
|
|
92
126
|
modifyItem: modifyItem,
|
|
93
127
|
deleteItem: deleteItem,
|
package/Loader/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Loader/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Loader/index.ts"],"names":[],"mappings":"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"}
|
package/Modal/ModalWindow.js
CHANGED
|
@@ -38,7 +38,7 @@ var react_1 = __importStar(require("react"));
|
|
|
38
38
|
var react_redux_1 = require("react-redux");
|
|
39
39
|
var actions_1 = require("./actions");
|
|
40
40
|
var ModalWindow = function (props) {
|
|
41
|
-
var delay = 150, _a = props.size, size = _a === void 0 ? "" : _a, Footer = props.Footer, Header = props.Header, _b = (0, react_1.useState)(false), show = _b[0], setShow = _b[1], _c = (0, react_1.useState)(false), waitingToClose = _c[0], setWaitingToClose = _c[1], _d = (0, react_1.useState)(0), enterTimeout = _d[0], setEnterTimeout = _d[1], _e = (0, react_1.useState)(0), exitTimeout = _e[0], setExitTimeout = _e[1], bodyRef = (0, react_1.useRef)(null), dialogRef = (0, react_1.useRef)(null), dispatch = (0, react_redux_1.useDispatch)(), tryToClose = function () {
|
|
41
|
+
var delay = 150, _a = props.size, size = _a === void 0 ? "" : _a, Footer = props.Footer, Header = props.Header, _b = (0, react_1.useState)(false), show = _b[0], setShow = _b[1], _c = (0, react_1.useState)(false), waitingToClose = _c[0], setWaitingToClose = _c[1], _d = (0, react_1.useState)(0), enterTimeout = _d[0], setEnterTimeout = _d[1], _e = (0, react_1.useState)(0), exitTimeout = _e[0], setExitTimeout = _e[1], bodyRef = (0, react_1.useRef)(null), dialogRef = (0, react_1.useRef)(null), dispatch = (0, react_redux_1.useDispatch)(), tryToClose = function (cbTryToClose) {
|
|
42
42
|
var closeModal = function () {
|
|
43
43
|
if (!props.preventDispatchHideModal) {
|
|
44
44
|
dispatch((0, actions_1.hideModal)());
|
|
@@ -46,6 +46,9 @@ var ModalWindow = function (props) {
|
|
|
46
46
|
if (typeof props.onClose === "function") {
|
|
47
47
|
props.onClose();
|
|
48
48
|
}
|
|
49
|
+
if (typeof cbTryToClose === "function") {
|
|
50
|
+
cbTryToClose();
|
|
51
|
+
}
|
|
49
52
|
};
|
|
50
53
|
clearTimeout(enterTimeout);
|
|
51
54
|
clearTimeout(exitTimeout);
|
|
@@ -105,7 +108,7 @@ var ModalWindow = function (props) {
|
|
|
105
108
|
typeof Header === "undefined" ? (react_1.default.createElement("h5", { className: "modal-title" }, props.title)) : (react_1.default.createElement(Header, __assign({ title: props.title }, props.headerProps, { tryToClose: tryToClose }))),
|
|
106
109
|
react_1.default.createElement("button", { "aria-label": "Close", className: "btn btn-link", "data-dismiss": "modal", onClick: tryToClose, type: "button" },
|
|
107
110
|
react_1.default.createElement("i", { className: "fa fa-times" }))),
|
|
108
|
-
react_1.default.createElement("div", { className: "modal-body" }, props.children),
|
|
111
|
+
react_1.default.createElement("div", { className: "modal-body" }, react_1.default.cloneElement(props.children, { tryToClose: tryToClose })),
|
|
109
112
|
typeof Footer === "undefined" ? null : (react_1.default.createElement(Footer, __assign({}, props.footerProps, { tryToClose: tryToClose })))))));
|
|
110
113
|
};
|
|
111
114
|
exports.default = ModalWindow;
|
package/Modal/ModalWindow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalWindow.js","sourceRoot":"","sources":["../../src/Modal/ModalWindow.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA2D;AAC3D,2CAA0C;AAC1C,qCAAsC;AAGtC,IAAM,WAAW,GAAG,UAAC,KAAwB;IAC3C,IACE,KAAK,GAAG,GAAG,EACT,KAA8B,KAAK,KAA1B,EAAT,IAAI,mBAAG,EAAE,KAAA,EAAE,MAAM,GAAa,KAAK,OAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,EAE3B,KAAkB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAA,EACd,KAAsC,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAApD,cAAc,QAAA,EAAE,iBAAiB,QAAA,EAElC,KAAkC,IAAA,gBAAQ,EAAC,CAAC,CAAC,EAA5C,YAAY,QAAA,EAAE,eAAe,QAAA,EAC9B,KAAgC,IAAA,gBAAQ,EAAC,CAAC,CAAC,EAA1C,WAAW,QAAA,EAAE,cAAc,QAAA,EAE5B,OAAO,GAAS,IAAA,cAAM,EAAC,IAAI,CAAC,EAC5B,SAAS,GAAS,IAAA,cAAM,EAAC,IAAI,CAAC,EAE9B,QAAQ,GAAG,IAAA,yBAAW,GAAE,EAExB,UAAU,GAAG;
|
|
1
|
+
{"version":3,"file":"ModalWindow.js","sourceRoot":"","sources":["../../src/Modal/ModalWindow.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED