Update imports

NDLANO · Jul 8, 2024 · cac426a · cac426a
1 parent 50eb8a8
commit cac426a
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 40 deletions.
diff --git a/src/components/CompetenceGoalTab.tsx b/src/components/CompetenceGoalTab.tsx
@@ -62,7 +62,7 @@ const CompetenceGoalTab = ({ items, type }: Props) => {
         <CompetenceItemWrapper key={index}>
           <hgroup>
             <StyledHeading element="h2" headingStyle="h2" margin="none">
-              <MenuBook size="normal" />
+              <MenuBook />
               {item.title}
             </StyledHeading>
             {type === "goal" && <Text margin="none">{t("competenceGoals.competenceGoalTitle")}</Text>}
@@ -164,7 +164,7 @@ export const CompetenceItem = ({ item, isOembed, showLinks }: CompetenceItemProp
                     </Text>
                     {showLinks && (
                       <StyledSafeLinkButton to={goal.url} target={isOembed ? "_blank" : "_self"} variant="outline">
-                        <Search size="normal" />
+                        <Search />
                         {t("competenceGoals.competenceGoalResourceSearchText", { code: goal.id })}
                       </StyledSafeLinkButton>
                     )}
@@ -179,7 +179,7 @@ export const CompetenceItem = ({ item, isOembed, showLinks }: CompetenceItemProp
               </Text>
               {showLinks && (
                 <StyledSafeLinkButton to={element.url} target={isOembed ? "_blank" : "_self"} variant="outline">
-                  <Search size="normal" />
+                  <Search />
                   {t("competenceGoals.coreResourceSearchText", { code: element.id })}
                 </StyledSafeLinkButton>
               )}

diff --git a/src/components/CompetenceGoals.tsx b/src/components/CompetenceGoals.tsx
@@ -208,7 +208,7 @@ const CompetenceGoals = ({ codes, subjectId, supportedLanguages, isOembed }: Pro
         <ModalContent size="full">
           <ModalHeader>
             <ModalTitle>
-              <FooterHeaderIcon size="normal" style={{ marginRight: "20px" }} />
+              <FooterHeaderIcon style={{ marginRight: "20px" }} />
               {t("competenceGoals.modalText")}
             </ModalTitle>
             <ModalCloseButton />

diff --git a/src/components/Learningpath/LearningpathFooter.tsx b/src/components/Learningpath/LearningpathFooter.tsx
@@ -149,7 +149,7 @@ const LearningpathFooter = ({
             to={toLearningPath(learningPath.id, previousStep.id, resource)}
             aria-label={t("learningPath.previousArrow")}
           >
-            <Back size="normal" />
+            <Back />
             <LinkText>{previousStep.title}</LinkText>
           </StyledSafeLink>
         ) : (
@@ -164,7 +164,7 @@ const LearningpathFooter = ({
             aria-label={t("learningPath.nextArrow")}
           >
             <LinkText>{nextStep.title}</LinkText>
-            <Forward size="normal" />
+            <Forward />
           </StyledSafeLink>
         ) : (
           <div />

diff --git a/src/components/MyNdla/FoldersPageTitle.tsx b/src/components/MyNdla/FoldersPageTitle.tsx
@@ -62,13 +62,7 @@ const FoldersPageTitle = ({ loading = false, selectedFolder, enableBreadcrumb =
           }
           isLoading={loading}
         >
-          {selectedFolder ? (
-            selectedFolder.status === "shared" ? (
-              <FolderSharedOutlined size="large" />
-            ) : (
-              <FolderOutlined size="large" />
-            )
-          ) : null}
+          {selectedFolder ? selectedFolder.status === "shared" ? <FolderSharedOutlined /> : <FolderOutlined /> : null}
           <MyNdlaTitle title={selectedFolder?.name ?? t("myNdla.myFolders")} />
         </WhileLoading>
       </TitleRow>

diff --git a/src/components/Topic/TopicMetaImage.tsx b/src/components/Topic/TopicMetaImage.tsx
@@ -160,7 +160,7 @@ const TopicMetaImage = ({ visualElementEmbedMeta, metaImage: articleMetaImage, v
             />
             <TopicHeaderOverlay data-overlay="" />
             <ExpandVisualElementButton data-indicator="">
-              {VisualElementIcon && <VisualElementIcon size="normal" />}
+              {VisualElementIcon && <VisualElementIcon />}
             </ExpandVisualElementButton>
           </VisualElementButton>
         </ModalTrigger>

diff --git a/src/containers/Masthead/components/MastheadSearch.tsx b/src/containers/Masthead/components/MastheadSearch.tsx
@@ -61,17 +61,13 @@ const SearchWrapper = styled("div", {
   },
 });
 
-const StyledDialogContent = styled(
-  DialogContent,
-  {
-    base: {
-      display: "flex",
-      justifyContent: "center",
-      height: "unset",
-    },
+const StyledDialogContent = styled(DialogContent, {
+  base: {
+    display: "flex",
+    justifyContent: "center",
+    height: "unset",
   },
-  { forwardCssProp: true },
-);
+});
 
 const MastheadSearch = ({ subject }: Props) => {
   const [dialogState, setDialogState] = useState({ open: false });

diff --git a/src/containers/MyNdla/Arena/ArenaToolbar.tsx b/src/containers/MyNdla/Arena/ArenaToolbar.tsx
@@ -50,7 +50,7 @@ export const PostButtons = () => {
           setIsOpen(false);
         }}
       >
-        <Plus size="nsmall" />
+        <Plus size="small" />
         {t("myNdla.arena.new.topic")}
       </StyledSafeLinkButton>
     </StyledListItem>
@@ -89,7 +89,7 @@ export const TopicButtons = () => {
           setIsOpen(false);
         }}
       >
-        <Plus size="nsmall" />
+        <Plus size="small" />
         {t("myNdla.arena.admin.category.form.newCategory")}
       </StyledSafeLinkButton>
     </StyledListItem>

diff --git a/src/containers/MyNdla/Arena/components/ArenaForm.tsx b/src/containers/MyNdla/Arena/components/ArenaForm.tsx
@@ -213,7 +213,7 @@ const ArenaForm = ({ onSave, onAbort, type, initialTitle, initialContent, initia
         />
       )}
       <InformationLabel>
-        <StyledInformationOutline size="nsmall" />
+        <StyledInformationOutline size="small" />
         <Text margin="none" textStyle="content">
           {t(`myNdla.arena.warning.${type}`)}
         </Text>

diff --git a/src/containers/MyNdla/FavoriteSubjects/FavoriteSubjectsPage.tsx b/src/containers/MyNdla/FavoriteSubjects/FavoriteSubjectsPage.tsx
@@ -77,7 +77,7 @@ const FavoriteSubjectsPage = () => {
       <StyledListItem key="allSubjects">
         <StyledSafeLinkButton variant="ghost" colorTheme="lighter" to="/subjects">
           {t("subjectsPage.allSubjects")}
-          <Forward size="nsmall" />
+          <Forward size="small" />
         </StyledSafeLinkButton>
       </StyledListItem>
     ),
@@ -90,7 +90,7 @@ const FavoriteSubjectsPage = () => {
         menuItems={[
           {
             text: t("subjectsPage.allSubjects"),
-            icon: <Forward size="nsmall" />,
+            icon: <Forward size="small" />,
             onClick: () => navigate("/subjects"),
           },
         ]}

diff --git a/src/containers/MyNdla/Folders/components/FolderButtons.tsx b/src/containers/MyNdla/Folders/components/FolderButtons.tsx
@@ -122,7 +122,7 @@ const FolderButtons = ({ setFocusId, selectedFolder }: FolderButtonProps) => {
             });
           }}
         >
-          <Cross size="nsmall" />
+          <Cross size="small" />
           {t("myNdla.folder.sharing.button.unShare")}
         </StyledButton>
       </StyledListItem>
@@ -157,7 +157,7 @@ const FolderButtons = ({ setFocusId, selectedFolder }: FolderButtonProps) => {
               });
           }}
         >
-          <Share size="nsmall" />
+          <Share size="small" />
           {t("myNdla.folder.sharing.button.shareShort")}
         </StyledButton>
       </StyledListItem>
@@ -210,7 +210,7 @@ const FolderButtons = ({ setFocusId, selectedFolder }: FolderButtonProps) => {
           aria-label={t("myNdla.folder.sharing.button.shareLink")}
           title={t("myNdla.folder.sharing.button.shareLink")}
         >
-          <Copy size="nsmall" />
+          <Copy size="small" />
           {t("myNdla.folder.sharing.button.shareLink")}
         </StyledButton>
       </StyledListItem>
@@ -227,7 +227,7 @@ const FolderButtons = ({ setFocusId, selectedFolder }: FolderButtonProps) => {
           aria-label={t("myNdla.folder.sharing.button.goTo")}
           title={t("myNdla.folder.sharing.button.goTo")}
         >
-          <ShareArrow size="nsmall" />
+          <ShareArrow size="small" />
           {t("myNdla.folder.sharing.button.goTo")}
         </StyledSafeLinkButton>
       </StyledListItem>

diff --git a/src/containers/MyNdla/Folders/components/FolderCreateModal.tsx b/src/containers/MyNdla/Folders/components/FolderCreateModal.tsx
@@ -55,7 +55,7 @@ const FolderCreateModal = ({ onSaved, parentFolder }: Props) => {
           aria-label={t("myNdla.newFolder")}
           title={t("myNdla.newFolder")}
         >
-          <Plus size="nsmall" />
+          <Plus size="small" />
           <span>{t("myNdla.newFolderShort")}</span>
         </AddButton>
       </ModalTrigger>

diff --git a/src/containers/MyNdla/Folders/components/FolderDeleteModal.tsx b/src/containers/MyNdla/Folders/components/FolderDeleteModal.tsx
@@ -31,7 +31,7 @@ const FolderDeleteModal = ({ onDelete, onClose }: Props) => {
           aria-label={t("myNdla.folder.delete")}
           title={t("myNdla.folder.delete")}
         >
-          <TrashCanOutline size="nsmall" />
+          <TrashCanOutline size="small" />
           {t("myNdla.folder.deleteShort")}
         </StyledButton>
       </ModalTrigger>

diff --git a/src/containers/MyNdla/Folders/components/FolderEditModal.tsx b/src/containers/MyNdla/Folders/components/FolderEditModal.tsx
@@ -34,7 +34,7 @@ const FolderEditModal = ({ folder, onSaved }: Props) => {
           aria-label={t("myNdla.folder.edit")}
           title={t("myNdla.folder.edit")}
         >
-          <Pencil size="nsmall" />
+          <Pencil size="small" />
           {t("myNdla.folder.editShort")}
         </StyledButton>
       </ModalTrigger>

diff --git a/src/containers/MyNdla/components/NotificationButton.tsx b/src/containers/MyNdla/components/NotificationButton.tsx
@@ -60,7 +60,7 @@ interface BellIconProps {
 export const BellIcon = ({ amountOfUnreadNotifications, left }: BellIconProps) => {
   return (
     <IconWrapper>
-      <Bell size="nsmall" />
+      <Bell size="small" />
       {amountOfUnreadNotifications !== 0 && (
         <NotificationCounter margin="none" element="div" textStyle="meta-text-xsmall" data-left={!!left}>
           {amountOfUnreadNotifications > 99 ? "99+" : amountOfUnreadNotifications}

diff --git a/src/containers/Resources/ResourceItem.tsx b/src/containers/Resources/ResourceItem.tsx
@@ -236,7 +236,7 @@ const ResourceItem = ({
         )}
         {showAdditionalResources && contentTypeDescription && (
           <IconWrapper id={contentTypeId} aria-label={contentTypeDescription} title={contentTypeDescription}>
-            {additional ? <StyledAdditional size="normal" /> : <StyledCore size="normal" />}
+            {additional ? <StyledAdditional /> : <StyledCore />}
           </IconWrapper>
         )}
         {heartButton?.(path)}

diff --git a/src/containers/SearchPage/components/SearchResultItem.tsx b/src/containers/SearchPage/components/SearchResultItem.tsx
@@ -227,14 +227,12 @@ const SearchResultItem = ({ item, type }: Props) => {
                             {context.isAdditional ? (
                               <Additional
                                 color={colors.brand.dark}
-                                size="normal"
                                 aria-hidden={false}
                                 aria-label={t("resource.tooltipAdditionalTopic")}
                               />
                             ) : (
                               <Core
                                 color={colors.brand.primary}
-                                size="normal"
                                 aria-hidden={false}
                                 aria-label={t("resource.tooltipCoreTopic")}
                               />