@navikt/ds-react 0.19.15 → 0.19.18

package/src/button/Button.tsx

@@ -32,70 +32,70 @@ export interface ButtonProps
   loading?: boolean;
 }
 
-export const Button: OverridableComponent<
-  ButtonProps,
-  HTMLButtonElement
-> = forwardRef(
-  (
-    {
-      as: Component = "button",
-      variant = "primary",
-      className,
-      children,
-      size = "medium",
-      loading = false,
-      disabled,
-      style,
-      ...rest
-    },
-    ref
-  ) => {
-    const buttonRef = useRef<HTMLButtonElement | null>(null);
-    const mergedRef = mergeRefs([buttonRef, ref]);
-    const [widthOverride, setWidthOverride] = useState<number>();
+export const Button: OverridableComponent<ButtonProps, HTMLButtonElement> =
+  forwardRef(
+    (
+      {
+        as: Component = "button",
+        variant = "primary",
+        className,
+        children,
+        size = "medium",
+        loading = false,
+        disabled,
+        style,
+        ...rest
+      },
+      ref
+    ) => {
+      const buttonRef = useRef<HTMLButtonElement | null>(null);
+      const mergedRef = mergeRefs([buttonRef, ref]);
+      const [widthOverride, setWidthOverride] = useState<number>();
 
-    useClientLayoutEffect(() => {
-      if (loading) {
-        const requestID = window.requestAnimationFrame(() => {
-          setWidthOverride(buttonRef?.current?.getBoundingClientRect()?.width);
-        });
-        return () => {
-          setWidthOverride(undefined);
-          cancelAnimationFrame(requestID);
-        };
-      }
-    }, [loading, children]);
+      useClientLayoutEffect(() => {
+        if (loading) {
+          const requestID = window.requestAnimationFrame(() => {
+            setWidthOverride(
+              buttonRef?.current?.getBoundingClientRect()?.width
+            );
+          });
+          return () => {
+            setWidthOverride(undefined);
+            cancelAnimationFrame(requestID);
+          };
+        }
+      }, [loading, children]);
 
-    return (
-      <Component
-        {...rest}
-        ref={mergedRef}
-        className={cl(
-          className,
-          "navds-button",
-          `navds-button--${variant}`,
-          `navds-button--${size}`,
-          {
-            "navds-button--loading": widthOverride,
-          }
-        )}
-        style={{
-          ...style,
-          width: widthOverride,
-        }}
-        disabled={disabled ?? widthOverride ? true : undefined}
-      >
-        <BodyShort
-          as="span"
-          className="navds-button__inner"
-          size={size === "medium" ? "medium" : "small"}
-          aria-live="polite"
+      return (
+        <Component
+          {...rest}
+          ref={mergedRef}
+          className={cl(
+            className,
+            "navds-button",
+            `navds-button--${variant}`,
+            `navds-button--${size}`,
+            {
+              "navds-button--loading": widthOverride,
+            }
+          )}
+          style={{
+            ...style,
+            width: widthOverride,
+          }}
+          disabled={disabled ?? widthOverride ? true : undefined}
         >
-          {widthOverride ? <Loader size={size} /> : children}
-        </BodyShort>
-      </Component>
-    );
-  }
-);
+          <BodyShort
+            as="span"
+            className="navds-button__inner"
+            size={size === "medium" ? "medium" : "small"}
+            aria-live="polite"
+          >
+            {widthOverride ? <Loader size={size} /> : children}
+          </BodyShort>
+        </Component>
+      );
+    }
+  );
 
 export default Button;

package/src/form/radio/RadioGroup.tsx

@@ -11,9 +11,8 @@ export interface RadioGroupContextProps {
   required?: boolean;
 }
 
-export const RadioGroupContext = React.createContext<RadioGroupContextProps | null>(
-  null
-);
+export const RadioGroupContext =
+  React.createContext<RadioGroupContextProps | null>(null);
 
 export interface RadioGroupProps
   extends Omit<

package/src/form/search/Search.tsx

@@ -8,10 +8,9 @@ import React, {
   useState,
 } from "react";
 import mergeRefs from "react-merge-refs";
-import { BodyShort, Label, omit, useEventListener } from "../..";
-import { FormFieldProps } from "../useFormField";
+import { BodyShort, ErrorMessage, Label, omit, useEventListener } from "../..";
+import { FormFieldProps, useFormField } from "../useFormField";
 import SearchButton, { SearchButtonType } from "./SearchButton";
