@@ -434,7 +434,7 @@ export default () => (
-
+ Add thing
@@ -447,7 +447,7 @@ export default () => (
-
+ Cancel
@@ -458,7 +458,7 @@ export default () => (
-
+ Create thing
@@ -471,7 +471,7 @@ export default () => (
-
+
Delete
@@ -495,7 +495,7 @@ export default () => (
-
+ Remove (
-
+ Save
-
+
Save and complete
diff --git a/src-docs/src/views/card/card_beta.js b/src-docs/src/views/card/card_beta.tsx
similarity index 54%
rename from src-docs/src/views/card/card_beta.js
rename to src-docs/src/views/card/card_beta.tsx
index 610eb50d04b..cead3eb18a4 100644
--- a/src-docs/src/views/card/card_beta.js
+++ b/src-docs/src/views/card/card_beta.tsx
@@ -7,31 +7,29 @@ import {
EuiFlexItem,
} from '../../../../src/components';
-const icons = ['dashboard', 'monitoring'];
-const badges = [null, 'Beta'];
-
-const cardNodes = icons.map(function (item, index) {
- return (
-
+export default () => (
+
+ }
- title={`Kibana ${item}`}
+ icon={}
+ title="Dashboards"
description="Example of a card's description. Stick to one or two sentences."
- betaBadgeLabel={badges[index]}
- betaBadgeTooltipContent={
- badges[index]
- ? 'This module is not GA. Please help us by reporting any bugs.'
- : undefined
- }
onClick={() => {}}
/>
- );
-});
-
-export default () => (
-
- {cardNodes}
+
+ }
+ title="Monitoring"
+ description="Example of a card's description. Stick to one or two sentences."
+ betaBadgeProps={{
+ label: 'Beta',
+ tooltipContent:
+ 'This module is not GA. Please help us by reporting any bugs.',
+ }}
+ onClick={() => {}}
+ />
+ }
@@ -41,9 +39,9 @@ export default () => (
betaBadgeProps={{
href: 'http://www.elastic.co/subscriptions',
target: '_blank',
+ label: 'Basic',
+ tooltipContent: 'This feature requires a Basic License',
}}
- betaBadgeLabel="Basic"
- betaBadgeTooltipContent="This feature requires a Basic License"
onClick={() => {}}
/>
diff --git a/src-docs/src/views/card/card_display.js b/src-docs/src/views/card/card_display.tsx
similarity index 87%
rename from src-docs/src/views/card/card_display.js
rename to src-docs/src/views/card/card_display.tsx
index ba04f40435a..5e6cbedf567 100644
--- a/src-docs/src/views/card/card_display.js
+++ b/src-docs/src/views/card/card_display.tsx
@@ -38,8 +38,11 @@ export default () => (
title="Transparent"
display="transparent"
description="This one doesn't have a background color anymore."
- betaBadgeLabel="Beta"
- betaBadgeTooltipContent="This module is not GA. Please help us by reporting any bugs."
+ betaBadgeProps={{
+ label: 'Beta',
+ tooltipContent:
+ 'This module is not GA. Please help us by reporting any bugs.',
+ }}
onClick={() => {}}
/>
diff --git a/src-docs/src/views/card/card_example.js b/src-docs/src/views/card/card_example.js
index 6cb0cbd2817..f99a8d7c973 100644
--- a/src-docs/src/views/card/card_example.js
+++ b/src-docs/src/views/card/card_example.js
@@ -242,11 +242,11 @@ export const CardExample = {
text: (
If the card links to or references a module that is not GA (beta, lab,
- etc), you can add a betaBadgeLabel and{' '}
- betaBadgeTooltipContent to the card and it will
- properly create and position an EuiBetaBadge. If you
- want to change the title of the tooltip, supply a{' '}
- betaBadgeTitle prop.
+ etc), you can add a betaBadgeProps.label and{' '}
+ betaBadgeProps.tooltipContent to the card and it
+ will properly create and position an EuiBetaBadge. If
+ you want to change the title of the tooltip, supply a{' '}
+ betaBadgeProps.title prop.
- The EuiCodeEditor, a wrapper of{' '}
- react-ace, has been deprecated and will be
- removed in a{' '}
-
- future release
-
- .
-
- If you are a Kibana developer, we recommend using the{' '}
-
- @kbn/monaco package
- {' '}
- within the Kibana codebase.
-
no items, click
@@ -459,7 +467,11 @@ exports[`EuiBasicTable empty renders a string as a custom message 1`] = `
where my items at?
@@ -2550,7 +2562,11 @@ exports[`EuiBasicTable with pagination and error 1`] = `
extends Component<
if (
!(column as EuiTableFieldDataColumnType).sortable ||
- (column as EuiTableFieldDataColumnType).hideForMobile
+ (column as EuiTableFieldDataColumnType)?.mobileOptions?.show ===
+ false
) {
return;
}
@@ -797,8 +798,6 @@ export class EuiBasicTable extends Component<
dataType,
sortable,
mobileOptions,
- isMobileHeader,
- hideForMobile,
readOnly,
description,
} = column as EuiTableFieldDataColumnType;
@@ -883,8 +882,6 @@ export class EuiBasicTable extends Component<
key={`_data_h_${field}_${index}`}
align={columnAlign}
width={width}
- isMobileHeader={isMobileHeader}
- hideForMobile={hideForMobile}
mobileOptions={mobileOptions}
data-test-subj={`tableHeaderCell_${field}_${index}`}
description={description}
@@ -917,12 +914,11 @@ export class EuiBasicTable extends Component<
const footer = getColumnFooter(column, { items, pagination });
const {
mobileOptions,
- isMobileHeader,
field,
align,
} = column as EuiTableFieldDataColumnType;
- if ((mobileOptions && mobileOptions!.only) || isMobileHeader) {
+ if (mobileOptions?.only) {
return; // exclude columns that only exist for mobile headers
}
@@ -982,7 +978,7 @@ export class EuiBasicTable extends Component<
{error}
@@ -1000,7 +996,7 @@ export class EuiBasicTable extends Component<
{noItemsMessage}
@@ -1080,14 +1076,7 @@ export class EuiBasicTable extends Component<
let expandedRowColSpan = selection ? columns.length + 1 : columns.length;
const mobileOnlyCols = columns.reduce((num, column) => {
- if (
- (column as EuiTableFieldDataColumnType).mobileOptions &&
- (column as EuiTableFieldDataColumnType).mobileOptions!.only
- ) {
- return num + 1;
- }
-
- return (column as EuiTableFieldDataColumnType).isMobileHeader
+ return (column as EuiTableFieldDataColumnType)?.mobileOptions?.only
? num + 1
: num + 0; // BWC only
}, 0);
diff --git a/src/components/basic_table/table_types.ts b/src/components/basic_table/table_types.ts
index f0bff460444..75c2d3da847 100644
--- a/src/components/basic_table/table_types.ts
+++ b/src/components/basic_table/table_types.ts
@@ -65,11 +65,9 @@ export interface EuiTableFieldDataColumnType
* Indicates whether this column should truncate its content when it doesn't fit
*/
truncateText?: boolean;
- isMobileHeader?: boolean;
mobileOptions?: Omit & {
render?: (item: T) => ReactNode;
};
- hideForMobile?: boolean;
/**
* Describe a custom renderer function for the content
*/
diff --git a/src/components/button/__snapshots__/button.test.tsx.snap b/src/components/button/__snapshots__/button.test.tsx.snap
index c925a773e3e..4483c843abd 100644
--- a/src/components/button/__snapshots__/button.test.tsx.snap
+++ b/src/components/button/__snapshots__/button.test.tsx.snap
@@ -79,21 +79,6 @@ exports[`EuiButton props color primary is rendered 1`] = `
`;
-exports[`EuiButton props color secondary is rendered 1`] = `
-
-`;
-
exports[`EuiButton props color success is rendered 1`] = `
`;
-exports[`EuiExpression props color secondary is rendered 1`] = `
-
-
- the answer is
-
-
-
- 42
-
-
-`;
-
exports[`EuiExpression props color subdued is rendered 1`] = `
;
/**
* Color of the `description`
- * **`secondary` color is DEPRECATED, use `success` instead**
*/
color?: ExpressionColor;
/**
diff --git a/src/components/form/form_row/make_id.test.ts b/src/components/form/form_row/make_id.test.ts
deleted file mode 100644
index 27c23c61027..00000000000
--- a/src/components/form/form_row/make_id.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import makeId from './make_id';
-
-describe('makeId', () => {
- const _consoleLog = console.log;
- beforeAll(() => {
- const _consoleLog = console.log;
- console.log = (...args: [any?, ...any[]]) => {
- // swallow the deprecation warning
- if (
- args[0] ===
- 'WARNING: makeId is deprecated. Use htmlIdGenerator from @elastic/eui instead.'
- )
- return;
- _consoleLog.apply(console, args);
- };
- });
-
- afterAll(() => {
- console.log = _consoleLog;
- });
-
- let ids: Map;
- beforeEach(() => {
- ids = new Map();
- });
-
- test('returns a string of length 8', () => {
- expect(makeId()).toHaveLength(8);
- });
-
- // Could be slow so adding a [SLOW] tag for use with --testNamePattern=
- test('returns a random string - [SLOW]', () => {
- for (let i = 0; i < 60000; i += 1) {
- const id: string = makeId();
- expect(ids.has(id)).toBeFalsy();
- ids.set(id, true);
- }
- });
-});
diff --git a/src/components/form/form_row/make_id.ts b/src/components/form/form_row/make_id.ts
deleted file mode 100644
index e0f8c554763..00000000000
--- a/src/components/form/form_row/make_id.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-// Generate statistically almost-certainly-unique `id`s for associating form
-// inputs with their labels and other descriptive text elements.
-function makeId(): string {
- console.log(
- 'WARNING: makeId is deprecated. Use htmlIdGenerator from @elastic/eui instead.'
- );
- return Math.random().toString(36).slice(-8);
-}
-
-export default makeId;
diff --git a/src/components/health/__snapshots__/health.test.tsx.snap b/src/components/health/__snapshots__/health.test.tsx.snap
index 0c2581fea23..8d8d5943526 100644
--- a/src/components/health/__snapshots__/health.test.tsx.snap
+++ b/src/components/health/__snapshots__/health.test.tsx.snap
@@ -177,28 +177,6 @@ exports[`EuiHealth props color primary is rendered 1`] = `
`;
-exports[`EuiHealth props color secondary is rendered 1`] = `
-
-
-
-
-
-
-
-
-`;
-
exports[`EuiHealth props color subdued is rendered 1`] = `
`;
-exports[`EuiIcon props color secondary is rendered 1`] = `
-
-`;
-
exports[`EuiIcon props color subdued is rendered 1`] = `
`;
-exports[`EuiLink secondary is rendered 1`] = `
-
-`;
-
exports[`EuiLink subdued is rendered 1`] = `