Merge branch 'main' into eslint

dubinc · versecafe · Jan 19, 2024 · Jan 19, 2024 · Jan 20, 2024 · Jan 20, 2024
commit cfe62fb7ff5e054b870e235f34370814ff4869c3
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
@@ -61,8 +61,9 @@ export function Button({
       {...props}
     >
       {loading ? <LoadingSpinner /> : icon ? icon : null}
-      <p>{text}</p>
-      {shortcut ? <kbd className="hidden rounded bg-zinc-700 px-2 py-0.5 text-xs font-light text-gray-400 transition-all duration-75 group-hover:bg-gray-100 group-hover:text-gray-500 md:inline-block">
+      {text && <p>{text}</p>}
+      {shortcut && (
+        <kbd className="hidden rounded bg-zinc-700 px-2 py-0.5 text-xs font-light text-gray-400 transition-all duration-75 group-hover:bg-gray-100 group-hover:text-gray-500 md:inline-block">
           {shortcut}
         </kbd> : null}
     </button>

diff --git a/packages/ui/src/copy-button.tsx b/packages/ui/src/copy-button.tsx
@@ -13,6 +13,7 @@ export function CopyButton({
 }: {
   value: string;
   className?: string;
+  icon?: LucideIcon;
 }): JSX.Element {
   const [copied, setCopied] = useState(false);
   const Comp = icon || Copy;

diff --git a/packages/ui/src/icons/google.tsx b/packages/ui/src/icons/google.tsx
@@ -1,6 +1,10 @@
 export default function Google({ className }: { className?: string }): JSX.Element {
   return (
     <svg
+      xmlns="http://www.w3.org/2000/svg"
+      height="24"
+      viewBox="0 0 24 24"
+      width="24"
       className={className}
       fill="currentColor"
       viewBox="0 0 488 512"