Merge d6d63a0 into d2964d3

Author: KenAJoh

.changeset/metal-pigs-sing.md

@@ -0,0 +1,6 @@
+---
+"@navikt/ds-react": minor
+"@navikt/ds-css": minor
+---
+
+InlineMessage: :tada: New component! Replaces `<Alert inline />` variant as a standalone component.

@navikt/core/css/config/_mappings.js

@@ -144,6 +144,11 @@ const StyleMappings = {
       dependencies: ["popover.css"],
     },
     { component: "Ingress", main: typoCss },
+    {
+      component: "InlineMessage",
+      main: "inline-message.css",
+      dependencies: [typoCss],
+    },
     {
       component: "InternalHeader",
       main: "internalheader.css",

@navikt/core/css/darkside/index.css

@@ -35,6 +35,7 @@
 @import "./expansioncard.darkside.css" layer(aksel.components);
 @import "./guide-panel.darkside.css" layer(aksel.components);
 @import "./help-text.darkside.css" layer(aksel.components);
+@import "./inline-message.darkside.css" layer(aksel.components);
 @import "./internalheader.darkside.css" layer(aksel.components);
 @import "./link.darkside.css" layer(aksel.components);
 @import "./link-panel.darkside.css" layer(aksel.components);

@navikt/core/css/darkside/inline-message.darkside.css

@@ -0,0 +1,15 @@
+.aksel-inline-message {
+  display: flex;
+  gap: var(--ax-space-4);
+  color: var(--ax-text-default);
+}
+
+.aksel-inline-message__icon {
+  color: var(--ax-text-subtle);
+  font-size: 1.5rem;
+  flex: 0 0 auto;
+
+  .aksel-inline-message[data-size="small"] & {
+    font-size: 1.25rem;
+  }
+}

@navikt/core/css/index.css

@@ -14,6 +14,7 @@
 @import "guide-panel.css";
 @import "form/index.css";
 @import "help-text.css";
+@import "inline-message.css";
 @import "internalheader.css";
 @import "link.css";
 @import "link-anchor.css";

@navikt/core/css/inline-message.css

@@ -0,0 +1,45 @@
+.navds-inline-message {
+  display: flex;
+  gap: var(--a-spacing-1);
+}
+
+.navds-inline-message[data-color="info"] {
+  color: var(--a-lightblue-900);
+
+  & .navds-inline-message__icon {
+    color: var(--a-icon-info);
+  }
+}
+
+.navds-inline-message[data-color="success"] {
+  color: var(--a-green-900);
+
+  & .navds-inline-message__icon {
+    color: var(--a-icon-success);
+  }
+}
+
+.navds-inline-message[data-color="danger"] {
+  color: var(--a-red-900);
+
+  & .navds-inline-message__icon {
+    color: var(--a-icon-danger);
+  }
+}
+
+.navds-inline-message[data-color="warning"] {
+  color: var(--a-orange-900);
+
+  & .navds-inline-message__icon {
+    color: var(--a-icon-warning);
+  }
+}
+
+.navds-inline-message__icon {
+  font-size: 1.5rem;
+  flex: 0 0 auto;
+
+  .navds-inline-message[data-size="small"] & {
+    font-size: 1.25rem;
+  }
+}

@navikt/core/react/package.json

@@ -624,6 +624,16 @@
         "default": "./cjs/form/form-progress/index.js"
       }
     },
