@navikt/ds-react 0.14.14 → 0.15.0-rc.45

package/src/menu/stories/menu.stories.tsx

@@ -0,0 +1,139 @@
+import * as React from "react";
+import cl from "classnames";
+import { Menu } from "../index";
+import { NavLink, HashRouter as Router } from "react-router-dom";
+import { MenuItemProps } from "../MenuItem";
+
+export default {
+  title: "ds-react/menu",
+  component: { Menu },
+};
+
+export const All = () => (
+  <div
+    style={{
+      background: "white",
+      maxWidth: 288,
+    }}
+  >
+    <h2>Only Menu.Items</h2>
+    <Menu>
+      <Menu.Item href="#leo">Leo</Menu.Item>
+
+      <Menu.Item href="#justo">Justo</Menu.Item>
+      <Menu.Item href="#pariatur" active aria-current="page">
+        Pariatur
+      </Menu.Item>
+      <Menu.Item href="#nulla">Nulla</Menu.Item>
+      <Menu.Item href="#luctus">Luctus</Menu.Item>
+      <Menu.Item href="#justo">Justo</Menu.Item>
+      <Menu.Item href="#pariatur">Pariatur</Menu.Item>
+    </Menu>
+
+    <h2>With Collapse</h2>
+    <Menu>
+      <Menu.Item href="#leo">Leo</Menu.Item>
+      <Menu.Collapse title="Proin">
+        <Menu.Item href="#nulla" active>
+          Nulla
+        </Menu.Item>
+        <Menu.Item href="#luctus">Luctus</Menu.Item>
+      </Menu.Collapse>
+      <Menu.Collapse title="Accumsan">
+        <Menu.Item href="#justo" aria-current="page">
+          Justo
+        </Menu.Item>
+        <Menu.Item href="#pariatur" active aria-current="page">
+          Pariatur
+        </Menu.Item>
+        <Menu.Collapse title="Proin">
+          <Menu.Item href="#nulla" active>
+            Nulla
+          </Menu.Item>
+          <Menu.Collapse title="Proin">
+            <Menu.Item href="#nulla" active>
+              Nulla
+            </Menu.Item>
+            <Menu.Item href="#luctus">Luctus</Menu.Item>
+          </Menu.Collapse>
+          <Menu.Item href="#luctus">Luctus</Menu.Item>
+        </Menu.Collapse>
+      </Menu.Collapse>
+      <Menu.Item href="#justo" active>
+        Justo
+      </Menu.Item>
+      <Menu.Item href="#pariatur">Pariatur</Menu.Item>
+    </Menu>
+  </div>
+);
+
+export const ReactRouter = () => {
+  const MenuItemLink = (props: MenuItemProps & { to: string }) => {
+    const { to } = props;
+
+    const CustomLink = React.useMemo(
+      () => (props: MenuItemProps) => (
+        <NavLink
+          {...props}
+          to={to}
+          className={({ isActive }) =>
+            cl(props.className, {
+              "navds-menu-item--active": isActive,
+            })
+          }
+        />
+      ),
+      [to]
+    );
+
+    return (
+      <Menu.Item {...props} as={CustomLink}>
+        Nivå 2 innrykk 2 rems
+      </Menu.Item>
+    );
+  };
+
+  return (
+    <Menu>
+      <Menu.Collapse title="Nivå 1 - 3 rems høy">
+        <MenuItemLink to="/1">Nivå 2 innrykk 2 rems</MenuItemLink>
+        <MenuItemLink to="/2">Subtitle 3</MenuItemLink>
+      </Menu.Collapse>
+      <Menu.Collapse title="Skjema og søknad">
+        <Menu.Collapse title="Satser">
+          <MenuItemLink to="/3">
+            Nivå 3 - 3 rems innrykk Har du rett til dagpenger når du mottar
+            annen økonomisk støtte fra NAV?
+          </MenuItemLink>
+        </Menu.Collapse>
+        <MenuItemLink to="/4">Subtitle 2</MenuItemLink>
+        <MenuItemLink to="/5">Subtitle 3</MenuItemLink>
+      </Menu.Collapse>
+      <Menu.Collapse title="Sakbehandlingstider">
+        <Menu.Collapse title="Subtitle 4 Lang tittel på andre nivå lorem ipsum">
+          <MenuItemLink to="/6">Subtitle 5</MenuItemLink>
+        </Menu.Collapse>
+      </Menu.Collapse>
+      <MenuItemLink to="/7">Internasjonalt</MenuItemLink>
+      <Menu.Collapse title="Meld fra om endringer lang tittel på første nivå">
+        <MenuItemLink to="/8">Subtitle 6</MenuItemLink>
+      </Menu.Collapse>
+      <MenuItemLink to="/9">Nivå 1</MenuItemLink>
+    </Menu>
+  );
+};
+
+ReactRouter.decorators = [
+  (Story) => (
+    <Router>
+      <div
+        style={{
+          background: "white",
+          maxWidth: 288,
+        }}
+      >
+        <Story />
+      </div>
+    </Router>
+  ),
+];

