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: support show react element from react server function #492

Merged
merged 2 commits into from
Nov 2, 2024
Merged

feat: support show react element from react server function #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b7bfe2
feat: support show react element from react server function
himself65 Oct 11, 2024
579816b
fix: test id
himself65 Oct 11, 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
3,802 changes: 2,634 additions & 1,168 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,11 @@ class Observer {
const originalPromise = p
.then(async (response) => {
result = ['resolve', response];
if (isHttpResponse(response) && !response.ok) {
const isReactElementResponse = React.isValidElement(response);
if (isReactElementResponse) {
shouldDismiss = false;
this.create({ id, type: 'default', message: response });
} else if (isHttpResponse(response) && !response.ok) {
shouldDismiss = false;
const message =
typeof data.error === 'function' ? await data.error(`HTTP error! status: ${response.status}`) : data.error;
Expand Down
6 changes: 1 addition & 5 deletions test/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
};
const nextConfig = {};

module.exports = nextConfig;
7 changes: 4 additions & 3 deletions test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
"@types/node": "18.15.0",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"ai": "^3.4.9",
"eslint": "8.35.0",
"eslint-config-next": "13.2.4",
"next": "13.4.19",
"react": "18.2.0",
"next": "14.2.15",
"react": "18.3.1",
"react-dom": "18.3.1",
"sonner": "workspace:*",
"react-dom": "18.2.0",
"typescript": "4.9.5"
}
}
17 changes: 17 additions & 0 deletions test/src/app/action.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use server';
import { createStreamableUI } from 'ai/rsc';

export async function action() {
'use server';
let progress = 0;
const ui = createStreamableUI('loading 0%');
const interval = setInterval(() => {
progress += 10;
ui.update('loading ' + progress + '%');
if (progress >= 100) {
clearInterval(interval);
ui.update('load complete');
}
}, 100);
return ui.value;
}
16 changes: 16 additions & 0 deletions test/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import React from 'react';
import { Toaster, toast } from 'sonner';
import { action } from '@/app/action';

const promise = () => new Promise((resolve) => setTimeout(resolve, 2000));

Expand Down Expand Up @@ -74,6 +75,21 @@ export default function Home({ searchParams }: any) {
>
Render Promise Toast
</button>
<button
data-testid="rsf-promise"
data-finally={isFinally ? '1' : '0'}
className="button"
onClick={() =>
toast.promise(action(), {
loading: 'Loading...',
success: 'Loaded',
error: 'Error',
finally: () => setIsFinally(true),
})
}
>
Render React Server Function Toast
</button>
<button
data-testid="custom"
className="button"
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"jsx": "react",
"moduleResolution": "node",
"esModuleInterop": true,
"lib": ["es2015", "dom"],
},
"lib": ["es2015", "dom"]
}
}
5 changes: 1 addition & 4 deletions website/src/components/CodeBlock/code-block.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@
cursor: pointer;
opacity: 0;
color: var(--gray12);
transition:
background 200ms,
box-shadow 200ms,
opacity 200ms;
transition: background 200ms, box-shadow 200ms, opacity 200ms;
}

.copyButton:focus-visible {
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/Hero/hero.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,8 @@
font-weight: 600;
flex-shrink: 0;
font-family: inherit;
box-shadow:
0px 0px 0px 1px rgba(0, 0, 0, 0.06),
0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04),
0px 3px 3px 0px rgba(0, 0, 0, 0.02),
0px 4px 4px 0px rgba(0, 0, 0, 0.01);
box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.06), 0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04), 0px 3px 3px 0px rgba(0, 0, 0, 0.02), 0px 4px 4px 0px rgba(0, 0, 0, 0.01);
position: relative;
overflow: hidden;
cursor: pointer;
Expand All @@ -66,9 +62,7 @@
display: inline-flex;
align-items: center;
justify-content: center;
transition:
box-shadow 200ms,
background 200ms;
transition: box-shadow 200ms, background 200ms;
width: 152px;
}

Expand All @@ -79,12 +73,8 @@
}
.button:focus-visible {
outline: none;
box-shadow:
0px 0px 0px 1px rgba(0, 0, 0, 0.06),
0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04),
0px 3px 3px 0px rgba(0, 0, 0, 0.02),
0px 4px 4px 0px rgba(0, 0, 0, 0.01),
box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.06), 0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04), 0px 3px 3px 0px rgba(0, 0, 0, 0.02), 0px 4px 4px 0px rgba(0, 0, 0, 0.01),
0 0 0 2px rgba(0, 0, 0, 0.15);
}

Expand Down
13 changes: 3 additions & 10 deletions website/src/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ code {
font-family: var(--font-sans);
cursor: pointer;
color: var(--gray12);
transition:
border-color 200ms,
background 200ms,
box-shadow 200ms;
transition: border-color 200ms, background 200ms, box-shadow 200ms;
}

.button:hover {
Expand All @@ -144,12 +141,8 @@ code {

.button:focus-visible {
outline: none;
box-shadow:
0px 0px 0px 1px rgba(0, 0, 0, 0.06),
0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04),
0px 3px 3px 0px rgba(0, 0, 0, 0.02),
0px 4px 4px 0px rgba(0, 0, 0, 0.01),
box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.06), 0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04), 0px 3px 3px 0px rgba(0, 0, 0, 0.02), 0px 4px 4px 0px rgba(0, 0, 0, 0.01),
0 0 0 2px rgba(0, 0, 0, 0.15);
}

Expand Down
13 changes: 3 additions & 10 deletions website/src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ body {
font-family: var(--font-sans);
cursor: pointer;
color: var(--gray12);
transition:
border-color 200ms,
background 200ms,
box-shadow 200ms;
transition: border-color 200ms, background 200ms, box-shadow 200ms;
margin: 1.5rem 0 0;
}

Expand All @@ -79,12 +76,8 @@ body {

.button:focus-visible {
outline: none;
box-shadow:
0px 0px 0px 1px rgba(0, 0, 0, 0.06),
0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04),
0px 3px 3px 0px rgba(0, 0, 0, 0.02),
0px 4px 4px 0px rgba(0, 0, 0, 0.01),
box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.06), 0px 1px 0px 0px rgba(0, 0, 0, 0.08),
0px 2px 2px 0px rgba(0, 0, 0, 0.04), 0px 3px 3px 0px rgba(0, 0, 0, 0.02), 0px 4px 4px 0px rgba(0, 0, 0, 0.01),
0 0 0 2px rgba(0, 0, 0, 0.15);
}

Expand Down
Loading