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

Add Skeleton component #3024

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/MetaMask/snaps.git"
},
"source": {
"shasum": "ssGPi4fxyZSvKOMXbVdOa/vnTx0qrq6WZWCUV91dLqo=",
"shasum": "BiCtwmtmQRs6IrssjgH8PXZWH7afx75+RKXMnl9KDZ8=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/browserify/snap.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/MetaMask/snaps.git"
},
"source": {
"shasum": "+342Ghzfo9UpTxJgqIPOieHvqRTnf4h00s8r0DpbozY=",
"shasum": "9K88gT7CbGCXTc/Qx63zbS91VQtHTkFFXWLjyXoM6YU=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe('snap_createInterface', () => {
error: {
code: -32602,
message:
'Invalid params: At path: ui -- Expected type to be one of: "Address", "Bold", "Box", "Button", "Copyable", "Divider", "Dropdown", "RadioGroup", "Field", "FileInput", "Form", "Heading", "Input", "Image", "Italic", "Link", "Row", "Spinner", "Text", "Tooltip", "Checkbox", "Card", "Icon", "Selector", "Section", "Avatar", "Banner", "Container", but received: undefined.',
'Invalid params: At path: ui -- Expected type to be one of: "Address", "Bold", "Box", "Button", "Copyable", "Divider", "Dropdown", "RadioGroup", "Field", "FileInput", "Form", "Heading", "Input", "Image", "Italic", "Link", "Row", "Spinner", "Text", "Tooltip", "Checkbox", "Card", "Icon", "Selector", "Section", "Avatar", "Banner", "Skeleton", "Container", but received: undefined.',
stack: expect.any(String),
},
id: 1,
Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-sdk/src/internals/structs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe('typedUnion', () => {
const result = validate(Text({}), unionStruct);

expect(result[0]?.message).toBe(
'At path: props.children -- Expected type to be one of: "Bold", "Italic", "Link", "Icon", but received: undefined',
'At path: props.children -- Expected type to be one of: "Bold", "Italic", "Link", "Icon", "Skeleton", but received: undefined',
);
});

Expand All @@ -75,7 +75,7 @@ describe('typedUnion', () => {
const result = validate(Text({}), nestedUnionStruct);

expect(result[0]?.message).toBe(
'At path: props.children -- Expected type to be one of: "Bold", "Italic", "Link", "Icon", but received: undefined',
'At path: props.children -- Expected type to be one of: "Bold", "Italic", "Link", "Icon", "Skeleton", but received: undefined',
);
});

Expand Down
2 changes: 2 additions & 0 deletions packages/snaps-sdk/src/jsx/components/Banner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { ButtonElement } from './form/Button';
import type { StandardFormattingElement } from './formatting';
import type { IconElement } from './Icon';
import type { LinkElement } from './Link';
import type { SkeletonElement } from './Skeleton';
import type { TextElement } from './Text';

/**
Expand All @@ -14,6 +15,7 @@ export type BannerChildren = SnapsChildren<
| LinkElement
| IconElement
| ButtonElement
| SkeletonElement
>;

/**
Expand Down
3 changes: 2 additions & 1 deletion packages/snaps-sdk/src/jsx/components/Image.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { createSnapComponent } from '../component';
import type { BorderRadius } from './utils';

/**
* The props of the {@link Image} component.
Expand All @@ -12,7 +13,7 @@ import { createSnapComponent } from '../component';
type ImageProps = {
src: string;
alt?: string | undefined;
borderRadius?: 'none' | 'medium' | 'full' | undefined;
borderRadius?: BorderRadius | undefined;
};

const TYPE = 'Image';
Expand Down
4 changes: 3 additions & 1 deletion packages/snaps-sdk/src/jsx/components/Row.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { createSnapComponent } from '../component';
import type { AddressElement } from './Address';
import type { ImageElement } from './Image';
import type { LinkElement } from './Link';
import type { SkeletonElement } from './Skeleton';
import type { TextElement } from './Text';
import type { ValueElement } from './Value';

Expand All @@ -13,7 +14,8 @@ export type RowChildren =
| ImageElement
| TextElement
| ValueElement
| LinkElement;
| LinkElement
| SkeletonElement;

/**
* The props of the {@link Row} component.
Expand Down
17 changes: 17 additions & 0 deletions packages/snaps-sdk/src/jsx/components/Skeleton.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Skeleton } from './Skeleton';

describe('Skeleton', () => {
it('renders a skeleton component', () => {
const result = <Skeleton width={320} height={32} borderRadius="medium" />;

expect(result).toStrictEqual({
type: 'Skeleton',
key: null,
props: {
width: 320,
height: 32,
borderRadius: 'medium',
},
});
});
});
36 changes: 36 additions & 0 deletions packages/snaps-sdk/src/jsx/components/Skeleton.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { createSnapComponent } from '../component';
import type { BorderRadius } from './utils';

/**
* The props of the {@link Skeleton} component.
*
* @param width - Width of the Skeleton.
* @param width - Height of the Skeleton.
* @param borderRadius - Border radius of the Skeleton.
*/
export type SkeletonProps = {
width?: number | string | undefined;
height?: number | string | undefined;
borderRadius?: BorderRadius | undefined;
};

const TYPE = 'Skeleton';

/**
* A Skeleton component, which is used to display skeleton of loading content.
*
* @param props - The props of the component.
* @param props.width - Width of the Skeleton.
* @param props.width - Height of the Skeleton.
* @param props.borderRadius - Border radius of the Skeleton.
* @example
* <Skeleton height={32} width="50%" />
*/
export const Skeleton = createSnapComponent<SkeletonProps, typeof TYPE>(TYPE);

/**
* A Skeleton element.
*
* @see Skeleton
*/
export type SkeletonElement = ReturnType<typeof Skeleton>;
7 changes: 6 additions & 1 deletion packages/snaps-sdk/src/jsx/components/Text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@ import { createSnapComponent } from '../component';
import type { StandardFormattingElement } from './formatting';
import type { IconElement } from './Icon';
import type { LinkElement } from './Link';
import type { SkeletonElement } from './Skeleton';

/**
* The children of the {@link Text} component.
*/
export type TextChildren = SnapsChildren<
string | StandardFormattingElement | LinkElement | IconElement
| string
| StandardFormattingElement
| LinkElement
| IconElement
| SkeletonElement
>;

/**
Expand Down
6 changes: 5 additions & 1 deletion packages/snaps-sdk/src/jsx/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import type { ImageElement } from './Image';
import type { LinkElement } from './Link';
import type { RowElement } from './Row';
import type { SectionElement } from './Section';
import type { SkeletonElement } from './Skeleton';
import type { SpinnerElement } from './Spinner';
import type { TextElement } from './Text';
import type { TooltipElement } from './Tooltip';
Expand All @@ -41,6 +42,8 @@ export * from './Footer';
export * from './Container';
export * from './Section';
export * from './Banner';
export * from './Skeleton';
export * from './utils';

/**
* A built-in JSX element, which can be used in a Snap user interface.
Expand All @@ -66,4 +69,5 @@ export type JSXElement =
| SpinnerElement
| TextElement
| TooltipElement
| BannerElement;
| BannerElement
| SkeletonElement;
4 changes: 4 additions & 0 deletions packages/snaps-sdk/src/jsx/components/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* Definition of border radius.
*/
export type BorderRadius = 'none' | 'medium' | 'full' | undefined;
33 changes: 33 additions & 0 deletions packages/snaps-sdk/src/jsx/validation.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
Section,
Avatar,
Banner,
Skeleton,
} from './components';
import {
AddressStruct,
Expand Down Expand Up @@ -72,6 +73,7 @@ import {
SectionStruct,
AvatarStruct,
BannerStruct,
SkeletonStruct,
} from './validation';

describe('KeyStruct', () => {
Expand Down Expand Up @@ -1618,3 +1620,34 @@ describe('BannerStruct', () => {
expect(is(value, BannerStruct)).toBe(false);
});
});

describe('SkeletonStruct', () => {
it.each([
<Skeleton />,
<Skeleton width={320} height={32} />,
<Skeleton width="30%" height="30%" />,
<Skeleton width={32} height="30%" />,
<Skeleton width="30%" height={32} />,
<Skeleton width="30%" height={32} borderRadius="full" />,
<Skeleton width={32} height="30%" borderRadius="medium" />,
])(`validates a Skeleton element`, (value) => {
expect(is(value, SkeletonStruct)).toBe(true);
});

it.each([
'foo',
42,
null,
undefined,
{},
[],
// @ts-expect-error - Invalid props.
<Skeleton foo="bar">foo</Skeleton>,
// @ts-expect-error - Invalid props.
<Skeleton title={<Copyable value="bar" />} severity="info">
<Text>foo</Text>
</Skeleton>,
])('does not validate "%p"', (value) => {
expect(is(value, SkeletonStruct)).toBe(false);
});
});
25 changes: 23 additions & 2 deletions packages/snaps-sdk/src/jsx/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import type {
SnapsChildren,
StringElement,
} from './component';
import type { AvatarElement } from './components';
import type { AvatarElement, SkeletonElement } from './components';
import {
type AddressElement,
type BoldElement,
Expand Down Expand Up @@ -692,6 +692,17 @@ export const LinkStruct: Describe<LinkElement> = element('Link', {
]),
});

