From c2992b06ad345002098e66fb80b10021915a8d5b Mon Sep 17 00:00:00 2001 From: Qing <7880675+devrsi0n@users.noreply.github.com> Date: Mon, 1 May 2023 22:20:42 +0800 Subject: [PATCH] fix: change sign-in to post when user hasn't signed in in comment editor --- .../main-button/main-button.tsx | 2 +- .../blocks/sign-in-button/sign-in-button.tsx | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/ui/src/blocks/rich-text-editor/main-button/main-button.tsx b/packages/ui/src/blocks/rich-text-editor/main-button/main-button.tsx index 4c95d4f32..55b59a2ae 100644 --- a/packages/ui/src/blocks/rich-text-editor/main-button/main-button.tsx +++ b/packages/ui/src/blocks/rich-text-editor/main-button/main-button.tsx @@ -104,7 +104,7 @@ export function MainButton({ ) ) : ( - + {buttonChildren} )} ); diff --git a/packages/ui/src/blocks/sign-in-button/sign-in-button.tsx b/packages/ui/src/blocks/sign-in-button/sign-in-button.tsx index ece0665a5..54931e433 100644 --- a/packages/ui/src/blocks/sign-in-button/sign-in-button.tsx +++ b/packages/ui/src/blocks/sign-in-button/sign-in-button.tsx @@ -8,6 +8,7 @@ import { useSignInWindow } from '../../hooks/use-sign-in-window'; export type SignInButtonProps = Pick & { inPageNav?: boolean; + children?: React.ReactNode; }; const handleSessionAndSignIn = () => { @@ -18,10 +19,21 @@ const handleSessionAndSignIn = () => { export function SignInButton({ variant = 'solid', inPageNav, + children, ...restProps }: SignInButtonProps): JSX.Element { const { loading: signInLoading } = useCurrentUser(); const handleSignIn = useSignInWindow(); + const defaultChildren = ( + <> + {signInLoading ? ( + + ) : ( + + )} + Sign in + + ); return ( );