@dhis2-ui/transfer 9.10.3 → 9.11.1-beta.1
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/build/cjs/__e2e__/{add_remove-highlighted-options.stories.e2e.js → add_remove-highlighted-options.e2e.stories.js} +2 -13
- package/build/cjs/__e2e__/common/options.js +2 -3
- package/build/cjs/__e2e__/common/stateful-decorator.js +3 -8
- package/build/cjs/__e2e__/{disabled-transfer-buttons.stories.e2e.js → disabled-transfer-buttons.e2e.stories.js} +4 -20
- package/build/cjs/__e2e__/{disabled-transfer-options.stories.e2e.js → disabled-transfer-options.e2e.stories.js} +4 -12
- package/build/cjs/__e2e__/{display-order.stories.e2e.js → display-order.e2e.stories.js} +2 -13
- package/build/cjs/__e2e__/{filter-options-list.stories.e2e.js → filter-options-list.e2e.stories.js} +3 -24
- package/build/cjs/__e2e__/{highlight-range-of-options.stories.e2e.js → highlight-range-of-options.e2e.stories.js} +2 -15
- package/build/cjs/__e2e__/{loading_lists.stories.e2e.js → loading_lists.e2e.stories.js} +2 -16
- package/build/cjs/__e2e__/{notify_at_end_of_list.stories.e2e.js → notify_at_end_of_list.e2e.stories.js} +2 -17
- package/build/cjs/__e2e__/{reorder-with-buttons.stories.e2e.js → reorder-with-buttons.e2e.stories.js} +2 -11
- package/build/cjs/__e2e__/{set_unset-highlighted-option.stories.e2e.js → set_unset-highlighted-option.e2e.stories.js} +2 -13
- package/build/cjs/__e2e__/{transferring-items.stories.e2e.js → transferring-items.e2e.stories.js} +2 -13
- package/build/cjs/__tests__/common.test.js +0 -1
- package/build/cjs/__tests__/helper/add-all-selectable-source-options.test.js +0 -1
- package/build/cjs/__tests__/helper/add-individual-source-options.test.js +0 -1
- package/build/cjs/__tests__/helper/default-filter-callback.test.js +0 -1
- package/build/cjs/__tests__/helper/is-reorder-down-disabled.test.js +0 -1
- package/build/cjs/__tests__/helper/is-reorder-up-disabled.test.js +0 -1
- package/build/cjs/__tests__/helper/move-highlighted-picked-option-down.test.js +0 -1
- package/build/cjs/__tests__/helper/move-highlighted-picked-option-up.test.js +0 -1
- package/build/cjs/__tests__/helper/remove-all-picked-options.test.js +0 -1
- package/build/cjs/__tests__/helper/remove-individual-picked-options.test.js +0 -1
- package/build/cjs/__tests__/helper/use-highlighted-option/create-toggle-highlighted-option.test.js +2 -9
- package/build/cjs/__tests__/helper/use-highlighted-option/toggle-add.test.js +0 -1
- package/build/cjs/__tests__/helper/use-highlighted-option/toggle-range.test.js +2 -3
- package/build/cjs/__tests__/helper/use-highlighted-option/toggle-replace.test.js +0 -1
- package/build/cjs/__tests__/helper/use-highlighted-option.test.js +1 -5
- package/build/cjs/__tests__/transfer.test.js +1 -5
- package/build/cjs/actions.js +2 -9
- package/build/cjs/add-all.js +2 -9
- package/build/cjs/add-individual.js +2 -9
- package/build/cjs/common/find-option-index.js +0 -3
- package/build/cjs/common/get-mode-by-modifier-key.js +2 -8
- package/build/cjs/common/index.js +0 -6
- package/build/cjs/common/is-option.js +0 -2
- package/build/cjs/common/modes.js +6 -9
- package/build/cjs/common/remove-option.js +0 -6
- package/build/cjs/common/styles.js +3 -8
- package/build/cjs/common/toggle-value.js +0 -4
- package/build/cjs/container.js +2 -8
- package/build/cjs/end-intersection-detector.js +1 -8
- package/build/cjs/features/add_remove-highlighted-options/index.js +0 -1
- package/build/cjs/features/common/index.js +0 -2
- package/build/cjs/features/disabled-transfer-buttons/index.js +0 -1
- package/build/cjs/features/disabled-transfer-options/index.js +0 -2
- package/build/cjs/features/display-order/index.js +6 -5
- package/build/cjs/features/filter-options-list/index.js +6 -8
- package/build/cjs/features/highlight-range-of-options/index.js +8 -5
- package/build/cjs/features/loading_lists/index.js +2 -3
- package/build/cjs/features/notify_at_end_of_list/index.js +1 -2
- package/build/cjs/features/reorder-with-buttons/index.js +3 -3
- package/build/cjs/features/set_unset-highlighted-option/index.js +0 -2
- package/build/cjs/features/transferring-items/index.js +6 -6
- package/build/cjs/filter.js +5 -14
- package/build/cjs/icons.js +17 -35
- package/build/cjs/index.js +0 -2
- package/build/cjs/left-footer.js +2 -10
- package/build/cjs/left-header.js +2 -10
- package/build/cjs/left-side.js +2 -9
- package/build/cjs/options-container.js +9 -20
- package/build/cjs/picked-options.js +2 -10
- package/build/cjs/remove-all.js +2 -9
- package/build/cjs/remove-individual.js +2 -9
- package/build/cjs/reordering-actions.js +7 -16
- package/build/cjs/right-footer.js +2 -10
- package/build/cjs/right-header.js +2 -10
- package/build/cjs/right-side.js +2 -9
- package/build/cjs/source-options.js +2 -10
- package/build/cjs/transfer/add-all-selectable-source-options.js +3 -4
- package/build/cjs/transfer/add-individual-source-options.js +1 -4
- package/build/cjs/transfer/create-double-click-handlers.js +0 -5
- package/build/cjs/transfer/default-filter-callback.js +0 -2
- package/build/cjs/transfer/get-option-click-handlers.js +0 -3
- package/build/cjs/transfer/index.js +0 -26
- package/build/cjs/transfer/is-reorder-down-disabled.js +4 -4
- package/build/cjs/transfer/is-reorder-up-disabled.js +4 -4
- package/build/cjs/transfer/move-highlighted-picked-option-down.js +4 -5
- package/build/cjs/transfer/move-highlighted-picked-option-up.js +4 -5
- package/build/cjs/transfer/remove-all-picked-options.js +0 -2
- package/build/cjs/transfer/remove-individual-picked-options.js +1 -4
- package/build/cjs/transfer/use-filter.js +0 -4
- package/build/cjs/transfer/use-highlighted-options/create-toggle-highlighted-option.js +2 -12
- package/build/cjs/transfer/use-highlighted-options/toggle-add.js +0 -3
- package/build/cjs/transfer/use-highlighted-options/toggle-range.js +3 -8
- package/build/cjs/transfer/use-highlighted-options/toggle-replace.js +0 -4
- package/build/cjs/transfer/use-highlighted-options.js +0 -5
- package/build/cjs/transfer-option.js +4 -16
- package/build/cjs/transfer.js +29 -54
- package/build/cjs/{transfer.stories.js → transfer.prod.stories.js} +83 -103
- package/build/cjs/use-resize-counter.js +0 -4
- package/build/es/__e2e__/common/stateful-decorator.js +1 -2
- package/build/es/__e2e__/{disabled-transfer-buttons.stories.e2e.js → disabled-transfer-buttons.e2e.stories.js} +2 -1
- package/build/es/__e2e__/{disabled-transfer-options.stories.e2e.js → disabled-transfer-options.e2e.stories.js} +2 -1
- package/build/es/__e2e__/{filter-options-list.stories.e2e.js → filter-options-list.e2e.stories.js} +1 -3
- package/build/es/__tests__/helper/use-highlighted-option/create-toggle-highlighted-option.test.js +2 -1
- package/build/es/__tests__/helper/use-highlighted-option/toggle-range.test.js +2 -2
- package/build/es/__tests__/helper/use-highlighted-option.test.js +1 -1
- package/build/es/actions.js +1 -1
- package/build/es/add-all.js +1 -1
- package/build/es/add-individual.js +1 -1
- package/build/es/common/find-option-index.js +1 -1
- package/build/es/common/get-mode-by-modifier-key.js +3 -6
- package/build/es/common/modes.js +5 -4
- package/build/es/common/remove-option.js +1 -4
- package/build/es/common/toggle-value.js +0 -2
- package/build/es/container.js +1 -1
- package/build/es/features/display-order/index.js +6 -3
- package/build/es/features/filter-options-list/index.js +6 -6
- package/build/es/features/highlight-range-of-options/index.js +8 -3
- package/build/es/features/loading_lists/index.js +2 -2
- package/build/es/features/notify_at_end_of_list/index.js +1 -1
- package/build/es/features/reorder-with-buttons/index.js +3 -2
- package/build/es/features/transferring-items/index.js +6 -3
- package/build/es/filter.js +4 -4
- package/build/es/icons.js +16 -16
- package/build/es/left-footer.js +1 -1
- package/build/es/left-header.js +1 -1
- package/build/es/left-side.js +1 -1
- package/build/es/options-container.js +6 -5
- package/build/es/picked-options.js +1 -1
- package/build/es/remove-all.js +1 -1
- package/build/es/remove-individual.js +1 -1
- package/build/es/reordering-actions.js +6 -6
- package/build/es/right-footer.js +1 -1
- package/build/es/right-header.js +1 -1
- package/build/es/right-side.js +1 -1
- package/build/es/source-options.js +1 -1
- package/build/es/transfer/add-all-selectable-source-options.js +3 -2
- package/build/es/transfer/add-individual-source-options.js +1 -2
- package/build/es/transfer/create-double-click-handlers.js +0 -3
- package/build/es/transfer/get-option-click-handlers.js +1 -1
- package/build/es/transfer/is-reorder-down-disabled.js +4 -2
- package/build/es/transfer/is-reorder-up-disabled.js +4 -2
- package/build/es/transfer/move-highlighted-picked-option-down.js +4 -3
- package/build/es/transfer/move-highlighted-picked-option-up.js +4 -3
- package/build/es/transfer/remove-individual-picked-options.js +1 -2
- package/build/es/transfer/use-filter.js +0 -2
- package/build/es/transfer/use-highlighted-options/create-toggle-highlighted-option.js +3 -7
- package/build/es/transfer/use-highlighted-options/toggle-add.js +1 -1
- package/build/es/transfer/use-highlighted-options/toggle-range.js +4 -6
- package/build/es/transfer/use-highlighted-options/toggle-replace.js +0 -2
- package/build/es/transfer/use-highlighted-options.js +1 -2
- package/build/es/transfer-option.js +1 -2
- package/build/es/transfer.js +28 -32
- package/build/es/{transfer.stories.js → transfer.prod.stories.js} +65 -50
- package/build/es/use-resize-counter.js +1 -2
- package/package.json +10 -10
- /package/build/es/__e2e__/{add_remove-highlighted-options.stories.e2e.js → add_remove-highlighted-options.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{display-order.stories.e2e.js → display-order.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{highlight-range-of-options.stories.e2e.js → highlight-range-of-options.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{loading_lists.stories.e2e.js → loading_lists.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{notify_at_end_of_list.stories.e2e.js → notify_at_end_of_list.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{reorder-with-buttons.stories.e2e.js → reorder-with-buttons.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{set_unset-highlighted-option.stories.e2e.js → set_unset-highlighted-option.e2e.stories.js} +0 -0
- /package/build/es/__e2e__/{transferring-items.stories.e2e.js → transferring-items.e2e.stories.js} +0 -0
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _isReorderDownDisabled = require("../../transfer/is-reorder-down-disabled.js");
|
|
4
|
-
|
|
5
4
|
describe('Transfer - isReorderDownDisabled', () => {
|
|
6
5
|
const selected = ['foo', 'bar', 'baz'];
|
|
7
6
|
it('should return true when there are no highlighted picked options', () => {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _isReorderUpDisabled = require("../../transfer/is-reorder-up-disabled.js");
|
|
4
|
-
|
|
5
4
|
describe('Transfer - isReorderUpDisabled', () => {
|
|
6
5
|
const selected = ['foo', 'bar', 'baz'];
|
|
7
6
|
it('should return true when there are no highlighted picked options', () => {
|
package/build/cjs/__tests__/helper/use-highlighted-option/create-toggle-highlighted-option.test.js
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _index = require("../../../common/index.js");
|
|
4
|
-
|
|
5
4
|
var _createToggleHighlightedOption = require("../../../transfer/use-highlighted-options/create-toggle-highlighted-option.js");
|
|
6
|
-
|
|
7
5
|
var _toggleAdd = require("../../../transfer/use-highlighted-options/toggle-add.js");
|
|
8
|
-
|
|
9
6
|
var _toggleRange = require("../../../transfer/use-highlighted-options/toggle-range.js");
|
|
10
|
-
|
|
11
7
|
var _toggleReplace = require("../../../transfer/use-highlighted-options/toggle-replace.js");
|
|
12
|
-
|
|
13
8
|
jest.mock('../../../transfer/use-highlighted-options/toggle-add.js', () => ({
|
|
14
9
|
toggleAdd: jest.fn()
|
|
15
10
|
}));
|
|
@@ -46,11 +41,8 @@ describe('Transfer- useHighlightedOptions - createToggleHighlightedOption', () =
|
|
|
46
41
|
});
|
|
47
42
|
afterEach(() => {
|
|
48
43
|
setLastClicked.mockClear();
|
|
49
|
-
|
|
50
44
|
_toggleAdd.toggleAdd.mockClear();
|
|
51
|
-
|
|
52
45
|
_toggleRange.toggleRange.mockClear();
|
|
53
|
-
|
|
54
46
|
_toggleReplace.toggleReplace.mockClear();
|
|
55
47
|
});
|
|
56
48
|
it('should set the lastClicked to the clicked option when mode is ADD_MODE', () => {
|
|
@@ -102,7 +94,8 @@ describe('Transfer- useHighlightedOptions - createToggleHighlightedOption', () =
|
|
|
102
94
|
expect(_toggleRange.toggleRange).toHaveBeenCalledTimes(0);
|
|
103
95
|
});
|
|
104
96
|
it('should do nothing when disabled is true', () => {
|
|
105
|
-
toggleHighlightedOption = (0, _createToggleHighlightedOption.createToggleHighlightedOption)({
|
|
97
|
+
toggleHighlightedOption = (0, _createToggleHighlightedOption.createToggleHighlightedOption)({
|
|
98
|
+
...createToggleHighlightedOptionDefaultPayload,
|
|
106
99
|
disabled: true
|
|
107
100
|
});
|
|
108
101
|
toggleHighlightedOption({
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _toggleRange = require("../../../transfer/use-highlighted-options/toggle-range.js");
|
|
4
|
-
|
|
5
4
|
describe('Transfer- useHighlightedOptions - toggleRange', () => {
|
|
6
5
|
const setHighlightedOptions = jest.fn();
|
|
7
6
|
const options = [{
|
|
@@ -118,10 +117,10 @@ describe('Transfer- useHighlightedOptions - toggleRange', () => {
|
|
|
118
117
|
});
|
|
119
118
|
expect(setHighlightedOptions).toHaveBeenCalledWith(expected);
|
|
120
119
|
});
|
|
120
|
+
|
|
121
121
|
/**
|
|
122
122
|
* E. g. lastClicked is hidden because of a filter change
|
|
123
123
|
*/
|
|
124
|
-
|
|
125
124
|
it('should highlight from the highest in list to the clicked when last clicked not visible anymore', () => {
|
|
126
125
|
const expected = options.slice(1, 6).map(_ref5 => {
|
|
127
126
|
let {
|
|
@@ -144,11 +143,11 @@ describe('Transfer- useHighlightedOptions - toggleRange', () => {
|
|
|
144
143
|
});
|
|
145
144
|
expect(setHighlightedOptions).toHaveBeenCalledWith(expected);
|
|
146
145
|
});
|
|
146
|
+
|
|
147
147
|
/**
|
|
148
148
|
* E. g. lastClicked is null because all options so far
|
|
149
149
|
* have been clicked with shift
|
|
150
150
|
*/
|
|
151
|
-
|
|
152
151
|
it('should highlight from the highest in list to the clicked when last clicked null', () => {
|
|
153
152
|
const expected = options.slice(1, 6).map(_ref7 => {
|
|
154
153
|
let {
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _useHighlightedOptions = require("../../transfer/use-highlighted-options.js");
|
|
4
|
-
|
|
5
3
|
var _createToggleHighlightedOption = require("../../transfer/use-highlighted-options/create-toggle-highlighted-option.js");
|
|
6
|
-
|
|
4
|
+
var _useHighlightedOptions = require("../../transfer/use-highlighted-options.js");
|
|
7
5
|
jest.mock('../../transfer/use-highlighted-options/create-toggle-highlighted-option.js', () => ({
|
|
8
6
|
createToggleHighlightedOption: jest.fn()
|
|
9
7
|
}));
|
|
@@ -25,9 +23,7 @@ describe('Transfer - useHighlightedOptions', () => {
|
|
|
25
23
|
});
|
|
26
24
|
it('should use the createToggleHighlightedOption factory to create the toggleHighlightedOption function', () => {
|
|
27
25
|
const createToggleHighlightedOptionReturnValue = jest.fn();
|
|
28
|
-
|
|
29
26
|
_createToggleHighlightedOption.createToggleHighlightedOption.mockImplementationOnce(() => createToggleHighlightedOptionReturnValue);
|
|
30
|
-
|
|
31
27
|
const {
|
|
32
28
|
toggleHighlightedOption
|
|
33
29
|
} = (0, _useHighlightedOptions.useHighlightedOptions)({});
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _enzyme = require("enzyme");
|
|
4
|
-
|
|
5
4
|
var _react = _interopRequireDefault(require("react"));
|
|
6
|
-
|
|
7
5
|
var _transfer = require("../transfer.js");
|
|
8
|
-
|
|
9
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
-
|
|
6
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
7
|
const options = [{
|
|
12
8
|
label: 'ANC 1st visit',
|
|
13
9
|
value: 'anc_1st_visit'
|
package/build/cjs/actions.js
CHANGED
|
@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Actions = void 0;
|
|
7
|
-
|
|
8
7
|
var _style = _interopRequireDefault(require("styled-jsx/style"));
|
|
9
|
-
|
|
10
8
|
var _uiConstants = require("@dhis2/ui-constants");
|
|
11
|
-
|
|
12
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
13
|
-
|
|
14
10
|
var _react = _interopRequireDefault(require("react"));
|
|
15
|
-
|
|
16
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
|
-
|
|
11
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
12
|
const Actions = _ref => {
|
|
19
13
|
let {
|
|
20
14
|
children,
|
|
@@ -26,9 +20,8 @@ const Actions = _ref => {
|
|
|
26
20
|
}, children, /*#__PURE__*/_react.default.createElement(_style.default, {
|
|
27
21
|
id: "1457814848",
|
|
28
22
|
dynamic: [_uiConstants.spacers.dp8]
|
|
29
|
-
}, [
|
|
23
|
+
}, [`div.__jsx-style-dynamic-selector{-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-shrink:1;-ms-flex-negative:1;flex-shrink:1;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:0 ${_uiConstants.spacers.dp8};}`, "div.__jsx-style-dynamic-selector>button{margin-top:8px;}", "div.__jsx-style-dynamic-selector>button:first-child{margin-top:0;}"]));
|
|
30
24
|
};
|
|
31
|
-
|
|
32
25
|
exports.Actions = Actions;
|
|
33
26
|
Actions.propTypes = {
|
|
34
27
|
dataTest: _propTypes.default.string.isRequired,
|
package/build/cjs/add-all.js
CHANGED
|
@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.AddAll = void 0;
|
|
7
|
-
|
|
8
7
|
var _button = require("@dhis2-ui/button");
|
|
9
|
-
|
|
10
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
|
-
|
|
12
9
|
var _react = _interopRequireDefault(require("react"));
|
|
13
|
-
|
|
14
10
|
var _icons = require("./icons.js");
|
|
15
|
-
|
|
16
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
|
-
|
|
11
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
12
|
const AddAll = _ref => {
|
|
19
13
|
let {
|
|
20
14
|
label,
|
|
@@ -27,12 +21,11 @@ const AddAll = _ref => {
|
|
|
27
21
|
disabled: disabled,
|
|
28
22
|
onClick: onClick,
|
|
29
23
|
icon: /*#__PURE__*/_react.default.createElement(_icons.IconAddAll, {
|
|
30
|
-
dataTest:
|
|
24
|
+
dataTest: `${dataTest}-iconaddall`,
|
|
31
25
|
disabled: disabled
|
|
32
26
|
})
|
|
33
27
|
}, label);
|
|
34
28
|
};
|
|
35
|
-
|
|
36
29
|
exports.AddAll = AddAll;
|
|
37
30
|
AddAll.propTypes = {
|
|
38
31
|
dataTest: _propTypes.default.string.isRequired,
|
|
@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.AddIndividual = void 0;
|
|
7
|
-
|
|
8
7
|
var _button = require("@dhis2-ui/button");
|
|
9
|
-
|
|
10
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
|
-
|
|
12
9
|
var _react = _interopRequireDefault(require("react"));
|
|
13
|
-
|
|
14
10
|
var _icons = require("./icons.js");
|
|
15
|
-
|
|
16
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
|
-
|
|
11
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
12
|
const AddIndividual = _ref => {
|
|
19
13
|
let {
|
|
20
14
|
label,
|
|
@@ -28,11 +22,10 @@ const AddIndividual = _ref => {
|
|
|
28
22
|
onClick: onClick,
|
|
29
23
|
icon: /*#__PURE__*/_react.default.createElement(_icons.IconAddIndividual, {
|
|
30
24
|
disabled: disabled,
|
|
31
|
-
dataTest:
|
|
25
|
+
dataTest: `${dataTest}-iconaddindividual`
|
|
32
26
|
})
|
|
33
27
|
}, label);
|
|
34
28
|
};
|
|
35
|
-
|
|
36
29
|
exports.AddIndividual = AddIndividual;
|
|
37
30
|
AddIndividual.propTypes = {
|
|
38
31
|
dataTest: _propTypes.default.string.isRequired,
|
|
@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.findOptionIndex = void 0;
|
|
7
|
-
|
|
8
7
|
var _isOption = require("./is-option.js");
|
|
9
|
-
|
|
10
8
|
/**
|
|
11
9
|
* @param {Object[]} options
|
|
12
10
|
* @param {Object} option
|
|
13
11
|
* @returns {Int}
|
|
14
12
|
*/
|
|
15
13
|
const findOptionIndex = (options, option) => options.findIndex(current => (0, _isOption.isOption)(current, option));
|
|
16
|
-
|
|
17
14
|
exports.findOptionIndex = findOptionIndex;
|
|
@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getModeByModifierKey = void 0;
|
|
7
|
-
|
|
8
7
|
var _modes = require("./modes.js");
|
|
9
|
-
|
|
10
8
|
/**
|
|
11
9
|
* @param {Object} args
|
|
12
10
|
* @param {bool} args.altKey
|
|
@@ -25,21 +23,17 @@ const getModeByModifierKey = _ref => {
|
|
|
25
23
|
const keys = [altKey, shiftKey, ctrlKey, metaKey];
|
|
26
24
|
const amountKeyPressed = keys.filter(v => v);
|
|
27
25
|
const moreThanOneKeyPressed = amountKeyPressed.length;
|
|
28
|
-
|
|
29
26
|
if (moreThanOneKeyPressed !== 1) {
|
|
30
27
|
return _modes.REPLACE_MODE;
|
|
31
28
|
}
|
|
32
|
-
|
|
33
29
|
if (altKey || ctrlKey || metaKey) {
|
|
34
30
|
return _modes.ADD_MODE;
|
|
35
31
|
}
|
|
36
|
-
|
|
37
32
|
if (shiftKey) {
|
|
38
33
|
return _modes.RANGE_MODE;
|
|
39
|
-
}
|
|
40
|
-
|
|
34
|
+
}
|
|
41
35
|
|
|
36
|
+
// default to replace mode
|
|
42
37
|
return _modes.REPLACE_MODE;
|
|
43
38
|
};
|
|
44
|
-
|
|
45
39
|
exports.getModeByModifierKey = getModeByModifierKey;
|
|
@@ -63,15 +63,9 @@ Object.defineProperty(exports, "toggleValue", {
|
|
|
63
63
|
return _toggleValue.toggleValue;
|
|
64
64
|
}
|
|
65
65
|
});
|
|
66
|
-
|
|
67
66
|
var _modes = require("./modes.js");
|
|
68
|
-
|
|
69
67
|
var _styles = require("./styles.js");
|
|
70
|
-
|
|
71
68
|
var _findOptionIndex = require("./find-option-index.js");
|
|
72
|
-
|
|
73
69
|
var _getModeByModifierKey = require("./get-mode-by-modifier-key.js");
|
|
74
|
-
|
|
75
70
|
var _isOption = require("./is-option.js");
|
|
76
|
-
|
|
77
71
|
var _toggleValue = require("./toggle-value.js");
|
|
@@ -4,12 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.isOption = void 0;
|
|
7
|
-
|
|
8
7
|
/**
|
|
9
8
|
* @param {Object} left
|
|
10
9
|
* @param {Object} left
|
|
11
10
|
* @returns {bool}
|
|
12
11
|
*/
|
|
13
12
|
const isOption = (left, right) => left.label === right.label && left.value === right.value;
|
|
14
|
-
|
|
15
13
|
exports.isOption = isOption;
|
|
@@ -4,17 +4,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.REPLACE_MODE = exports.RANGE_MODE = exports.ADD_MODE = void 0;
|
|
7
|
-
|
|
8
7
|
/**
|
|
9
8
|
* Click modes when clicking on an option with/without
|
|
10
9
|
* a modifier key (ctrl, alt, cmd, shift)
|
|
11
10
|
*/
|
|
12
|
-
// no or multiple modifier keys
|
|
13
|
-
const REPLACE_MODE = 'REPLACE_MODE'; // add/remove options from selection
|
|
14
11
|
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
exports.ADD_MODE = ADD_MODE;
|
|
19
|
-
|
|
20
|
-
exports.RANGE_MODE = RANGE_MODE;
|
|
12
|
+
// no or multiple modifier keys
|
|
13
|
+
const REPLACE_MODE = exports.REPLACE_MODE = 'REPLACE_MODE';
|
|
14
|
+
// add/remove options from selection
|
|
15
|
+
const ADD_MODE = exports.ADD_MODE = 'ADD_MODE';
|
|
16
|
+
// create selection range
|
|
17
|
+
const RANGE_MODE = exports.RANGE_MODE = 'RANGE_MODE';
|
|
@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.removeOption = void 0;
|
|
7
|
-
|
|
8
7
|
var _findOptionIndex = require("./find-option-index.js");
|
|
9
|
-
|
|
10
8
|
/**
|
|
11
9
|
* @param {Object[]} options
|
|
12
10
|
* @param {Object} option
|
|
@@ -14,16 +12,12 @@ var _findOptionIndex = require("./find-option-index.js");
|
|
|
14
12
|
*/
|
|
15
13
|
const removeOption = (options, option) => {
|
|
16
14
|
const index = (0, _findOptionIndex.findOptionIndex)(options, option);
|
|
17
|
-
|
|
18
15
|
if (index === -1) {
|
|
19
16
|
return options;
|
|
20
17
|
}
|
|
21
|
-
|
|
22
18
|
if (index === 0) {
|
|
23
19
|
return options.slice(1);
|
|
24
20
|
}
|
|
25
|
-
|
|
26
21
|
return [...options.slice(0, index), ...options.slice(index + 1)];
|
|
27
22
|
};
|
|
28
|
-
|
|
29
23
|
exports.removeOption = removeOption;
|
|
@@ -4,12 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.borderRadius = exports.borderColor = exports.backgroundColor = void 0;
|
|
7
|
-
|
|
8
7
|
var _uiConstants = require("@dhis2/ui-constants");
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
exports.
|
|
12
|
-
const borderColor = _uiConstants.colors.grey400;
|
|
13
|
-
exports.borderColor = borderColor;
|
|
14
|
-
const borderRadius = '3px';
|
|
15
|
-
exports.borderRadius = borderRadius;
|
|
8
|
+
const backgroundColor = exports.backgroundColor = _uiConstants.colors.white;
|
|
9
|
+
const borderColor = exports.borderColor = _uiConstants.colors.grey400;
|
|
10
|
+
const borderRadius = exports.borderRadius = '3px';
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.toggleValue = void 0;
|
|
7
|
-
|
|
8
7
|
/**
|
|
9
8
|
* @param {string[]} values
|
|
10
9
|
* @param {string} value
|
|
@@ -12,16 +11,13 @@ exports.toggleValue = void 0;
|
|
|
12
11
|
*/
|
|
13
12
|
const toggleValue = (values, value) => {
|
|
14
13
|
const index = values.indexOf(value);
|
|
15
|
-
|
|
16
14
|
if (index === -1) {
|
|
17
15
|
return [...values, value];
|
|
18
16
|
} else if (index === 0) {
|
|
19
17
|
values.slice(1);
|
|
20
18
|
}
|
|
21
|
-
|
|
22
19
|
const prevSlice = values.slice(0, index);
|
|
23
20
|
const nextSlice = values.slice(index + 1);
|
|
24
21
|
return [...prevSlice, ...nextSlice];
|
|
25
22
|
};
|
|
26
|
-
|
|
27
23
|
exports.toggleValue = toggleValue;
|
package/build/cjs/container.js
CHANGED
|
@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Container = void 0;
|
|
7
|
-
|
|
8
7
|
var _style = _interopRequireDefault(require("styled-jsx/style"));
|
|
9
|
-
|
|
10
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
|
-
|
|
12
9
|
var _react = _interopRequireDefault(require("react"));
|
|
13
|
-
|
|
14
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
-
|
|
10
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
16
11
|
const Container = _ref => {
|
|
17
12
|
let {
|
|
18
13
|
children,
|
|
@@ -26,9 +21,8 @@ const Container = _ref => {
|
|
|
26
21
|
}, children, /*#__PURE__*/_react.default.createElement(_style.default, {
|
|
27
22
|
id: "3332822660",
|
|
28
23
|
dynamic: [height]
|
|
29
|
-
}, [
|
|
24
|
+
}, [`div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;height:${height};}`]));
|
|
30
25
|
};
|
|
31
|
-
|
|
32
26
|
exports.Container = Container;
|
|
33
27
|
Container.propTypes = {
|
|
34
28
|
height: _propTypes.default.string.isRequired,
|
|
@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.EndIntersectionDetector = void 0;
|
|
7
|
-
|
|
8
7
|
var _style = _interopRequireDefault(require("styled-jsx/style"));
|
|
9
|
-
|
|
10
8
|
var _intersectionDetector = require("@dhis2-ui/intersection-detector");
|
|
11
|
-
|
|
12
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
13
|
-
|
|
14
10
|
var _react = _interopRequireDefault(require("react"));
|
|
15
|
-
|
|
16
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
|
-
|
|
11
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
12
|
const EndIntersectionDetector = _ref => {
|
|
19
13
|
let {
|
|
20
14
|
rootRef,
|
|
@@ -36,7 +30,6 @@ const EndIntersectionDetector = _ref => {
|
|
|
36
30
|
id: "2799340139"
|
|
37
31
|
}, ["div.jsx-2799340139{width:100%;height:50px;position:absolute;z-index:-1;bottom:0;inset-inline-start:0;}"]));
|
|
38
32
|
};
|
|
39
|
-
|
|
40
33
|
exports.EndIntersectionDetector = EndIntersectionDetector;
|
|
41
34
|
EndIntersectionDetector.propTypes = {
|
|
42
35
|
rootRef: _propTypes.default.shape({
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _cypressCucumberPreprocessor = require("@badeball/cypress-cucumber-preprocessor");
|
|
4
|
-
|
|
5
4
|
(0, _cypressCucumberPreprocessor.Given)('the option list has two or more items', () => {
|
|
6
5
|
cy.visitStory('Transfer add & remove highlighted options', 'Has Options');
|
|
7
6
|
cy.get('{transfer-sourceoptions}').as('list');
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.extractOptionFromElement = void 0;
|
|
7
|
-
|
|
8
7
|
const extractOptionFromElement = element => {
|
|
9
8
|
const $element = Cypress.$(element);
|
|
10
9
|
return {
|
|
@@ -12,5 +11,4 @@ const extractOptionFromElement = element => {
|
|
|
12
11
|
value: $element.data('value')
|
|
13
12
|
};
|
|
14
13
|
};
|
|
15
|
-
|
|
16
14
|
exports.extractOptionFromElement = extractOptionFromElement;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _cypressCucumberPreprocessor = require("@badeball/cypress-cucumber-preprocessor");
|
|
4
|
-
|
|
5
4
|
var _index2 = require("../common/index.js");
|
|
6
|
-
|
|
7
5
|
const enabledSourceOptionSelector = '{transfer-sourceoptions} {transferoption}:not(.disabled)';
|
|
8
6
|
const disabledSourceOptionSelector = '{transfer-sourceoptions} {transferoption}.disabled';
|
|
9
7
|
(0, _cypressCucumberPreprocessor.Given)('a source list that contains a disabled option', () => {
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _cypressCucumberPreprocessor = require("@badeball/cypress-cucumber-preprocessor");
|
|
4
|
-
|
|
5
4
|
var _index = require("../common/index.js");
|
|
6
|
-
|
|
7
5
|
(0, _cypressCucumberPreprocessor.Given)('none of the supplied options have been selected', () => {
|
|
8
6
|
cy.visitStory('Transfer Display Order', 'No Selection');
|
|
9
7
|
});
|
|
@@ -19,7 +17,8 @@ var _index = require("../common/index.js");
|
|
|
19
17
|
cy.get('{transfer-actions-removeindividual}').click();
|
|
20
18
|
});
|
|
21
19
|
(0, _cypressCucumberPreprocessor.When)('the user deselects multiple selected options', () => {
|
|
22
|
-
cy.get('{transfer-pickedoptions} {transferoption}')
|
|
20
|
+
cy.get('{transfer-pickedoptions} {transferoption}')
|
|
21
|
+
// should take third, then first item
|
|
23
22
|
.then($options => {
|
|
24
23
|
const $arr = $options.toArray();
|
|
25
24
|
return [$arr[2], $arr[0]];
|
|
@@ -32,7 +31,8 @@ var _index = require("../common/index.js");
|
|
|
32
31
|
cy.get('{transfer-actions-addindividual}').click();
|
|
33
32
|
});
|
|
34
33
|
(0, _cypressCucumberPreprocessor.When)('the user selects multiple options', () => {
|
|
35
|
-
cy.get('{transfer-sourceoptions} {transferoption}')
|
|
34
|
+
cy.get('{transfer-sourceoptions} {transferoption}')
|
|
35
|
+
// should take fifth, then first item
|
|
36
36
|
.then($options => {
|
|
37
37
|
const $arr = $options.toArray();
|
|
38
38
|
return [$arr[4], $arr[0]];
|
|
@@ -78,8 +78,9 @@ var _index = require("../common/index.js");
|
|
|
78
78
|
} = _ref5;
|
|
79
79
|
return label === option.label && value === option.value;
|
|
80
80
|
}));
|
|
81
|
-
expect(selectableSourceOptions).to.eql(originalOptions);
|
|
81
|
+
expect(selectableSourceOptions).to.eql(originalOptions);
|
|
82
82
|
|
|
83
|
+
// and confirm that the deselected option is in the selectable options list
|
|
83
84
|
const [deselectedOption] = deselectedOptions;
|
|
84
85
|
const hasOption = !!selectableSourceOptions.find(_ref6 => {
|
|
85
86
|
let {
|