Skip to content

Commit

Permalink
Merge branch 'main' into row-height-auto-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tkajtoch authored Jan 13, 2025
2 parents 6793850 + 9959b18 commit 87173cd
Show file tree
Hide file tree
Showing 20 changed files with 111 additions and 39 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: 🐛 Bug report
about: Create a report to help us improve
title: ''
labels: bug, ⚠️ needs validation
type: 'bug'
assignees: ''

---
Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
name: ✨ Feature request
about: Suggest an idea for this project
about: A request, idea, or new functionality
title: ''
labels: feature request
type: 'Enhancement'
assignees: ''

---
Expand Down
13 changes: 13 additions & 0 deletions packages/eui/changelogs/CHANGELOG_2025.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## [`v99.0.0`](https://github.com/elastic/eui/releases/v99.0.0)

- Added two new icons: `createGenericJob` and `createGeoJob` ([#8248](https://github.com/elastic/eui/pull/8248))
- Added new icon `section` ([#8261](https://github.com/elastic/eui/pull/8261))

**Bug fixes**

- Ensures that the `values` of `EuiI18n` used in `EuiPagination` use `key` attributes to prevent potential ["unique key" warnings](https://react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key). ([#8243](https://github.com/elastic/eui/pull/8243))

**Breaking changes**

- Removed `EuiPopover`'s deprecated `hasDragDrop` prop. Use `usePortal` on any child `EuiDraggable` instead ([#8256](https://github.com/elastic/eui/pull/8256))

3 changes: 0 additions & 3 deletions packages/eui/changelogs/upcoming/8243.md

This file was deleted.

2 changes: 0 additions & 2 deletions packages/eui/changelogs/upcoming/8248.md

This file was deleted.

2 changes: 2 additions & 0 deletions packages/eui/changelogs/upcoming/8255.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Updated font-weight and font-size of `EuiBetaBadge`s to improve legibility

3 changes: 0 additions & 3 deletions packages/eui/changelogs/upcoming/8256.md

This file was deleted.

38 changes: 19 additions & 19 deletions packages/eui/i18ntokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -5808,7 +5808,7 @@
"end": {
"line": 165,
"column": 12,
"index": 4729
"index": 4762
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5821,12 +5821,12 @@
"start": {
"line": 210,
"column": 12,
"index": 5723
"index": 5756
},
"end": {
"line": 215,
"column": 13,
"index": 5947
"index": 5980
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5839,12 +5839,12 @@
"start": {
"line": 251,
"column": 12,
"index": 6982
"index": 7015
},
"end": {
"line": 259,
"column": 13,
"index": 7289
"index": 7322
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5857,12 +5857,12 @@
"start": {
"line": 306,
"column": 20,
"index": 8472
"index": 8505
},
"end": {
"line": 306,
"column": 60,
"index": 8512
"index": 8545
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5875,12 +5875,12 @@
"start": {
"line": 307,
"column": 20,
"index": 8534
"index": 8567
},
"end": {
"line": 307,
"column": 60,
"index": 8574
"index": 8607
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5893,12 +5893,12 @@
"start": {
"line": 308,
"column": 18,
"index": 8594
"index": 8627
},
"end": {
"line": 308,
"column": 54,
"index": 8630
"index": 8663
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5911,12 +5911,12 @@
"start": {
"line": 309,
"column": 26,
"index": 8658
"index": 8691
},
"end": {
"line": 309,
"column": 78,
"index": 8710
"index": 8743
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5929,12 +5929,12 @@
"start": {
"line": 310,
"column": 23,
"index": 8735
"index": 8768
},
"end": {
"line": 310,
"column": 75,
"index": 8787
"index": 8820
}
},
"filepath": "src/components/pagination/pagination.tsx"
Expand All @@ -5945,14 +5945,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 700,
"line": 692,
"column": 16,
"index": 20852
"index": 20560
},
"end": {
"line": 703,
"line": 695,
"column": 18,
"index": 21046
"index": 20754
}
},
"filepath": "src/components/popover/popover.tsx"
Expand Down
2 changes: 1 addition & 1 deletion packages/eui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@elastic/eui",
"description": "Elastic UI Component Library",
"version": "98.2.1",
"version": "99.0.0",
"license": "SEE LICENSE IN LICENSE.txt",
"main": "lib",
"module": "es",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"euiVersions": [
"99.0.0",
"98.2.1",
"98.2.0",
"98.1.0",
Expand Down
1 change: 1 addition & 0 deletions packages/eui/src-docs/src/views/icon/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ export const iconTypes = [
'save',
'scale',
'search',
'section',
'securitySignal',
'securitySignalDetected',
'securitySignalResolved',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"years": [
2025,
2024,
2023,
2022,
Expand Down
20 changes: 14 additions & 6 deletions packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ import { euiBadgeColors } from '../color_utils';
export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
const { euiTheme, colorMode } = euiThemeContext;
const badgeColors = euiBadgeColors(euiThemeContext);
const badgeSizes = {
m: euiTheme.size.l,
s: mathWithUnits(euiTheme.size.base, (x) => x * 1.25),
};

return {
euiBetaBadge: css`
display: inline-block;
border-radius: ${euiTheme.size.l};
cursor: default;
font-weight: ${euiTheme.font.weight.bold};
font-weight: ${euiTheme.font.weight.semiBold};
text-transform: uppercase;
letter-spacing: 0.05em;
text-align: center;
Expand All @@ -53,19 +57,23 @@ export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
// Font sizes
m: css`
font-size: ${euiFontSizeFromScale('xs', euiTheme)};
line-height: ${euiTheme.size.l};
line-height: ${badgeSizes.m};
`,
s: css`
font-size: 0.625rem;
line-height: ${mathWithUnits(euiTheme.size.xs, (x) => x + euiTheme.base)};
font-size: 0.7rem;
line-height: ${badgeSizes.s};
`,
// Padding/width sizes
badgeSizes: {
default: {
m: `
${logicalCSS('padding-horizontal', euiTheme.size.base)}`,
${logicalCSS('height', badgeSizes.m)}
${logicalCSS('padding-horizontal', euiTheme.size.base)}
`,
s: `
${logicalCSS('padding-horizontal', euiTheme.size.m)}`,
${logicalCSS('height', badgeSizes.s)}
${logicalCSS('padding-horizontal', euiTheme.size.m)}
`,
},
// When it's just an icon or a single letter, make the badge a circle
circle: {
Expand Down
20 changes: 18 additions & 2 deletions packages/eui/src/components/icon/__snapshots__/icon.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1961,9 +1961,7 @@ exports[`EuiIcon props type createGeoJob is rendered 1`] = `
/>
<path
class="euiIcon__fillSecondary"
clip-rule="evenodd"
d="M23 15h-6V9h-2v6H9v2h6v6h2v-6h6v-2Zm-1 9.196C22 27.329 25.427 32 27 32s5-4.67 5-7.804V24a5 5 0 1 0-10 .096v.1ZM27 26a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"
fill-rule="evenodd"
/>
</svg>
`;
Expand Down Expand Up @@ -9048,6 +9046,24 @@ exports[`EuiIcon props type searchProfilerApp is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type section is rendered 1`] = `
<svg
aria-hidden="true"
class="euiIcon emotion-euiIcon-m-isLoaded"
data-icon-type="section"
data-is-loaded="true"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M1.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm1.5.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5ZM1.5 4a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5H7a.5.5 0 0 0 .5-.5v-4A.5.5 0 0 0 7 4H1.5Zm7 .5A.5.5 0 0 1 9 4h5.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H9a.5.5 0 0 1-.5-.5v-4Zm-7 5.5a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 0-.5-.5h-13Z"
/>
</svg>
`;

exports[`EuiIcon props type securityAnalyticsApp is rendered 1`] = `
<svg
aria-hidden="true"
Expand Down
2 changes: 0 additions & 2 deletions packages/eui/src/components/icon/assets/ml_create_geo_job.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ const EuiIconMlCreateGeoJob = ({
{title ? <title id={titleId}>{title}</title> : null}
<path d="M16 32C7.163 32 0 24.837 0 16S7.163 0 16 0s16 7.163 16 16h-2c0-7.732-6.268-14-14-14S2 8.268 2 16s6.268 14 14 14v2Z" />
<path
clipRule="evenodd"
fillRule="evenodd"
d="M23 15h-6V9h-2v6H9v2h6v6h2v-6h6v-2Zm-1 9.196C22 27.329 25.427 32 27 32s5-4.67 5-7.804V24a5 5 0 1 0-10 .096v.1ZM27 26a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"
className="euiIcon__fillSecondary"
/>
Expand Down
34 changes: 34 additions & 0 deletions packages/eui/src/components/icon/assets/section.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* 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.
*/

// THIS IS A GENERATED FILE. DO NOT MODIFY MANUALLY. @see scripts/compile-icons.js

import * as React from 'react';
import type { SVGProps } from 'react';
interface SVGRProps {
title?: string;
titleId?: string;
}
const EuiIconSection = ({
title,
titleId,
...props
}: SVGProps<SVGSVGElement> & SVGRProps) => (
<svg
xmlns="http://www.w3.org/2000/svg"
width={16}
height={16}
viewBox="0 0 16 16"
aria-labelledby={titleId}
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path d="M1.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm1.5.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5ZM1.5 4a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5H7a.5.5 0 0 0 .5-.5v-4A.5.5 0 0 0 7 4H1.5Zm7 .5A.5.5 0 0 1 9 4h5.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H9a.5.5 0 0 1-.5-.5v-4Zm-7 5.5a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 0-.5-.5h-13Z" />
</svg>
);
export const icon = EuiIconSection;
1 change: 1 addition & 0 deletions packages/eui/src/components/icon/icon_map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ export const typeToPathMap = {
scale: 'scale',
search: 'search',
searchProfilerApp: 'app_search_profiler',
section: 'section',
securityAnalyticsApp: 'app_security_analytics',
securityApp: 'app_security',
securitySignal: 'securitySignal',
Expand Down
1 change: 1 addition & 0 deletions packages/eui/src/components/icon/svgs/section.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ export const iconTypes: Array<IconType> = [
'save',
'scale',
'search',
'section',
'securitySignal',
'securitySignalDetected',
'securitySignalResolved',
Expand Down
1 change: 1 addition & 0 deletions packages/website/static/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"euiVersions": [
"99.0.0",
"98.2.1",
"98.2.0",
"98.1.0",
Expand Down

0 comments on commit 87173cd

Please sign in to comment.