@atlaskit/select 15.7.6 → 15.7.7

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/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/select
2
2
 
3
+ ## 15.7.7
4
+
5
+ ### Patch Changes
6
+
7
+ - [`8048ae661df`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8048ae661df) - [ux] Fixed bug where consumers extending the styles of PopupSelect would not receive the correct base styles in their custom styles functions.
8
+
3
9
  ## 15.7.6
4
10
 
5
11
  ### Patch Changes
@@ -390,7 +390,7 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
390
390
  ref: _this.getSelectRef
391
391
  }, props, {
392
392
  isSearchable: showSearchControl,
393
- styles: _objectSpread(_objectSpread({}, _this.defaultStyles), props.styles),
393
+ styles: (0, _reactSelect.mergeStyles)(_this.defaultStyles, props.styles || {}),
394
394
  maxMenuHeight: _this.getMaxHeight(),
395
395
  components: components,
396
396
  onChange: _this.handleSelectChange
@@ -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.7.6";
17
+ var packageVersion = "15.7.7";
18
18
  var SelectWithoutAnalytics = (0, _createSelect.default)(_reactSelect.default);
19
19
  exports.SelectWithoutAnalytics = SelectWithoutAnalytics;
20
20
  var createAndFireEventOnAtlaskit = (0, _analyticsNext.createAndFireEvent)('atlaskit');
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/select",
3
- "version": "15.7.6",
3
+ "version": "15.7.7",
4
4
  "sideEffects": false
5
5
  }
@@ -346,9 +346,7 @@ export default class PopupSelect extends PureComponent {
346
346
  ref: this.getSelectRef
347
347
  }, props, {
348
348
  isSearchable: showSearchControl,
349
- styles: { ...this.defaultStyles,
350
- ...props.styles
351
- },
349
+ styles: mergeStyles(this.defaultStyles, props.styles || {}),
352
350
  maxMenuHeight: this.getMaxHeight(),
353
351
  components: components,
354
352
  onChange: this.handleSelectChange
@@ -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.7.6";
5
+ const packageVersion = "15.7.7";
6
6
  export const SelectWithoutAnalytics = createSelect(Select);
7
7
  const createAndFireEventOnAtlaskit = createAndFireEvent('atlaskit');
8
8
  export default withAnalyticsContext({
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/select",
3
- "version": "15.7.6",
3
+ "version": "15.7.7",
4
4
  "sideEffects": false
5
5
  }
@@ -379,7 +379,7 @@ var PopupSelect = /*#__PURE__*/function (_PureComponent) {
379
379
  ref: _this.getSelectRef
380
380
  }, props, {
381
381
  isSearchable: showSearchControl,
382
- styles: _objectSpread(_objectSpread({}, _this.defaultStyles), props.styles),
382
+ styles: mergeStyles(_this.defaultStyles, props.styles || {}),
383
383
  maxMenuHeight: _this.getMaxHeight(),
384
384
  components: components,
385
385
  onChange: _this.handleSelectChange
@@ -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.7.6";
5
+ var packageVersion = "15.7.7";
6
6
  export var SelectWithoutAnalytics = createSelect(Select);
7
7
  var createAndFireEventOnAtlaskit = createAndFireEvent('atlaskit');
8
8
  export default withAnalyticsContext({
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/select",
3
- "version": "15.7.6",
3
+ "version": "15.7.7",
4
4
  "sideEffects": false
5
5
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/select",
3
- "version": "15.7.6",
3
+ "version": "15.7.7",
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/"