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

feat: slot provider #835

Merged
merged 1 commit into from
Nov 19, 2024
Merged

feat: slot provider #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/__storyshots__/Updated Components/Breadcrumb-BasicBreadcrumbs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 1_link"
href="/first-level"
>
Expand Down Expand Up @@ -196,6 +197,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 2_link"
href="/second-level"
>
Expand Down Expand Up @@ -230,6 +232,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 3_link"
href="/third-level"
>
Expand Down Expand Up @@ -264,6 +267,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 4_link"
href="/forth-level"
>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Breadcrumb-GoBackTo.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
>
<a
class="emotion-3"
data-slot="link"
data-testid="_breadcrumb_go_back_to_Level 1_link"
href="/first-level"
>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Breadcrumb-Playground.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
>
<a
class="emotion-7"
data-slot="link"
data-testid="_breadcrumb_link_Level 1_link"
href="/first-level"
>
Expand Down
4 changes: 4 additions & 0 deletions src/__storyshots__/Updated Components/Breadcrumb-ThirdPartyRoutingLibrary.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 1_link"
href="/first-level"
>
Expand Down Expand Up @@ -196,6 +197,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 2_link"
href="/second-level"
>
Expand Down Expand Up @@ -230,6 +232,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 3_link"
href="/third-level"
>
Expand Down Expand Up @@ -264,6 +267,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_breadcrumb_link_Level 4_link"
href="/forth-level"
>
Expand Down
2 changes: 2 additions & 0 deletions src/__storyshots__/Updated Components/Link-LinkStyles.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
>
<a
class="emotion-1"
data-slot="link"
data-testid="_link"
href="#"
>
Expand All @@ -159,6 +160,7 @@
>
<a
class="emotion-3"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down
3 changes: 3 additions & 0 deletions src/__storyshots__/Updated Components/Link-LinkWithIcon.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
>
<a
class="emotion-1"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down Expand Up @@ -263,6 +264,7 @@
>
<a
class="emotion-4"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down Expand Up @@ -292,6 +294,7 @@
>
<a
class="emotion-7"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down
2 changes: 2 additions & 0 deletions src/__storyshots__/Updated Components/Link-Placement.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@

<a
class="emotion-1"
data-slot="link"
data-testid="_link"
href="#"
>
Expand All @@ -149,6 +150,7 @@
This is a
<a
class="emotion-2"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Link-Playground.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
>
<a
class="emotion-1"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down
3 changes: 3 additions & 0 deletions src/__storyshots__/Updated Components/Link-Sizes.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
>
<a
class="emotion-1"
data-slot="link"
data-testid="_link"
href="#"
>
Expand All @@ -193,6 +194,7 @@
>
<a
class="emotion-2"
data-slot="link"
data-testid="_link"
href="#"
>
Expand All @@ -206,6 +208,7 @@
>
<a
class="emotion-3"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Link-ThirdPartyRoutingLibrary.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<div>
<a
class="emotion-0"
data-slot="link"
data-testid="_link"
href="/"
>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Menu-MenuTriggers.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
aria-haspopup="true"
aria-label="Menu"
class="emotion-8"
data-slot="link"
data-testid="_link"
href="#"
>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Notifications/Inline Alert-Error.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
>
<a
class="emotion-7"
data-slot="link"
data-testid="_link"
>
<span>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Notifications/Inline Alert-Informational.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@
>
<a
class="emotion-7"
data-slot="link"
data-testid="_link"
>
<span>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Notifications/Inline Alert-Neutral.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@
>
<a
class="emotion-5"
data-slot="link"
data-testid="_link"
>
<span>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Notifications/Inline Alert-Playground.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@
>
<a
class="emotion-5"
data-slot="link"
data-testid="_link"
>
<span>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Notifications/Inline Alert-Success.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
>
<a
class="emotion-7"
data-slot="link"
data-testid="_link"
>
<span>
Expand Down
1 change: 1 addition & 0 deletions src/__storyshots__/Updated Components/Notifications/Inline Alert-Warning.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@
>
<a
class="emotion-7"
data-slot="link"
data-testid="_link"
>
<span>
Expand Down
3 changes: 2 additions & 1 deletion src/components/ButtonBase/ButtonBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { generateTestDataId } from 'utils/helpers';
import type { ComponentSizes, TestProps } from 'utils/types';

