Merge branch 'main' of github.com:mongodb/leafygreen-ui into LG-4105-…

…codemod-scaffold
mongodb · May 29, 2024 · 7d8986a · 7d8986a
2 parents 0d150be + 34ac734
commit 7d8986a
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 19 deletions.
diff --git a/.changeset/spotty-ghosts-play.md b/.changeset/spotty-ghosts-play.md
@@ -0,0 +1,5 @@
+---
+'@leafygreen-ui/avatar': patch
+---
+
+Avatar `text` prop can now be `null` even when `format === 'text'`, allowing for a more seamless integration with the `getInitials` function. If `text === null`, the Avatar will fall back to `Icon` format.
diff --git a/.changeset/tidy-bananas-rescue.md b/.changeset/tidy-bananas-rescue.md
@@ -0,0 +1,5 @@
+---
+'@leafygreen-ui/icon': minor
+---
+
+Adds Stop to glyph set and updates Pause glyph
diff --git a/chat/rich-links/CHANGELOG.md b/chat/rich-links/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @lg-chat/rich-links
 
+## 1.0.1
+
+### Patch Changes
+
+- 53ff5692: Fixes a malformed import & exports rich link variants
+
 ## 1.0.0
 
 ### Major Changes

diff --git a/chat/rich-links/package.json b/chat/rich-links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lg-chat/rich-links",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "lg-chat Rich Links",
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",

diff --git a/chat/rich-links/src/RichLink/RichLinkBadge/RichLinkBadge.types.ts b/chat/rich-links/src/RichLink/RichLinkBadge/RichLinkBadge.types.ts
@@ -1,4 +1,4 @@
-import { GlyphName } from '@leafygreen-ui/icon/src/glyphs';
+import { GlyphName } from '@leafygreen-ui/icon';
 import { DarkModeProps } from '@leafygreen-ui/lib';
 import { BaseFontSize } from '@leafygreen-ui/tokens';
 

diff --git a/chat/rich-links/src/index.ts b/chat/rich-links/src/index.ts
@@ -1,4 +1,12 @@
-export { RichLink, type RichLinkProps } from './RichLink';
+export {
+  createRichLinkVariant,
+  type CreateRichLinkVariantArgs,
+  RichLink,
+  type RichLinkProps,
+  type RichLinkVariantMap,
+  type RichLinkVariantName,
+  richLinkVariants,
+} from './RichLink';
 export {
   RichLinkBadge,
   type RichLinkBadgeProps,

diff --git a/packages/avatar/src/Avatar.stories.tsx b/packages/avatar/src/Avatar.stories.tsx
@@ -139,7 +139,7 @@ export const TextAvatar: StoryObj<typeof Avatar> = {
     },
     generate: {
       combineArgs: {
-        text: ['A', 'MW'],
+        text: ['A', 'MW', null],
       },
     },
   },

diff --git a/packages/avatar/src/Avatar/Avatar.spec.tsx b/packages/avatar/src/Avatar/Avatar.spec.tsx
@@ -14,6 +14,8 @@ describe('packages/Avatar', () => {
     <Avatar format="mongodb" />;
     // Accepts (but ignores) `text` prop;
     <Avatar format="mongodb" text="AT" />;
+    // Accepts (but ignores) null `text` prop;
+    <Avatar format="mongodb" text={null} />;
     // Accepts (but ignores) `glyph` prop;
     <Avatar format="mongodb" glyph="PersonGroup" />;
 
@@ -28,12 +30,16 @@ describe('packages/Avatar', () => {
     <Avatar format="icon" glyph="NotAnIcon" />;
     // Accepts (but ignores) `text` prop;
     <Avatar format="icon" text="AT" />;
+    // Accepts (but ignores) null `text` prop;
+    <Avatar format="icon" text={null} />;
 
     /**
      * TEXT FORMAT
      */
     // @ts-expect-error - Requires `text` prop
     <Avatar format="text" />;
+    // Accepts null text prop
+    <Avatar format="text" text={null} />;
     // Accepts text prop
     <Avatar format="text" text="AT" />;
     // Accepts (but ignores) `glyph` prop;
@@ -49,8 +55,10 @@ describe('packages/Avatar', () => {
       Format.Text,
     ]) as Format;
 
-    // @ts-expect-error expects required props for all formats
+    // @ts-expect-error - requires defined text prop
     <Avatar format={arbitraryFormat} />;
+    // Accepts null text prop
+    <Avatar format={arbitraryFormat} text={null} />;
     // Accepts text prop
     <Avatar format={arbitraryFormat} text="AT" />;
     // Accepts glyph prop

diff --git a/packages/avatar/src/Avatar/Avatar.types.ts b/packages/avatar/src/Avatar/Avatar.types.ts
@@ -53,7 +53,7 @@ export type DiscriminatedAvatarProps =
       /**
        * The text to render in the Avatar when `format === 'text'`
        */
-      text: string;
+      text: string | null;
 
       /**
        * The LeafyGreen icon glyph name to render in the Avatar when `format === 'icon'`
@@ -78,7 +78,7 @@ export type DiscriminatedAvatarProps =
       /**
        * The text to render in the Avatar when `format === 'text'`
        */
-      text?: string;
+      text?: string | null;
     }
   | {
       /**
@@ -89,7 +89,7 @@ export type DiscriminatedAvatarProps =
       /**
        * The text to render in the Avatar when `format === 'text'`
        */
-      text?: string;
+      text?: string | null;
 
       /**
        * The LeafyGreen icon glyph name to render in the Avatar when `format === 'icon'`

diff --git a/packages/icon/README.md b/packages/icon/README.md
diff --git a/packages/icon/src/generated/Pause.tsx b/packages/icon/src/generated/Pause.tsx
diff --git a/packages/icon/src/generated/Stop.tsx b/packages/icon/src/generated/Stop.tsx
diff --git a/packages/icon/src/glyphs/Pause.svg b/packages/icon/src/glyphs/Pause.svg
diff --git a/packages/icon/src/glyphs/Stop.svg b/packages/icon/src/glyphs/Stop.svg
diff --git a/packages/icon/src/glyphs/index.ts b/packages/icon/src/glyphs/index.ts
@@ -133,6 +133,7 @@ import Sparkle from './Sparkle.svg';
 import SplitHorizontal from './SplitHorizontal.svg';
 import SplitVertical from './SplitVertical.svg';
 import Stitch from './Stitch.svg';
+import Stop from './Stop.svg';
 import String from './String.svg';
 import Sun from './Sun.svg';
 import Support from './Support.svg';
@@ -292,6 +293,7 @@ const _glyphs = {
   SplitHorizontal,
   SplitVertical,
   Stitch,
+  Stop,
   String,
   Sun,
   Support,