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 Prefetch component #65

Open
wants to merge 2 commits into
base: master
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dist
example/.cache
.DS_Store
.vscode
*.js
*.d.ts
/*.js
*.d.ts
34 changes: 34 additions & 0 deletions src/Link.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { createResource } from './createResource';

type LinkProps = {
rel: string;
href: string;
as?: string;
media?: string;
};

export const LinkResource = createResource(
load,
({ rel, href }) => `${rel}.${href}`
);

function load({ rel, href, as, media = 'all' }: LinkProps) {
return new Promise((resolve, reject) => {
const link = document.createElement('link');
link.rel = rel;
if (as) {
link.as = as;
}
link.media = media;
link.href = href;
link.onload = resolve;
link.onerror = reject;
document.body.appendChild(link);
});
}

export const Link: React.FC<LinkProps> = props => {
LinkResource.read(props);

return null;
};
12 changes: 12 additions & 0 deletions src/Prefetch.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import { Link } from './Link';

type PrefetchProps = {
href: string;
as: string;
media?: string;
};

export const Prefetch: React.FC<PrefetchProps> = props => {
return <Link rel="prefetch" {...props} />;
};
31 changes: 4 additions & 27 deletions src/Preload.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,12 @@
import { createResource } from './createResource';
import React from 'react';
import { Link } from './Link';

type PreloadProps = {
href: string;
as: string;
media?: string;
};

export const PreloadResource = createResource(
load,
({ href, as }) => `${href}.${as}`
);

function load({ href, as, media = 'all' }: PreloadProps) {
return new Promise((resolve, reject) => {
const link = document.createElement('link');
link.rel = 'preload';
link.as = as;
link.media = media;
link.href = href;
link.onload = resolve;
link.onerror = reject;
document.body.appendChild(link);
});
}

export const Preload: React.FC<PreloadProps> = ({ children, ...rest }) => {
PreloadResource.read(rest);

if (typeof children === 'function') {
return children();
}

return children;
export const Preload: React.FC<PreloadProps> = props => {
return <Link rel="preload" {...props} />;
};
24 changes: 3 additions & 21 deletions src/Stylesheet.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@
import React from 'react';
import { createResource } from './createResource';
import { Link, LinkResource } from './Link';

type StylesheetProps = {
href: string;
media?: string;
};

export const StylesheetResource = createResource(
load,
({ href, media }) => `${href}.${media}`
);

function load({ href, media = 'all' }: StylesheetProps) {
return new Promise((resolve, reject) => {
const link = document.createElement('link');
link.rel = 'stylesheet';
link.href = href;
link.media = media;
link.onload = resolve;
link.onerror = reject;
document.body.appendChild(link);
});
}

export const Stylesheet: React.FC<StylesheetProps> = props => {
StylesheetResource.read(props);
return <link {...props} />;
return <Link rel="stylesheet" {...props} />;
};

export function useStylesheet(props: StylesheetProps) {
return StylesheetResource.read(props);
return LinkResource.read({ ...props, rel: 'stylesheet' });
}
25 changes: 25 additions & 0 deletions tests/Prefetch.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react';
import { render, Simulate, cleanup } from 'react-testing-library';
import { Prefetch } from '../src/Prefetch';

function App() {
return (
<React.Suspense fallback={null}>
<Prefetch href="href" as="script" />
</React.Suspense>
);
}

afterEach(cleanup);

describe('Prefetch', () => {
test('renders link tag', () => {
const { baseElement } = render(<App />);
const link = baseElement.querySelector('link');

expect(link).toBeInTheDocument();
expect(link).toHaveAttribute('rel', 'prefetch');
expect(link).toHaveAttribute('href', 'href');
expect(link.as).toBe('script');
});
});
25 changes: 25 additions & 0 deletions tests/Preload.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react';
import { render, Simulate, cleanup } from 'react-testing-library';
import { Preload } from '../src/Preload';

function App() {
return (
<React.Suspense fallback={null}>
<Preload href="href" as="script" />
</React.Suspense>
);
}

afterEach(cleanup);

describe('Preload', () => {
test('renders link tag', () => {
const { baseElement } = render(<App />);
const link = baseElement.querySelector('link');

expect(link).toBeInTheDocument();
expect(link).toHaveAttribute('rel', 'preload');
expect(link).toHaveAttribute('href', 'href');
expect(link.as).toBe('script'); // jsdom does not support 'as' attribute
});
});
24 changes: 24 additions & 0 deletions tests/Stylesheet.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import { render, Simulate, cleanup } from 'react-testing-library';
import { Stylesheet } from '../src/Stylesheet';

function App() {
return (
<React.Suspense fallback={null}>
<Stylesheet href="href" />
</React.Suspense>
);
}

afterEach(cleanup);

describe('Stylesheet', () => {
test('renders link tag', () => {
const { baseElement } = render(<App />);
const link = baseElement.querySelector('link');

expect(link).toBeInTheDocument();
expect(link).toHaveAttribute('rel', 'stylesheet');
expect(link).toHaveAttribute('href', 'href');
});
});