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

feat(FeedbackScreens): updates in icons, paddings and styling #852

Merged
merged 14 commits into from
Aug 24, 2023
Merged
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 71 additions & 13 deletions src/__screenshot_tests__/feedback-screenshot-test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {openStoryPage, setRootFontSize} from '../test-utils';
import {MOVISTAR_SKIN, VIVO_SKIN, O2_SKIN} from '../skins/constants';
import {MOVISTAR_SKIN, VIVO_SKIN, O2_SKIN, VIVO_NEW_SKIN} from '../skins/constants';

import type {Device} from '../test-utils';

Expand All @@ -11,35 +11,93 @@ const feedbackTypes = [
'infofeedbackscreen--info',
];

const cases: Array<[string, string, Device]> = [];
for (const skin of testableSkins) {
const getCases = () => {
const cases: Array<[string, string, Device]> = [];
for (const skin of testableSkins) {
for (const device of testableDevices) {
for (const feedbackType of feedbackTypes) {
cases.push([feedbackType, skin, device]);
}
}
}
return cases;
};

const getExtraContentCases = () => {
const cases: Array<[string, Device]> = [];
for (const device of testableDevices) {
for (const feedbackType of feedbackTypes) {
cases.push([feedbackType, skin, device]);
if (!feedbackType.includes('error')) {
cases.push([feedbackType, device]);
}
}
}
}
return cases;
};

test.each(getCases())(
'Feedback %s screen appears properly on %s and %s',
async (feedbackType, skin, device) => {
const page = await openStoryPage({
id: `patterns-feedback-${feedbackType}`,
skin: skin as never,
marcoskolodny marked this conversation as resolved.
Show resolved Hide resolved
device,
});

const image = await page.screenshot();
expect(image).toMatchImageSnapshot();
}
);

