Merge pull request #85 from storybookjs/valentin/replace-deprecated-i…

…con-component Replace deprecated Icon component
storybookjs · Jan 25, 2024 · 1c18b81 · 1c18b81
2 parents 245bbce + 35f562f
commit 1c18b81
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
   },
   "dependencies": {
     "@storybook/telemetry": "next",
+    "@storybook/icons": "^1.2.3",
     "react-confetti": "^6.1.0"
   },
   "devDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/List/ListItem/ListItem.tsx b/src/components/List/ListItem/ListItem.tsx
@@ -1,10 +1,10 @@
 import React from "react";
-import { Icons } from "@storybook/components";
 import {
   ListItemContentWrapper,
   ListItemIndexWrapper,
   ListItemWrapper,
 } from "./ListItem.styled";
+import { CheckIcon } from "@storybook/icons";
 
 interface ListItemProps {
   children: React.ReactNode;
@@ -20,7 +20,7 @@ export const ListItem = ({ children, index, isCompleted }: ListItemProps) => {
         isCompleted={isCompleted}
       >
         {isCompleted ? (
-          <Icons width={10} height={10} icon="check" color="white" />
+          <CheckIcon width={10} height={10} color="white" />
         ) : (
           index
         )}

diff --git a/src/features/WelcomeModal/WelcomeModal.styled.tsx b/src/features/WelcomeModal/WelcomeModal.styled.tsx
@@ -1,4 +1,4 @@
-import { Icons } from "@storybook/components";
+import { ArrowRightIcon } from "@storybook/icons";
 import { keyframes, styled } from "@storybook/theming";
 
 export const ModalContentWrapper = styled.div`
@@ -51,7 +51,7 @@ export const SkipButton = styled.button`
   }
 `;
 
-export const StyledIcon = styled(Icons)`
+export const StyledIcon = styled(ArrowRightIcon)`
   margin-left: 2px;
   height: 10px;
 `;

diff --git a/src/features/WelcomeModal/WelcomeModal.tsx b/src/features/WelcomeModal/WelcomeModal.tsx
@@ -43,7 +43,7 @@ export const WelcomeModal: FC<WelcomeModalProps> = ({
             </TopContent>
             <SkipButton onClick={skipOnboarding}>
               Skip tour
-              <StyledIcon icon="arrowright" />
+              <StyledIcon />
             </SkipButton>
             <Background>
               <Circle1 />

diff --git a/src/features/WriteStoriesModal/WriteStoriesModal.tsx b/src/features/WriteStoriesModal/WriteStoriesModal.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useState, type FC } from "react";
 import { Button } from "../../components/Button/Button";
 import { Modal } from "../../components/Modal/Modal";
-import { Icons } from "@storybook/components";
 import useMeasure from "react-use-measure";
 import {
   Background,
@@ -31,6 +30,7 @@ import { API, AddonStore } from "@storybook/manager-api";
 import { STORYBOOK_ADDON_ONBOARDING_CHANNEL } from "../../constants";
 import { useTheme } from "@storybook/theming";
 import { CodeSnippets } from "./code/types";
+import { BookmarkHollowIcon, CrossIcon } from "@storybook/icons";
 
 // TODO: Add warning if backdropBoundary && !warningButtonStatus?.data is not true.
 // backdropBoundary && !warningButtonStatus?.data
@@ -71,19 +71,19 @@ export const WriteStoriesModal: FC<WriteStoriesModalProps> = ({
   const warningButtonStatus = useGetWarningButtonStatus(
     step === "customStory",
     api,
-    addonsStore
+    addonsStore,
   );
   const backdropBoundary = useGetBackdropBoundary(
     "syntax-highlighter-backdrop",
-    step === "customStory"
+    step === "customStory",
   );
 
-  const isJavascript = codeSnippets?.language === 'javascript'
+  const isJavascript = codeSnippets?.language === "javascript";
 
   const copyWarningStory = () => {
     const warningContent = codeSnippets.code[3][0].snippet;
     navigator.clipboard.writeText(
-      warningContent.replace("// Copy the code below", "")
+      warningContent.replace("// Copy the code below", ""),
     );
     setWarningStoryCopied(true);
   };
@@ -133,14 +133,13 @@ export const WriteStoriesModal: FC<WriteStoriesModalProps> = ({
             <Header>
               <Title asChild>
                 <ModalTitle>
-                  <Icons icon="bookmarkhollow" width={13} />
+                  <BookmarkHollowIcon width={13} />
                   <span>How to write a story</span>
                 </ModalTitle>
               </Title>
               <Close onClick={onModalClose} asChild>
-                <Icons
+                <CrossIcon
                   style={{ cursor: "pointer" }}
-                  icon="cross"
                   width={13}
                   onClick={skipOnboarding}
                   color={theme.color.darkest}
@@ -153,18 +152,24 @@ export const WriteStoriesModal: FC<WriteStoriesModalProps> = ({
                   <>
                     <div>
                       <h3>Imports</h3>
-                      {isJavascript ? (<p>
-                        Import a component. In this case, the Button
-                        component.
-                      </p>) : <><p>
-                        First, import <SpanHighlight>Meta</SpanHighlight> and{" "}
-                        <SpanHighlight>StoryObj</SpanHighlight> for type safety
-                        and autocompletion in TypeScript stories.
-                      </p>
+                      {isJavascript ? (
                         <p>
-                          Next, import a component. In this case, the Button
+                          Import a component. In this case, the Button
                           component.
-                        </p></>}
+                        </p>
+                      ) : (
+                        <>
+                          <p>
+                            First, import <SpanHighlight>Meta</SpanHighlight>{" "}
+                            and <SpanHighlight>StoryObj</SpanHighlight> for type
+                            safety and autocompletion in TypeScript stories.
+                          </p>
+                          <p>
+                            Next, import a component. In this case, the Button
+                            component.
+                          </p>
+                        </>
+                      )}
                     </div>
                     <Button
                       style={{ marginTop: 4 }}
@@ -285,7 +290,11 @@ export const WriteStoriesModal: FC<WriteStoriesModalProps> = ({
                             </Step2Text>
                             {buttonPath?.data && (
                               // Replace '/' by '/<zero-width-place>' to properly break line
-                              <SpanHighlight>{buttonPath.data.replaceAll('/', '/').replaceAll('\\', '\\')}</SpanHighlight>
+                              <SpanHighlight>
+                                {buttonPath.data
+                                  .replaceAll("/", "/")
+                                  .replaceAll("\\", "\\")}
+                              </SpanHighlight>
                             )}
                           </ListItem>
                           <ListItem