Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/eui/changelogs/upcoming/8756.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Replaced `question` icon glyph
2 changes: 1 addition & 1 deletion packages/eui/src/components/basic_table/table_types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export type EuiTableColumnNameTooltipProps = {
content: ReactNode;
/**
* The icon type to display
* @default 'questionInCircle'
* @default 'question'
*/
icon?: IconType;
/** Additional props for EuiIcon */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const CustomHeaderCell = ({ title }: { title: string }) => (
<span>{title}</span>
<EuiToolTip content="tooltip content">
<EuiButtonIcon
iconType="questionInCircle"
iconType="question"
aria-label="Additional information"
color="primary"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9201,6 +9201,32 @@ exports[`EuiIcon props type push is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type question is rendered 1`] = `
<svg
aria-hidden="true"
class="euiIcon emotion-euiIcon-m-isLoaded"
data-icon-type="question"
data-is-loaded="true"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M8 14A6 6 0 1 0 8 2a6 6 0 0 0 0 12Zm0 1A7 7 0 1 0 8 1a7 7 0 0 0 0 14Z"
fill-rule="evenodd"
/>
<path
d="M9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
/>
<path
d="M8 4h.033l.067.004a2.343 2.343 0 0 1 .874.236c.246.124.508.317.708.616.2.302.318.682.318 1.144 0 .463-.117.843-.318 1.145-.2.299-.462.492-.708.615a2.274 2.274 0 0 1-.474.172V9h-1V7H8c.005 0 .015 0 .029-.002a1.344 1.344 0 0 0 .498-.133.817.817 0 0 0 .323-.275C8.93 6.47 9 6.288 9 6c0-.287-.07-.47-.15-.59a.818.818 0 0 0-.324-.275 1.344 1.344 0 0 0-.555-.133 1.344 1.344 0 0 0-.498.133.817.817 0 0 0-.323.275C7.07 5.53 7 5.713 7 6H6c0-.462.117-.843.318-1.144.2-.3.462-.492.708-.616a2.343 2.343 0 0 1 .94-.24H8Z"
fill-rule="evenodd"
/>
</svg>
`;

exports[`EuiIcon props type questionInCircle is rendered 1`] = `
<svg
aria-hidden="true"
Expand All @@ -9214,7 +9240,15 @@ exports[`EuiIcon props type questionInCircle is rendered 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M8 14A6 6 0 1 1 8 2a6 6 0 0 1 0 12Zm0-1A5 5 0 1 0 8 3a5 5 0 0 0 0 10Zm-.186-1.065A.785.785 0 0 1 7 11.12c0-.48.34-.82.814-.82.475 0 .809.34.809.82 0 .475-.334.815-.809.815ZM5.9 6.317C5.96 5.168 6.755 4.4 8.048 4.4c1.218 0 2.091.759 2.091 1.8 0 .736-.36 1.304-1.03 1.707-.56.33-.717.56-.717 1.022v.305l-.1.1H7.47l-.1-.1v-.431c-.005-.646.302-1.104.987-1.514.527-.322.708-.59.708-1.047 0-.536-.416-.91-1.05-.91-.652 0-1.064.374-1.112.998l-.1.092H6l-.1-.105Z"
d="M8 14A6 6 0 1 0 8 2a6 6 0 0 0 0 12Zm0 1A7 7 0 1 0 8 1a7 7 0 0 0 0 14Z"
fill-rule="evenodd"
/>
<path
d="M9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
/>
<path
d="M8 4h.033l.067.004a2.343 2.343 0 0 1 .874.236c.246.124.508.317.708.616.2.302.318.682.318 1.144 0 .463-.117.843-.318 1.145-.2.299-.462.492-.708.615a2.274 2.274 0 0 1-.474.172V9h-1V7H8c.005 0 .015 0 .029-.002a1.344 1.344 0 0 0 .498-.133.817.817 0 0 0 .323-.275C8.93 6.47 9 6.288 9 6c0-.287-.07-.47-.15-.59a.818.818 0 0 0-.324-.275 1.344 1.344 0 0 0-.555-.133 1.344 1.344 0 0 0-.498.133.817.817 0 0 0-.323.275C7.07 5.53 7 5.713 7 6H6c0-.462.117-.843.318-1.144.2-.3.462-.492.708-.616a2.343 2.343 0 0 1 .94-.24H8Z"
fill-rule="evenodd"
/>
</svg>
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface SVGRProps {
title?: string;
titleId?: string;
}
const EuiIconQuestionInCircle = ({
const EuiIconQuestion = ({
title,
titleId,
...props
Expand All @@ -28,7 +28,15 @@ const EuiIconQuestionInCircle = ({
{...props}
>
{title ? <title id={titleId}>{title}</title> : null}
<path d="M8 14A6 6 0 1 1 8 2a6 6 0 0 1 0 12Zm0-1A5 5 0 1 0 8 3a5 5 0 0 0 0 10Zm-.186-1.065A.785.785 0 0 1 7 11.12c0-.48.34-.82.814-.82.475 0 .809.34.809.82 0 .475-.334.815-.809.815ZM5.9 6.317C5.96 5.168 6.755 4.4 8.048 4.4c1.218 0 2.091.759 2.091 1.8 0 .736-.36 1.304-1.03 1.707-.56.33-.717.56-.717 1.022v.305l-.1.1H7.47l-.1-.1v-.431c-.005-.646.302-1.104.987-1.514.527-.322.708-.59.708-1.047 0-.536-.416-.91-1.05-.91-.652 0-1.064.374-1.112.998l-.1.092H6l-.1-.105Z" />
<path
fillRule="evenodd"
d="M8 14A6 6 0 1 0 8 2a6 6 0 0 0 0 12Zm0 1A7 7 0 1 0 8 1a7 7 0 0 0 0 14Z"
/>
<path d="M9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z" />
<path
fillRule="evenodd"
d="M8 4h.033l.067.004a2.343 2.343 0 0 1 .874.236c.246.124.508.317.708.616.2.302.318.682.318 1.144 0 .463-.117.843-.318 1.145-.2.299-.462.492-.708.615a2.274 2.274 0 0 1-.474.172V9h-1V7H8c.005 0 .015 0 .029-.002a1.344 1.344 0 0 0 .498-.133.817.817 0 0 0 .323-.275C8.93 6.47 9 6.288 9 6c0-.287-.07-.47-.15-.59a.818.818 0 0 0-.324-.275 1.344 1.344 0 0 0-.555-.133 1.344 1.344 0 0 0-.498.133.817.817 0 0 0-.323.275C7.07 5.53 7 5.713 7 6H6c0-.462.117-.843.318-1.144.2-.3.462-.492.708-.616a2.343 2.343 0 0 1 .94-.24H8Z"
/>
</svg>
);
export const icon = EuiIconQuestionInCircle;
export const icon = EuiIconQuestion;
2 changes: 1 addition & 1 deletion packages/eui/src/components/icon/icon_glyphs.a11y.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ describe('EuiIcons', () => {
'plusInCircleFilled',
'popout',
'push',
'questionInCircle',
'question',
'quote',
'refresh',
'reporter',
Expand Down
3 changes: 2 additions & 1 deletion packages/eui/src/components/icon/icon_map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ export const typeToPathMap = {
plusInSquare: 'plus_in_square',
popout: 'popout',
push: 'push',
questionInCircle: 'question_in_circle',
questionInCircle: 'question', // NOTE: To be deprecated in favor of `question`
question: 'question',
quote: 'quote',
readOnly: 'readOnly',
recentlyViewedApp: 'app_recently_viewed',
Expand Down
5 changes: 5 additions & 0 deletions packages/eui/src/components/icon/svgs/question.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const tooltipMarkdownRenderer: FunctionComponent<
<span>
<strong>{children}</strong>
<EuiIcon
type="questionInCircle"
type="question"
// This is to offset the tooltip icon, which isn't perfectly centered
css={{ transform: 'translateY(-1px)' }}
/>
Expand Down
4 changes: 2 additions & 2 deletions packages/eui/src/components/table/table_header_cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ const CellContents = ({
canSort ? (
<EuiIcon
className="euiTableSortIcon"
type={tooltipProps.icon || 'questionInCircle'}
type={tooltipProps.icon || 'question'}
size="m"
color="subdued"
{...tooltipProps.iconProps}
/>
) : (
<EuiIconTip
content={tooltipProps.content}
type={tooltipProps.icon || 'questionInCircle'}
type={tooltipProps.icon || 'question'}
size="m"
color="subdued"
position="top"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`EuiIconTip is rendered 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
>
<span
data-euiicon-type="questionInCircle"
data-euiicon-type="question"
tabindex="0"
>
aria-label
Expand All @@ -19,7 +19,7 @@ exports[`EuiIconTip props color is rendered as the icon color 1`] = `
>
<span
color="warning"
data-euiicon-type="questionInCircle"
data-euiicon-type="question"
tabindex="0"
>
Info
Expand All @@ -32,7 +32,7 @@ exports[`EuiIconTip props size is rendered as the icon size 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
>
<span
data-euiicon-type="questionInCircle"
data-euiicon-type="question"
tabindex="0"
>
Info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const meta: Meta<EuiIconTipProps> = {
),
],
args: {
type: 'questionInCircle',
type: 'question',
position: 'top',
delay: 'regular',
display: 'inlineBlock',
Expand Down
2 changes: 1 addition & 1 deletion packages/eui/src/components/tool_tip/icon_tip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export type EuiIconTipProps = Omit<
};

export const EuiIconTip: FunctionComponent<EuiIconTipProps> = ({
type = 'questionInCircle',
type = 'question',
'aria-label': ariaLabel,
color,
size,
Expand Down
2 changes: 1 addition & 1 deletion packages/eui/src/components/tour/tour.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const Playground: Story = {
minWidth: 300,
maxWidth: 600,
decoration: 'beacon',
children: <EuiButtonIcon iconType="questionInCircle" />,
children: <EuiButtonIcon iconType="question" />,
onFinish: () => {},
anchorPosition: 'downCenter',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eui/src/components/tour/tour_step.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ export const Playground: Story = {
content: 'Tour step content',
isStepOpen: true,
stepsTotal: 3,
children: <EuiButtonIcon iconType="questionInCircle" />,
children: <EuiButtonIcon iconType="question" />,
},
};
Loading