+    "./InlineMessage": {
+      "import": {
+        "types": "./esm/inline-message/index.d.ts",
+        "default": "./esm/inline-message/index.js"
+      },
+      "require": {
+        "types": "./cjs/inline-message/index.d.ts",
+        "default": "./cjs/inline-message/index.js"
+      }
+    },
     "./package.json": "./package.json",
     "./Theme": {
       "import": {

@navikt/core/react/src/index.ts

@@ -163,6 +163,7 @@ export {
   type LinkCardIconProps,
   type LinkCardImageProps,
 } from "./link-card";
+export { InlineMessage, type InlineMessageProps } from "./inline-message";
 
 /**
  * Theming

@navikt/core/react/src/inline-message/InlineMessage.stories.tsx

@@ -0,0 +1,119 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import React from "react";
+import { VStack } from "../layout/stack";
+import { Link } from "../link";
+import { renderStoriesForChromatic } from "../util/renderStoriesForChromatic";
+import { InlineMessage } from "./index";
+
+const meta: Meta<typeof InlineMessage> = {
+  title: "ds-react/InlineMessage",
+  component: InlineMessage,
+  parameters: {
+    chromatic: { disable: true },
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof InlineMessage>;
+
+const variants = ["info", "success", "warning", "error"] as const;
+
+export const Default: Story = {
+  render: (props) => {
+    return (
+      <InlineMessage variant={props.variant ?? "warning"}>
+        {props.children ?? "InlineMessage content"}
+      </InlineMessage>
+    );
+  },
+
+  args: {
+    children: "Id elit esse enim reprehenderit enim nisi veniam nostrud.",
+    variant: "warning",
+  },
+  argTypes: {
+    variant: {
+      control: { type: "select" },
+      options: variants,
+    },
+  },
+};
+
+export const SizeSmall: Story = {
+  render: () => {
+    return (
+      <InlineMessage variant="warning" size="small">
+        <DemoContent />
+      </InlineMessage>
+    );
+  },
+};
+
+export const Compositions: Story = {
+  render: () => {
+    return (
+      <VStack gap="space-16">
+        {variants.map((variant) => (
+          <InlineMessage variant={variant} key={variant}>
+            <DemoContent />
+          </InlineMessage>
+        ))}
+      </VStack>
+    );
+  },
+};
+
+export const WrappingTitle: Story = {
+  render: () => {
+    return (
+      <InlineMessage variant="warning">
+        <DemoContent />
+      </InlineMessage>
+    );
+  },
+};
+
+export const AsLink: Story = {
+  render: () => {
+    return (
+      <InlineMessage variant="warning" as={Link} href="#">
+        This is a link inside the InlineMessage
+      </InlineMessage>
+    );
+  },
+};
+
+export const Chromatic = renderStoriesForChromatic({
+  Default,
+  Compositions,
+  WrappingTitle,
+  SizeSmall,
+});
+
+export const ChromaticLight = renderStoriesForChromatic({
+  Default,
+  Compositions,
+  WrappingTitle,
+  SizeSmall,
+});
+ChromaticLight.globals = { theme: "light", mode: "darkside" };
+
+export const ChromaticDark = renderStoriesForChromatic({
+  Default,
+  Compositions,
+  WrappingTitle,
+  SizeSmall,
+});
+ChromaticDark.globals = { theme: "dark", mode: "darkside" };
+
+function DemoContent() {
+  return (
+    <span>
+      Lorem ipsum dolor, sit amet consectetur adipisicing elit. Iure unde,
+      repudiandae, deleniti exercitationem quod aut veniam sint officiis
+      necessitatibus nulla nostrum voluptatem <Link href="#">Test</Link>{" "}
+      facilis! Commodi, nobis tempora quibusdam temporibus nulla quam.
+    </span>
+  );
+}

@navikt/core/react/src/inline-message/icon/InlineMessageIcon.tsx

@@ -0,0 +1,40 @@
+import React from "react";
+import {
+  CheckmarkCircleFillIcon,
+  ExclamationmarkTriangleFillIcon,
+  InformationSquareFillIcon,
+  XMarkOctagonFillIcon,
+} from "@navikt/aksel-icons";
+import { useRenameCSS } from "../../theme/Theme";
+import { useI18n } from "../../util/i18n/i18n.hooks";
+
+const VARIANT_ICONS = {
+  info: InformationSquareFillIcon,
+  success: CheckmarkCircleFillIcon,
+  warning: ExclamationmarkTriangleFillIcon,
+  error: XMarkOctagonFillIcon,
+} as const;
+
+function InlineMessageIcon({
+  variant,
+}: {
+  variant: "info" | "success" | "warning" | "error";
+}) {
+  const translate = useI18n("Alert");
+  const { cn } = useRenameCSS();
+
+  if (!(variant in VARIANT_ICONS)) {
+    return null;
+  }
+
+  const Icon = VARIANT_ICONS[variant];
+
+  return (
+    <Icon
+      title={translate(variant)}
+      className={cn("navds-inline-message__icon")}
+    />
+  );
+}
+
+export { InlineMessageIcon };