Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

UI changes in the challange share form (#963)

typesafegh81b9010f304f
diff --git a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx b/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
index bf339173..bda9723d 100644
--- a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
@@ -1,5 +1,6 @@
'use client';
+import { Checkbox } from '@repo/ui/components/checkbox';
import { DialogFooter } from '@repo/ui/components/dialog';
import { CheckCircle2 as CheckCircle2Icon, Clipboard as ClipboardIcon } from '@repo/ui/icons';
import lzstring from 'lz-string';
@@ -10,12 +11,16 @@ import { useLocalStorage } from '~/utils/useLocalStorage';
export function ShareForm() {
const { slug } = useParams();
const [copied, setCopied] = useState(false);
- const [copiedWithCode, setCopiedWithCode] = useState(false);
+ const [copyWithCode, setCopyWithCode] = useState(false);
const [codeToCompress] = useLocalStorage(`challenge-${slug}`, '');
const url = `${window.location.origin}/challenge/${slug}`;
const copyToClipboard = useCallback(async () => {
- const url = `${window.location.origin}/challenge/${slug}`;
+ let url = `${window.location.origin}/challenge/${slug}`;
+ if (copyWithCode && codeToCompress) {
+ const compressedCode = lzstring.compressToEncodedURIComponent(codeToCompress);
+ url += `?code=${compressedCode}`;
+ }
try {
if (navigator.clipboard && !copied) {
@@ -27,54 +32,46 @@ export function ShareForm() {
console.error('copyToClipboard', e);
setCopied(false);
}
- }, [slug, copied]);
-
- const copyToClipboardWithCode = useCallback(async () => {
- const compressedCode = lzstring.compressToEncodedURIComponent(codeToCompress);
- const url = `${window.location.origin}/challenge/${slug}/?code=${compressedCode}`;
+ }, [slug, copied, copyWithCode, codeToCompress]);
- try {
- if (navigator.clipboard && !copiedWithCode) {
- await navigator.clipboard.writeText(url);
- setCopiedWithCode(true);
- window.setTimeout(() => setCopiedWithCode(false), 3000);
- }
- } catch (e) {
- console.error('copyToClipboard', e);
- setCopiedWithCode(false);
- }
- }, [slug, copiedWithCode, codeToCompress]);
+ const onCopyWithCodeChange = useCallback((checked: boolean) => {
+ setCopyWithCode(checked);
+ }, []);
return (
<div className="flex flex-col space-y-4">
<p>Copy this challenge url to share with your friends!</p>
- <code className="rounded-md border px-4 py-2 dark:border-gray-300">{url}</code>
+ <code className="rounded-lg border border-black/20 px-4 py-2 dark:border-white/20">
+ {url}
+ </code>
<DialogFooter>
- <div className="flex justify-end gap-2">
- <button
- className={`flex items-center justify-between space-x-2 rounded-lg px-2 py-1 duration-300 active:scale-75
- ${
- copiedWithCode
- ? 'border border-green-500 text-green-500 dark:border-green-700 dark:bg-green-700 dark:text-white'
- : 'border border-gray-100 text-black hover:bg-gray-100 dark:bg-white'
- }`}
- onClick={copyToClipboardWithCode}
- >
- <span>{copiedWithCode ? 'Copied!' : 'Share with Code'}</span>
- {copiedWithCode ? <CheckCircle2Icon /> : <ClipboardIcon />}
- </button>
+ <div className="flex items-center justify-end gap-2">
+ {Boolean(codeToCompress) && (
+ <div className="flex h-fit items-center justify-center gap-2 text-xs">
+ <Checkbox
+ id="copy-with-code"
+ checked={copyWithCode}
+ onCheckedChange={onCopyWithCodeChange}
+ />
+ <label htmlFor="copy-with-code">Copy with code</label>
+ </div>
+ )}
<button
className={`flex items-center justify-between space-x-2 rounded-lg px-2 py-1 duration-300 active:scale-75
${
copied
? 'border border-green-500 text-green-500 dark:border-green-700 dark:bg-green-700 dark:text-white'
- : 'border border-gray-100 text-black hover:bg-gray-100 dark:bg-white'
+ : 'border border-black/20 text-black hover:bg-gray-100 dark:bg-white'
}`}
onClick={copyToClipboard}
>
<span>{copied ? 'Copied!' : 'Copy'}</span>
- {copied ? <CheckCircle2Icon /> : <ClipboardIcon />}
+ {copied ? (
+ <CheckCircle2Icon className="h-4 w-4" />
+ ) : (
+ <ClipboardIcon className="h-4 w-4" />
+ )}
</button>
</div>
</DialogFooter>