package/src/modal/Modal.tsx

@@ -33,6 +33,9 @@ export interface ModalProps {
    * @default true
    */
   closeButton?: boolean;
+  "aria-labelledby"?: string;
+  "aria-describedby"?: string;
+  "aria-modal"?: boolean;
 }
 
 interface ModalComponent
@@ -56,6 +59,9 @@ const Modal = forwardRef<ReactModal, ModalProps>(
       className,
       shouldCloseOnOverlayClick = true,
       closeButton = true,
+      "aria-describedby": ariaDescribedBy,
+      "aria-labelledby": ariaLabelledBy,
+      "aria-modal": ariaModal,
       ...rest
     },
     ref
@@ -81,6 +87,11 @@ const Modal = forwardRef<ReactModal, ModalProps>(
         overlayClassName="navds-modal__overlay"
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
         onRequestClose={(e) => onModalCloseRequest(e)}
+        aria={{
+          describedby: ariaDescribedBy,
+          labelledby: ariaLabelledBy,
+          modal: ariaModal,
+        }}
       >
         {children}
         {closeButton && (

package/src/page-header/PageHeader.tsx

@@ -55,11 +55,7 @@ const PageHeader = forwardRef<HTMLDivElement, PageHeaderProps>(
           <div className="navds-page-header__illustration">{illustration}</div>
         )}
         <div className="navds-page-header__wrapper">
-          <Heading
-            className="navds-page-header__title"
-            size="2xlarge"
-            level="1"
-          >
+          <Heading className="navds-page-header__title" size="xlarge" level="1">
             {children}
           </Heading>
           {description && (

package/src/pagination/Pagination.tsx

@@ -0,0 +1,143 @@
+import React from "react";
+import cl from "classnames";
+import { Back, Next } from "@navikt/ds-icons";
+import { BodyShort } from "..";
+
+interface PaginationProps extends React.HTMLAttributes<HTMLElement> {
+  /**
+   * Current page
+   */
+  page: number;
+  /**
+   * Number of always visible pages before and after the current page.
+   * @default 1
+   */
+  siblingCount?: number;
+  /**
+   * Number of always visible pages at the beginning and end.
+   * @default 1
+   */
+  boundaryCount?: number;
+  /**
+   * Callback when current page changes
+   */
+  onPageChange: (page: number) => void;
+  /**
+   * Total number of pages
+   */
+  count: number;
+  /**
+   * Changes padding, height and font-size
+   * @default "medium"
+   */
+  size?: "medium" | "small";
+  /**
+   * Display text alongside "previous" and "next" icons
+   * @default false
+   */
+  prevNextTexts?: boolean;
+}
+
+export const getSteps = ({
+  page,
+  count,
+  boundaryCount = 1,
+  siblingCount = 1,
+}) => {
+  const range = (start: number, end: number) =>
+    Array.from({ length: end - start + 1 }, (_, i) => start + i);
+
+  if (count <= (boundaryCount + siblingCount) * 2 + 3) return range(1, count);
+
+  const startPages = range(1, boundaryCount);
+  const endPages = range(count - boundaryCount + 1, count);
+
+  const siblingsStart = Math.max(
+    Math.min(page - siblingCount, count - boundaryCount - siblingCount * 2 - 1),
+    boundaryCount + 2
+  );
+  const siblingsEnd = siblingsStart + siblingCount * 2;
+
+  return [
+    ...startPages,
+    siblingsStart - (startPages[startPages.length - 1] ?? 0) === 2
+      ? siblingsStart - 1
+      : "ellipsis",
+    ...range(siblingsStart, siblingsEnd),
+    (endPages[0] ?? count + 1) - siblingsEnd === 2
+      ? siblingsEnd + 1
+      : "ellipsis",
+    ...endPages,
+  ];
+};
+const Pagination = ({
+  page,
+  onPageChange,
+  count,
+  siblingCount,
+  boundaryCount,
+  className,
+  size = "medium",
+  prevNextTexts = false,
+}: PaginationProps) => {
+  return (
+    <nav
+      className={cl("navds-pagination", `navds-pagination--${size}`, className)}
+    >
+      <ul className="navds-pagination__list">
+        <li>
+          <button
+            className="navds-pagination__previous"
+            disabled={page === 1}
+            onClick={() => onPageChange(page - 1)}
+          >
+            <Back
+              className="navds-pagination__previous-icon"
+              title={prevNextTexts ? undefined : "Tilbake"}
+              role={prevNextTexts ? "presentation" : undefined}
+            />
+            {prevNextTexts && <BodyShort size={size}>Tilbake</BodyShort>}
+          </button>
+        </li>
+        {getSteps({ page, count, siblingCount, boundaryCount }).map(
+          (step, i) => {
+            const n = Number(step);
+            return isNaN(n) ? (
+              <li className="navds-pagination__ellipsis" key={`${step}${i}`}>
+                <BodyShort size={size}>...</BodyShort>
+              </li>
+            ) : (
+              <li key={step}>
+                <BodyShort
+                  size={size}
+                  as="button"
+                  className="navds-pagination__item"
+                  onClick={() => onPageChange(n)}
+                  aria-current={page === n ? true : undefined}
+                >
+                  {n}
+                </BodyShort>
+              </li>
+            );
+          }
+        )}
+        <li>
+          <button
+            className="navds-pagination__next"
+            disabled={page === count}
+            onClick={() => onPageChange(page + 1)}
+          >
+            {prevNextTexts && <BodyShort size={size}>Neste</BodyShort>}
+            <Next
+              className="navds-pagination__next-icon"
+              title={prevNextTexts ? undefined : "Neste"}
+              role={prevNextTexts ? "presentation" : undefined}
+            />
+          </button>
+        </li>
+      </ul>
+    </nav>
+  );
+};
+
+export default Pagination;

package/src/pagination/index.ts

@@ -0,0 +1,2 @@
+export { default as Pagination } from "./Pagination";
+export * from "./Pagination";

package/src/pagination/steps.test.ts

@@ -0,0 +1,120 @@
+import faker from "faker";
+import { getSteps } from "./Pagination";
+
+describe("getSteps", () => {
+  it("lists all pages when count is <= 7", () => {
+    const count = faker.datatype.number({ min: 1, max: 7 });
+    expect(getSteps({ page: 1, count })).toEqual(
+      Array.from({ length: count }, (_, i) => i + 1)
+    );
+  });
+
+  it("has an end ellipsis when count >= 8", () => {
+    const count = faker.datatype.number({ min: 8 });
+    const page = faker.datatype.number({ min: 1, max: 4 });
+    expect(
+      getSteps({
+        page,
+        count,
+      })
+    ).toEqual([1, 2, 3, 4, 5, "ellipsis", count]);
+  });
+
+  it("has a start ellipsis when count - page >= 3", () => {
+    const count = faker.datatype.number({ min: 8 });
+    const page = faker.datatype.number({ min: count - 3, max: count });
+    expect(
+      getSteps({
+        page,
+        count,
+      })
+    ).toEqual([
+      1,
+      "ellipsis",
+      count - 4,
+      count - 3,
+      count - 2,
+      count - 1,
+      count,
+    ]);
+  });
+
+  it("has start & end ellipsis when count is high", () => {
+    const count = faker.datatype.number({ min: 9 });
+    const page = faker.datatype.number({ min: 5, max: count - 4 });
+    expect(
+      getSteps({
+        page,
+        count,
+      })
+    ).toEqual([1, "ellipsis", page - 1, page, page + 1, "ellipsis", count]);
+  });
+
+  it("can have a reduced siblingCount", () => {
+    const count = faker.datatype.number({ min: 7 });
+    const page = faker.datatype.number({ min: 4, max: count - 3 });
+    expect(
+      getSteps({
+        page,
+        count,
+        siblingCount: 0,
+      })
+    ).toEqual([1, "ellipsis", page, "ellipsis", count]);
+  });
+
+  it("can have an increased siblingCount", () => {
+    const count = faker.datatype.number({ min: 11 });
+    const page = faker.datatype.number({ min: 6, max: count - 5 });
+    expect(
+      getSteps({
+        page,
+        count,
+        siblingCount: 2,
+      })
+    ).toEqual([
+      1,
+      "ellipsis",
+      page - 2,
+      page - 1,
+      page,
+      page + 1,
+      page + 2,
+      "ellipsis",
+      count,
+    ]);
+  });
+
+  it("can have an reduced boundaryCount", () => {
+    const count = faker.datatype.number({ min: 7 });
+    const page = faker.datatype.number({ min: 4, max: count - 3 });
+    expect(
+      getSteps({
+        page,
+        count,
+        boundaryCount: 0,
+      })
+    ).toEqual(["ellipsis", page - 1, page, page + 1, "ellipsis"]);
+  });
+
+  it("can have an increased boundaryCount", () => {
+    const count = faker.datatype.number({ min: 11 });
+    const page = faker.datatype.number({ min: 6, max: count - 5 });
+    expect(
+      getSteps({
+        page,
+        count,
+        boundaryCount: 2,
+      })
+    ).toEqual([
+      1,
+      2,
+      "ellipsis",
+      page - 1,
+      page,
+      page + 1,
+      "ellipsis",
+      count - 1,
+      count,
+    ]);
+  });
+});

package/src/pagination/stories/pagination.stories.tsx

@@ -0,0 +1,18 @@
+import React, { useState } from "react";
+import Pagination from "../Pagination";
+
+export default {
+  title: "ds-react/pagination",
+  component: Pagination,
+};
+
+export const All = (props) => {
+  const [page, setPage] = useState(props.page);
+  return <Pagination {...props} page={page} onPageChange={setPage} />;
+};
+All.args = {
+  page: 1,
+  count: 8,
+  siblingCount: 1,
+  boundaryCount: 1,
+};

package/src/table/ColumnHeader.tsx

@@ -0,0 +1,70 @@
+import React, { forwardRef, useContext } from "react";
+import { TableContext } from "..";
+import { Down, Up } from "@navikt/ds-icons";
+import HeaderCell from "./HeaderCell";
+
+interface ColumnHeaderProps extends React.HTMLAttributes<HTMLTableCellElement> {
+  /**
+   * Column is sortable
+   * @default false
+   */
+  sortable?: boolean;
+  /**
+   * Key to sort by
+   */
+  sortKey?: string;
+}
+
+export interface ColumnHeaderType
+  extends React.ForwardRefExoticComponent<
+    ColumnHeaderProps & React.RefAttributes<HTMLTableCellElement>
+  > {}
+
+const ColumnHeader: ColumnHeaderType = forwardRef(
+  ({ className, children, sortable = false, sortKey, ...rest }, ref) => {
+    const context = useContext(TableContext);
+
+    if (sortable && !sortKey) {
+      console.warn("ColumnHeader with `sortable=true` must have a sortKey.");
+    }
+
+    return (
+      <HeaderCell
+        scope="col"
+        ref={ref}
+        className={className}
+        aria-sort={
+          sortable
+            ? context?.sort?.orderBy === sortKey
+              ? context?.sort?.direction
+              : "none"
+            : undefined
+        }
+        {...rest}
+      >
+        {sortable ? (
+          <button
+            className="navds-table__sort-button"
+            onClick={
+              sortable && sortKey
+                ? () => context?.onSortChange?.(sortKey)
+                : undefined
+            }
+          >
+            {children}
+            {context?.sort?.orderBy === sortKey &&
+            context?.sort?.direction === "descending" ? (
+              <Down aria-label="sorter synkende" />
+            ) : (
+              <Up aria-label="sorter stigende" />
+            )}
+          </button>
+        ) : (
+          children
+        )}
+      </HeaderCell>
+    );
+  }
+);
+
+export default ColumnHeader;

package/src/table/Table.tsx

@@ -3,9 +3,15 @@ import cl from "classnames";
 import Header, { HeaderType } from "./Header";
 import Body, { BodyType } from "./Body";
 import Row, { RowType } from "./Row";
+import ColumnHeader, { ColumnHeaderType } from "./ColumnHeader";
 import HeaderCell, { HeaderCellType } from "./HeaderCell";
 import DataCell, { DataCellType } from "./DataCell";
 
+export interface SortState {
+  orderBy: string;
+  direction: "ascending" | "descending";
+}
+
 export interface TableProps extends React.HTMLAttributes<HTMLTableElement> {
   /**
    * Changes padding
@@ -17,6 +23,14 @@ export interface TableProps extends React.HTMLAttributes<HTMLTableElement> {
    * @default false
    */
   zebraStripes?: boolean;
+  /**
+   * Sort state
+   */
+  sort?: SortState;
+  /**
+   * Callback whens ort state changes
+   */
+  onSortChange?: (sortKey?: string) => void;
 }
 
 export interface TableType
@@ -28,17 +42,30 @@ export interface TableType
   Row: RowType;
   DataCell: DataCellType;
   HeaderCell: HeaderCellType;
+  ColumnHeader: ColumnHeaderType;
 }
 
 export interface TableContextProps {
   size: "medium" | "small";
+  onSortChange?: (sortKey: string) => void;
+  sort?: SortState;
 }
 
 export const TableContext = createContext<TableContextProps | null>(null);
 
 const Table = forwardRef(
-  ({ className, zebraStripes = false, size = "medium", ...rest }, ref) => (
-    <TableContext.Provider value={{ size }}>
+  (
+    {
+      className,
+      zebraStripes = false,
+      size = "medium",
+      onSortChange,
+      sort,
+      ...rest
+    },
+    ref
+  ) => (
+    <TableContext.Provider value={{ size, onSortChange, sort }}>
       <table
         {...rest}
         ref={ref}
@@ -53,6 +80,7 @@ const Table = forwardRef(
 Table.Header = Header;
 Table.Body = Body;
 Table.Row = Row;
+Table.ColumnHeader = ColumnHeader;
 Table.HeaderCell = HeaderCell;
 Table.DataCell = DataCell;