Merge pull request #2639 from NDLANO/chore/no-old-icons

chore: remove old icons

README.md

@@ -99,7 +99,7 @@ As mentioned on https://designmanual.ndla.no/?path=/story/components--icons, new
 - Sizing is written in full (link-m-line = LinkMediumLine, arrow-up-s-line = ArrowUpShortLine)
 - Some icons have several variants, indicated by numbers. Since we won't be using more than one such variant, the number is omitted
 
-Icons are downloaded and placed in the best matching sub-folder in `frontend-packages/packages/ndla-icons/svg/`. Edit the svg and add license information matching the other svg files.
+Icons are downloaded and placed in the best matching sub-folder in `frontend-packages/packages/icons/svg/`. Edit the svg and add license information matching the other svg files.
 
 ### Generate typescript component file
 

jest.config.js

@@ -22,8 +22,8 @@ module.exports = {
   moduleNameMapper: {
     // @ndla/styled-system has a different structure from our other packages
     "@ndla/styled-system/(.+)$": "<rootDir>packages/styled-system/src/$1",
-    // Fix for ndla-icons. Should be changed '<rootDir>packages/$1/src/$2' when ndla-icons folder is renamed to icons
-    "@ndla/(.+)/(.+)$": "<rootDir>packages/ndla-$1/src/$2",
+    // Fix for @ndla/icons.
+    "@ndla/(.+)/(.+)$": "<rootDir>packages/$1/src/$2",
     "@ndla/(.+)$": ["<rootDir>packages/$1/src", "<rootDir>packages/ndla-$1/src"],
   },
   testRegex: "/packages/.*/src/.*__tests__/.*-test.(js|jsx|ts|tsx)$",

packages/ndla-icons/README.md → packages/icons/README.md

@@ -1,4 +1,4 @@
-# ndla-icons
+# @ndla/icons
 
 A package containing icons used in NDLA frontends
 
@@ -51,7 +51,7 @@ _TLDR:_ Change/Add/Remove svg file(s). Run `node scripts/createTsIconComponents.
 
 ### Add new svg file:
 
-1. Add svg file to an appropiate folder in [ndla-icons/svg](/packages/ndla-icons/svg).
+1. Add svg file to an appropiate folder in [icons/svg](/packages/icons/svg).
 2. Ensure that `data-license` and `data-source` attributes are on the `<svg>` element.
 3. Run `node scripts/createTsIconComponents.mjs` from root folder.
 4. Commit changes.
@@ -72,4 +72,4 @@ _TLDR:_ Change/Add/Remove svg file(s). Run `node scripts/createTsIconComponents.
 
 1. Do changes.
 2. Run `node scripts/createTsIconComponents.mjs` from root folder.
-3. Update files array in [packages.json](/packages/ndla-icons/package.json).
+3. Update files array in [packages.json](/packages/icons/package.json).

packages/ndla-icons/package.json → packages/icons/package.json

@@ -15,7 +15,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/NDLANO/frontend-packages.git",
-    "directory": "packages/ndla-icons"
+    "directory": "packages/icons"
   },
   "keywords": [
     "ndla"

packages/ndla-icons/src/Icon.stories.tsx → packages/icons/src/Icon.stories.tsx

@@ -17,7 +17,6 @@ import * as actionIcons from "./action";
 import { FileCopyLine } from "./action";
 import * as commonIcons from "./common";
 import { UserFill } from "./common";
-import * as contentTypeIcons from "./contentType";
 import * as editorIcons from "./editor";
 
 interface IconItemProps {
@@ -113,14 +112,6 @@ export const CommonIcons: StoryObj<typeof Icon> = {
   render: () => <IconList icons={commonIcons} folder="common" />,
 };
 
-/** Hver innholdstype i NDLA-systemet har et ikon knyttet til seg. Ikonene er visuelle representasjoner av innholdstypen og skal sammen med innholdstypefargen skape en gjenkjennelseseffekt for brukerne.
- *
- * Hvis det skal lages nye innholdstypeikoner er det viktig at de kommuniserer innholdstypens kjernefunksjon og hensikt. De må også ha lik visuell utførelse og fremtoning som de eksisterende. Alle innholdstypeikonene er bygget ut fra Material Design sine ikoner; https://material.io/icons/
- **/
-export const ContentTypes: StoryObj<typeof Icon> = {
-  render: () => <IconList icons={contentTypeIcons} folder="contentType" />,
-};
-
 export const Action: StoryObj<typeof Icon> = {
   render: () => <IconList icons={actionIcons} folder="action" />,
 };

packages/ndla-icons/src/action/Reply.tsx → packages/icons/src/action/Reply.tsx

@@ -8,7 +8,13 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT;
 import Icon, { type Props } from "../Icon";
 const Reply = (props: Props) => (
-  <Icon fill="currentColor" viewBox="0 -960 960 960" {...props}>
+  <Icon
+    fill="currentColor"
+    data-license="Apache License 2.0"
+    data-source="Material Design"
+    viewBox="0 -960 960 960"
+    {...props}
+  >
     <path d="M760-200v-160q0-50-35-85t-85-35H273l144 144-57 56-240-240 240-240 57 56-144 144h367q83 0 141.5 58.5T840-360v160z" />
   </Icon>
 );

packages/ndla-icons/src/action/index.ts → packages/icons/src/action/index.ts

@@ -9,35 +9,23 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT
 export { default as AddLine } from "./AddLine";
 export { default as ArrowLeftRightLine } from "./ArrowLeftRightLine";
-export { default as Back15 } from "./Back15";
 export { default as BookmarkFill } from "./BookmarkFill";
 export { default as BookmarkLine } from "./BookmarkLine";
 export { default as CloseLine } from "./CloseLine";
-export { default as Copy } from "./Copy";
 export { default as DeleteBinFill } from "./DeleteBinFill";
 export { default as DeleteBinLine } from "./DeleteBinLine";
-export { default as ExpandLess } from "./ExpandLess";
-export { default as ExpandMore } from "./ExpandMore";
-export { default as FileCompare } from "./FileCompare";
 export { default as FileCopyFill } from "./FileCopyFill";
 export { default as FileCopyLine } from "./FileCopyLine";
 export { default as FileMarkedFill } from "./FileMarkedFill";
 export { default as FileMarkedLine } from "./FileMarkedLine";
-export { default as Forward15 } from "./Forward15";
 export { default as Forward15Line } from "./Forward15Line";
 export { default as HeartFill } from "./HeartFill";
 export { default as HeartLine } from "./HeartLine";
-export { default as HeartOutline } from "./HeartOutline";
-export { default as List } from "./List";
-export { default as MenuBook } from "./MenuBook";
 export { default as MenuLine } from "./MenuLine";
-export { default as Minus } from "./Minus";
 export { default as PencilFill } from "./PencilFill";
 export { default as PencilLine } from "./PencilLine";
-export { default as RemoveCircle } from "./RemoveCircle";
 export { default as Replay15Line } from "./Replay15Line";
 export { default as Reply } from "./Reply";
-export { default as RightArrow } from "./RightArrow";
 export { default as SubtractLine } from "./SubtractLine";
 export { default as Thumb } from "./Thumb";
 export { default as ThumbFilled } from "./ThumbFilled";

packages/icons/src/common/ArrowUpDoubleLine.tsx

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2024-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+// N.B! AUTOGENERATED FILE. DO NOT EDIT;
+import Icon, { type Props } from "../Icon";
+const ArrowUpDoubleLine = (props: Props) => (
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
+    <path d="m12 4.84-6.2 6.2 1.4 1.42 4.8-4.8 4.8 4.8 1.4-1.42zm0 5.65-6.2 6.2 1.4 1.42 4.8-4.8 4.8 4.8 1.4-1.42z" />
+  </Icon>
+);
+export default ArrowUpDoubleLine;

packages/ndla-icons/src/common/ExternalLinkLine.tsx → packages/icons/src/common/ExternalLinkLine.tsx

@@ -8,7 +8,7 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT;
 import Icon, { type Props } from "../Icon";
 const ExternalLinkLine = (props: Props) => (
-  <Icon fill="currentColor" viewBox="0 0 24 24" {...props}>
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
     <path d="M10 6v2H5v11h11v-5h2v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1zm11-3v8h-2V6.41l-7.8 7.8-1.4-1.42L17.57 5H13V3z" />
   </Icon>
 );

packages/ndla-icons/src/common/InstagramLine.tsx → packages/icons/src/common/InstagramLine.tsx

@@ -8,13 +8,7 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT;
 import Icon, { type Props } from "../Icon";
 const InstagramLine = (props: Props) => (
-  <Icon
-    fill="currentColor"
-    data-license="Apache License 2.0"
-    data-source="Material Design"
-    viewBox="0 0 24 24"
-    {...props}
-  >
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
     <path d="M12 9a3 3 0 1 0 0 6 3 3 0 0 0 0-6m0-2a5 5 0 1 1 0 10 5 5 0 0 1 0-10m6.5-.25a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0M12 4c-2.47 0-2.88 0-4.03.06-.78.03-1.3.14-1.8.33a2.9 2.9 0 0 0-1.08.7c-.33.34-.53.65-.7 1.08-.19.5-.3 1.02-.33 1.8A69.5 69.5 0 0 0 4 12c0 2.47 0 2.88.06 4.03.04.78.14 1.3.33 1.8a3.05 3.05 0 0 0 1.78 1.78c.5.2 1.02.3 1.8.33 1.1.05 1.5.06 4.03.06 2.48 0 2.88 0 4.03-.06.78-.03 1.3-.14 1.8-.33a3.05 3.05 0 0 0 1.78-1.78c.2-.5.3-1.02.33-1.8.05-1.1.06-1.5.06-4.03 0-2.47 0-2.88-.06-4.03a5.46 5.46 0 0 0-.33-1.8 2.91 2.91 0 0 0-.7-1.08 2.88 2.88 0 0 0-1.08-.7 5.42 5.42 0 0 0-1.8-.33C14.93 4 14.54 4 12 4m0-2c2.72 0 3.06.01 4.12.06 1.07.05 1.8.22 2.43.46.66.26 1.22.6 1.77 1.16.56.55.9 1.11 1.16 1.77.24.64.41 1.36.46 2.43C22 8.94 22 9.28 22 12s0 3.06-.06 4.12a7.38 7.38 0 0 1-.46 2.43c-.26.66-.6 1.22-1.16 1.77-.55.56-1.11.9-1.77 1.16a7.4 7.4 0 0 1-2.43.46c-1.06.05-1.4.06-4.12.06s-3.05-.01-4.12-.06a7.38 7.38 0 0 1-2.43-.46 4.89 4.89 0 0 1-1.77-1.16 4.9 4.9 0 0 1-1.15-1.77 7.38 7.38 0 0 1-.47-2.43C2.01 15.06 2 14.72 2 12s.01-3.06.06-4.12c.05-1.07.22-1.8.47-2.43.25-.66.6-1.22 1.15-1.77a4.9 4.9 0 0 1 1.77-1.16 7.37 7.37 0 0 1 2.43-.46C8.95 2.01 9.28 2 12 2" />
   </Icon>
 );

packages/ndla-icons/src/common/index.ts → packages/icons/src/common/index.ts

@@ -12,109 +12,82 @@ export { default as AccountCircleLine } from "./AccountCircleLine";
 export { default as Additional } from "./Additional";
 export { default as AdminFill } from "./AdminFill";
 export { default as AdminLine } from "./AdminLine";
-export { default as AdminPanelSettings } from "./AdminPanelSettings";
-export { default as AdminPanelSettingsFilled } from "./AdminPanelSettingsFilled";
-export { default as Alarm } from "./Alarm";
 export { default as AlertFill } from "./AlertFill";
 export { default as AlertLine } from "./AlertLine";
-export { default as Announcement } from "./Announcement";
 export { default as ArrowDownShortLine } from "./ArrowDownShortLine";
-export { default as ArrowDropDown } from "./ArrowDropDown";
-export { default as ArrowDropDownRounded } from "./ArrowDropDownRounded";
 export { default as ArrowLeftLine } from "./ArrowLeftLine";
 export { default as ArrowLeftShortLine } from "./ArrowLeftShortLine";
 export { default as ArrowRightLine } from "./ArrowRightLine";
 export { default as ArrowRightShortLine } from "./ArrowRightShortLine";
+export { default as ArrowUpDoubleLine } from "./ArrowUpDoubleLine";
 export { default as ArrowUpShortLine } from "./ArrowUpShortLine";
-export { default as Audio } from "./Audio";
-export { default as Back } from "./Back";
-export { default as Bell } from "./Bell";
-export { default as BellOutlined } from "./BellOutlined";
-export { default as Book } from "./Book";
-export { default as BookOpen } from "./BookOpen";
 export { default as BookOpenFill } from "./BookOpenFill";
 export { default as BookOpenLine } from "./BookOpenLine";
-export { default as BookOutlined } from "./BookOutlined";
 export { default as BookReadFill } from "./BookReadFill";
 export { default as BookReadLine } from "./BookReadLine";
 export { default as BroadcastFill } from "./BroadcastFill";
 export { default as BroadcastLine } from "./BroadcastLine";
 export { default as ChatHeartFill } from "./ChatHeartFill";
 export { default as ChatHeartLine } from "./ChatHeartLine";
 export { default as CircleFill } from "./CircleFill";
-export { default as Comment } from "./Comment";
 export { default as CompassFill } from "./CompassFill";
 export { default as CompassLine } from "./CompassLine";
 export { default as CornerDownLeftLine } from "./CornerDownLeftLine";
-export { default as Download } from "./Download";
 export { default as DownloadLine } from "./DownloadLine";
-export { default as Email } from "./Email";
-export { default as EmailOutline } from "./EmailOutline";
 export { default as ErrorWarningFill } from "./ErrorWarningFill";
 export { default as ErrorWarningLine } from "./ErrorWarningLine";
-export { default as ExclamationMark } from "./ExclamationMark";
 export { default as ExternalLinkLine } from "./ExternalLinkLine";
-export { default as Facebook } from "./Facebook";
 export { default as FacebookCircleFill } from "./FacebookCircleFill";
 export { default as FacebookCircleLine } from "./FacebookCircleLine";
-export { default as FacebookFilled } from "./FacebookFilled";
 export { default as Feide } from "./Feide";
-export { default as FileDocumentOutline } from "./FileDocumentOutline";
 export { default as FileEditFill } from "./FileEditFill";
 export { default as FileEditLine } from "./FileEditLine";
 export { default as FilePdfFill } from "./FilePdfFill";
 export { default as FilePdfLine } from "./FilePdfLine";
 export { default as FileTextFill } from "./FileTextFill";
 export { default as FileTextLine } from "./FileTextLine";
+export { default as FolderUserFill } from "./FolderUserFill";
+export { default as FolderUserLine } from "./FolderUserLine";
 export { default as Forum } from "./Forum";
 export { default as ForumOutlined } from "./ForumOutlined";
 export { default as HashTag } from "./HashTag";
 export { default as HeadphoneFill } from "./HeadphoneFill";
 export { default as HeadphoneLine } from "./HeadphoneLine";
-export { default as Home } from "./Home";
 export { default as HomeFill } from "./HomeFill";
 export { default as HomeLine } from "./HomeLine";
-export { default as Information } from "./Information";
 export { default as InformationFill } from "./InformationFill";
 export { default as InformationLine } from "./InformationLine";
-export { default as InformationOutline } from "./InformationOutline";
-export { default as Insights } from "./Insights";
-export { default as Instagram } from "./Instagram";
 export { default as InstagramFill } from "./InstagramFill";
 export { default as InstagramLine } from "./InstagramLine";
-export { default as Language } from "./Language";
-export { default as Launch } from "./Launch";
 export { default as LineChartLine } from "./LineChartLine";
-export { default as Link } from "./Link";
-export { default as LinkedIn } from "./LinkedIn";
 export { default as LinkedinBoxFill } from "./LinkedinBoxFill";
 export { default as LinkedinBoxLine } from "./LinkedinBoxLine";
 export { default as LockFill } from "./LockFill";
 export { default as LockLine } from "./LockLine";
 export { default as LockUnlockedFill } from "./LockUnlockedFill";
 export { default as LockUnlockedLine } from "./LockUnlockedLine";
-export { default as LogIn } from "./LogIn";
 export { default as LoginBoxLine } from "./LoginBoxLine";
 export { default as LogoutBoxRightLine } from "./LogoutBoxRightLine";
 export { default as MailFill } from "./MailFill";
 export { default as MailLine } from "./MailLine";
 export { default as MegaphoneFill } from "./MegaphoneFill";
 export { default as MegaphoneLine } from "./MegaphoneLine";
-export { default as Menu } from "./Menu";
+export { default as MenuSearchFill } from "./MenuSearchFill";
+export { default as MenuSearchLine } from "./MenuSearchLine";
 export { default as MessageFill } from "./MessageFill";
 export { default as MessageLine } from "./MessageLine";
+export { default as MoreFill } from "./MoreFill";
+export { default as MoreLine } from "./MoreLine";
+export { default as MoreVerticalFill } from "./MoreVerticalFill";
+export { default as MoreVerticalLine } from "./MoreVerticalLine";
 export { default as NotificationFill } from "./NotificationFill";
 export { default as NotificationLine } from "./NotificationLine";
 export { default as PanoramaPhotosphere } from "./PanoramaPhotosphere";
 export { default as PauseLine } from "./PauseLine";
-export { default as Person } from "./Person";
-export { default as PersonOutlined } from "./PersonOutlined";
-export { default as Pin } from "./Pin";
 export { default as PlayCircleFill } from "./PlayCircleFill";
 export { default as PlayCircleLine } from "./PlayCircleLine";
 export { default as PlayFill } from "./PlayFill";
 export { default as PlayLine } from "./PlayLine";
-export { default as Podcast } from "./Podcast";
 export { default as PresentationFill } from "./PresentationFill";
 export { default as PresentationLine } from "./PresentationLine";
 export { default as PushpinFill } from "./PushpinFill";
@@ -123,35 +96,25 @@ export { default as QuestionAnswerFill } from "./QuestionAnswerFill";
 export { default as QuestionAnswerLine } from "./QuestionAnswerLine";
 export { default as QuestionFill } from "./QuestionFill";
 export { default as QuestionLine } from "./QuestionLine";
-export { default as Report } from "./Report";
 export { default as RouteFill } from "./RouteFill";
 export { default as RouteLine } from "./RouteLine";
-export { default as RssFeed } from "./RssFeed";
 export { default as RssFill } from "./RssFill";
 export { default as RssLine } from "./RssLine";
-export { default as Search } from "./Search";
 export { default as SearchFill } from "./SearchFill";
 export { default as SearchLine } from "./SearchLine";
-export { default as Share } from "./Share";
 export { default as ShareBoxLine } from "./ShareBoxLine";
 export { default as ShareFill } from "./ShareFill";
 export { default as ShareLine } from "./ShareLine";
 export { default as ShieldUserFill } from "./ShieldUserFill";
 export { default as ShieldUserLine } from "./ShieldUserLine";
 export { default as SpamFill } from "./SpamFill";
 export { default as SpamLine } from "./SpamLine";
-export { default as TagOutlined } from "./TagOutlined";
-export { default as Time } from "./Time";
 export { default as TimeFill } from "./TimeFill";
 export { default as TimeLine } from "./TimeLine";
-export { default as Twitter } from "./Twitter";
 export { default as UserFill } from "./UserFill";
 export { default as UserLine } from "./UserLine";
 export { default as VoicePrintLine } from "./VoicePrintLine";
-export { default as VolumeUp } from "./VolumeUp";
 export { default as VolumeUpFill } from "./VolumeUpFill";
 export { default as VolumeUpLine } from "./VolumeUpLine";
-export { default as WarningOutline } from "./WarningOutline";
-export { default as Youtube } from "./Youtube";
 export { default as YoutubeFill } from "./YoutubeFill";
 export { default as YoutubeLine } from "./YoutubeLine";

packages/ndla-icons/src/editor/AlignCenter.tsx → packages/icons/src/editor/AlignCenter.tsx

@@ -8,13 +8,7 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT;
 import Icon, { type Props } from "../Icon";
 const AlignCenter = (props: Props) => (
-  <Icon
-    fill="currentColor"
-    data-license="Apache License 2.0"
-    data-source="Material Design"
-    viewBox="0 0 24 24"
-    {...props}
-  >
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
     <path d="M3 4h18v2H3zm2 15h14v2H5zm-2-5h18v2H3zm2-5h14v2H5z" />
   </Icon>
 );

packages/ndla-icons/src/editor/AlignLeft.tsx → packages/icons/src/editor/AlignLeft.tsx

@@ -8,13 +8,7 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT;
 import Icon, { type Props } from "../Icon";
 const AlignLeft = (props: Props) => (
-  <Icon
-    fill="currentColor"
-    data-license="Apache License 2.0"
-    data-source="Material Design"
-    viewBox="0 0 24 24"
-    {...props}
-  >
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
     <path d="M3 4h18v2H3zm0 15h14v2H3zm0-5h18v2H3zm0-5h14v2H3z" />
   </Icon>
 );

packages/ndla-icons/src/editor/AlignRight.tsx → packages/icons/src/editor/AlignRight.tsx

@@ -8,13 +8,7 @@
 // N.B! AUTOGENERATED FILE. DO NOT EDIT;
 import Icon, { type Props } from "../Icon";
 const AlignRight = (props: Props) => (
-  <Icon
-    fill="currentColor"
-    data-license="Apache License 2.0"
-    data-source="Material Design"
-    viewBox="0 0 24 24"
-    {...props}
-  >
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
     <path d="M3 4h18v2H3zm4 15h14v2H7zm-4-5h18v2H3zm4-5h14v2H7z" />
   </Icon>
 );

packages/icons/src/editor/FocusMode.tsx

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2024-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+// N.B! AUTOGENERATED FILE. DO NOT EDIT;
+import Icon, { type Props } from "../Icon";
+const FocusMode = (props: Props) => (
+  <Icon fill="currentColor" data-license="Apache License 2.0" data-source="RemixIcon" viewBox="0 0 24 24" {...props}>
+    <path d="M4 3a1 1 0 0 0-1 1v4h2V5h3V3zm16 0h-4v2h3v3h2V4a1 1 0 0 0-1-1M5 16v3h3v2H4a1 1 0 0 1-1-1v-4zm14 0v3h-3v2h4a1 1 0 0 0 1-1v-4zm-9-7a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1v-4a1 1 0 0 0-1-1z" />
+  </Icon>
+);
+export default FocusMode;