Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[EuiIcon] Add keyboard glyph #6058

Merged
merged 2 commits into from
Jul 18, 2022
Merged

[EuiIcon] Add keyboard glyph #6058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4489663
[EuiIcon] Add `keyboard` glyph
miukimiu Jul 18, 2022
c740b19
Added CL. Deprecated `keyboardShortcut` in favor of `keyboard`.
miukimiu Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-docs/src/views/icon/icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const iconTypes = [
'inspect',
'invert',
'ip',
'keyboardShortcut',
'keyboard',
'kqlField',
'kqlFunction',
'kqlOperand',
Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/selectable/selectable_sitewide_template_example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const SitewideSearchExample = {
</p>
<EuiCallOut
size="s"
iconType="keyboardShortcut"
iconType="keyboard"
title="The demo showcases the possibility to allow a keyboard shortcut (command + K) to trigger the search input focus, but the template does not come with this ability."
/>
<h3>Popover</h3>
Expand Down
10 changes: 5 additions & 5 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4037,21 +4037,21 @@ exports[`EuiIcon props type ip is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type keyboardShortcut is rendered 1`] = `
exports[`EuiIcon props type keyboard is rendered 1`] = `
<svg
aria-hidden="true"
class="euiIcon emotion-euiIcon-m-isLoaded"
data-icon-type="keyboardShortcut"
data-icon-type="keyboard"
data-is-loaded="true"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M15 9a1 1 0 01.993.883L16 10v5a1 1 0 01-.883.993L15 16H7a1 1 0 01-.993-.883L6 15v-5a1 1 0 01.883-.993L7 9h8zM2.5 10a.5.5 0 01.492.41L3 10.5V12h1.5a.5.5 0 01.09.992L4.5 13H3v1.5a.5.5 0 01-.992.09L2 14.5V13H.5a.5.5 0 01-.09-.992L.5 12H2v-1.5a.5.5 0 01.5-.5zM15 10H7v5h8v-5zm-1 3v1H8v-1h6zm1-13a1 1 0 011 1v5a1 1 0 01-1 1H1a1 1 0 01-1-1V1a1 1 0 011-1h14zm0 1H1v5h14V1zM8 4v1H2V4h6z"
clip-rule="evenodd"
d="M0 3h16v11H0V3zm15 10V4H1v9h14zM2 5h2v1H2V5zm2 7v-1H2v1h2zm10-1v1h-2v-1h2zm-3 1v-1H5v1h6zM5 5h1v1H5V5zM3 7H2v1h1V7zm3 0h1v1H6V7zM3 9H2v1h1V9zm3 0h1v1H6V9zm2-4H7v1h1V5zM4 7h1v1H4V7zm5 0H8v1h1V7zm1 0h1v1h-1V7zM5 9H4v1h1V9zm3 0h1v1H8V9zm3 0h-1v1h1V9zM9 5h1v1H9V5zm3 0h-1v1h1V5zm1 0h1v1h-1V5zm1 2h-2v3h2V7z"
fill-rule="evenodd"
/>
</svg>
`;
Expand Down
12 changes: 7 additions & 5 deletions ...ponents/icon/assets/keyboard_shortcut.tsx → src/components/icon/assets/keyboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@ interface SVGRProps {
titleId?: string;
}

const EuiIconKeyboardShortcut = ({
const EuiIconKeyboard = ({
title,
titleId,
...props
}: React.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="M15 9a1 1 0 01.993.883L16 10v5a1 1 0 01-.883.993L15 16H7a1 1 0 01-.993-.883L6 15v-5a1 1 0 01.883-.993L7 9h8zM2.5 10a.5.5 0 01.492.41L3 10.5V12h1.5a.5.5 0 01.09.992L4.5 13H3v1.5a.5.5 0 01-.992.09L2 14.5V13H.5a.5.5 0 01-.09-.992L.5 12H2v-1.5a.5.5 0 01.5-.5zM15 10H7v5h8v-5zm-1 3v1H8v-1h6zm1-13a1 1 0 011 1v5a1 1 0 01-1 1H1a1 1 0 01-1-1V1a1 1 0 011-1h14zm0 1H1v5h14V1zM8 4v1H2V4h6z" />
<path
fillRule="evenodd"
clipRule="evenodd"
d="M0 3h16v11H0V3zm15 10V4H1v9h14zM2 5h2v1H2V5zm2 7v-1H2v1h2zm10-1v1h-2v-1h2zm-3 1v-1H5v1h6zM5 5h1v1H5V5zM3 7H2v1h1V7zm3 0h1v1H6V7zM3 9H2v1h1V9zm3 0h1v1H6V9zm2-4H7v1h1V5zM4 7h1v1H4V7zm5 0H8v1h1V7zm1 0h1v1h-1V7zM5 9H4v1h1V9zm3 0h1v1H8V9zm3 0h-1v1h1V9zM9 5h1v1H9V5zm3 0h-1v1h1V5zm1 0h1v1h-1V5zm1 2h-2v3h2V7z"
/>
</svg>
);

export const icon = EuiIconKeyboardShortcut;
export const icon = EuiIconKeyboard;
2 changes: 1 addition & 1 deletion src/components/icon/icon_map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export const typeToPathMap = {
inspect: 'inspect',
invert: 'invert',
ip: 'ip',
keyboardShortcut: 'keyboard_shortcut',
keyboard: 'keyboard',
kqlField: 'kql_field',
kqlFunction: 'kql_function',
kqlOperand: 'kql_operand',
Expand Down
3 changes: 3 additions & 0 deletions src/components/icon/svgs/keyboard.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/components/icon/svgs/keyboard_shortcut.svg
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions upcoming_changelogs/6058.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Added `keyboard` glyph to `EuiIcon`

**Deprecations**

- Deprecated `EuiIcon`'s `keyboardShortcut` in favor of `keyboard`