@occmundial/occ-atomic 2.0.0-beta.15 → 2.0.0-beta.16
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +8 -0
- package/build/Pager/Pager.js +15 -7
- package/build/Pager/Pager.test.js +11 -11
- package/build/Pager/__snapshots__/Pager.test.js.snap +12 -9
- package/build/Pager/styles.js +12 -9
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
# [2.0.0-beta.16](https://github.com/occmundial/occ-atomic/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2024-05-14)
|
2
|
+
|
3
|
+
|
4
|
+
### Bug Fixes
|
5
|
+
|
6
|
+
* Adjust icon in prev and next button ([8d78c19](https://github.com/occmundial/occ-atomic/commit/8d78c196ce2a27990084683fbeb95b0b9e49be02))
|
7
|
+
* Change tabs to spaces ([ba606c3](https://github.com/occmundial/occ-atomic/commit/ba606c3951a779fd05937fed49f785cc529cd611))
|
8
|
+
|
1
9
|
# [2.0.0-beta.15](https://github.com/occmundial/occ-atomic/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2024-05-10)
|
2
10
|
|
3
11
|
|
package/build/Pager/Pager.js
CHANGED
@@ -218,20 +218,28 @@ var Pager = /*#__PURE__*/function (_React$Component) {
|
|
218
218
|
return /*#__PURE__*/_react["default"].createElement("ul", {
|
219
219
|
className: "".concat(classes.pager).concat(className ? " ".concat(className) : '')
|
220
220
|
}, /*#__PURE__*/_react["default"].createElement("li", {
|
221
|
-
className: "".concat(classes.btn, " ").concat(classes.
|
221
|
+
className: "".concat(classes.btn, " ").concat(classes.listItemPrevious).concat(selected == 1 ? " ".concat(classes.disabled) : ''),
|
222
222
|
tabIndex: "0",
|
223
223
|
onClick: this.handlePrevPage
|
224
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
225
|
+
className: classes.prev
|
224
226
|
}, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
|
225
|
-
iconName: "
|
227
|
+
iconName: "chevron-left",
|
228
|
+
width: 14,
|
229
|
+
height: 14,
|
226
230
|
colors: ['#adb4bb']
|
227
|
-
}),
|
228
|
-
className: "".concat(classes.btn, " ").concat(classes.
|
231
|
+
}), previousLabel)), !hideNumbers && this.pagination(), /*#__PURE__*/_react["default"].createElement("li", {
|
232
|
+
className: "".concat(classes.btn, " ").concat(classes.listItemNext).concat(selected == pageCount ? " ".concat(classes.disabled) : ''),
|
229
233
|
tabIndex: "0",
|
230
234
|
onClick: this.handleNextPage
|
231
|
-
},
|
232
|
-
|
235
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
236
|
+
className: classes.next
|
237
|
+
}, nextLabel, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
|
238
|
+
iconName: "chevron-right",
|
239
|
+
width: 14,
|
240
|
+
height: 14,
|
233
241
|
colors: ['#adb4bb']
|
234
|
-
})));
|
242
|
+
}))));
|
235
243
|
}
|
236
244
|
}]);
|
237
245
|
|
@@ -30,10 +30,10 @@ describe("Pager", function () {
|
|
30
30
|
var wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_Pager["default"], {
|
31
31
|
classes: classes
|
32
32
|
}));
|
33
|
-
expect(wrapper.find('.
|
34
|
-
expect(wrapper.find('.
|
35
|
-
expect(wrapper.find('.
|
36
|
-
expect(wrapper.find('.
|
33
|
+
expect(wrapper.find('.listItemPrevious').length).toBe(1);
|
34
|
+
expect(wrapper.find('.listItemPrevious').text()).toEqual('<Jss(Icon) />Previous');
|
35
|
+
expect(wrapper.find('.listItemNext').length).toBe(1);
|
36
|
+
expect(wrapper.find('.listItemNext').text()).toEqual('Next<Jss(Icon) />');
|
37
37
|
});
|
38
38
|
it('changes to previous page', function () {
|
39
39
|
var wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_Pager["default"], {
|
@@ -41,7 +41,7 @@ describe("Pager", function () {
|
|
41
41
|
classes: classes
|
42
42
|
}));
|
43
43
|
expect(wrapper.state('selected')).toEqual(3);
|
44
|
-
wrapper.find('.
|
44
|
+
wrapper.find('.listItemPrevious').simulate('click', {
|
45
45
|
target: {}
|
46
46
|
});
|
47
47
|
expect(wrapper.state('selected')).toEqual(2);
|
@@ -52,7 +52,7 @@ describe("Pager", function () {
|
|
52
52
|
classes: classes
|
53
53
|
}));
|
54
54
|
expect(wrapper.state('selected')).toEqual(3);
|
55
|
-
wrapper.find('.
|
55
|
+
wrapper.find('.listItemNext').simulate('click', {
|
56
56
|
target: {}
|
57
57
|
});
|
58
58
|
expect(wrapper.state('selected')).toEqual(4);
|
@@ -84,11 +84,11 @@ describe("Pager", function () {
|
|
84
84
|
initialPage: 1,
|
85
85
|
classes: classes
|
86
86
|
}));
|
87
|
-
expect(wrapper.find('.
|
87
|
+
expect(wrapper.find('.listItemPrevious').hasClass('disabled')).toEqual(true);
|
88
88
|
wrapper.setProps({
|
89
89
|
forcePage: 5
|
90
90
|
});
|
91
|
-
expect(wrapper.find('.
|
91
|
+
expect(wrapper.find('.listItemPrevious').hasClass('disabled')).toEqual(false);
|
92
92
|
});
|
93
93
|
it('disables the next page button', function () {
|
94
94
|
var wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_Pager["default"], {
|
@@ -96,11 +96,11 @@ describe("Pager", function () {
|
|
96
96
|
initialPage: 5,
|
97
97
|
classes: classes
|
98
98
|
}));
|
99
|
-
expect(wrapper.find('.
|
99
|
+
expect(wrapper.find('.listItemNext').hasClass('disabled')).toEqual(true);
|
100
100
|
wrapper.setProps({
|
101
101
|
forcePage: 1
|
102
102
|
});
|
103
|
-
expect(wrapper.find('.
|
103
|
+
expect(wrapper.find('.listItemNext').hasClass('disabled')).toEqual(false);
|
104
104
|
});
|
105
105
|
it('calls the onPageChange function', function () {
|
106
106
|
var onPageChange = jest.fn();
|
@@ -108,7 +108,7 @@ describe("Pager", function () {
|
|
108
108
|
onPageChange: onPageChange,
|
109
109
|
classes: classes
|
110
110
|
}));
|
111
|
-
wrapper.find('.
|
111
|
+
wrapper.find('.listItemNext').simulate('click', {
|
112
112
|
target: {}
|
113
113
|
});
|
114
114
|
expect(onPageChange.mock.calls.length).toBe(1);
|
@@ -15,7 +15,6 @@ Object {
|
|
15
15
|
"border": "1px solid #bfbfbf",
|
16
16
|
"borderRadius": "5px",
|
17
17
|
"cursor": "pointer",
|
18
|
-
"display": "inline-block",
|
19
18
|
"fontFamily": "'OccText', sans-serif",
|
20
19
|
"outline": "0",
|
21
20
|
"padding": "3px 13px",
|
@@ -25,24 +24,28 @@ Object {
|
|
25
24
|
"opacity": "0.4",
|
26
25
|
"pointerEvents": "none",
|
27
26
|
},
|
28
|
-
"
|
29
|
-
"& span": Object {
|
30
|
-
"transform": "rotate(-90deg)",
|
31
|
-
},
|
27
|
+
"listItemNext": Object {
|
32
28
|
"marginLeft": "15px",
|
33
29
|
},
|
30
|
+
"listItemPrevious": Object {
|
31
|
+
"marginRight": "15px",
|
32
|
+
},
|
33
|
+
"next": Object {
|
34
|
+
"alignItems": "center",
|
35
|
+
"display": "flex",
|
36
|
+
},
|
34
37
|
"pager": Object {
|
38
|
+
"alignItems": "center",
|
35
39
|
"color": "#727272",
|
40
|
+
"display": "flex",
|
36
41
|
"fontFamily": "'OccText', sans-serif",
|
37
42
|
"fontSize": "14px",
|
38
43
|
"listStyle": "none",
|
39
44
|
"paddingLeft": "0",
|
40
45
|
},
|
41
46
|
"prev": Object {
|
42
|
-
"
|
43
|
-
|
44
|
-
},
|
45
|
-
"marginRight": "15px",
|
47
|
+
"alignItems": "center",
|
48
|
+
"display": "flex",
|
46
49
|
},
|
47
50
|
}
|
48
51
|
`;
|
package/build/Pager/styles.js
CHANGED
@@ -15,12 +15,13 @@ var _default = {
|
|
15
15
|
pager: {
|
16
16
|
listStyle: 'none',
|
17
17
|
paddingLeft: '0',
|
18
|
+
display: 'flex',
|
19
|
+
alignItems: 'center',
|
18
20
|
fontFamily: _fonts["default"].body,
|
19
21
|
color: _colors["default"].grey7,
|
20
22
|
fontSize: '14px'
|
21
23
|
},
|
22
24
|
btn: {
|
23
|
-
display: 'inline-block',
|
24
25
|
fontFamily: _fonts["default"].body,
|
25
26
|
border: "1px solid ".concat(_colors["default"].grey1),
|
26
27
|
borderRadius: '5px',
|
@@ -37,16 +38,18 @@ var _default = {
|
|
37
38
|
}
|
38
39
|
},
|
39
40
|
prev: {
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
41
|
+
display: 'flex',
|
42
|
+
alignItems: 'center'
|
43
|
+
},
|
44
|
+
listItemPrevious: {
|
45
|
+
marginRight: '15px'
|
44
46
|
},
|
45
47
|
next: {
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
48
|
+
display: 'flex',
|
49
|
+
alignItems: 'center'
|
50
|
+
},
|
51
|
+
listItemNext: {
|
52
|
+
marginLeft: '15px'
|
50
53
|
},
|
51
54
|
disabled: {
|
52
55
|
pointerEvents: 'none',
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@occmundial/occ-atomic",
|
3
|
-
"version": "2.0.0-beta.
|
3
|
+
"version": "2.0.0-beta.16",
|
4
4
|
"description": "Collection of shareable styled React components for OCC applications.",
|
5
5
|
"homepage": "http://occmundial.github.io/occ-atomic",
|
6
6
|
"main": "build/index.js",
|