/**
* A struct for the {@link SkeletonElement} type.
*/
export const SkeletonStruct: Describe<SkeletonElement> = element('Skeleton', {
width: optional(union([number(), string()])),
height: optional(union([number(), string()])),
borderRadius: optional(
nullUnion([literal('none'), literal('medium'), literal('full')]),
),
});

/**
* A struct for the {@link TextElement} type.
*/
Expand All @@ -701,7 +712,13 @@ export const TextStruct: Describe<TextElement> = element('Text', {
if (typeof value === 'string') {
return string();
}
return typedUnion([BoldStruct, ItalicStruct, LinkStruct, IconStruct]);
return typedUnion([
BoldStruct,
ItalicStruct,
LinkStruct,
IconStruct,
SkeletonStruct,
]);
}),
]),
alignment: optional(
Expand Down Expand Up @@ -797,6 +814,7 @@ export const BannerStruct: Describe<BannerElement> = element('Banner', {
ButtonStruct,
BoldStruct,
ItalicStruct,
SkeletonStruct,
]),
title: string(),
severity: union([
Expand All @@ -818,6 +836,7 @@ export const RowStruct: Describe<RowElement> = element('Row', {
TextStruct,
ValueStruct,
LinkStruct,
SkeletonStruct,
]),
variant: optional(
nullUnion([literal('default'), literal('warning'), literal('critical')]),
Expand Down Expand Up @@ -863,6 +882,7 @@ export const BoxChildStruct = typedUnion([
SectionStruct,
AvatarStruct,
BannerStruct,
SkeletonStruct,
]);

/**
Expand Down Expand Up @@ -932,6 +952,7 @@ export const JSXElementStruct: Describe<JSXElement> = typedUnion([
SectionStruct,
AvatarStruct,
BannerStruct,
SkeletonStruct,
]);

/**
Expand Down
Loading