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.

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

docs(tooltip): use Button instead of Information icons in stories #17006

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
27b3008
docs(tooltip): use SquareOutline instead of Information icons in stories
tay1orjones Jul 19, 2024
2b6137f
docs(tooltip): use Button instead of Information icon in stories
tay1orjones Jul 19, 2024
f80393a
docs(tooltip): use Button instead of Information icon in mdx docs
tay1orjones Jul 19, 2024
e400716
docs(formlabel): remove tooltip example from formlabel stories
tay1orjones Jul 19, 2024
aaf2696
chore(tooltip): add missing import
tay1orjones Jul 19, 2024
d3988b9
Merge branch 'main' into update-tooltip-icons
tay1orjones Jul 22, 2024
b308d0d
fix(tooltip): add squareoutline import
tay1orjones Aug 12, 2024
ed75e1f
Merge branch 'main' of github.com:carbon-design-system/carbon into up…
tay1orjones Aug 15, 2024
c7d6906
test(formlabel): remove tooltip tests
tay1orjones Aug 15, 2024
eb738a7
Merge branch 'main' into update-tooltip-icons
tay1orjones Oct 15, 2024
38e7e92
docs(tooltip): remove classname for custom story classes
tay1orjones Oct 15, 2024
6048876
Merge branch 'main' into update-tooltip-icons
tay1orjones Oct 15, 2024
c76f68e
Merge branch 'main' into update-tooltip-icons
tay1orjones Oct 16, 2024
02c40ce
Merge branch 'main' into update-tooltip-icons
alisonjoseph Oct 17, 2024
2ad523b
Merge branch 'main' into update-tooltip-icons
tay1orjones Oct 21, 2024
2f4d5f3
Merge branch 'main' into update-tooltip-icons
kennylam Oct 29, 2024
7ff9464
Merge branch 'main' into update-tooltip-icons
alisonjoseph Oct 31, 2024
8e68c98
Merge branch 'main' into update-tooltip-icons
tay1orjones Nov 6, 2024
f1ab2ce
Merge branch 'main' into update-tooltip-icons
tay1orjones Nov 15, 2024
66301b3
Merge branch 'main' into update-tooltip-icons
tay1orjones Nov 15, 2024
2345771
Merge branch 'main' into update-tooltip-icons
tay1orjones Nov 15, 2024
86c0de1
test(formlabel): update vrt story id
tay1orjones Nov 18, 2024
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
20 changes: 6 additions & 14 deletions e2e/components/FormLabel/FormLabel-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,27 @@ test.describe('@avt FormLabel', () => {
await expect(page).toHaveNoACViolations('FormLabel');
});

test('@avt-advanced-states FormLabel with tooltip', async ({ page }) => {
test('@avt-advanced-states FormLabel with toggletip', async ({ page }) => {
await visitStory(page, {
component: 'FormLabel',
id: 'components-formlabel--with-tooltip',
id: 'components-formlabel--with-toggletip',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('FormLabel-with-tooltip');
await expect(page).toHaveNoACViolations('FormLabel-with-toggletip');
});

test('@avt-keyboard-nav FormLabel with tooltip', async ({ page }) => {
test('@avt-keyboard-nav FormLabel with toggletip', async ({ page }) => {
await visitStory(page, {
component: 'FormLabel',
id: 'components-formlabel--with-tooltip',
id: 'components-formlabel--with-toggletip',
globals: {
theme: 'white',
},
});

await expect(page.getByText('Form label with Tooltip')).toBeVisible();
await page.keyboard.press('Tab');
await expect(
page
.getByText(
'This can be used to provide more information about a field.'
)
.first()
).toBeVisible();
await expect(page.getByText('Form label with toggletip')).toBeVisible();
await page.keyboard.press('Tab');
await page.keyboard.press('Enter');
await expect(
Expand Down
2 changes: 1 addition & 1 deletion e2e/components/FormLabel/FormLabel-test.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test.describe('FormLabel', () => {
test('with tooltip @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'FormLabel',
id: 'components-formlabel--with-tooltip',
id: 'components-formlabel--with-toggletip',
theme,
});
});
Expand Down
12 changes: 1 addition & 11 deletions packages/react/src/components/FormLabel/FormLabel.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,10 @@ export default {

export const Default = () => <FormLabel>Form label</FormLabel>;

export const WithTooltip = (controls) => {
export const WithToggletip = (controls) => {
const { align } = controls;
return (
<>
<div className="form-wrapper">
<FormLabel>Form label with Tooltip</FormLabel>
<Tooltip
align="bottom"
label="This can be used to provide more information about a field.">
<button className="cds--tooltip__trigger" type="button">
<Information />
</button>
</Tooltip>
</div>
<div className="form-wrapper">
<FormLabel>Form label with Toggletip</FormLabel>
<Toggletip align={align}>
Expand Down
23 changes: 8 additions & 15 deletions packages/react/src/components/Tooltip/Tooltip.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

import './story.scss';

import { Information } from '@carbon/icons-react';
import React, { useRef, useEffect } from 'react';
import { SquareOutline } from '@carbon/icons-react';
import { Tooltip } from './';
import Button from './../Button';
import mdx from './Tooltip.mdx';

export default {
Expand Down Expand Up @@ -55,19 +56,15 @@ export const Default = () => {
'Occasionally, services are updated in a specified time window to ensure no down time for customers.';
return (
<Tooltip align="bottom" label={label}>
<button className="sb-tooltip-trigger" type="button">
<Information />
</button>
<Button>This button has a tooltip</Button>
</Tooltip>
);
};

export const Alignment = () => {
return (
<Tooltip label="Tooltip alignment" align="bottom-left">
<button className="sb-tooltip-trigger" type="button">
<Information />
</button>
<Button>This button has a tooltip</Button>
</Tooltip>
);
};
Expand All @@ -89,9 +86,7 @@ export const ExperimentalAutoAlign = () => {
left: '2500px',
}}>
<Tooltip label={tooltipLabel} align="top" autoAlign>
<button className="sb-tooltip-trigger" type="button" ref={ref}>
<Information />
</button>
<Button ref={ref}>This button has a tooltip</Button>
</Tooltip>
</div>
</div>
Expand All @@ -101,9 +96,7 @@ export const ExperimentalAutoAlign = () => {
export const Duration = () => {
return (
<Tooltip label="Label one" enterDelayMs={0} leaveDelayMs={300}>
<button className="sb-tooltip-trigger" type="button">
<Information />
</button>
<Button>This button has a tooltip</Button>
</Tooltip>
);
};
Expand All @@ -127,8 +120,8 @@ const PlaygroundStory = (props) => {
label={label}
leaveDelayMs={leaveDelayMs}
closeOnActivation={closeOnActivation}>
<button className="sb-tooltip-trigger" type="button">
<Information />
<button type="button">
<SquareOutline />
</button>
</Tooltip>
);
Expand Down
Loading