-import { useSearch } from "./useSearch";
 
 export type SearchClearEvent =
   | {
@@ -21,7 +20,7 @@ export type SearchClearEvent =
   | { trigger: "Escape"; event: React.KeyboardEvent<HTMLDivElement> };
 
 export interface SearchProps
-  extends Omit<FormFieldProps, "error" | "errorId">,
+  extends FormFieldProps,
     Omit<InputHTMLAttributes<HTMLInputElement>, "size" | "onChange"> {
   children?: React.ReactNode;
   /**
@@ -82,7 +81,10 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(
       inputProps,
       size = "medium",
       inputDescriptionId,
-    } = useSearch(props, "searchfield");
+      errorId,
+      showErrorMsg,
+      hasError,
+    } = useFormField(props, "searchfield");
 
     const {
       className,
@@ -146,6 +148,7 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(
           `navds-form-field--${size}`,
           "navds-search",
           {
+            "navds-search--error": hasError,
             "navds-search--disabled": !!inputProps.disabled,
           }
         )}
@@ -179,7 +182,7 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(
             )}
             <input
               ref={mergedRef}
-              {...omit(rest, ["size"])}
+              {...omit(rest, ["error", "errorId", "size"])}
               {...inputProps}
               value={value ?? internalValue}
               onChange={(e) => handleChange(e.target.value)}
@@ -217,6 +220,16 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(
             {children ? children : variant !== "simple" && <SearchButton />}
           </SearchContext.Provider>
         </div>
+        <div
+          className="navds-form-field__error"
+          id={errorId}
+          aria-relevant="additions removals"
+          aria-live="polite"
+        >
+          {showErrorMsg && (
+            <ErrorMessage size={size}>{props.error}</ErrorMessage>
+          )}
+        </div>
       </div>
     );
   }

package/src/form/search/search.stories.tsx

@@ -23,6 +23,11 @@ export default {
         options: ["primary", "secondary", "simple"],
       },
     },
+    error: {
+      control: {
+        type: "text",
+      },
+    },
   },
 } as Meta;
 
@@ -38,6 +43,7 @@ export const Default = (props) => {
         clearButton={props.clearButton}
         variant={props.variant}
         hideLabel={props.hideLabel}
+        error={props.error}
       />
     </div>
   );
@@ -79,6 +85,21 @@ export const Variants = () => (
   </div>
 );
 
+export const ErrorVariants = () => (
+  <div className="rowgap">
+    <div className="colgap">
+      <Search error="errormsg" label="Søk" />
+      <Search error="errormsg" label="Søk" variant="secondary" />
+      <Search error="errormsg" label="Søk" variant="simple" />
+    </div>
+    <div className="colgap" data-theme="dark">
+      <Search error="errormsg" label="Søk" />
+      <Search error="errormsg" label="Søk" variant="secondary" />
+      <Search error="errormsg" label="Søk" variant="simple" />
+    </div>
+  </div>
+);
+
 export const Placeholder = () => (
   <div className="rowgap">
     <div className="colgap">

package/src/link/Link.tsx

@@ -10,11 +10,9 @@ export interface LinkProps
   children: React.ReactNode;
 }
 
-export const Link: OverridableComponent<
-  LinkProps,
-  HTMLAnchorElement
-> = forwardRef(({ as: Component = "a", className, ...rest }, ref) => (
-  <Component {...rest} ref={ref} className={cl("navds-link", className)} />
-));
+export const Link: OverridableComponent<LinkProps, HTMLAnchorElement> =
+  forwardRef(({ as: Component = "a", className, ...rest }, ref) => (
+    <Component {...rest} ref={ref} className={cl("navds-link", className)} />
+  ));
 
 export default Link;

package/src/stepper/Step.tsx

@@ -10,10 +10,10 @@ export interface StepperStepProps
    */
   children: string;
   /**
-   * Handled by Stepper
+   * Handled by Stepper, overwriting may break component logic
    * @private
    */
-  index?: number;
+  unsafe_index?: number;
 }
 
 export interface StepperStepType
@@ -23,33 +23,36 @@ export const StepComponent: OverridableComponent<
   StepperStepProps,
   HTMLAnchorElement
 > = forwardRef(
-  ({ className, children, as: Component = "a", index = 0, ...rest }, ref) => {
+  (
+    { className, children, as: Component = "a", unsafe_index = 0, ...rest },
+    ref
+  ) => {
     const context = useContext(StepperContext);
     if (context === null) {
-      console.error(
-        "<StepIndicator.Step> has to be used within an <StepIndicator>"
-      );
+      console.error("<Stepper.Step> has to be used within <Stepper>");
       return null;
     }
-    const activeStep = context.activeStep === index;
+    const { activeStep } = context;
 
     return (
       <Component
         {...rest}
-        aria-current={Boolean(activeStep)}
+        aria-current={activeStep === unsafe_index}
         ref={ref}
         className={cl("navds-stepper__step", className, {
-          "navds-stepper__step--active": activeStep,
+          "navds-stepper__step--active": activeStep === unsafe_index,
         })}
         onClick={(e) => {
-          context.onStepChange(index);
+          context.onStepChange(unsafe_index + 1);
           rest?.onClick?.(e);
         }}
       >
-        <Label className="navds-stepper__step-number" as="span">
-          {activeStep ? `${index + 1}` : index + 1}
+        <Label className="navds-stepper__circle" as="span" aria-hidden="true">
+          {unsafe_index + 1}
+        </Label>
+        <Label as="span" className="navds-stepper__content">
+          {children}
         </Label>
-        <Label className="navds-stepper__step-label">{children}</Label>
       </Component>
     );
   }

package/src/stepper/Stepper.tsx

@@ -8,15 +8,18 @@ export interface StepperProps extends React.HTMLAttributes<HTMLOListElement> {
    */
   children: React.ReactNode;
   /**
-   * Adds classname to wrapper
+   * The direction the component grows.
+   * @default "vertical"
    */
-  className?: string;
+  orientation?: "horizontal" | "vertical";
   /**
-   * Current active step index
+   * Current active step.
+   * @note Stepper index starts at 1, not 0
    */
   activeStep: number;
   /**
-   * Callback for clicked step index
+   * Callback for next activeStep
+   * @note Stepper index starts at 1, not 0
    */
   onStepChange?: (step: number) => void;
 }
@@ -32,6 +35,7 @@ interface StepperContextProps {
   activeStep: number;
   onStepChange: (step: number) => void;
   lastIndex: number;
+  orientation: "horizontal" | "vertical";
 }
 
 export const StepperContext = createContext<StepperContextProps | null>(null);
@@ -41,27 +45,49 @@ export const Stepper: StepperComponent = forwardRef<
   StepperProps
 >(
   (
-    { children, className, activeStep, onStepChange = () => {}, ...rest },
+    {
+      children,
+      className,
+      activeStep,
+      orientation = "vertical",
+      onStepChange = () => {},
+      ...rest
+    },
     ref
   ) => {
+    activeStep = activeStep - 1;
     return (
-      <ol {...rest} ref={ref} className={cl("navds-stepper", className)}>
+      <ol
+        {...rest}
+        ref={ref}
+        className={cl(
+          "navds-stepper",
+          orientation === "horizontal" ? "navds-stepper--horizontal" : "",
+          className
+        )}
+      >
         <StepperContext.Provider
           value={{
             activeStep,
             onStepChange,
             lastIndex: React.Children.count(children),
+            orientation,
           }}
         >
           {React.Children.map(children, (step, index) => {
             return (
               <li
-                className={cl("navds-stepper__step-wrapper")}
+                className={cl("navds-stepper__item")}
                 key={index + (children?.toString?.() ?? "")}
               >
+                <span className="navds-stepper__line navds-stepper__line--1" />
                 {React.isValidElement<StepperStepProps>(step)
-                  ? React.cloneElement(step, { ...step.props, index })
+                  ? React.cloneElement(step, {
+                      ...step.props,
+                      unsafe_index: index,
+                    })
                   : step}
+                <span className="navds-stepper__line navds-stepper__line--2" />
               </li>
             );
           })}

package/src/stepper/stepper.stories.tsx

@@ -0,0 +1,133 @@
+import { Meta } from "@storybook/react/types-6-0";
+import React, { useState } from "react";
+import Stepper from "./Stepper";
+import { BodyLong } from "..";
+
+export default {
+  title: "ds-react/Stepper",
+  component: Stepper,
+  argTypes: {
+    orientation: {
+      control: {
+        type: "radio",
+        options: ["horizontal", "vertical"],
+      },
+    },
+  },
+} as Meta;
+
+const storyTexts = [
+  "Minimize backwards overflow agile. Horsehead offer commitment to the cause nor copy and paste from stack overflow problem territories, innovation is hot right now for can you slack it to me?. High touch client table the discussion , and get buy-in so manage expectations loop back, please advise soonest. We need a paradigm shift dogpile that, and i need to pee and then go to another meeting for let's prioritize the low-hanging fruit.",
+  "Customer centric sorry i didn't get your email proceduralize, and first-order optimal strategies. I dont care if you got some copy, why you dont use officeipsumcom or something like that ? wheelhouse. Viral engagement new economy, this proposal is a win-win situation which will cause a stellar paradigm shift, and produce a multi-fold increase in deliverables Bob called an all-hands this afternoon. Fire up your browser touch base innovation is hot right now so this medium needs to be more dynamic.",
+  "Touch base define the underlying principles that drive decisions and strategy for your design language. I have zero cycles for this. Cadence social currency, for low engagement execute . Deliverables rehydrate the team or let's circle back to that those options are already baked in with this model teams were able to drive adoption and awareness we need to start advertising on social media circle back. Through the lens of face time.",
+  "Take five, punch the tree, and come back in here with a clear head those options are already baked in with this model ultimate measure of success and we need to crystallize a plan yet open door policy who's responsible for the ask for this request? what do you feel you would bring to the table if you were hired for this position. Wiggle room guerrilla marketing shelfware. Code feature creep can we parallel path lose client to 10:00 meeting hire the best manage expectations root-and-branch review.",
+  "Curate downselect tread it daily cc me on that due diligence, or close the loop. All hands on deck my supervisor didn't like the latest revision you gave me can you switch back to the first revision? ping me or game-plan, yet make it a priority, on this journey win-win. Our competitors are jumping the shark we need to build it so that it scales post launch future-proof can we align on lunch orders. Deliverables message the initiative.",
+  "Out of scope poop, so pre launch. I just wanted to give you a heads-up wiggle room cc me on that I have been doing some research this morning and we need to better, nor dog and pony show prioritize these line items so UX. Big data upstream selling circle back, in an ideal world. Get all your ducks in a row land it in region so code so one-sheet. Action item we need to think big start small and scale fast to energize our clients. Cta due diligence, for this vendor is incompetent nor forcing function and circle back and low engagement.",
+  "Move the needle a loss a day will keep you focus yet can you put it into a banner that is not alarming, but eye catching and not too giant or strategic fit, nor it is all exactly as i said, but i don't like it or streamline. We've bootstrapped the model. This proposal is a win-win situation which will cause a stellar paradigm shift, and produce a multi-fold increase in deliverables the horse is out of the barn usabiltiy, for going forward but going forward.",
+];
+
+export const Default = ({ asButton, ...props }) => {
+  const [activeStep, setActiveStep] = useState(1);
+
+  const newProps = {
+    onClick: (e) => e.preventDefault(),
+    ...(asButton ? { as: "button" } : { href: "#" }),
+  };
+
+  return (
+    <div style={{ display: "flex", gap: "10rem", flexDirection: "column" }}>
+      <Stepper
+        aria-labelledby="stepper-heading"
+        activeStep={activeStep}
+        onStepChange={setActiveStep}
+        orientation="horizontal"
+        {...props}
+      >
+        <Stepper.Step {...newProps}>Start søknad</Stepper.Step>
+        <Stepper.Step {...newProps}>Personopplysninger</Stepper.Step>
+        <Stepper.Step {...newProps}>Saksopplysninger</Stepper.Step>
+        <Stepper.Step {...newProps}>
+          Søknadstekst for en veldig spesifikk prosess i NAV som må beskrives og
+          forklares i sitt fulle i denne labelen
+        </Stepper.Step>
+        <Stepper.Step {...newProps}>Vedlegg</Stepper.Step>
+        <Stepper.Step {...newProps}>Oppsummering</Stepper.Step>
+        <Stepper.Step {...newProps}>Innsending</Stepper.Step>
+      </Stepper>
+      <BodyLong style={{ marginTop: "5rem" }}>
+        {storyTexts[activeStep]}
+      </BodyLong>
+    </div>
+  );
+};
+
+Default.args = {
+  asButton: false,
+};
+
+export const Horizontal = () => {
+  const [activeStep, setActiveStep] = useState(2);
+  const props = { onClick: (e) => e.preventDefault(), href: "#" };
+  return (
+    <Stepper
+      aria-labelledby="stepper-heading"
+      activeStep={activeStep}
+      onStepChange={setActiveStep}
+      orientation="horizontal"
+    >
+      <Stepper.Step {...props}>Start søknad</Stepper.Step>
+      <Stepper.Step {...props}>Personopplysninger</Stepper.Step>
+      <Stepper.Step {...props}>Saksopplysninger</Stepper.Step>
+      <Stepper.Step {...props}>
+        Søknadstekst for en veldig spesifikk prosess i NAV som har lang tekst
+      </Stepper.Step>
+      <Stepper.Step {...props}>Vedlegg</Stepper.Step>
+      <Stepper.Step {...props}>Oppsummering</Stepper.Step>
+      <Stepper.Step {...props}>Innsending</Stepper.Step>
+    </Stepper>
+  );
+};
+
+export const Vertical = () => {
+  const [activeStep, setActiveStep] = useState(2);
+  const props = { onClick: (e) => e.preventDefault(), href: "#" };
+  return (
+    <Stepper
+      aria-labelledby="stepper-heading"
+      activeStep={activeStep}
+      onStepChange={setActiveStep}
+      orientation="vertical"
+    >
+      <Stepper.Step {...props}>Start søknad</Stepper.Step>
+      <Stepper.Step {...props}>Personopplysninger</Stepper.Step>
+      <Stepper.Step {...props}>Saksopplysninger</Stepper.Step>
+      <Stepper.Step {...props}>
+        Søknadstekst for en veldig spesifikk prosess i NAV som har lang tekst
+      </Stepper.Step>
+      <Stepper.Step {...props}>Vedlegg</Stepper.Step>
+      <Stepper.Step {...props}>Oppsummering</Stepper.Step>
+      <Stepper.Step {...props}>Innsending</Stepper.Step>
+    </Stepper>
+  );
+};
+
+export const DisplayOnly = () => {
+  const props = { as: "div" };
+  return (
+    <Stepper
+      aria-labelledby="stepper-heading"
+      activeStep={2}
+      orientation="vertical"
+    >
+      <Stepper.Step {...props}>Start søknad</Stepper.Step>
+      <Stepper.Step {...props}>Personopplysninger</Stepper.Step>
+      <Stepper.Step {...props}>Saksopplysninger</Stepper.Step>
+      <Stepper.Step {...props}>
+        Søknadstekst for en veldig spesifikk prosess i NAV som har lang tekst
+      </Stepper.Step>
+      <Stepper.Step {...props}>Vedlegg</Stepper.Step>
+      <Stepper.Step {...props}>Oppsummering</Stepper.Step>
+      <Stepper.Step {...props}>Innsending</Stepper.Step>
+    </Stepper>
+  );
+};

package/src/tooltip/Tooltip.tsx

@@ -171,10 +171,10 @@ export const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
     );
 
     /* https://floating-ui.com/docs/react-dom#stable-ref-prop */
-    const stableRef = useMemo(() => mergeRefs([ref, refs.floating]), [
-      ref,
-      refs.floating,
-    ]);
+    const stableRef = useMemo(
+      () => mergeRefs([ref, refs.floating]),
+      [ref, refs.floating]
+    );
 
     if (
       !children ||

package/src/typography/Heading.tsx

@@ -23,23 +23,21 @@ export interface HeadingProps extends React.HTMLAttributes<HTMLHeadingElement> {
   spacing?: boolean;
 }
 
-export const Heading: OverridableComponent<
-  HeadingProps,
-  HTMLHeadingElement
-> = forwardRef(
-  ({ level = "1", size, spacing = false, className, as, ...rest }, ref) => {
-    let HeadingTag = as ?? (`h${level}` as React.ElementType);
+export const Heading: OverridableComponent<HeadingProps, HTMLHeadingElement> =
+  forwardRef(
+    ({ level = "1", size, spacing = false, className, as, ...rest }, ref) => {
+      let HeadingTag = as ?? (`h${level}` as React.ElementType);
 
-    return (
-      <HeadingTag
-        {...rest}
-        ref={ref}
-        className={cl(className, "navds-heading", `navds-heading--${size}`, {
-          "navds-typo--spacing": spacing,
-        })}
-      />
-    );
-  }
-);
+      return (
+        <HeadingTag
+          {...rest}
+          ref={ref}
+          className={cl(className, "navds-heading", `navds-heading--${size}`, {
+            "navds-typo--spacing": spacing,
+          })}
+        />
+      );
+    }
+  );
 
 export default Heading;

package/src/typography/Ingress.tsx

@@ -14,17 +14,15 @@ export interface IngressProps
   spacing?: boolean;
 }
 
-export const Ingress: OverridableComponent<
-  IngressProps,
-  HTMLParagraphElement
-> = forwardRef(({ className, spacing, as: Component = "p", ...rest }, ref) => (
-  <Component
-    {...rest}
-    ref={ref}
-    className={cl(className, "navds-ingress", {
-      "navds-typo--spacing": !!spacing,
-    })}
-  />
-));
+export const Ingress: OverridableComponent<IngressProps, HTMLParagraphElement> =
+  forwardRef(({ className, spacing, as: Component = "p", ...rest }, ref) => (
+    <Component
+      {...rest}
+      ref={ref}
+      className={cl(className, "navds-ingress", {
+        "navds-typo--spacing": !!spacing,
+      })}
+    />
+  ));
 
 export default Ingress;