@dxc-technology/halstack-react 0.0.0-cb610df → 0.0.0-cc01d9c
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/README.md +1 -1
- package/babel.config.js +6 -2
- package/dist/BackgroundColorContext.js +46 -0
- package/dist/ThemeContext.js +237 -2
- package/dist/V3Select/V3Select.js +549 -0
- package/dist/V3Select/index.d.ts +27 -0
- package/dist/V3Textarea/V3Textarea.js +264 -0
- package/dist/V3Textarea/index.d.ts +27 -0
- package/dist/accordion/Accordion.js +152 -67
- package/dist/accordion/index.d.ts +28 -0
- package/dist/accordion-group/AccordionGroup.js +186 -0
- package/dist/accordion-group/index.d.ts +16 -0
- package/dist/alert/Alert.js +183 -84
- package/dist/alert/index.d.ts +51 -0
- package/dist/badge/Badge.js +63 -0
- package/dist/box/Box.js +31 -23
- package/dist/box/index.d.ts +25 -0
- package/dist/button/Button.js +63 -27
- package/dist/button/index.d.ts +24 -0
- package/dist/card/Card.js +72 -35
- package/dist/card/index.d.ts +22 -0
- package/dist/checkbox/Checkbox.js +99 -40
- package/dist/checkbox/index.d.ts +24 -0
- package/dist/chip/Chip.js +97 -40
- package/dist/chip/index.d.ts +22 -0
- package/dist/common/RequiredComponent.js +2 -8
- package/dist/common/utils.js +2 -22
- package/dist/common/variables.js +1444 -304
- package/dist/date/Date.js +75 -52
- package/dist/date/index.d.ts +27 -0
- package/dist/date-input/DateInput.js +400 -0
- package/dist/date-input/index.d.ts +95 -0
- package/dist/dialog/Dialog.js +58 -37
- package/dist/dialog/index.d.ts +18 -0
- package/dist/dropdown/Dropdown.js +177 -82
- package/dist/dropdown/index.d.ts +26 -0
- package/dist/file-input/FileInput.js +644 -0
- package/dist/file-input/FileItem.js +287 -0
- package/dist/file-input/index.d.ts +81 -0
- package/dist/footer/Footer.js +90 -40
- package/dist/footer/Icons.js +77 -0
- package/dist/footer/index.d.ts +25 -0
- package/dist/header/Header.js +192 -95
- package/dist/header/Icons.js +59 -0
- package/dist/header/index.d.ts +25 -0
- package/dist/heading/Heading.js +93 -16
- package/dist/heading/index.d.ts +17 -0
- package/dist/input-text/Icons.js +22 -0
- package/dist/input-text/InputText.js +248 -113
- package/dist/input-text/index.d.ts +36 -0
- package/dist/layout/ApplicationLayout.js +18 -26
- package/dist/layout/Icons.js +55 -0
- package/dist/link/Link.js +107 -41
- package/dist/link/index.d.ts +23 -0
- package/dist/main.d.ts +40 -0
- package/dist/main.js +96 -16
- package/dist/number-input/NumberInput.js +136 -0
- package/dist/number-input/NumberInputContext.js +16 -0
- package/dist/number-input/index.d.ts +113 -0
- package/dist/paginator/Icons.js +66 -0
- package/dist/paginator/Paginator.js +150 -63
- package/dist/paginator/index.d.ts +20 -0
- package/dist/password-input/PasswordInput.js +203 -0
- package/dist/password-input/index.d.ts +94 -0
- package/dist/progress-bar/ProgressBar.js +95 -38
- package/dist/progress-bar/index.d.ts +18 -0
- package/dist/radio/Radio.js +31 -17
- package/dist/radio/index.d.ts +23 -0
- package/dist/resultsetTable/ResultsetTable.js +90 -65
- package/dist/resultsetTable/index.d.ts +19 -0
- package/dist/select/Select.js +914 -271
- package/dist/select/index.d.ts +53 -0
- package/dist/sidenav/Sidenav.js +66 -15
- package/dist/sidenav/index.d.ts +13 -0
- package/dist/slider/Slider.js +211 -73
- package/dist/slider/index.d.ts +29 -0
- package/dist/spinner/Spinner.js +247 -59
- package/dist/spinner/index.d.ts +17 -0
- package/dist/switch/Switch.js +50 -27
- package/dist/switch/index.d.ts +24 -0
- package/dist/table/Table.js +51 -24
- package/dist/table/index.d.ts +13 -0
- package/dist/tabs/Tabs.js +206 -35
- package/dist/tabs/index.d.ts +19 -0
- package/dist/tag/Tag.js +85 -37
- package/dist/tag/index.d.ts +24 -0
- package/dist/text-input/TextInput.js +974 -0
- package/dist/text-input/index.d.ts +135 -0
- package/dist/textarea/Textarea.js +248 -106
- package/dist/textarea/index.d.ts +117 -0
- package/dist/toggle/Toggle.js +16 -19
- package/dist/toggle/index.d.ts +21 -0
- package/dist/toggle-group/ToggleGroup.js +156 -43
- package/dist/toggle-group/index.d.ts +21 -0
- package/dist/upload/Upload.js +13 -8
- package/dist/upload/buttons-upload/ButtonsUpload.js +32 -19
- package/dist/upload/buttons-upload/Icons.js +40 -0
- package/dist/upload/dragAndDropArea/DragAndDropArea.js +84 -34
- package/dist/upload/dragAndDropArea/Icons.js +39 -0
- package/dist/upload/file-upload/FileToUpload.js +64 -33
- package/dist/upload/file-upload/Icons.js +66 -0
- package/dist/upload/files-upload/FilesToUpload.js +16 -16
- package/dist/upload/index.d.ts +15 -0
- package/dist/upload/transaction/Icons.js +160 -0
- package/dist/upload/transaction/Transaction.js +42 -49
- package/dist/upload/transactions/Transactions.js +38 -20
- package/dist/useTheme.js +22 -0
- package/dist/wizard/Icons.js +65 -0
- package/dist/wizard/Wizard.js +138 -60
- package/dist/wizard/index.d.ts +18 -0
- package/package.json +14 -11
- package/test/AccordionGroup.test.js +125 -0
- package/test/Date.test.js +15 -13
- package/test/DateInput.test.js +242 -0
- package/test/Dropdown.test.js +15 -0
- package/test/FileInput.test.js +201 -0
- package/test/Footer.test.js +2 -7
- package/test/Header.test.js +5 -10
- package/test/Heading.test.js +60 -12
- package/test/InputText.test.js +29 -25
- package/test/Link.test.js +12 -2
- package/test/NumberInput.test.js +259 -0
- package/test/Paginator.test.js +72 -60
- package/test/PasswordInput.test.js +83 -0
- package/test/ResultsetTable.test.js +66 -19
- package/test/Select.test.js +371 -147
- package/test/Slider.test.js +9 -17
- package/test/Spinner.test.js +5 -0
- package/test/Tabs.test.js +21 -0
- package/test/TextInput.test.js +732 -0
- package/test/Textarea.test.js +193 -0
- package/test/ToggleGroup.test.js +5 -1
- package/test/Upload.test.js +1 -1
- package/test/V3Select.test.js +212 -0
- package/test/{TextArea.test.js → V3TextArea.test.js} +6 -7
- package/dist/accordion/Accordion.stories.js +0 -207
- package/dist/accordion/readme.md +0 -96
- package/dist/alert/Alert.stories.js +0 -158
- package/dist/alert/close.svg +0 -4
- package/dist/alert/error.svg +0 -4
- package/dist/alert/info.svg +0 -4
- package/dist/alert/readme.md +0 -43
- package/dist/alert/success.svg +0 -4
- package/dist/alert/warning.svg +0 -4
- package/dist/button/Button.stories.js +0 -224
- package/dist/button/readme.md +0 -93
- package/dist/checkbox/Checkbox.stories.js +0 -144
- package/dist/checkbox/readme.md +0 -116
- package/dist/common/services/example-service.js +0 -10
- package/dist/common/services/example-service.test.js +0 -12
- package/dist/date/Date.stories.js +0 -205
- package/dist/date/calendar.svg +0 -1
- package/dist/date/calendar_dark.svg +0 -1
- package/dist/date/readme.md +0 -73
- package/dist/dialog/Dialog.stories.js +0 -217
- package/dist/dialog/readme.md +0 -32
- package/dist/dropdown/Dropdown.stories.js +0 -249
- package/dist/dropdown/baseline-arrow_drop_down.svg +0 -1
- package/dist/dropdown/baseline-arrow_drop_down_wh.svg +0 -4
- package/dist/dropdown/baseline-arrow_drop_up.svg +0 -1
- package/dist/dropdown/baseline-arrow_drop_up_wh.svg +0 -4
- package/dist/dropdown/readme.md +0 -69
- package/dist/footer/Footer.stories.js +0 -94
- package/dist/footer/dxc_logo_wht.png +0 -0
- package/dist/footer/readme.md +0 -41
- package/dist/header/Header.stories.js +0 -176
- package/dist/header/close_icon.svg +0 -1
- package/dist/header/dxc_logo_black.png +0 -0
- package/dist/header/dxc_logo_blk_rgb.svg +0 -6
- package/dist/header/dxc_logo_white.png +0 -0
- package/dist/header/hamb_menu_black.svg +0 -1
- package/dist/header/hamb_menu_white.svg +0 -1
- package/dist/header/readme.md +0 -33
- package/dist/input-text/InputText.stories.js +0 -209
- package/dist/input-text/error.svg +0 -1
- package/dist/input-text/readme.md +0 -91
- package/dist/layout/facebook.svg +0 -45
- package/dist/layout/linkedin.svg +0 -50
- package/dist/layout/twitter.svg +0 -53
- package/dist/link/readme.md +0 -51
- package/dist/paginator/images/next.svg +0 -3
- package/dist/paginator/images/nextPage.svg +0 -3
- package/dist/paginator/images/previous.svg +0 -3
- package/dist/paginator/images/previousPage.svg +0 -3
- package/dist/paginator/readme.md +0 -50
- package/dist/progress-bar/ProgressBar.stories.js +0 -280
- package/dist/progress-bar/readme.md +0 -63
- package/dist/radio/Radio.stories.js +0 -166
- package/dist/radio/readme.md +0 -70
- package/dist/resultsetTable/arrow_downward-24px_wht.svg +0 -1
- package/dist/resultsetTable/arrow_upward-24px_wht.svg +0 -1
- package/dist/resultsetTable/unfold_more-24px_wht.svg +0 -1
- package/dist/select/Select.stories.js +0 -235
- package/dist/select/readme.md +0 -72
- package/dist/slider/Slider.stories.js +0 -241
- package/dist/slider/readme.md +0 -64
- package/dist/spinner/Spinner.stories.js +0 -183
- package/dist/spinner/readme.md +0 -65
- package/dist/switch/Switch.stories.js +0 -134
- package/dist/switch/readme.md +0 -133
- package/dist/tabs/Tabs.stories.js +0 -130
- package/dist/tabs/readme.md +0 -78
- package/dist/tabs-for-sections/TabsForSections.js +0 -92
- package/dist/tabs-for-sections/readme.md +0 -78
- package/dist/toggle/Toggle.stories.js +0 -297
- package/dist/toggle/readme.md +0 -80
- package/dist/toggle-group/readme.md +0 -82
- package/dist/upload/Upload.stories.js +0 -72
- package/dist/upload/buttons-upload/drag-drop-icon.svg +0 -4
- package/dist/upload/buttons-upload/upload-button.svg +0 -1
- package/dist/upload/dragAndDropArea/upload_drop.svg +0 -4
- package/dist/upload/dragAndDropArea/upload_file.svg +0 -4
- package/dist/upload/file-upload/audio-icon.svg +0 -4
- package/dist/upload/file-upload/close.svg +0 -4
- package/dist/upload/file-upload/file-icon.svg +0 -4
- package/dist/upload/file-upload/video-icon.svg +0 -4
- package/dist/upload/readme.md +0 -37
- package/dist/upload/transaction/audio-icon-err.svg +0 -4
- package/dist/upload/transaction/audio-icon.svg +0 -4
- package/dist/upload/transaction/error-icon.svg +0 -4
- package/dist/upload/transaction/file-icon-err.svg +0 -4
- package/dist/upload/transaction/file-icon.svg +0 -4
- package/dist/upload/transaction/image-icon-err.svg +0 -4
- package/dist/upload/transaction/image-icon.svg +0 -4
- package/dist/upload/transaction/success-icon.svg +0 -4
- package/dist/upload/transaction/video-icon-err.svg +0 -4
- package/dist/upload/transaction/video-icon.svg +0 -4
- package/dist/wizard/invalid_icon.svg +0 -6
- package/dist/wizard/valid_icon.svg +0 -6
- package/dist/wizard/validation-wrong.svg +0 -6
- package/test/TabsForSections.test.js +0 -34
- package/test/Toggle.test.js +0 -43
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.validIcon = exports.invalidIcon = void 0;
|
|
9
|
+
|
|
10
|
+
var _react = _interopRequireDefault(require("react"));
|
|
11
|
+
|
|
12
|
+
var invalidIcon = _react["default"].createElement("svg", {
|
|
13
|
+
id: "highlight_off_black_18dp",
|
|
14
|
+
xmlns: "http://www.w3.org/2000/svg",
|
|
15
|
+
width: "18",
|
|
16
|
+
height: "18",
|
|
17
|
+
viewBox: "0 0 18 18"
|
|
18
|
+
}, _react["default"].createElement("path", {
|
|
19
|
+
id: "Path_2943",
|
|
20
|
+
"data-name": "Path 2943",
|
|
21
|
+
d: "M0,0H18V18H0Z",
|
|
22
|
+
fill: "none"
|
|
23
|
+
}), _react["default"].createElement("path", {
|
|
24
|
+
id: "Path_2944",
|
|
25
|
+
"data-name": "Path 2944",
|
|
26
|
+
d: "M10,4a6,6,0,1,0,6,6A6.01,6.01,0,0,0,10,4Zm3,7.945L11.945,13,10,11.06,8.059,13,7,11.945,8.944,10,7,8.059,8.059,7,10,8.944,11.945,7,13,8.059,11.06,10Z",
|
|
27
|
+
transform: "translate(-1.002 -1.002)",
|
|
28
|
+
fill: "#ffe6e9"
|
|
29
|
+
}), _react["default"].createElement("path", {
|
|
30
|
+
id: "Path_2945",
|
|
31
|
+
"data-name": "Path 2945",
|
|
32
|
+
d: "M11.444,6.5,9.5,8.443,7.558,6.5,6.5,7.558,8.443,9.5,6.5,11.444,7.558,12.5,9.5,10.558,11.444,12.5,12.5,11.444,10.558,9.5,12.5,7.558ZM9.5,2A7.5,7.5,0,1,0,17,9.5,7.494,7.494,0,0,0,9.5,2Zm0,13.5a6,6,0,1,1,6-6A6.009,6.009,0,0,1,9.5,15.5Z",
|
|
33
|
+
transform: "translate(-0.501 -0.501)",
|
|
34
|
+
fill: "#d0011b"
|
|
35
|
+
}));
|
|
36
|
+
|
|
37
|
+
exports.invalidIcon = invalidIcon;
|
|
38
|
+
|
|
39
|
+
var validIcon = _react["default"].createElement("svg", {
|
|
40
|
+
id: "check_circle_black_18dp",
|
|
41
|
+
xmlns: "http://www.w3.org/2000/svg",
|
|
42
|
+
width: "18",
|
|
43
|
+
height: "18",
|
|
44
|
+
viewBox: "0 0 18 18"
|
|
45
|
+
}, _react["default"].createElement("path", {
|
|
46
|
+
id: "Path_2946",
|
|
47
|
+
"data-name": "Path 2946",
|
|
48
|
+
d: "M0,0H18V18H0Z",
|
|
49
|
+
fill: "none"
|
|
50
|
+
}), _react["default"].createElement("path", {
|
|
51
|
+
id: "Path_2947",
|
|
52
|
+
"data-name": "Path 2947",
|
|
53
|
+
d: "M9.986,4a5.986,5.986,0,1,0,5.986,5.986A5.994,5.994,0,0,0,9.986,4Zm-1.5,9.727L5.5,10.734,6.551,9.679l1.938,1.93L13.42,6.679l1.055,1.063Z",
|
|
54
|
+
transform: "translate(-0.986 -0.986)",
|
|
55
|
+
fill: "#eafaef",
|
|
56
|
+
opacity: "0.999"
|
|
57
|
+
}), _react["default"].createElement("path", {
|
|
58
|
+
id: "Path_2948",
|
|
59
|
+
"data-name": "Path 2948",
|
|
60
|
+
d: "M9.493,2a7.493,7.493,0,1,0,7.493,7.493A7.5,7.5,0,0,0,9.493,2Zm0,13.487a5.994,5.994,0,1,1,5.994-5.994A6,6,0,0,1,9.493,15.487Zm3.439-9.306L7.994,11.119,6.054,9.186,5,10.242l3,3,5.994-5.994Z",
|
|
61
|
+
transform: "translate(-0.493 -0.493)",
|
|
62
|
+
fill: "#24a148"
|
|
63
|
+
}));
|
|
64
|
+
|
|
65
|
+
exports.validIcon = validIcon;
|
package/dist/wizard/Wizard.js
CHANGED
|
@@ -11,10 +11,10 @@ exports["default"] = void 0;
|
|
|
11
11
|
|
|
12
12
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
13
13
|
|
|
14
|
-
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
15
|
-
|
|
16
14
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
17
15
|
|
|
16
|
+
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
17
|
+
|
|
18
18
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
19
19
|
|
|
20
20
|
var _react = _interopRequireWildcard(require("react"));
|
|
@@ -25,16 +25,32 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
25
25
|
|
|
26
26
|
var _variables = require("../common/variables.js");
|
|
27
27
|
|
|
28
|
-
var
|
|
28
|
+
var _useTheme = _interopRequireDefault(require("../useTheme.js"));
|
|
29
|
+
|
|
30
|
+
var _Icons = require("./Icons");
|
|
31
|
+
|
|
32
|
+
function _templateObject14() {
|
|
33
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n width: ", ";\n height: ", ";\n ", "\n border: ", ";\n opacity: 1;\n flex-grow: 1;\n"]);
|
|
34
|
+
|
|
35
|
+
_templateObject14 = function _templateObject14() {
|
|
36
|
+
return data;
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
return data;
|
|
40
|
+
}
|
|
29
41
|
|
|
30
|
-
|
|
42
|
+
function _templateObject13() {
|
|
43
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n text-align: ", ";\n font-family: ", ";\n font-size: ", ";\n font-style: ", ";\n font-weight: ", ";\n letter-spacing: ", ";\n text-transform: ", ";\n ", ";\n margin: 0;\n"]);
|
|
31
44
|
|
|
32
|
-
|
|
45
|
+
_templateObject13 = function _templateObject13() {
|
|
46
|
+
return data;
|
|
47
|
+
};
|
|
33
48
|
|
|
34
|
-
|
|
49
|
+
return data;
|
|
50
|
+
}
|
|
35
51
|
|
|
36
52
|
function _templateObject12() {
|
|
37
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n
|
|
53
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n text-align: ", ";\n font-family: ", ";\n font-size: ", ";\n font-style: ", ";\n font-weight: ", ";\n letter-spacing: ", ";\n ", ";\n text-transform: ", ";\n margin: 0;\n"]);
|
|
38
54
|
|
|
39
55
|
_templateObject12 = function _templateObject12() {
|
|
40
56
|
return data;
|
|
@@ -44,7 +60,7 @@ function _templateObject12() {
|
|
|
44
60
|
}
|
|
45
61
|
|
|
46
62
|
function _templateObject11() {
|
|
47
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n
|
|
63
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n margin-left: 12px;\n"]);
|
|
48
64
|
|
|
49
65
|
_templateObject11 = function _templateObject11() {
|
|
50
66
|
return data;
|
|
@@ -54,7 +70,7 @@ function _templateObject11() {
|
|
|
54
70
|
}
|
|
55
71
|
|
|
56
72
|
function _templateObject10() {
|
|
57
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n
|
|
73
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n width: 18px;\n height: 18px;\n position: absolute;\n top: 22.5px;\n left: 22.5px;\n"]);
|
|
58
74
|
|
|
59
75
|
_templateObject10 = function _templateObject10() {
|
|
60
76
|
return data;
|
|
@@ -64,7 +80,7 @@ function _templateObject10() {
|
|
|
64
80
|
}
|
|
65
81
|
|
|
66
82
|
function _templateObject9() {
|
|
67
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n
|
|
83
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n font-size: ", ";\n font-family: ", ";\n font-style: ", ";\n font-weight: ", ";\n letter-spacing: ", ";\n opacity: 1;\n margin: 0px 0px 0px 1px;\n"]);
|
|
68
84
|
|
|
69
85
|
_templateObject9 = function _templateObject9() {
|
|
70
86
|
return data;
|
|
@@ -74,7 +90,7 @@ function _templateObject9() {
|
|
|
74
90
|
}
|
|
75
91
|
|
|
76
92
|
function _templateObject8() {
|
|
77
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n
|
|
93
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n background-color: ", ";\n mask: url(", ") no-repeat center;\n mask-size: ", ";\n height: ", ";\n width: ", ";\n"]);
|
|
78
94
|
|
|
79
95
|
_templateObject8 = function _templateObject8() {
|
|
80
96
|
return data;
|
|
@@ -84,7 +100,7 @@ function _templateObject8() {
|
|
|
84
100
|
}
|
|
85
101
|
|
|
86
102
|
function _templateObject7() {
|
|
87
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n
|
|
103
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n width: ", ";\n height: ", ";\n overflow: hidden;\n img,\n svg {\n height: 100%;\n width: 100%;\n }\n"]);
|
|
88
104
|
|
|
89
105
|
_templateObject7 = function _templateObject7() {
|
|
90
106
|
return data;
|
|
@@ -94,7 +110,7 @@ function _templateObject7() {
|
|
|
94
110
|
}
|
|
95
111
|
|
|
96
112
|
function _templateObject6() {
|
|
97
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n width:
|
|
113
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n width: ", ";\n height: ", ";\n"]);
|
|
98
114
|
|
|
99
115
|
_templateObject6 = function _templateObject6() {
|
|
100
116
|
return data;
|
|
@@ -104,7 +120,7 @@ function _templateObject6() {
|
|
|
104
120
|
}
|
|
105
121
|
|
|
106
122
|
function _templateObject5() {
|
|
107
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n width: ", ";\n height: ", ";\n
|
|
123
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n width: ", ";\n height: ", ";\n\n ", "\n ", ";\n\n border-radius: ", ";\n display: flex;\n justify-content: center;\n align-items: center;\n"]);
|
|
108
124
|
|
|
109
125
|
_templateObject5 = function _templateObject5() {
|
|
110
126
|
return data;
|
|
@@ -114,7 +130,7 @@ function _templateObject5() {
|
|
|
114
130
|
}
|
|
115
131
|
|
|
116
132
|
function _templateObject4() {
|
|
117
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n position: relative;\n display: inline-flex;\n padding-bottom:
|
|
133
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n position: relative;\n display: inline-flex;\n padding-bottom: 4px;\n"]);
|
|
118
134
|
|
|
119
135
|
_templateObject4 = function _templateObject4() {
|
|
120
136
|
return data;
|
|
@@ -124,7 +140,7 @@ function _templateObject4() {
|
|
|
124
140
|
}
|
|
125
141
|
|
|
126
142
|
function _templateObject3() {
|
|
127
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n border: none;\n background: inherit;\n display: flex;\n justify-content: flex-start;\n align-items: center;\n margin: ", ";\n\n padding: 0px;\n ", ";\n\n &:
|
|
143
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n border: none;\n background: inherit;\n display: flex;\n justify-content: flex-start;\n align-items: center;\n margin: ", ";\n\n padding: 0px;\n ", ";\n\n &:hover {\n ", ";\n }\n &:focus {\n outline: ", " auto 1px;\n }\n"]);
|
|
128
144
|
|
|
129
145
|
_templateObject3 = function _templateObject3() {
|
|
130
146
|
return data;
|
|
@@ -144,7 +160,7 @@ function _templateObject2() {
|
|
|
144
160
|
}
|
|
145
161
|
|
|
146
162
|
function _templateObject() {
|
|
147
|
-
var data = (0, _taggedTemplateLiteral2["default"])(["\n display: inline-flex;\n flex-direction: ", ";\n justify-content: \"center\";\n ", ";\n\n margin: ", ";\n margin-top: ", ";\n margin-right: ", ";\n margin-bottom: ", ";\n margin-left: ", ";\n"]);
|
|
163
|
+
var data = (0, _taggedTemplateLiteral2["default"])(["\n display: inline-flex;\n flex-direction: ", ";\n justify-content: \"center\";\n ", ";\n font-family: ", ";\n\n margin: ", ";\n margin-top: ", ";\n margin-right: ", ";\n margin-bottom: ", ";\n margin-left: ", ";\n"]);
|
|
148
164
|
|
|
149
165
|
_templateObject = function _templateObject() {
|
|
150
166
|
return data;
|
|
@@ -159,18 +175,17 @@ var DxcWizard = function DxcWizard(_ref) {
|
|
|
159
175
|
currentStep = _ref.currentStep,
|
|
160
176
|
onStepClick = _ref.onStepClick,
|
|
161
177
|
steps = _ref.steps,
|
|
162
|
-
margin = _ref.margin
|
|
178
|
+
margin = _ref.margin,
|
|
179
|
+
_ref$tabIndex = _ref.tabIndex,
|
|
180
|
+
tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
|
|
163
181
|
|
|
164
|
-
var
|
|
165
|
-
|
|
166
|
-
innerCurrent =
|
|
167
|
-
setInnerCurrentStep =
|
|
182
|
+
var _useState = (0, _react.useState)(currentStep || 0),
|
|
183
|
+
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
184
|
+
innerCurrent = _useState2[0],
|
|
185
|
+
setInnerCurrentStep = _useState2[1];
|
|
168
186
|
|
|
169
187
|
var renderedCurrent = currentStep == null ? innerCurrent : currentStep;
|
|
170
|
-
var
|
|
171
|
-
var colorsTheme = (0, _react.useMemo)(function () {
|
|
172
|
-
return (0, _utils.getCustomTheme)(_variables.theme, (0, _utils.getCustomTheme)(_variables.defaultTheme, customTheme));
|
|
173
|
-
}, [customTheme]);
|
|
188
|
+
var colorsTheme = (0, _useTheme["default"])();
|
|
174
189
|
|
|
175
190
|
var handleStepClick = function handleStepClick(newValue) {
|
|
176
191
|
if (currentStep == null) {
|
|
@@ -183,7 +198,7 @@ var DxcWizard = function DxcWizard(_ref) {
|
|
|
183
198
|
};
|
|
184
199
|
|
|
185
200
|
return _react["default"].createElement(_styledComponents.ThemeProvider, {
|
|
186
|
-
theme: colorsTheme
|
|
201
|
+
theme: colorsTheme.wizard
|
|
187
202
|
}, _react["default"].createElement(StepsContainer, {
|
|
188
203
|
mode: mode,
|
|
189
204
|
margin: margin
|
|
@@ -193,11 +208,11 @@ var DxcWizard = function DxcWizard(_ref) {
|
|
|
193
208
|
mode: mode,
|
|
194
209
|
lastStep: i === steps.length - 1
|
|
195
210
|
}, _react["default"].createElement(Step, {
|
|
211
|
+
tabIndex: tabIndex,
|
|
196
212
|
onClick: function onClick() {
|
|
197
213
|
return handleStepClick(i);
|
|
198
214
|
},
|
|
199
215
|
mode: mode,
|
|
200
|
-
disable: step.disabled,
|
|
201
216
|
disabled: step.disabled,
|
|
202
217
|
first: i === 0,
|
|
203
218
|
last: i === steps.length - 1
|
|
@@ -205,21 +220,23 @@ var DxcWizard = function DxcWizard(_ref) {
|
|
|
205
220
|
current: i === renderedCurrent,
|
|
206
221
|
visited: i < renderedCurrent,
|
|
207
222
|
disabled: step.disabled
|
|
208
|
-
}, step.
|
|
223
|
+
}, step.icon ? _react["default"].createElement(StepIconContainer, {
|
|
224
|
+
disabled: step.disabled
|
|
225
|
+
}, (0, _typeof2["default"])(step.icon) === "object" ? step.icon.type === "img" ? _react["default"].createElement(ImgContainer, {
|
|
226
|
+
current: i === renderedCurrent,
|
|
227
|
+
img: step.icon.props.src
|
|
228
|
+
}) : step.icon : _react["default"].createElement(step.icon)) : step.iconSrc ? _react["default"].createElement(Icon, {
|
|
209
229
|
src: step.iconSrc
|
|
210
230
|
}) : _react["default"].createElement(Number, {
|
|
211
231
|
disabled: step.disabled,
|
|
212
232
|
current: i === renderedCurrent
|
|
213
|
-
}, i + 1)), step.valid !== undefined ? step.valid ? _react["default"].createElement(
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
}, step.label ? _react["default"].createElement(Label, {
|
|
221
|
-
disable: step.disabled
|
|
222
|
-
}, step.label) : "", step.description ? _react["default"].createElement(Description, null, step.description) : "") : ""), i === steps.length - 1 ? "" : _react["default"].createElement(StepSeparator, {
|
|
233
|
+
}, i + 1)), step.valid !== undefined ? step.valid ? _react["default"].createElement(ValidityIconContainer, null, _Icons.validIcon) : _react["default"].createElement(ValidityIconContainer, null, _Icons.invalidIcon) : ""), step.label || step.description ? _react["default"].createElement(InfoContainer, null, step.label ? _react["default"].createElement(Label, {
|
|
234
|
+
disabled: step.disabled,
|
|
235
|
+
visited: i <= innerCurrent
|
|
236
|
+
}, step.label) : "", step.description ? _react["default"].createElement(Description, {
|
|
237
|
+
disabled: step.disabled,
|
|
238
|
+
visited: i <= innerCurrent
|
|
239
|
+
}, step.description) : "") : ""), i === steps.length - 1 ? "" : _react["default"].createElement(StepSeparator, {
|
|
223
240
|
mode: mode
|
|
224
241
|
}));
|
|
225
242
|
})));
|
|
@@ -229,6 +246,8 @@ var StepsContainer = _styledComponents["default"].div(_templateObject(), functio
|
|
|
229
246
|
return props.mode === "vertical" ? "column" : "row";
|
|
230
247
|
}, function (props) {
|
|
231
248
|
return props.mode === "vertical" ? "height: 500px" : "width: 100%";
|
|
249
|
+
}, function (props) {
|
|
250
|
+
return props.theme.fontFamily;
|
|
232
251
|
}, function (props) {
|
|
233
252
|
return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
|
|
234
253
|
}, function (props) {
|
|
@@ -252,57 +271,114 @@ var StepContainer = _styledComponents["default"].div(_templateObject2(), functio
|
|
|
252
271
|
});
|
|
253
272
|
|
|
254
273
|
var Step = _styledComponents["default"].button(_templateObject3(), function (props) {
|
|
255
|
-
return props.first ? props.mode === "vertical" ? "0 0
|
|
274
|
+
return props.first ? props.mode === "vertical" ? "0 0 24px 0" : "0 24px 0 0" : props.last ? props.mode === "vertical" ? "24px 0 0 0" : "0 0 0 24px" : props.mode === "vertical" ? "24px 0" : "0 24px";
|
|
256
275
|
}, function (props) {
|
|
257
276
|
return props.disabled ? "cursor: not-allowed" : "";
|
|
258
277
|
}, function (props) {
|
|
259
278
|
return props.disabled ? "" : "cursor: pointer";
|
|
279
|
+
}, function (props) {
|
|
280
|
+
return props.theme.focusColor;
|
|
260
281
|
});
|
|
261
282
|
|
|
262
283
|
var StepHeader = _styledComponents["default"].div(_templateObject4());
|
|
263
284
|
|
|
264
285
|
var IconContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
|
|
265
|
-
return
|
|
266
|
-
}, function (props) {
|
|
267
|
-
return !props.current && !props.disabled ? "32px" : "36px";
|
|
286
|
+
return props.disabled ? props.theme.disabledCircleWidth : props.current ? props.theme.selectedCircleWidth : props.theme.circleWidth;
|
|
268
287
|
}, function (props) {
|
|
269
|
-
return
|
|
288
|
+
return props.disabled ? props.theme.disabledCircleHeight : props.current ? props.theme.selectedCircleHeight : props.theme.circleHeight;
|
|
270
289
|
}, function (props) {
|
|
271
|
-
return props.disabled ? "
|
|
290
|
+
return "\n ".concat(!props.current && !props.disabled ? "border: ".concat(props.theme.circleBorderThickness, " ").concat(props.theme.circleBorderStyle, " ").concat(props.theme.circleBorderColor, ";") : props.current ? "border: ".concat(props.theme.selectedCircleBorderThickness, " ").concat(props.theme.selectedCircleBorderStyle, " ").concat(props.theme.selectedCircleBorderColor, ";") : props.disabled ? "border: ".concat(props.theme.disabledCircleBorderThickness, " ").concat(props.theme.disabledCircleBorderStyle, " ").concat(props.theme.disabledCircleBorderColor, ";") : "", "\n background: ").concat(props.disabled ? "".concat(props.theme.disabledBackgroundColor) : props.current ? "".concat(props.theme.stepContainerSelectedBackgroundColor) : "".concat(props.theme.stepContainerBackgroundColor), ";\n ");
|
|
272
291
|
}, function (props) {
|
|
273
|
-
return props.
|
|
292
|
+
return props.disabled ? "color: ".concat(props.theme.disabledFontColor, ";") : "color: ".concat(props.current ? props.theme.stepContainerSelectedFontColor : props.theme.stepContainerFontColor, ";");
|
|
274
293
|
}, function (props) {
|
|
275
|
-
return props.current ?
|
|
294
|
+
return !props.current && !props.disabled ? props.theme.circleBorderRadius : props.current ? props.theme.selectedCircleBorderRadius : props.disabled ? props.theme.disabledCircleBorderRadius : "";
|
|
276
295
|
});
|
|
277
296
|
|
|
278
|
-
var Icon = _styledComponents["default"].img(_templateObject6())
|
|
297
|
+
var Icon = _styledComponents["default"].img(_templateObject6(), function (props) {
|
|
298
|
+
return props.theme.stepContainerIconSize;
|
|
299
|
+
}, function (props) {
|
|
300
|
+
return props.theme.stepContainerIconSize;
|
|
301
|
+
});
|
|
279
302
|
|
|
280
|
-
var
|
|
281
|
-
return props.theme.
|
|
303
|
+
var StepIconContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
|
|
304
|
+
return props.theme.stepContainerIconSize;
|
|
305
|
+
}, function (props) {
|
|
306
|
+
return props.theme.stepContainerIconSize;
|
|
282
307
|
});
|
|
283
308
|
|
|
284
|
-
var
|
|
309
|
+
var ImgContainer = _styledComponents["default"].div(_templateObject8(), function (props) {
|
|
310
|
+
return props.current ? props.theme.stepContainerSelectedFontColor : props.theme.stepContainerFontColor;
|
|
311
|
+
}, function (_ref2) {
|
|
312
|
+
var img = _ref2.img;
|
|
313
|
+
return img;
|
|
314
|
+
}, function (props) {
|
|
315
|
+
return "".concat(props.theme.stepContainerIconSize, " ").concat(props.theme.stepContainerIconSize);
|
|
316
|
+
}, function (props) {
|
|
317
|
+
return props.theme.stepContainerIconSize;
|
|
318
|
+
}, function (props) {
|
|
319
|
+
return props.theme.stepContainerIconSize;
|
|
320
|
+
});
|
|
285
321
|
|
|
286
|
-
var
|
|
287
|
-
return props.theme.
|
|
322
|
+
var Number = _styledComponents["default"].p(_templateObject9(), function (props) {
|
|
323
|
+
return props.theme.stepContainerFontSize;
|
|
324
|
+
}, function (props) {
|
|
325
|
+
return props.theme.stepContainerFontFamily;
|
|
288
326
|
}, function (props) {
|
|
289
|
-
return
|
|
327
|
+
return props.theme.stepContainerFontStyle;
|
|
328
|
+
}, function (props) {
|
|
329
|
+
return props.theme.stepContainerFontWeight;
|
|
330
|
+
}, function (props) {
|
|
331
|
+
return props.theme.stepContainerLetterSpacing;
|
|
290
332
|
});
|
|
291
333
|
|
|
292
|
-
var
|
|
293
|
-
|
|
334
|
+
var ValidityIconContainer = _styledComponents["default"].div(_templateObject10());
|
|
335
|
+
|
|
336
|
+
var InfoContainer = _styledComponents["default"].div(_templateObject11());
|
|
337
|
+
|
|
338
|
+
var Label = _styledComponents["default"].p(_templateObject12(), function (props) {
|
|
339
|
+
return props.theme.labelTextAlign;
|
|
340
|
+
}, function (props) {
|
|
341
|
+
return props.theme.labelFontFamily;
|
|
342
|
+
}, function (props) {
|
|
343
|
+
return props.theme.labelFontSize;
|
|
344
|
+
}, function (props) {
|
|
345
|
+
return props.theme.labelFontStyle;
|
|
346
|
+
}, function (props) {
|
|
347
|
+
return props.theme.labelFontWeight;
|
|
348
|
+
}, function (props) {
|
|
349
|
+
return props.theme.labelLetterSpacing;
|
|
350
|
+
}, function (props) {
|
|
351
|
+
return props.disabled ? "color: ".concat(props.theme.disabledFontColor, ";") : "color: ".concat(props.visited ? props.theme.visitedLabelFontColor : props.theme.labelFontColor, ";");
|
|
352
|
+
}, function (props) {
|
|
353
|
+
return props.theme.labelFontTextTransform;
|
|
294
354
|
});
|
|
295
355
|
|
|
296
|
-
var Description = _styledComponents["default"].p(
|
|
356
|
+
var Description = _styledComponents["default"].p(_templateObject13(), function (props) {
|
|
357
|
+
return props.theme.descriptionTextAlign;
|
|
358
|
+
}, function (props) {
|
|
359
|
+
return props.theme.descriptionFontFamily;
|
|
360
|
+
}, function (props) {
|
|
361
|
+
return props.theme.descriptionFontSize;
|
|
362
|
+
}, function (props) {
|
|
363
|
+
return props.theme.descriptionFontStyle;
|
|
364
|
+
}, function (props) {
|
|
365
|
+
return props.theme.descriptionFontWeight;
|
|
366
|
+
}, function (props) {
|
|
367
|
+
return props.theme.descriptionLetterSpacing;
|
|
368
|
+
}, function (props) {
|
|
369
|
+
return props.theme.descriptionFontTextTransform;
|
|
370
|
+
}, function (props) {
|
|
371
|
+
return props.disabled ? "color: ".concat(props.theme.disabledFontColor, ";") : "color: ".concat(props.visited ? props.theme.visitedDescriptionFontColor : props.theme.descriptionFontColor, ";");
|
|
372
|
+
});
|
|
297
373
|
|
|
298
|
-
var StepSeparator = _styledComponents["default"].div(
|
|
374
|
+
var StepSeparator = _styledComponents["default"].div(_templateObject14(), function (props) {
|
|
299
375
|
return props.mode === "horizontal" ? "" : "0";
|
|
300
376
|
}, function (props) {
|
|
301
377
|
return props.mode === "horizontal" ? "0" : "";
|
|
302
378
|
}, function (props) {
|
|
303
379
|
return props.mode === "vertical" ? "margin: 0 18px;" : "";
|
|
304
380
|
}, function (props) {
|
|
305
|
-
return "
|
|
381
|
+
return "".concat(props.theme.separatorBorderStyle, " ").concat(props.theme.separatorBorderThickness, " ").concat(props.theme.separatorColor);
|
|
306
382
|
});
|
|
307
383
|
|
|
308
384
|
DxcWizard.propTypes = {
|
|
@@ -312,6 +388,7 @@ DxcWizard.propTypes = {
|
|
|
312
388
|
steps: _propTypes["default"].arrayOf(_propTypes["default"].shape({
|
|
313
389
|
label: _propTypes["default"].string,
|
|
314
390
|
description: _propTypes["default"].string,
|
|
391
|
+
icon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
|
|
315
392
|
iconSrc: _propTypes["default"].string,
|
|
316
393
|
disabled: _propTypes["default"].bool,
|
|
317
394
|
valid: _propTypes["default"].bool
|
|
@@ -321,7 +398,8 @@ DxcWizard.propTypes = {
|
|
|
321
398
|
bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
|
|
322
399
|
left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
|
|
323
400
|
right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
|
|
324
|
-
}), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
|
|
401
|
+
}), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
|
|
402
|
+
tabIndex: _propTypes["default"].number
|
|
325
403
|
};
|
|
326
404
|
var _default = DxcWizard;
|
|
327
405
|
exports["default"] = _default;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
|
|
2
|
+
type Margin = {
|
|
3
|
+
top?: Space;
|
|
4
|
+
bottom?: Space;
|
|
5
|
+
left?: Space;
|
|
6
|
+
right?: Space;
|
|
7
|
+
};
|
|
8
|
+
|
|
9
|
+
type Props = {
|
|
10
|
+
mode?: "horizontal" | "vertical";
|
|
11
|
+
currentStep?: number;
|
|
12
|
+
onStepClick?: void;
|
|
13
|
+
steps?: any;
|
|
14
|
+
margin?: Space | Margin;
|
|
15
|
+
tabIndex?: number;
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
export default function DxcWizard(props: Props): JSX.Element;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxc-technology/halstack-react",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-cc01d9c",
|
|
4
4
|
"description": "DXC Halstack React components library",
|
|
5
5
|
"repository": "dxc-technology/halstack-react",
|
|
6
6
|
"homepage": "http://developer.dxc.com/tools/react",
|
|
@@ -11,22 +11,26 @@
|
|
|
11
11
|
"url": "https://dxc.com"
|
|
12
12
|
},
|
|
13
13
|
"main": "./dist/main.js",
|
|
14
|
+
"types": "./dist/main.d.ts",
|
|
14
15
|
"peerDependencies": {
|
|
15
|
-
"react": "^
|
|
16
|
-
"react-dom": "^
|
|
17
|
-
"styled-components": "
|
|
16
|
+
"react": "^17.0.1",
|
|
17
|
+
"react-dom": "^17.0.1",
|
|
18
|
+
"styled-components": "^5.0.1"
|
|
18
19
|
},
|
|
19
20
|
"dependencies": {
|
|
20
21
|
"@date-io/date-fns": "^1.3.9",
|
|
21
|
-
"@material-ui/core": "4.
|
|
22
|
+
"@material-ui/core": "4.11.1",
|
|
22
23
|
"@material-ui/icons": "4.4.3",
|
|
23
24
|
"@material-ui/lab": "4.0.0-alpha.17",
|
|
24
25
|
"@material-ui/pickers": "3.2.2",
|
|
25
26
|
"@material-ui/styles": "4.0.2",
|
|
27
|
+
"@testing-library/user-event": "^12.6.3",
|
|
28
|
+
"color": "^3.1.3",
|
|
26
29
|
"date-fns": "^2.0.0-beta.4",
|
|
27
30
|
"moment": "2.24.0",
|
|
28
31
|
"prop-types": "^15.7.2",
|
|
29
|
-
"
|
|
32
|
+
"rgb-hex": "^3.0.0",
|
|
33
|
+
"uuid": "^8.3.2"
|
|
30
34
|
},
|
|
31
35
|
"scripts": {
|
|
32
36
|
"test": "jest",
|
|
@@ -38,10 +42,12 @@
|
|
|
38
42
|
"@babel/cli": "^7.6.2",
|
|
39
43
|
"@babel/core": "^7.6.2",
|
|
40
44
|
"@babel/plugin-proposal-class-properties": "^7.5.5",
|
|
45
|
+
"@babel/plugin-proposal-nullish-coalescing-operator": "7.13.8",
|
|
46
|
+
"@babel/plugin-proposal-optional-chaining": "7.13.8",
|
|
41
47
|
"@babel/plugin-transform-runtime": "^7.10.1",
|
|
42
48
|
"@babel/preset-env": "^7.6.2",
|
|
43
49
|
"@babel/preset-react": "^7.0.0",
|
|
44
|
-
"@testing-library/react": "^
|
|
50
|
+
"@testing-library/react": "^11.2.5",
|
|
45
51
|
"babel-jest": "^24.8.0",
|
|
46
52
|
"babel-loader": "^8.0.6",
|
|
47
53
|
"eslint": "^5.16.0",
|
|
@@ -64,9 +70,6 @@
|
|
|
64
70
|
"\\.(css|less|scss|sass)$": "identity-obj-proxy",
|
|
65
71
|
"\\.(svg)$": "<rootDir>/test/mocks/svgMock.js",
|
|
66
72
|
"\\.(png)$": "<rootDir>/test/mocks/pngMock.js"
|
|
67
|
-
}
|
|
68
|
-
"transformIgnorePatterns": [
|
|
69
|
-
"/node_modules/(?!react-use-scrollspy).+\\.js$"
|
|
70
|
-
]
|
|
73
|
+
}
|
|
71
74
|
}
|
|
72
75
|
}
|