@atlaskit/select 15.2.11 → 15.3.0
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/AsyncCreatableSelect/package.json +1 -0
- package/AsyncSelect/package.json +1 -0
- package/CHANGELOG.md +28 -0
- package/CheckboxSelect/package.json +1 -0
- package/CountrySelect/package.json +1 -0
- package/CreatableSelect/package.json +1 -0
- package/RadioSelect/package.json +1 -0
- package/Select/package.json +1 -0
- package/createSelect/package.json +1 -0
- package/dist/cjs/PopupSelect/PopupSelect.js +34 -3
- package/dist/cjs/Select.js +1 -1
- package/dist/cjs/styles.js +3 -3
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/PopupSelect/PopupSelect.js +37 -3
- package/dist/es2019/Select.js +1 -1
- package/dist/es2019/styles.js +3 -3
- package/dist/es2019/version.json +1 -1
- package/dist/esm/PopupSelect/PopupSelect.js +36 -3
- package/dist/esm/Select.js +1 -1
- package/dist/esm/styles.js +3 -3
- package/dist/esm/version.json +1 -1
- package/dist/types/PopupSelect/PopupSelect.d.ts +28 -9
- package/dist/types/PopupSelect/components.d.ts +1 -1
- package/ert/package.json +1 -0
- package/package.json +7 -7
- package/styles/package.json +1 -0
- package/types/package.json +1 -0
package/AsyncSelect/package.json
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,33 @@
|
|
|
1
1
|
# @atlaskit/select
|
|
2
2
|
|
|
3
|
+
## 15.3.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`145c9cea461`](https://bitbucket.org/atlassian/atlassian-frontend/commits/145c9cea461) - [ux] Added 2 new props for controlling the open state of PopupSelect:
|
|
8
|
+
|
|
9
|
+
- `isOpen` controls whether the popup is open (controlled)
|
|
10
|
+
- `defaultIsOpen` controls whether the popup is initially open on mount (uncontrolled)
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- [`db58fa26cbf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/db58fa26cbf) - [ux] Updated input tokens within `@atlaskit/select`.
|
|
15
|
+
- [`4624991be21`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4624991be21) - [ux] Fixes a regression affecting MacOS Safari. The cursor incorrectly displayed as 'text' rather than 'default' when the pointer was over a select option.
|
|
16
|
+
- [`e7438659c2e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e7438659c2e) - Updated dependency '@types/react-select' to fix type error
|
|
17
|
+
|
|
18
|
+
## 15.2.13
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- Updated dependencies
|
|
23
|
+
|
|
24
|
+
## 15.2.12
|
|
25
|
+
|
|
26
|
+
### Patch Changes
|
|
27
|
+
|
|
28
|
+
- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Upgrade to TypeScript 4.2.4
|
|
29
|
+
- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Updated types for @atlaskit/select to support Typescript 4.2.4
|
|
30
|
+
|
|
3
31
|
## 15.2.11
|
|
4
32
|
|
|
5
33
|
### Patch Changes
|
package/RadioSelect/package.json
CHANGED
package/Select/package.json
CHANGED
|
@@ -103,6 +103,8 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
103
103
|
var _super = _createSuper(PopupSelect);
|
|
104
104
|
|
|
105
105
|
function PopupSelect() {
|
|
106
|
+
var _this$defaultOpenStat;
|
|
107
|
+
|
|
106
108
|
var _this;
|
|
107
109
|
|
|
108
110
|
(0, _classCallCheck2.default)(this, PopupSelect);
|
|
@@ -123,8 +125,10 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
123
125
|
});
|
|
124
126
|
}
|
|
125
127
|
}));
|
|
128
|
+
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isOpenControlled", _this.props.isOpen !== undefined);
|
|
129
|
+
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultOpenState", _this.isOpenControlled ? _this.props.isOpen : _this.props.defaultIsOpen);
|
|
126
130
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
|
|
127
|
-
isOpen: false,
|
|
131
|
+
isOpen: (_this$defaultOpenStat = _this.defaultOpenState) !== null && _this$defaultOpenStat !== void 0 ? _this$defaultOpenStat : false,
|
|
128
132
|
mergedComponents: _components.defaultComponents,
|
|
129
133
|
mergedPopperProps: defaultPopperProps
|
|
130
134
|
});
|
|
@@ -180,9 +184,14 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
180
184
|
onChange(value, actionMeta);
|
|
181
185
|
}
|
|
182
186
|
});
|
|
183
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "open", function () {
|
|
187
|
+
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "open", function (options) {
|
|
184
188
|
var onOpen = _this.props.onOpen;
|
|
185
189
|
|
|
190
|
+
if (!(options !== null && options !== void 0 && options.controlOverride) && _this.isOpenControlled) {
|
|
191
|
+
// Prevent popup opening if it's open state is already being controlled
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
|
|
186
195
|
if (onOpen) {
|
|
187
196
|
onOpen();
|
|
188
197
|
}
|
|
@@ -219,9 +228,14 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
219
228
|
return _this.focusTrap.activate();
|
|
220
229
|
}, 1);
|
|
221
230
|
});
|
|
222
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "close", function () {
|
|
231
|
+
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "close", function (options) {
|
|
223
232
|
var onClose = _this.props.onClose;
|
|
224
233
|
|
|
234
|
+
if (!(options !== null && options !== void 0 && options.controlOverride) && _this.isOpenControlled) {
|
|
235
|
+
// Prevent popup closing if it's open state is already being controlled
|
|
236
|
+
return;
|
|
237
|
+
}
|
|
238
|
+
|
|
225
239
|
if (onClose) {
|
|
226
240
|
onClose();
|
|
227
241
|
}
|
|
@@ -381,6 +395,23 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
381
395
|
|
|
382
396
|
window.removeEventListener('click', this.handleClick, true);
|
|
383
397
|
window.removeEventListener('keydown', this.handleKeyDown, true);
|
|
398
|
+
}
|
|
399
|
+
}, {
|
|
400
|
+
key: "componentDidUpdate",
|
|
401
|
+
value: function componentDidUpdate(prevProps) {
|
|
402
|
+
var isOpen = this.props.isOpen;
|
|
403
|
+
|
|
404
|
+
if (prevProps.isOpen !== isOpen) {
|
|
405
|
+
if (isOpen === true) {
|
|
406
|
+
this.open({
|
|
407
|
+
controlOverride: true
|
|
408
|
+
});
|
|
409
|
+
} else if (isOpen === false) {
|
|
410
|
+
this.close({
|
|
411
|
+
controlOverride: true
|
|
412
|
+
});
|
|
413
|
+
}
|
|
414
|
+
}
|
|
384
415
|
} // Event Handlers
|
|
385
416
|
// ==============================
|
|
386
417
|
|
package/dist/cjs/Select.js
CHANGED
|
@@ -14,7 +14,7 @@ var _analyticsNext = require("@atlaskit/analytics-next");
|
|
|
14
14
|
var _createSelect = _interopRequireDefault(require("./createSelect"));
|
|
15
15
|
|
|
16
16
|
var packageName = "@atlaskit/select";
|
|
17
|
-
var packageVersion = "15.
|
|
17
|
+
var packageVersion = "15.3.0";
|
|
18
18
|
var SelectWithoutAnalytics = (0, _createSelect.default)(_reactSelect.default);
|
|
19
19
|
exports.SelectWithoutAnalytics = SelectWithoutAnalytics;
|
|
20
20
|
var createAndFireEventOnAtlaskit = (0, _analyticsNext.createAndFireEvent)('atlaskit');
|
package/dist/cjs/styles.js
CHANGED
|
@@ -30,7 +30,7 @@ function baseStyles(validationState, isCompact) {
|
|
|
30
30
|
// react-select disables pointer events when isDisabled is true.
|
|
31
31
|
// We override this and make the inner container turn it off instead.
|
|
32
32
|
pointerEvents: 'all',
|
|
33
|
-
cursor: isDisabled ? 'not-allowed' :
|
|
33
|
+
cursor: isDisabled ? 'not-allowed' : css.cursor
|
|
34
34
|
});
|
|
35
35
|
},
|
|
36
36
|
input: function input(css) {
|
|
@@ -176,14 +176,14 @@ function baseStyles(validationState, isCompact) {
|
|
|
176
176
|
} else if (isSelected) {
|
|
177
177
|
backgroundColor = "var(--ds-background-selected, ".concat(_colors.B50, ")");
|
|
178
178
|
} else if (isFocused) {
|
|
179
|
-
backgroundColor = "var(--ds-background-
|
|
179
|
+
backgroundColor = "var(--ds-background-input-pressed, ".concat(_colors.N20, ")");
|
|
180
180
|
}
|
|
181
181
|
|
|
182
182
|
if (!isDisabled && (isFocused || isSelected)) {
|
|
183
183
|
boxShadow = "inset 2px 0px 0px ".concat("var(--ds-border-selected, ".concat(_colors.B400, ")"));
|
|
184
184
|
}
|
|
185
185
|
|
|
186
|
-
var cursor = isDisabled ? 'not-allowed' :
|
|
186
|
+
var cursor = isDisabled ? 'not-allowed' : css.cursor;
|
|
187
187
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
188
188
|
padding: '6px 12px',
|
|
189
189
|
backgroundColor: backgroundColor,
|
package/dist/cjs/version.json
CHANGED
|
@@ -44,6 +44,8 @@ const isEmpty = obj => Object.keys(obj).length === 0;
|
|
|
44
44
|
|
|
45
45
|
export default class PopupSelect extends PureComponent {
|
|
46
46
|
constructor(...args) {
|
|
47
|
+
var _this$defaultOpenStat;
|
|
48
|
+
|
|
47
49
|
super(...args);
|
|
48
50
|
|
|
49
51
|
_defineProperty(this, "focusTrap", null);
|
|
@@ -60,8 +62,12 @@ export default class PopupSelect extends PureComponent {
|
|
|
60
62
|
})
|
|
61
63
|
}));
|
|
62
64
|
|
|
65
|
+
_defineProperty(this, "isOpenControlled", this.props.isOpen !== undefined);
|
|
66
|
+
|
|
67
|
+
_defineProperty(this, "defaultOpenState", this.isOpenControlled ? this.props.isOpen : this.props.defaultIsOpen);
|
|
68
|
+
|
|
63
69
|
_defineProperty(this, "state", {
|
|
64
|
-
isOpen: false,
|
|
70
|
+
isOpen: (_this$defaultOpenStat = this.defaultOpenState) !== null && _this$defaultOpenStat !== void 0 ? _this$defaultOpenStat : false,
|
|
65
71
|
mergedComponents: defaultComponents,
|
|
66
72
|
mergedPopperProps: defaultPopperProps
|
|
67
73
|
});
|
|
@@ -125,11 +131,16 @@ export default class PopupSelect extends PureComponent {
|
|
|
125
131
|
}
|
|
126
132
|
});
|
|
127
133
|
|
|
128
|
-
_defineProperty(this, "open",
|
|
134
|
+
_defineProperty(this, "open", options => {
|
|
129
135
|
const {
|
|
130
136
|
onOpen
|
|
131
137
|
} = this.props;
|
|
132
138
|
|
|
139
|
+
if (!(options !== null && options !== void 0 && options.controlOverride) && this.isOpenControlled) {
|
|
140
|
+
// Prevent popup opening if it's open state is already being controlled
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
|
|
133
144
|
if (onOpen) {
|
|
134
145
|
onOpen();
|
|
135
146
|
}
|
|
@@ -165,11 +176,16 @@ export default class PopupSelect extends PureComponent {
|
|
|
165
176
|
setTimeout(() => this.focusTrap.activate(), 1);
|
|
166
177
|
});
|
|
167
178
|
|
|
168
|
-
_defineProperty(this, "close",
|
|
179
|
+
_defineProperty(this, "close", options => {
|
|
169
180
|
const {
|
|
170
181
|
onClose
|
|
171
182
|
} = this.props;
|
|
172
183
|
|
|
184
|
+
if (!(options !== null && options !== void 0 && options.controlOverride) && this.isOpenControlled) {
|
|
185
|
+
// Prevent popup closing if it's open state is already being controlled
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
|
|
173
189
|
if (onClose) {
|
|
174
190
|
onClose();
|
|
175
191
|
}
|
|
@@ -361,6 +377,24 @@ export default class PopupSelect extends PureComponent {
|
|
|
361
377
|
|
|
362
378
|
window.removeEventListener('click', this.handleClick, true);
|
|
363
379
|
window.removeEventListener('keydown', this.handleKeyDown, true);
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
componentDidUpdate(prevProps) {
|
|
383
|
+
const {
|
|
384
|
+
isOpen
|
|
385
|
+
} = this.props;
|
|
386
|
+
|
|
387
|
+
if (prevProps.isOpen !== isOpen) {
|
|
388
|
+
if (isOpen === true) {
|
|
389
|
+
this.open({
|
|
390
|
+
controlOverride: true
|
|
391
|
+
});
|
|
392
|
+
} else if (isOpen === false) {
|
|
393
|
+
this.close({
|
|
394
|
+
controlOverride: true
|
|
395
|
+
});
|
|
396
|
+
}
|
|
397
|
+
}
|
|
364
398
|
} // Event Handlers
|
|
365
399
|
// ==============================
|
|
366
400
|
|
package/dist/es2019/Select.js
CHANGED
|
@@ -2,7 +2,7 @@ import Select from 'react-select';
|
|
|
2
2
|
import { withAnalyticsEvents, withAnalyticsContext, createAndFireEvent } from '@atlaskit/analytics-next';
|
|
3
3
|
import createSelect from './createSelect';
|
|
4
4
|
const packageName = "@atlaskit/select";
|
|
5
|
-
const packageVersion = "15.
|
|
5
|
+
const packageVersion = "15.3.0";
|
|
6
6
|
export const SelectWithoutAnalytics = createSelect(Select);
|
|
7
7
|
const createAndFireEventOnAtlaskit = createAndFireEvent('atlaskit');
|
|
8
8
|
export default withAnalyticsContext({
|
package/dist/es2019/styles.js
CHANGED
|
@@ -12,7 +12,7 @@ export default function baseStyles(validationState, isCompact) {
|
|
|
12
12
|
// react-select disables pointer events when isDisabled is true.
|
|
13
13
|
// We override this and make the inner container turn it off instead.
|
|
14
14
|
pointerEvents: 'all',
|
|
15
|
-
cursor: isDisabled ? 'not-allowed' :
|
|
15
|
+
cursor: isDisabled ? 'not-allowed' : css.cursor
|
|
16
16
|
}),
|
|
17
17
|
input: css => ({ ...css,
|
|
18
18
|
color: "var(--ds-text, hsl(0, 0%, 20%))"
|
|
@@ -151,14 +151,14 @@ export default function baseStyles(validationState, isCompact) {
|
|
|
151
151
|
} else if (isSelected) {
|
|
152
152
|
backgroundColor = `var(--ds-background-selected, ${B50})`;
|
|
153
153
|
} else if (isFocused) {
|
|
154
|
-
backgroundColor = `var(--ds-background-
|
|
154
|
+
backgroundColor = `var(--ds-background-input-pressed, ${N20})`;
|
|
155
155
|
}
|
|
156
156
|
|
|
157
157
|
if (!isDisabled && (isFocused || isSelected)) {
|
|
158
158
|
boxShadow = `inset 2px 0px 0px ${`var(--ds-border-selected, ${B400})`}`;
|
|
159
159
|
}
|
|
160
160
|
|
|
161
|
-
const cursor = isDisabled ? 'not-allowed' :
|
|
161
|
+
const cursor = isDisabled ? 'not-allowed' : css.cursor;
|
|
162
162
|
return { ...css,
|
|
163
163
|
padding: '6px 12px',
|
|
164
164
|
backgroundColor,
|
package/dist/es2019/version.json
CHANGED
|
@@ -69,6 +69,8 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
69
69
|
var _super = _createSuper(PopupSelect);
|
|
70
70
|
|
|
71
71
|
function PopupSelect() {
|
|
72
|
+
var _this$defaultOpenStat;
|
|
73
|
+
|
|
72
74
|
var _this;
|
|
73
75
|
|
|
74
76
|
_classCallCheck(this, PopupSelect);
|
|
@@ -95,8 +97,12 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
95
97
|
}
|
|
96
98
|
}));
|
|
97
99
|
|
|
100
|
+
_defineProperty(_assertThisInitialized(_this), "isOpenControlled", _this.props.isOpen !== undefined);
|
|
101
|
+
|
|
102
|
+
_defineProperty(_assertThisInitialized(_this), "defaultOpenState", _this.isOpenControlled ? _this.props.isOpen : _this.props.defaultIsOpen);
|
|
103
|
+
|
|
98
104
|
_defineProperty(_assertThisInitialized(_this), "state", {
|
|
99
|
-
isOpen: false,
|
|
105
|
+
isOpen: (_this$defaultOpenStat = _this.defaultOpenState) !== null && _this$defaultOpenStat !== void 0 ? _this$defaultOpenStat : false,
|
|
100
106
|
mergedComponents: defaultComponents,
|
|
101
107
|
mergedPopperProps: defaultPopperProps
|
|
102
108
|
});
|
|
@@ -157,9 +163,14 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
157
163
|
}
|
|
158
164
|
});
|
|
159
165
|
|
|
160
|
-
_defineProperty(_assertThisInitialized(_this), "open", function () {
|
|
166
|
+
_defineProperty(_assertThisInitialized(_this), "open", function (options) {
|
|
161
167
|
var onOpen = _this.props.onOpen;
|
|
162
168
|
|
|
169
|
+
if (!(options !== null && options !== void 0 && options.controlOverride) && _this.isOpenControlled) {
|
|
170
|
+
// Prevent popup opening if it's open state is already being controlled
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
|
|
163
174
|
if (onOpen) {
|
|
164
175
|
onOpen();
|
|
165
176
|
}
|
|
@@ -198,9 +209,14 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
198
209
|
}, 1);
|
|
199
210
|
});
|
|
200
211
|
|
|
201
|
-
_defineProperty(_assertThisInitialized(_this), "close", function () {
|
|
212
|
+
_defineProperty(_assertThisInitialized(_this), "close", function (options) {
|
|
202
213
|
var onClose = _this.props.onClose;
|
|
203
214
|
|
|
215
|
+
if (!(options !== null && options !== void 0 && options.controlOverride) && _this.isOpenControlled) {
|
|
216
|
+
// Prevent popup closing if it's open state is already being controlled
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
|
|
204
220
|
if (onClose) {
|
|
205
221
|
onClose();
|
|
206
222
|
}
|
|
@@ -368,6 +384,23 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
|
|
|
368
384
|
|
|
369
385
|
window.removeEventListener('click', this.handleClick, true);
|
|
370
386
|
window.removeEventListener('keydown', this.handleKeyDown, true);
|
|
387
|
+
}
|
|
388
|
+
}, {
|
|
389
|
+
key: "componentDidUpdate",
|
|
390
|
+
value: function componentDidUpdate(prevProps) {
|
|
391
|
+
var isOpen = this.props.isOpen;
|
|
392
|
+
|
|
393
|
+
if (prevProps.isOpen !== isOpen) {
|
|
394
|
+
if (isOpen === true) {
|
|
395
|
+
this.open({
|
|
396
|
+
controlOverride: true
|
|
397
|
+
});
|
|
398
|
+
} else if (isOpen === false) {
|
|
399
|
+
this.close({
|
|
400
|
+
controlOverride: true
|
|
401
|
+
});
|
|
402
|
+
}
|
|
403
|
+
}
|
|
371
404
|
} // Event Handlers
|
|
372
405
|
// ==============================
|
|
373
406
|
|
package/dist/esm/Select.js
CHANGED
|
@@ -2,7 +2,7 @@ import Select from 'react-select';
|
|
|
2
2
|
import { withAnalyticsEvents, withAnalyticsContext, createAndFireEvent } from '@atlaskit/analytics-next';
|
|
3
3
|
import createSelect from './createSelect';
|
|
4
4
|
var packageName = "@atlaskit/select";
|
|
5
|
-
var packageVersion = "15.
|
|
5
|
+
var packageVersion = "15.3.0";
|
|
6
6
|
export var SelectWithoutAnalytics = createSelect(Select);
|
|
7
7
|
var createAndFireEventOnAtlaskit = createAndFireEvent('atlaskit');
|
|
8
8
|
export default withAnalyticsContext({
|
package/dist/esm/styles.js
CHANGED
|
@@ -18,7 +18,7 @@ export default function baseStyles(validationState, isCompact) {
|
|
|
18
18
|
// react-select disables pointer events when isDisabled is true.
|
|
19
19
|
// We override this and make the inner container turn it off instead.
|
|
20
20
|
pointerEvents: 'all',
|
|
21
|
-
cursor: isDisabled ? 'not-allowed' :
|
|
21
|
+
cursor: isDisabled ? 'not-allowed' : css.cursor
|
|
22
22
|
});
|
|
23
23
|
},
|
|
24
24
|
input: function input(css) {
|
|
@@ -164,14 +164,14 @@ export default function baseStyles(validationState, isCompact) {
|
|
|
164
164
|
} else if (isSelected) {
|
|
165
165
|
backgroundColor = "var(--ds-background-selected, ".concat(B50, ")");
|
|
166
166
|
} else if (isFocused) {
|
|
167
|
-
backgroundColor = "var(--ds-background-
|
|
167
|
+
backgroundColor = "var(--ds-background-input-pressed, ".concat(N20, ")");
|
|
168
168
|
}
|
|
169
169
|
|
|
170
170
|
if (!isDisabled && (isFocused || isSelected)) {
|
|
171
171
|
boxShadow = "inset 2px 0px 0px ".concat("var(--ds-border-selected, ".concat(B400, ")"));
|
|
172
172
|
}
|
|
173
173
|
|
|
174
|
-
var cursor = isDisabled ? 'not-allowed' :
|
|
174
|
+
var cursor = isDisabled ? 'not-allowed' : css.cursor;
|
|
175
175
|
return _objectSpread(_objectSpread({}, css), {}, {
|
|
176
176
|
padding: '6px 12px',
|
|
177
177
|
backgroundColor: backgroundColor,
|
package/dist/esm/version.json
CHANGED
|
@@ -2,7 +2,7 @@ import React, { PureComponent, ReactNode } from 'react';
|
|
|
2
2
|
import Select from 'react-select';
|
|
3
3
|
import { FocusTrap } from 'focus-trap';
|
|
4
4
|
import { PopperProps } from 'react-popper';
|
|
5
|
-
import {
|
|
5
|
+
import { OptionType, ActionMeta, ReactSelectProps, StylesConfig, ValueType } from '../types';
|
|
6
6
|
declare type defaultModifiers = 'offset' | 'preventOverflow';
|
|
7
7
|
declare type PopperPropsNoChildren<Modifiers> = Omit<PopperProps<Modifiers>, 'children'>;
|
|
8
8
|
interface PopupSelectTriggerProps {
|
|
@@ -11,7 +11,7 @@ interface PopupSelectTriggerProps {
|
|
|
11
11
|
'aria-expanded': boolean;
|
|
12
12
|
'aria-controls'?: string;
|
|
13
13
|
}
|
|
14
|
-
export interface PopupSelectProps<Option = OptionType, IsMulti extends boolean = false, Modifiers =
|
|
14
|
+
export interface PopupSelectProps<Option = OptionType, IsMulti extends boolean = false, Modifiers = string> extends ReactSelectProps<Option, IsMulti> {
|
|
15
15
|
closeMenuOnSelect?: boolean;
|
|
16
16
|
footer?: ReactNode;
|
|
17
17
|
popperProps?: PopperPropsNoChildren<Modifiers>;
|
|
@@ -19,8 +19,10 @@ export interface PopupSelectProps<Option = OptionType, IsMulti extends boolean =
|
|
|
19
19
|
target?: (options: PopupSelectTriggerProps & {
|
|
20
20
|
isOpen: boolean;
|
|
21
21
|
}) => ReactNode;
|
|
22
|
+
isOpen?: boolean;
|
|
23
|
+
defaultIsOpen?: boolean;
|
|
22
24
|
}
|
|
23
|
-
interface State<Modifiers =
|
|
25
|
+
interface State<Modifiers = string> {
|
|
24
26
|
isOpen: boolean;
|
|
25
27
|
mergedComponents: Object;
|
|
26
28
|
mergedPopperProps: PopperPropsNoChildren<defaultModifiers | Modifiers>;
|
|
@@ -31,14 +33,16 @@ export default class PopupSelect<Option = OptionType, IsMulti extends boolean =
|
|
|
31
33
|
selectRef: Select<Option, IsMulti> | null;
|
|
32
34
|
targetRef: HTMLElement | null;
|
|
33
35
|
defaultStyles: StylesConfig<Option, IsMulti>;
|
|
36
|
+
isOpenControlled: boolean;
|
|
37
|
+
defaultOpenState: boolean | undefined;
|
|
34
38
|
state: {
|
|
35
39
|
isOpen: boolean;
|
|
36
40
|
mergedComponents: {
|
|
37
|
-
Control: React.FC<import("
|
|
41
|
+
Control: React.FC<import("../types").ControlProps<OptionType, boolean>>;
|
|
38
42
|
DropdownIndicator: () => JSX.Element;
|
|
39
|
-
Menu: ({ children, innerProps, ...props }: import("
|
|
43
|
+
Menu: ({ children, innerProps, ...props }: import("../types").MenuProps<OptionType, boolean>) => JSX.Element;
|
|
40
44
|
};
|
|
41
|
-
mergedPopperProps:
|
|
45
|
+
mergedPopperProps: PopperPropsNoChildren<string>;
|
|
42
46
|
};
|
|
43
47
|
popperWrapperId: string;
|
|
44
48
|
static defaultProps: {
|
|
@@ -52,15 +56,30 @@ export default class PopupSelect<Option = OptionType, IsMulti extends boolean =
|
|
|
52
56
|
styles: {};
|
|
53
57
|
options: never[];
|
|
54
58
|
};
|
|
55
|
-
static getDerivedStateFromProps(props: PopupSelectProps<OptionType>, state: State): Partial<State<
|
|
59
|
+
static getDerivedStateFromProps(props: PopupSelectProps<OptionType>, state: State): Partial<State<string>> | null;
|
|
56
60
|
componentDidMount(): void;
|
|
57
61
|
componentWillUnmount(): void;
|
|
62
|
+
componentDidUpdate(prevProps: PopupSelectProps<Option, IsMulti>): void;
|
|
58
63
|
handleKeyDown: (event: KeyboardEvent) => void;
|
|
59
64
|
handleClick: ({ target }: MouseEvent) => void;
|
|
60
65
|
handleSelectChange: (value: ValueType<Option, IsMulti>, actionMeta: ActionMeta<Option>) => void;
|
|
61
|
-
|
|
66
|
+
/**
|
|
67
|
+
* Opens the popup
|
|
68
|
+
*
|
|
69
|
+
* @param options.controlOverride - Force the popup to open when it's open state is being controlled
|
|
70
|
+
*/
|
|
71
|
+
open: (options?: {
|
|
72
|
+
controlOverride?: boolean | undefined;
|
|
73
|
+
} | undefined) => void;
|
|
62
74
|
initialiseFocusTrap: () => void;
|
|
63
|
-
|
|
75
|
+
/**
|
|
76
|
+
* Closes the popup
|
|
77
|
+
*
|
|
78
|
+
* @param options.controlOverride - Force the popup to close when it's open state is being controlled
|
|
79
|
+
*/
|
|
80
|
+
close: (options?: {
|
|
81
|
+
controlOverride?: boolean | undefined;
|
|
82
|
+
} | undefined) => void;
|
|
64
83
|
resolveTargetRef: (popperRef: React.Ref<HTMLElement>) => (ref: HTMLElement) => void;
|
|
65
84
|
resolveMenuRef: (popperRef: React.Ref<HTMLElement>) => (ref: HTMLElement) => void;
|
|
66
85
|
getSelectRef: (ref: Select<Option, IsMulti>) => void;
|
|
@@ -11,7 +11,7 @@ interface MenuDialogProps {
|
|
|
11
11
|
export declare const MenuDialog: FC<MenuDialogProps>;
|
|
12
12
|
export declare const DummyControl: FC<ControlProps<OptionType, boolean>>;
|
|
13
13
|
export declare const defaultComponents: {
|
|
14
|
-
Control: FC<
|
|
14
|
+
Control: FC<ControlProps<OptionType, boolean>>;
|
|
15
15
|
DropdownIndicator: () => JSX.Element;
|
|
16
16
|
Menu: ({ children, innerProps, ...props }: MenuProps<OptionType, boolean>) => JSX.Element;
|
|
17
17
|
};
|
package/ert/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/select",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.3.0",
|
|
4
4
|
"description": "Select allows users to make a single selection or multiple selections from a list of options.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
7
7
|
},
|
|
8
|
-
"repository": "https://bitbucket.org/atlassian/atlassian-frontend",
|
|
8
|
+
"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
|
|
9
9
|
"author": "Atlassian Pty Ltd",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"main": "dist/cjs/index.js",
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
"@atlaskit/icon": "^21.10.0",
|
|
28
28
|
"@atlaskit/spinner": "^15.0.0",
|
|
29
29
|
"@atlaskit/theme": "^12.1.0",
|
|
30
|
-
"@atlaskit/tokens": "^0.
|
|
30
|
+
"@atlaskit/tokens": "^0.10.0",
|
|
31
31
|
"@atlaskit/visually-hidden": "^1.0.0",
|
|
32
32
|
"@babel/runtime": "^7.0.0",
|
|
33
33
|
"@emotion/core": "^10.0.9",
|
|
34
34
|
"@popperjs/core": "^2.9.1",
|
|
35
|
-
"@types/react-select": "^4.0.
|
|
35
|
+
"@types/react-select": "^4.0.18",
|
|
36
36
|
"focus-trap": "^2.4.5",
|
|
37
37
|
"memoize-one": "^6.0.0",
|
|
38
38
|
"react-fast-compare": "^3.2.0",
|
|
@@ -47,12 +47,12 @@
|
|
|
47
47
|
"react-dom": "^16.8.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@atlaskit/button": "^16.
|
|
50
|
+
"@atlaskit/button": "^16.3.0",
|
|
51
51
|
"@atlaskit/checkbox": "^12.2.0",
|
|
52
52
|
"@atlaskit/docs": "*",
|
|
53
53
|
"@atlaskit/drawer": "^7.1.0",
|
|
54
54
|
"@atlaskit/form": "^8.5.0",
|
|
55
|
-
"@atlaskit/logo": "^13.
|
|
55
|
+
"@atlaskit/logo": "^13.7.0",
|
|
56
56
|
"@atlaskit/modal-dialog": "^12.2.0",
|
|
57
57
|
"@atlaskit/section-message": "^6.0.0",
|
|
58
58
|
"@atlaskit/ssr": "*",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"jscodeshift": "^0.13.0",
|
|
68
68
|
"react-dom": "^16.8.0",
|
|
69
69
|
"react-value": "^0.2.0",
|
|
70
|
-
"typescript": "
|
|
70
|
+
"typescript": "4.2.4",
|
|
71
71
|
"wait-for-expect": "^1.2.0"
|
|
72
72
|
},
|
|
73
73
|
"techstack": {
|
package/styles/package.json
CHANGED