test.each(cases)('Feedback %s screen appears properly on %s and %s', async (feedbackType, skin, device) => {
test.each(getExtraContentCases())(
'Feedback %s screen with extra content appears properly on %s',
async (feedbackType, device) => {
const page = await openStoryPage({
id: `patterns-feedback-${feedbackType}`,
device,
args: {extra: true},
});

const image = await page.screenshot();
expect(image).toMatchImageSnapshot();
}
);

test('Feedback screen with large fontSize', async () => {
const page = await openStoryPage({
id: `patterns-feedback-${feedbackType}`,
skin: skin as never,
device,
id: 'patterns-feedback-successfeedbackscreen--success',
skin: MOVISTAR_SKIN,
device: 'MOBILE_IOS',
});

await setRootFontSize(32);

const image = await page.screenshot();
expect(image).toMatchImageSnapshot();
});

test('Feedback screen with large fontSize', async () => {
test('Info feedback screen with custom icon', async () => {
const page = await openStoryPage({
id: 'patterns-feedback-successfeedbackscreen--success',
id: 'patterns-feedback-infofeedbackscreen--info',
skin: MOVISTAR_SKIN,
device: 'MOBILE_IOS',
args: {icon: 'custom'},
});

await setRootFontSize(32);

const image = await page.screenshot();
expect(image).toMatchImageSnapshot();
});

test.each(testableDevices)(
'Success feedback screen appears properly with Vivo New skin on %s',
async (device) => {
const page = await openStoryPage({
id: 'patterns-feedback-successfeedbackscreen--success',
skin: VIVO_NEW_SKIN,
device,
});

const image = await page.screenshot();
expect(image).toMatchImageSnapshot();
}
);
16 changes: 15 additions & 1 deletion src/__screenshot_tests__/success-feedback-screenshot-test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {openStoryPage} from '../test-utils';
import {MOVISTAR_SKIN, VIVO_SKIN, O2_SKIN} from '../skins/constants';
import {MOVISTAR_SKIN, VIVO_SKIN, O2_SKIN, VIVO_NEW_SKIN} from '../skins/constants';

import type {Device} from '../test-utils';

Expand Down Expand Up @@ -37,3 +37,17 @@ test.each(testableDevices)(
expect(image).toMatchImageSnapshot();
}
);

test.each(testableDevices)(
'Success Feedback component appears properly with Vivo New skin on %s',
async (device) => {
const page = await openStoryPage({
id: `patterns-feedback-successfeedback--success`,
skin: VIVO_NEW_SKIN,
device,
});

const image = await page.screenshot();
expect(image).toMatchImageSnapshot();
}
);
1 change: 1 addition & 0 deletions src/__stories__/error-feedback-screen-story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ export const Error: StoryComponent = () => (
errorReference="Error reference: #95001"
/>
);

Error.storyName = 'ErrorFeedbackScreen';
23 changes: 12 additions & 11 deletions src/__stories__/feedback-screen-story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default {
const IconOrders = (): JSX.Element => {
const {inverse, brand} = skinVars.colors;
return (
<svg role="presentation" width="64" height="64" viewBox="0 0 64 64">
<svg role="presentation" width="100%" height="100%" viewBox="0 0 64 64">
<path
fill={useIsInverseVariant() ? inverse : brand}
fillRule="evenodd"
Expand Down Expand Up @@ -117,16 +117,17 @@ export const FeedbackScreenStory: StoryComponent<FeedbackScreenArgs> = ({
) : undefined
}
link={linkText ? <ButtonLink href="#">{linkText}</ButtonLink> : undefined}
>
<Stack space={16}>
<Text2 regular as="p">
Your content goes here.
</Text2>
<Text2 regular as="p">
You can customize this story. Check the "Controls" tab.
</Text2>
</Stack>
</FeedbackScreen>
extra={
<Stack space={16}>
<Text2 regular as="p">
Your content goes here.
</Text2>
<Text2 regular as="p">
You can customize this story. Check the "Controls" tab.
</Text2>
</Stack>
}
/>
</Box>
</>
)}
Expand Down
22 changes: 21 additions & 1 deletion src/__stories__/info-feedback-screen-story.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
import * as React from 'react';
import {InfoFeedbackScreen} from '../feedback';
import {ButtonPrimary} from '../button';
import IconError from '../icons/icon-error';
import {Placeholder} from '../placeholder';

export default {
title: 'Patterns/Feedback/InfoFeedbackScreen',
parameters: {
fullScreen: true,
},
argTypes: {
icon: {
options: ['default', 'custom'],
control: {type: 'select'},
},
},
};

type Args = {
icon: string;
extra: boolean;
};

export const Info: StoryComponent = () => (
export const Info: StoryComponent<Args> = ({icon, extra}) => (
<InfoFeedbackScreen
title="I'm the title"
description="I'm the description"
primaryButton={<ButtonPrimary onPress={() => {}}>Action1</ButtonPrimary>}
Icon={icon === 'custom' ? IconError : undefined}
extra={extra ? <Placeholder /> : undefined}
/>
);

Info.storyName = 'InfoFeedbackScreen';
Info.args = {
icon: 'default',
extra: false,
};
13 changes: 10 additions & 3 deletions src/__stories__/success-feedback-screen-story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import {SuccessFeedbackScreen} from '../feedback';
import {ButtonPrimary, ButtonSecondary} from '../button';
import emptyStateImg from './images/empty-state.png';
import {Placeholder} from '../placeholder';

export default {
title: 'Patterns/Feedback/SuccessFeedbackScreen',
Expand All @@ -16,11 +17,16 @@ export default {
},
};

type SuccessArgs = {imageUrl: string | null; imageFit: 'fit' | 'fill'; multipleParagraphs: boolean};
type SuccessArgs = {
imageUrl: string | null;
imageFit: 'fit' | 'fill';
multipleParagraphs: boolean;
extra: boolean;
};

const defaultDescription = "I'm the description";

export const Success: StoryComponent<SuccessArgs> = ({imageUrl, imageFit, multipleParagraphs}) => (
export const Success: StoryComponent<SuccessArgs> = ({imageUrl, imageFit, multipleParagraphs, extra}) => (
<SuccessFeedbackScreen
title="I'm the title"
description={
Expand All @@ -30,7 +36,8 @@ export const Success: StoryComponent<SuccessArgs> = ({imageUrl, imageFit, multip
secondaryButton={<ButtonSecondary onPress={() => {}}>Action2</ButtonSecondary>}
imageUrl={imageUrl ?? undefined}
imageFit={imageFit}
extra={extra ? <Placeholder /> : undefined}
/>
);
Success.storyName = 'SuccessFeedbackScreen';
Success.args = {imageUrl: emptyStateImg, imageFit: 'fit', multipleParagraphs: false};
Success.args = {imageUrl: emptyStateImg, imageFit: 'fit', multipleParagraphs: false, extra: false};
7 changes: 7 additions & 0 deletions src/__stories__/success-feedback-story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type SuccessArgs = {
imageFit: 'fit' | 'fill';
multipleParagraphs: boolean;
withButtons: boolean;
extra?: boolean;
};

const primaryButton = <ButtonPrimary onPress={() => {}}>Action1</ButtonPrimary>;
Expand All @@ -39,6 +40,7 @@ export const Success: StoryComponent<SuccessArgs> = ({
imageFit,
multipleParagraphs,
withButtons,
extra,
}) => (
<SuccessFeedback
title={defaultTitle}
Expand All @@ -49,6 +51,7 @@ export const Success: StoryComponent<SuccessArgs> = ({
secondaryButton={withButtons ? secondaryButton : undefined}
imageUrl={imageUrl ?? undefined}
imageFit={imageFit}
extra={extra ? <Placeholder /> : undefined}
/>
);
Success.storyName = 'SuccessFeedback';
Expand All @@ -57,13 +60,15 @@ Success.args = {
imageFit: 'fit',
multipleParagraphs: false,
withButtons: true,
extra: false,
};

export const SuccessAsHeader: StoryComponent<SuccessArgs> = ({
imageUrl,
imageFit,
multipleParagraphs,
withButtons,
extra,
}) => {
const {isTabletOrSmaller} = useScreenSize();
const successFeedback = (
Expand All @@ -76,6 +81,7 @@ export const SuccessAsHeader: StoryComponent<SuccessArgs> = ({
secondaryButton={withButtons ? secondaryButton : undefined}
imageUrl={imageUrl ?? undefined}
imageFit={imageFit}
extra={extra ? <Placeholder /> : undefined}
/>
);
return (
Expand All @@ -96,4 +102,5 @@ SuccessAsHeader.args = {
imageFit: 'fit',
multipleParagraphs: false,
withButtons: true,
extra: false,
};
7 changes: 6 additions & 1 deletion src/feedback.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,16 @@ export const container = style([

export const innerContainer = style({
textAlign: 'left',
padding: '64px 8px 16px',
padding: '64px 0px 16px',
zIndex: 1, // needed to support hack for o2-classic
position: 'relative', // needed to support hack for o2-classic
});

export const iconContainer = sprinkles({
width: 48,
height: 48,
});

export const feedbackDataAppear = style({opacity: 0, transform: 'translate(0, 20px)'});

export const feedbackDataAppearActive = style({
Expand Down
Loading
Loading