瀏覽代碼

feat: update X brand logo & tweak labels (#7518)

David Luzar 1 年之前
父節點
當前提交
1cb350b2aa

+ 4 - 3
packages/excalidraw/components/icons.tsx

@@ -486,10 +486,11 @@ export const DiscordIcon = createIcon(
   modifiedTablerIconProps,
 );
 
-export const TwitterIcon = createIcon(
+export const XBrandIcon = createIcon(
   <g strokeWidth="1.25">
-    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-    <path d="M22 4.01c-1 .49 -1.98 .689 -3 .99c-1.121 -1.265 -2.783 -1.335 -4.38 -.737s-2.643 2.06 -2.62 3.737v1c-3.245 .083 -6.135 -1.395 -8 -4c0 0 -4.182 7.433 4 11c-1.872 1.247 -3.739 2.088 -6 2c3.308 1.803 6.913 2.423 10.034 1.517c3.58 -1.04 6.522 -3.723 7.651 -7.742a13.84 13.84 0 0 0 .497 -3.753c-.002 -.249 1.51 -2.772 1.818 -4.013z"></path>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M4 4l11.733 16h4.267l-11.733 -16z" />
+    <path d="M4 20l6.768 -6.768m2.46 -2.46l6.772 -6.772" />
   </g>,
   tablerIconProps,
 );

+ 30 - 26
packages/excalidraw/components/main-menu/DefaultItems.tsx

@@ -17,7 +17,7 @@ import {
   TrashIcon,
   usersIcon,
 } from "../icons";
-import { GithubIcon, DiscordIcon, TwitterIcon } from "../icons";
+import { GithubIcon, DiscordIcon, XBrandIcon } from "../icons";
 import DropdownMenuItem from "../dropdownMenu/DropdownMenuItem";
 import DropdownMenuItemLink from "../dropdownMenu/DropdownMenuItemLink";
 import {
@@ -241,31 +241,35 @@ export const Export = () => {
 };
 Export.displayName = "Export";
 
-export const Socials = () => (
-  <>
-    <DropdownMenuItemLink
-      icon={GithubIcon}
-      href="https://github.com/excalidraw/excalidraw"
-      aria-label="GitHub"
-    >
-      GitHub
-    </DropdownMenuItemLink>
-    <DropdownMenuItemLink
-      icon={DiscordIcon}
-      href="https://discord.gg/UexuTaE"
-      aria-label="Discord"
-    >
-      Discord
-    </DropdownMenuItemLink>
-    <DropdownMenuItemLink
-      icon={TwitterIcon}
-      href="https://twitter.com/excalidraw"
-      aria-label="Twitter"
-    >
-      Twitter
-    </DropdownMenuItemLink>
-  </>
-);
+export const Socials = () => {
+  const { t } = useI18n();
+
+  return (
+    <>
+      <DropdownMenuItemLink
+        icon={GithubIcon}
+        href="https://github.com/excalidraw/excalidraw"
+        aria-label="GitHub"
+      >
+        GitHub
+      </DropdownMenuItemLink>
+      <DropdownMenuItemLink
+        icon={XBrandIcon}
+        href="https://x.com/excalidraw"
+        aria-label="X"
+      >
+        {t("labels.followUs")}
+      </DropdownMenuItemLink>
+      <DropdownMenuItemLink
+        icon={DiscordIcon}
+        href="https://discord.gg/UexuTaE"
+        aria-label="Discord"
+      >
+        {t("labels.discordChat")}
+      </DropdownMenuItemLink>
+    </>
+  );
+};
 Socials.displayName = "Socials";
 
 export const LiveCollaborationTrigger = ({

+ 3 - 1
packages/excalidraw/locales/en.json

@@ -138,7 +138,9 @@
     "removeAllElementsFromFrame": "Remove all elements from frame",
     "eyeDropper": "Pick color from canvas",
     "textToDiagram": "Text to diagram",
-    "prompt": "Prompt"
+    "prompt": "Prompt",
+    "followUs": "Follow us",
+    "discordChat": "Discord chat"
   },
   "library": {
     "noItems": "No items added yet...",

+ 20 - 17
packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap

@@ -387,12 +387,12 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
         </div>
       </a>
       <a
-        aria-label="Discord"
+        aria-label="X"
         class="dropdown-menu-item dropdown-menu-item-base"
-        href="https://discord.gg/UexuTaE"
+        href="https://x.com/excalidraw"
         rel="noreferrer"
         target="_blank"
-        title="Discord"
+        title="X"
       >
         <div
           class="dropdown-menu-item__icon"
@@ -406,16 +406,22 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
             stroke="currentColor"
             stroke-linecap="round"
             stroke-linejoin="round"
-            viewBox="0 0 20 20"
+            stroke-width="2"
+            viewBox="0 0 24 24"
           >
             <g
               stroke-width="1.25"
             >
               <path
-                d="M7.5 10.833a.833.833 0 1 0 0-1.666.833.833 0 0 0 0 1.666ZM12.5 10.833a.833.833 0 1 0 0-1.666.833.833 0 0 0 0 1.666ZM6.25 6.25c2.917-.833 4.583-.833 7.5 0M5.833 13.75c2.917.833 5.417.833 8.334 0"
+                d="M0 0h24v24H0z"
+                fill="none"
+                stroke="none"
               />
               <path
-                d="M12.917 14.167c0 .833 1.25 2.5 1.666 2.5 1.25 0 2.361-1.39 2.917-2.5.556-1.39.417-4.861-1.25-9.584-1.214-.846-2.5-1.116-3.75-1.25l-.833 2.084M7.083 14.167c0 .833-1.13 2.5-1.526 2.5-1.191 0-2.249-1.39-2.778-2.5-.529-1.39-.397-4.861 1.19-9.584 1.157-.846 2.318-1.116 3.531-1.25l.833 2.084"
+                d="M4 4l11.733 16h4.267l-11.733 -16z"
+              />
+              <path
+                d="M4 20l6.768 -6.768m2.46 -2.46l6.772 -6.772"
               />
             </g>
           </svg>
@@ -423,16 +429,16 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
         <div
           class="dropdown-menu-item__text"
         >
-          Discord
+          Follow us
         </div>
       </a>
       <a
-        aria-label="Twitter"
+        aria-label="Discord"
         class="dropdown-menu-item dropdown-menu-item-base"
-        href="https://twitter.com/excalidraw"
+        href="https://discord.gg/UexuTaE"
         rel="noreferrer"
         target="_blank"
-        title="Twitter"
+        title="Discord"
       >
         <div
           class="dropdown-menu-item__icon"
@@ -446,19 +452,16 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
             stroke="currentColor"
             stroke-linecap="round"
             stroke-linejoin="round"
-            stroke-width="2"
-            viewBox="0 0 24 24"
+            viewBox="0 0 20 20"
           >
             <g
               stroke-width="1.25"
             >
               <path
-                d="M0 0h24v24H0z"
-                fill="none"
-                stroke="none"
+                d="M7.5 10.833a.833.833 0 1 0 0-1.666.833.833 0 0 0 0 1.666ZM12.5 10.833a.833.833 0 1 0 0-1.666.833.833 0 0 0 0 1.666ZM6.25 6.25c2.917-.833 4.583-.833 7.5 0M5.833 13.75c2.917.833 5.417.833 8.334 0"
               />
               <path
-                d="M22 4.01c-1 .49 -1.98 .689 -3 .99c-1.121 -1.265 -2.783 -1.335 -4.38 -.737s-2.643 2.06 -2.62 3.737v1c-3.245 .083 -6.135 -1.395 -8 -4c0 0 -4.182 7.433 4 11c-1.872 1.247 -3.739 2.088 -6 2c3.308 1.803 6.913 2.423 10.034 1.517c3.58 -1.04 6.522 -3.723 7.651 -7.742a13.84 13.84 0 0 0 .497 -3.753c-.002 -.249 1.51 -2.772 1.818 -4.013z"
+                d="M12.917 14.167c0 .833 1.25 2.5 1.666 2.5 1.25 0 2.361-1.39 2.917-2.5.556-1.39.417-4.861-1.25-9.584-1.214-.846-2.5-1.116-3.75-1.25l-.833 2.084M7.083 14.167c0 .833-1.13 2.5-1.526 2.5-1.191 0-2.249-1.39-2.778-2.5-.529-1.39-.397-4.861 1.19-9.584 1.157-.846 2.318-1.116 3.531-1.25l.833 2.084"
               />
             </g>
           </svg>
@@ -466,7 +469,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
         <div
           class="dropdown-menu-item__text"
         >
-          Twitter
+          Discord chat
         </div>
       </a>
     </div>