import { buttonBaseStyle, buttonWrapperStyle } from './ButtonBase.style';
import { useSlotProps } from '../utils/Slots';
import type { ButtonTypes } from 'components/Button/Button.types';
import ButtonLoader from 'components/Button/ButtonLoader';
import type { IconButtonShape } from 'components/IconButton';
Expand Down Expand Up @@ -43,6 +44,7 @@ export type ButtonBaseProps = {

//@TODO fix props to not overwrite button props
const ButtonBase = React.forwardRef<HTMLButtonElement, ButtonBaseProps>((props, ref) => {
props = useSlotProps(props, 'button');
const {
type = 'primary',
size = 'normal',
Expand Down Expand Up @@ -70,7 +72,6 @@ const ButtonBase = React.forwardRef<HTMLButtonElement, ButtonBaseProps>((props,
ref={ref}
type={htmlType}
data-testid={generateTestDataId(testIdName, dataTestId)}
data-slot="button"
css={buttonBaseStyle({
type,
size,
Expand Down
24 changes: 7 additions & 17 deletions src/components/InlineAlert/InlineAlert.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Story = StoryObj<typeof InlineAlert>;

export const Neutral: Story = {
render: (args) => (
<InlineAlert actions={<Link size={2}>Single Action</Link>} onDismiss={() => {}} {...args}>
<InlineAlert actions={<Link>Single Action</Link>} onDismiss={() => {}} {...args}>
Alert copy should be short, easy to understand and actionable.
</InlineAlert>
),
Expand All @@ -40,7 +40,7 @@ export const Informational: Story = {
render: (args) => (
<InlineAlert
status="informational"
actions={<Link size={2}>Single Action</Link>}
actions={<Link>Single Action</Link>}
onDismiss={() => {}}
{...args}
>
Expand All @@ -51,12 +51,7 @@ export const Informational: Story = {

export const Error: Story = {
render: (args) => (
<InlineAlert
status="error"
actions={<Link size={2}>Single Action</Link>}
onDismiss={() => {}}
{...args}
>
<InlineAlert status="error" actions={<Link>Single Action</Link>} onDismiss={() => {}} {...args}>
Alert copy should be short, easy to understand and actionable.
</InlineAlert>
),
Expand All @@ -66,7 +61,7 @@ export const Warning: Story = {
render: (args) => (
<InlineAlert
status="warning"
actions={<Link size={2}>Single Action</Link>}
actions={<Link>Single Action</Link>}
onDismiss={() => {}}
{...args}
>
Expand All @@ -79,7 +74,7 @@ export const Success: Story = {
render: (args) => (
<InlineAlert
status="success"
actions={<Link size={2}>Single Action</Link>}
actions={<Link>Single Action</Link>}
onDismiss={() => {}}
{...args}
>
Expand All @@ -92,12 +87,7 @@ export const WithButtons: Story = {
render: (args) => (
<InlineAlert
status="informational"
actions={[
<Button type="tertiary" size="compact">
Tertiary
</Button>,
<Button size="compact">Primary</Button>,
]}
actions={[<Button type="tertiary">Tertiary</Button>, <Button>Primary</Button>]}
onDismiss={() => {}}
{...args}
>
Expand Down Expand Up @@ -141,7 +131,7 @@ export const WithTrigger: Story = {

export const Playground: Story = {
render: (args) => (
<InlineAlert actions={<Link size={2}>Single Action</Link>} onDismiss={() => {}} {...args}>
<InlineAlert actions={<Link>Single Action</Link>} onDismiss={() => {}} {...args}>
Alert copy should be short, easy to understand and actionable.
</InlineAlert>
),
Expand Down
16 changes: 14 additions & 2 deletions src/components/InlineAlert/InlineAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import { useId } from 'react-aria';
import { getIconColor, styles } from './InlineAlert.style';
import type { InlineAlertProps } from './InlineAlert.types';
import Icon from '../Icon';
import { SlotProvider, useSlotProps } from '../utils/Slots';
import { useDOMRef } from '../utils/useDOMRef';

import useTheme from '~/hooks/useTheme';

export const InlineAlert = forwardRef<HTMLDivElement, InlineAlertProps>(
(props: InlineAlertProps, ref: RefObject<HTMLDivElement>) => {
props = useSlotProps(props, 'inline-alert');
const {
status = 'neutral',
actions,
Expand Down Expand Up @@ -46,7 +48,6 @@ export const InlineAlert = forwardRef<HTMLDivElement, InlineAlertProps>(
tabIndex={0}
role={status === 'warning' || status === 'error' ? 'alert' : 'status'}
aria-describedby={onDismiss ? dismissId : undefined}
data-slot="inline-alert"
data-testid={`${dataTestPrefixId}_inline_alert`}
>
{status !== 'neutral' ? (
Expand All @@ -59,7 +60,18 @@ export const InlineAlert = forwardRef<HTMLDivElement, InlineAlertProps>(
/>
) : null}
<div css={styles.content}>{children}</div>
{actionsArray.length > 0 ? <div css={styles.actions}>{actionsArray}</div> : null}
{actionsArray.length > 0 ? (
<div css={styles.actions}>
<SlotProvider
slots={{
button: { size: 'compact' },
link: { size: 2 },
}}
>
{actionsArray}
</SlotProvider>
</div>
) : null}
{onDismiss ? (
<Icon
role="button"
Expand Down
2 changes: 2 additions & 0 deletions src/components/Link/Link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import React from 'react';
import { iconSize } from './constants';
import { linkContainer } from './Link.style';
import type { LinkProps } from './Link.types';
import { useSlotProps } from '../utils/Slots';
import Icon from 'components/Icon';

const Link = React.forwardRef<HTMLAnchorElement, LinkProps>((props, ref) => {
props = useSlotProps(props, 'link');
const {
type = 'primary',
placement = 'block',
Expand Down
Loading
Loading