@elastic/eui 106.5.0 → 106.6.0-backport.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.
Files changed (11) hide show
  1. package/es/components/badge/badge.styles.js +10 -4
  2. package/es/components/datagrid/controls/column_selector.js +32 -3
  3. package/lib/components/badge/badge.styles.js +10 -4
  4. package/lib/components/datagrid/controls/column_selector.js +32 -3
  5. package/optimize/es/components/badge/badge.styles.js +10 -4
  6. package/optimize/es/components/datagrid/controls/column_selector.js +34 -3
  7. package/optimize/lib/components/badge/badge.styles.js +10 -4
  8. package/optimize/lib/components/datagrid/controls/column_selector.js +34 -5
  9. package/package.json +3 -3
  10. package/test-env/components/badge/badge.styles.js +10 -4
  11. package/test-env/components/datagrid/controls/column_selector.js +34 -5
package/es/components/badge/badge.styles.js CHANGED
@@ -11,6 +11,14 @@ import { css } from '@emotion/react';
11
11
  import { euiFontSize, euiFocusRing, euiTextTruncate, logicalCSS, logicalShorthandCSS, logicalTextAlignCSS, mathWithUnits } from '../../global_styling';
12
12
  import { euiBadgeColors } from './color_utils';
13
13
  var _ref = process.env.NODE_ENV === "production" ? {
14
+ name: "1jbvl30-euiBadge__iconButton",
15
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"
16
+ } : {
17
+ name: "1jbvl30-euiBadge__iconButton",
18
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;",
19
+ toString: _EMOTION_STRINGIFIED_CSS_ERROR__
20
+ };
21
+ var _ref2 = process.env.NODE_ENV === "production" ? {
14
22
  name: "1hw5vc4-clickable",
15
23
  styles: "cursor:pointer;label:clickable;"
16
24
  } : {
@@ -53,7 +61,7 @@ export var euiBadgeStyles = function euiBadgeStyles(euiThemeContext) {
53
61
  // Text
54
62
  text: {
55
63
  euiBadge__text: /*#__PURE__*/css(euiTextTruncate(), " cursor:inherit;;label:euiBadge__text;"),
56
- clickable: _ref
64
+ clickable: _ref2
57
65
  },
58
66
  // Icon
59
67
  icon: {
@@ -63,9 +71,7 @@ export var euiBadgeStyles = function euiBadgeStyles(euiThemeContext) {
63
71
  },
64
72
  // Clickable icons (iconOnClick)
65
73
  iconButton: {
66
- euiBadge__iconButton: /*#__PURE__*/css("font-size:0;&:focus{background-color:", euiTheme.components.badgeIconButtonBackgroundHover, ";color:", euiTheme.colors.ink, ";border-radius:", mathWithUnits(euiTheme.border.radius.small, function (x) {
67
- return x / 2;
68
- }), ";}&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"),
74
+ euiBadge__iconButton: _ref,
69
75
  right: /*#__PURE__*/css(logicalCSS('margin-left', euiTheme.size.xs), ";;label:right;"),
70
76
  left: /*#__PURE__*/css(logicalCSS('margin-right', euiTheme.size.xs), ";;label:left;")
71
77
  },
package/es/components/datagrid/controls/column_selector.js CHANGED
@@ -3,6 +3,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
3
3
  function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
4
4
  function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
5
5
  function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
6
+ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
6
7
  function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
7
8
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
8
9
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -35,17 +36,45 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
35
36
  export var useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
36
37
  var allowColumnHiding = getNestedObjectOptions(showColumnSelector, 'allowHide');
37
38
  var allowColumnReorder = getNestedObjectOptions(showColumnSelector, 'allowReorder');
39
+ var visibleColumns = columnVisibility.visibleColumns,
40
+ setVisibleColumns = columnVisibility.setVisibleColumns;
38
41
  var _useDependentState = useDependentState(function () {
39
- return availableColumns.map(function (_ref) {
42
+ var availableColumnIds = availableColumns.map(function (_ref) {
40
43
  var id = _ref.id;
41
44
  return id;
42
45
  });
46
+ var availableSet = new Set(availableColumnIds);
47
+ // Filter visibleColumns to only include existing columns
48
+ var validVisibleColumns = visibleColumns.filter(function (id) {
49
+ return availableSet.has(id);
50
+ });
51
+ var visibleSet = new Set(validVisibleColumns);
52
+ var result = [];
53
+ var visibleIndex = 0;
54
+ var _iterator = _createForOfIteratorHelper(availableColumnIds),
55
+ _step;
56
+ try {
57
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
58
+ var columnId = _step.value;
59
+ if (visibleSet.has(columnId)) {
60
+ // Replace with next visible column in order
61
+ result.push(validVisibleColumns[visibleIndex++]);
62
+ } else {
63
+ // Keep hidden column in original position
64
+ result.push(columnId);
65
+ }
66
+ }
67
+ } catch (err) {
68
+ _iterator.e(err);
69
+ } finally {
70
+ _iterator.f();
71
+ }
72
+ return result;
73
+ // doesn't depend on visibleColumns on purpose to keep it an initial state
43
74
  }, [availableColumns]),
44
75
  _useDependentState2 = _slicedToArray(_useDependentState, 2),
45
76
  sortedColumns = _useDependentState2[0],
46
77
  setSortedColumns = _useDependentState2[1];
47
- var visibleColumns = columnVisibility.visibleColumns,
48
- setVisibleColumns = columnVisibility.setVisibleColumns;
49
78
  var visibleColumnIds = useMemo(function () {
50
79
  return new Set(visibleColumns);
51
80
  }, [visibleColumns]);
package/lib/components/badge/badge.styles.js CHANGED
@@ -15,6 +15,14 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
15
15
  * Side Public License, v 1.
16
16
  */
17
17
  var _ref = process.env.NODE_ENV === "production" ? {
18
+ name: "1jbvl30-euiBadge__iconButton",
19
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"
20
+ } : {
21
+ name: "1jbvl30-euiBadge__iconButton",
22
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;",
23
+ toString: _EMOTION_STRINGIFIED_CSS_ERROR__
24
+ };
25
+ var _ref2 = process.env.NODE_ENV === "production" ? {
18
26
  name: "1hw5vc4-clickable",
19
27
  styles: "cursor:pointer;label:clickable;"
20
28
  } : {
@@ -57,7 +65,7 @@ var euiBadgeStyles = exports.euiBadgeStyles = function euiBadgeStyles(euiThemeCo
57
65
  // Text
58
66
  text: {
59
67
  euiBadge__text: /*#__PURE__*/(0, _react.css)((0, _global_styling.euiTextTruncate)(), " cursor:inherit;;label:euiBadge__text;"),
60
- clickable: _ref
68
+ clickable: _ref2
61
69
  },
62
70
  // Icon
63
71
  icon: {
@@ -67,9 +75,7 @@ var euiBadgeStyles = exports.euiBadgeStyles = function euiBadgeStyles(euiThemeCo
67
75
  },
68
76
  // Clickable icons (iconOnClick)
69
77
  iconButton: {
70
- euiBadge__iconButton: /*#__PURE__*/(0, _react.css)("font-size:0;&:focus{background-color:", euiTheme.components.badgeIconButtonBackgroundHover, ";color:", euiTheme.colors.ink, ";border-radius:", (0, _global_styling.mathWithUnits)(euiTheme.border.radius.small, function (x) {
71
- return x / 2;
72
- }), ";}&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"),
78
+ euiBadge__iconButton: _ref,
73
79
  right: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-left', euiTheme.size.xs), ";;label:right;"),
74
80
  left: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-right', euiTheme.size.xs), ";;label:left;")
75
81
  },
package/lib/components/datagrid/controls/column_selector.js CHANGED
@@ -28,6 +28,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
28
28
  function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
29
29
  function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
30
30
  function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
31
+ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
31
32
  function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
32
33
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
33
34
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -43,17 +44,45 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } /*
43
44
  var useDataGridColumnSelector = exports.useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
44
45
  var allowColumnHiding = (0, _data_grid_toolbar.getNestedObjectOptions)(showColumnSelector, 'allowHide');
45
46
  var allowColumnReorder = (0, _data_grid_toolbar.getNestedObjectOptions)(showColumnSelector, 'allowReorder');
47
+ var visibleColumns = columnVisibility.visibleColumns,
48
+ setVisibleColumns = columnVisibility.setVisibleColumns;
46
49
  var _useDependentState = (0, _services.useDependentState)(function () {
47
- return availableColumns.map(function (_ref) {
50
+ var availableColumnIds = availableColumns.map(function (_ref) {
48
51
  var id = _ref.id;
49
52
  return id;
50
53
  });
54
+ var availableSet = new Set(availableColumnIds);
55
+ // Filter visibleColumns to only include existing columns
56
+ var validVisibleColumns = visibleColumns.filter(function (id) {
57
+ return availableSet.has(id);
58
+ });
59
+ var visibleSet = new Set(validVisibleColumns);
60
+ var result = [];
61
+ var visibleIndex = 0;
62
+ var _iterator = _createForOfIteratorHelper(availableColumnIds),
63
+ _step;
64
+ try {
65
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
66
+ var columnId = _step.value;
67
+ if (visibleSet.has(columnId)) {
68
+ // Replace with next visible column in order
69
+ result.push(validVisibleColumns[visibleIndex++]);
70
+ } else {
71
+ // Keep hidden column in original position
72
+ result.push(columnId);
73
+ }
74
+ }
75
+ } catch (err) {
76
+ _iterator.e(err);
77
+ } finally {
78
+ _iterator.f();
79
+ }
80
+ return result;
81
+ // doesn't depend on visibleColumns on purpose to keep it an initial state
51
82
  }, [availableColumns]),
52
83
  _useDependentState2 = _slicedToArray(_useDependentState, 2),
53
84
  sortedColumns = _useDependentState2[0],
54
85
  setSortedColumns = _useDependentState2[1];
55
- var visibleColumns = columnVisibility.visibleColumns,
56
- setVisibleColumns = columnVisibility.setVisibleColumns;
57
86
  var visibleColumnIds = (0, _react.useMemo)(function () {
58
87
  return new Set(visibleColumns);
59
88
  }, [visibleColumns]);
package/optimize/es/components/badge/badge.styles.js CHANGED
@@ -11,6 +11,14 @@ import { css } from '@emotion/react';
11
11
  import { euiFontSize, euiFocusRing, euiTextTruncate, logicalCSS, logicalShorthandCSS, logicalTextAlignCSS, mathWithUnits } from '../../global_styling';
12
12
  import { euiBadgeColors } from './color_utils';
13
13
  var _ref = process.env.NODE_ENV === "production" ? {
14
+ name: "1jbvl30-euiBadge__iconButton",
15
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"
16
+ } : {
17
+ name: "1jbvl30-euiBadge__iconButton",
18
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;",
19
+ toString: _EMOTION_STRINGIFIED_CSS_ERROR__
20
+ };
21
+ var _ref2 = process.env.NODE_ENV === "production" ? {
14
22
  name: "1hw5vc4-clickable",
15
23
  styles: "cursor:pointer;label:clickable;"
16
24
  } : {
@@ -53,7 +61,7 @@ export var euiBadgeStyles = function euiBadgeStyles(euiThemeContext) {
53
61
  // Text
54
62
  text: {
55
63
  euiBadge__text: /*#__PURE__*/css(euiTextTruncate(), " cursor:inherit;;label:euiBadge__text;"),
56
- clickable: _ref
64
+ clickable: _ref2
57
65
  },
58
66
  // Icon
59
67
  icon: {
@@ -63,9 +71,7 @@ export var euiBadgeStyles = function euiBadgeStyles(euiThemeContext) {
63
71
  },
64
72
  // Clickable icons (iconOnClick)
65
73
  iconButton: {
66
- euiBadge__iconButton: /*#__PURE__*/css("font-size:0;&:focus{background-color:", euiTheme.components.badgeIconButtonBackgroundHover, ";color:", euiTheme.colors.ink, ";border-radius:", mathWithUnits(euiTheme.border.radius.small, function (x) {
67
- return x / 2;
68
- }), ";}&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"),
74
+ euiBadge__iconButton: _ref,
69
75
  right: /*#__PURE__*/css(logicalCSS('margin-left', euiTheme.size.xs), ";;label:right;"),
70
76
  left: /*#__PURE__*/css(logicalCSS('margin-right', euiTheme.size.xs), ";;label:left;")
71
77
  },
package/optimize/es/components/datagrid/controls/column_selector.js CHANGED
@@ -1,6 +1,9 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
3
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
4
+ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
5
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
6
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
4
7
  /*
5
8
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
6
9
  * or more contributor license agreements. Licensed under the Elastic License
@@ -27,17 +30,45 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
27
30
  export var useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
28
31
  var allowColumnHiding = getNestedObjectOptions(showColumnSelector, 'allowHide');
29
32
  var allowColumnReorder = getNestedObjectOptions(showColumnSelector, 'allowReorder');
33
+ var visibleColumns = columnVisibility.visibleColumns,
34
+ setVisibleColumns = columnVisibility.setVisibleColumns;
30
35
  var _useDependentState = useDependentState(function () {
31
- return availableColumns.map(function (_ref) {
36
+ var availableColumnIds = availableColumns.map(function (_ref) {
32
37
  var id = _ref.id;
33
38
  return id;
34
39
  });
40
+ var availableSet = new Set(availableColumnIds);
41
+ // Filter visibleColumns to only include existing columns
42
+ var validVisibleColumns = visibleColumns.filter(function (id) {
43
+ return availableSet.has(id);
44
+ });
45
+ var visibleSet = new Set(validVisibleColumns);
46
+ var result = [];
47
+ var visibleIndex = 0;
48
+ var _iterator = _createForOfIteratorHelper(availableColumnIds),
49
+ _step;
50
+ try {
51
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
52
+ var columnId = _step.value;
53
+ if (visibleSet.has(columnId)) {
54
+ // Replace with next visible column in order
55
+ result.push(validVisibleColumns[visibleIndex++]);
56
+ } else {
57
+ // Keep hidden column in original position
58
+ result.push(columnId);
59
+ }
60
+ }
61
+ } catch (err) {
62
+ _iterator.e(err);
63
+ } finally {
64
+ _iterator.f();
65
+ }
66
+ return result;
67
+ // doesn't depend on visibleColumns on purpose to keep it an initial state
35
68
  }, [availableColumns]),
36
69
  _useDependentState2 = _slicedToArray(_useDependentState, 2),
37
70
  sortedColumns = _useDependentState2[0],
38
71
  setSortedColumns = _useDependentState2[1];
39
- var visibleColumns = columnVisibility.visibleColumns,
40
- setVisibleColumns = columnVisibility.setVisibleColumns;
41
72
  var visibleColumnIds = useMemo(function () {
42
73
  return new Set(visibleColumns);
43
74
  }, [visibleColumns]);
package/optimize/lib/components/badge/badge.styles.js CHANGED
@@ -15,6 +15,14 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
15
15
  * Side Public License, v 1.
16
16
  */
17
17
  var _ref = process.env.NODE_ENV === "production" ? {
18
+ name: "1jbvl30-euiBadge__iconButton",
19
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"
20
+ } : {
21
+ name: "1jbvl30-euiBadge__iconButton",
22
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;",
23
+ toString: _EMOTION_STRINGIFIED_CSS_ERROR__
24
+ };
25
+ var _ref2 = process.env.NODE_ENV === "production" ? {
18
26
  name: "1hw5vc4-clickable",
19
27
  styles: "cursor:pointer;label:clickable;"
20
28
  } : {
@@ -57,7 +65,7 @@ var euiBadgeStyles = exports.euiBadgeStyles = function euiBadgeStyles(euiThemeCo
57
65
  // Text
58
66
  text: {
59
67
  euiBadge__text: /*#__PURE__*/(0, _react.css)((0, _global_styling.euiTextTruncate)(), " cursor:inherit;;label:euiBadge__text;"),
60
- clickable: _ref
68
+ clickable: _ref2
61
69
  },
62
70
  // Icon
63
71
  icon: {
@@ -67,9 +75,7 @@ var euiBadgeStyles = exports.euiBadgeStyles = function euiBadgeStyles(euiThemeCo
67
75
  },
68
76
  // Clickable icons (iconOnClick)
69
77
  iconButton: {
70
- euiBadge__iconButton: /*#__PURE__*/(0, _react.css)("font-size:0;&:focus{background-color:", euiTheme.components.badgeIconButtonBackgroundHover, ";color:", euiTheme.colors.ink, ";border-radius:", (0, _global_styling.mathWithUnits)(euiTheme.border.radius.small, function (x) {
71
- return x / 2;
72
- }), ";}&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"),
78
+ euiBadge__iconButton: _ref,
73
79
  right: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-left', euiTheme.size.xs), ";;label:right;"),
74
80
  left: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-right', euiTheme.size.xs), ";;label:left;")
75
81
  },
package/optimize/lib/components/datagrid/controls/column_selector.js CHANGED
@@ -26,28 +26,57 @@ var _column_selector = require("./column_selector.styles");
26
26
  var _react2 = require("@emotion/react");
27
27
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
28
28
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
29
- /*
29
+ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
30
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
31
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } /*
30
32
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
31
33
  * or more contributor license agreements. Licensed under the Elastic License
32
34
  * 2.0 and the Server Side Public License, v 1; you may not use this file except
33
35
  * in compliance with, at your election, the Elastic License 2.0 or the Server
34
36
  * Side Public License, v 1.
35
37
  */
36
-
37
38
  var useDataGridColumnSelector = exports.useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
38
39
  var allowColumnHiding = (0, _data_grid_toolbar.getNestedObjectOptions)(showColumnSelector, 'allowHide');
39
40
  var allowColumnReorder = (0, _data_grid_toolbar.getNestedObjectOptions)(showColumnSelector, 'allowReorder');
41
+ var visibleColumns = columnVisibility.visibleColumns,
42
+ setVisibleColumns = columnVisibility.setVisibleColumns;
40
43
  var _useDependentState = (0, _services.useDependentState)(function () {
41
- return availableColumns.map(function (_ref) {
44
+ var availableColumnIds = availableColumns.map(function (_ref) {
42
45
  var id = _ref.id;
43
46
  return id;
44
47
  });
48
+ var availableSet = new Set(availableColumnIds);
49
+ // Filter visibleColumns to only include existing columns
50
+ var validVisibleColumns = visibleColumns.filter(function (id) {
51
+ return availableSet.has(id);
52
+ });
53
+ var visibleSet = new Set(validVisibleColumns);
54
+ var result = [];
55
+ var visibleIndex = 0;
56
+ var _iterator = _createForOfIteratorHelper(availableColumnIds),
57
+ _step;
58
+ try {
59
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
60
+ var columnId = _step.value;
61
+ if (visibleSet.has(columnId)) {
62
+ // Replace with next visible column in order
63
+ result.push(validVisibleColumns[visibleIndex++]);
64
+ } else {
65
+ // Keep hidden column in original position
66
+ result.push(columnId);
67
+ }
68
+ }
69
+ } catch (err) {
70
+ _iterator.e(err);
71
+ } finally {
72
+ _iterator.f();
73
+ }
74
+ return result;
75
+ // doesn't depend on visibleColumns on purpose to keep it an initial state
45
76
  }, [availableColumns]),
46
77
  _useDependentState2 = (0, _slicedToArray2.default)(_useDependentState, 2),
47
78
  sortedColumns = _useDependentState2[0],
48
79
  setSortedColumns = _useDependentState2[1];
49
- var visibleColumns = columnVisibility.visibleColumns,
50
- setVisibleColumns = columnVisibility.setVisibleColumns;
51
80
  var visibleColumnIds = (0, _react.useMemo)(function () {
52
81
  return new Set(visibleColumns);
53
82
  }, [visibleColumns]);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@elastic/eui",
3
3
  "description": "Elastic UI Component Library",
4
- "version": "106.5.0",
4
+ "version": "106.6.0-backport.0",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "main": "lib",
7
7
  "module": "es",
@@ -107,7 +107,7 @@
107
107
  "@cypress/webpack-dev-server": "^1.7.0",
108
108
  "@elastic/charts": "^64.1.0",
109
109
  "@elastic/datemath": "^5.0.3",
110
- "@elastic/eui-theme-borealis": "3.3.2",
110
+ "@elastic/eui-theme-borealis": "3.4.0",
111
111
  "@emotion/babel-preset-css-prop": "^11.11.0",
112
112
  "@emotion/cache": "^11.11.0",
113
113
  "@emotion/css": "^11.11.0",
@@ -257,7 +257,7 @@
257
257
  },
258
258
  "peerDependencies": {
259
259
  "@elastic/datemath": "^5.0.2",
260
- "@elastic/eui-theme-borealis": "3.3.2",
260
+ "@elastic/eui-theme-borealis": "3.4.0",
261
261
  "@emotion/css": "11.x",
262
262
  "@emotion/react": "11.x",
263
263
  "@types/react": "^17.0 || ^18.0",
package/test-env/components/badge/badge.styles.js CHANGED
@@ -15,6 +15,14 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
15
15
  * Side Public License, v 1.
16
16
  */
17
17
  var _ref = process.env.NODE_ENV === "production" ? {
18
+ name: "1jbvl30-euiBadge__iconButton",
19
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"
20
+ } : {
21
+ name: "1jbvl30-euiBadge__iconButton",
22
+ styles: "font-size:0;&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;",
23
+ toString: _EMOTION_STRINGIFIED_CSS_ERROR__
24
+ };
25
+ var _ref2 = process.env.NODE_ENV === "production" ? {
18
26
  name: "1hw5vc4-clickable",
19
27
  styles: "cursor:pointer;label:clickable;"
20
28
  } : {
@@ -57,7 +65,7 @@ var euiBadgeStyles = exports.euiBadgeStyles = function euiBadgeStyles(euiThemeCo
57
65
  // Text
58
66
  text: {
59
67
  euiBadge__text: /*#__PURE__*/(0, _react.css)((0, _global_styling.euiTextTruncate)(), " cursor:inherit;;label:euiBadge__text;"),
60
- clickable: _ref
68
+ clickable: _ref2
61
69
  },
62
70
  // Icon
63
71
  icon: {
@@ -67,9 +75,7 @@ var euiBadgeStyles = exports.euiBadgeStyles = function euiBadgeStyles(euiThemeCo
67
75
  },
68
76
  // Clickable icons (iconOnClick)
69
77
  iconButton: {
70
- euiBadge__iconButton: /*#__PURE__*/(0, _react.css)("font-size:0;&:focus{background-color:", euiTheme.components.badgeIconButtonBackgroundHover, ";color:", euiTheme.colors.ink, ";border-radius:", (0, _global_styling.mathWithUnits)(euiTheme.border.radius.small, function (x) {
71
- return x / 2;
72
- }), ";}&:disabled{cursor:not-allowed;}.euiBadge__icon{margin:0!important;};label:euiBadge__iconButton;"),
78
+ euiBadge__iconButton: _ref,
73
79
  right: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-left', euiTheme.size.xs), ";;label:right;"),
74
80
  left: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-right', euiTheme.size.xs), ";;label:left;")
75
81
  },
package/test-env/components/datagrid/controls/column_selector.js CHANGED
@@ -26,28 +26,57 @@ var _column_selector = require("./column_selector.styles");
26
26
  var _react2 = require("@emotion/react");
27
27
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
28
28
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
29
- /*
29
+ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
30
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
31
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } /*
30
32
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
31
33
  * or more contributor license agreements. Licensed under the Elastic License
32
34
  * 2.0 and the Server Side Public License, v 1; you may not use this file except
33
35
  * in compliance with, at your election, the Elastic License 2.0 or the Server
34
36
  * Side Public License, v 1.
35
37
  */
36
-
37
38
  var useDataGridColumnSelector = exports.useDataGridColumnSelector = function useDataGridColumnSelector(availableColumns, columnVisibility, showColumnSelector, displayValues) {
38
39
  var allowColumnHiding = (0, _data_grid_toolbar.getNestedObjectOptions)(showColumnSelector, 'allowHide');
39
40
  var allowColumnReorder = (0, _data_grid_toolbar.getNestedObjectOptions)(showColumnSelector, 'allowReorder');
41
+ var visibleColumns = columnVisibility.visibleColumns,
42
+ setVisibleColumns = columnVisibility.setVisibleColumns;
40
43
  var _useDependentState = (0, _services.useDependentState)(function () {
41
- return availableColumns.map(function (_ref) {
44
+ var availableColumnIds = availableColumns.map(function (_ref) {
42
45
  var id = _ref.id;
43
46
  return id;
44
47
  });
48
+ var availableSet = new Set(availableColumnIds);
49
+ // Filter visibleColumns to only include existing columns
50
+ var validVisibleColumns = visibleColumns.filter(function (id) {
51
+ return availableSet.has(id);
52
+ });
53
+ var visibleSet = new Set(validVisibleColumns);
54
+ var result = [];
55
+ var visibleIndex = 0;
56
+ var _iterator = _createForOfIteratorHelper(availableColumnIds),
57
+ _step;
58
+ try {
59
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
60
+ var columnId = _step.value;
61
+ if (visibleSet.has(columnId)) {
62
+ // Replace with next visible column in order
63
+ result.push(validVisibleColumns[visibleIndex++]);
64
+ } else {
65
+ // Keep hidden column in original position
66
+ result.push(columnId);
67
+ }
68
+ }
69
+ } catch (err) {
70
+ _iterator.e(err);
71
+ } finally {
72
+ _iterator.f();
73
+ }
74
+ return result;
75
+ // doesn't depend on visibleColumns on purpose to keep it an initial state
45
76
  }, [availableColumns]),
46
77
  _useDependentState2 = (0, _slicedToArray2.default)(_useDependentState, 2),
47
78
  sortedColumns = _useDependentState2[0],
48
79
  setSortedColumns = _useDependentState2[1];
49
- var visibleColumns = columnVisibility.visibleColumns,
50
- setVisibleColumns = columnVisibility.setVisibleColumns;
51
80
  var visibleColumnIds = (0, _react.useMemo)(function () {
52
81
  return new Set(visibleColumns);
53
82
  }, [visibleColumns]);