@navikt/ds-react 0.15.0-rc.30 → 0.15.2

package/src/button/{stories/button.stories.tsx → button.stories.tsx}

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Button } from "../index";
+import { Button } from "./index";
 import { Success } from "@navikt/ds-icons";
 
 export default {
@@ -78,14 +78,6 @@ export const All = () => {
           </Button>
         ))}
       </Section>
-      <h2>Xsmall</h2>
-      <Section>
-        {variants.map((variant) => (
-          <Button key={variant} variant={variant} size="xsmall">
-            {varSwitch[variant]}
-          </Button>
-        ))}
-      </Section>
       <h2>Button w/icon</h2>
       <Section>
         {variants.map((variant) => (

package/src/form/checkbox/Checkbox.tsx

@@ -24,6 +24,11 @@ export interface CheckboxProps
    * The value of the HTML element.
    */
   value?: string;
+  /**
+   * Specify whether the Checkbox is in an indeterminate state
+   * @default false
+   */
+  indeterminate?: boolean;
 }
 
 const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>((props, ref) => {
@@ -52,8 +57,20 @@ const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>((props, ref) => {
           "hideLabel",
         ])}
         {...inputProps}
+        type="checkbox"
         className="navds-checkbox__input"
-        ref={ref}
+        aria-checked={props.indeterminate ? "mixed" : inputProps.checked}
+        ref={(el) => {
+          if (el) {
+            el.indeterminate = props.indeterminate ?? false;
+          }
+
+          if (typeof ref === "function") {
+            ref(el);
+          } else if (ref != null) {
+            ref.current = el;
+          }
+        }}
       />
       <label htmlFor={inputProps.id} className="navds-checkbox__label">
         <div

package/src/form/checkbox/stories/checkbox.stories.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { Checkbox, CheckboxGroup } from "../../index";
 import { Meta } from "@storybook/react/types-6-0";
 export default {
@@ -6,6 +6,36 @@ export default {
   component: Checkbox,
 } as Meta;
 
+export const Indeterminate = () => {
+  const [checked, setChecked] = useState([true, false]);
+
+  return (
+    <>
+      <Checkbox
+        checked={checked[0] && checked[1]}
+        indeterminate={checked[0] !== checked[1]}
+        onChange={(e) => setChecked([e.target.checked, e.target.checked])}
+      >
+        Parent
+      </Checkbox>
+      <div style={{ paddingLeft: "2rem" }}>
+        <Checkbox
+          checked={checked[0]}
+          onChange={(e) => setChecked([e.target.checked, checked[1]])}
+        >
+          Child 1
+        </Checkbox>
+        <Checkbox
+          checked={checked[1]}
+          onChange={(e) => setChecked([checked[0], e.target.checked])}
+        >
+          Child 2
+        </Checkbox>
+      </div>
+    </>
+  );
+};
+
 export const All = () => {
   const Checkboxes = (props) => (
     <CheckboxGroup
@@ -51,6 +81,13 @@ export const All = () => {
       <Checkbox value="Orange" description="Laborum ad" disabled defaultChecked>
         Orange
       </Checkbox>
+      <h3>Indeterminate</h3>
+      <Checkbox value="Apple" indeterminate>
+        Apple
+      </Checkbox>
+      <Checkbox value="Orange" indeterminate size="small">
+        Orange
+      </Checkbox>
 
       <h2>Checkbox group</h2>
       <Checkboxes />

package/src/form/checkbox/useCheckbox.ts

@@ -32,7 +32,6 @@ const useCheckbox = ({ children, ...props }: CheckboxProps) => {
     ...rest,
     inputProps: {
       ...inputProps,
-      type: "checkbox",
       checked: checkboxGroup?.value
         ? checkboxGroup.value.includes(props.value as string)
         : props.checked,

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from "./accordion";
-export * from "./accordion-menu";
 export * from "./alert";
 export * from "./button";
 export * from "./form";
@@ -9,8 +8,8 @@ export * from "./guide-panel";
 export * from "./link";
 export * from "./link-panel";
 export * from "./loader";
+export * from "./menu";
 export * from "./modal";
-export * from "./pagination";
 export * from "./panel";
 export * from "./popover";
 export * from "./speech-bubble";

package/src/menu/Menu.tsx

@@ -0,0 +1,36 @@
+import React, { forwardRef } from "react";
+import cl from "classnames";
+import MenuItems from "./MenuItems";
+
+import Item, { MenuItemType } from "./MenuItem";
+import Collapse, { MenuCollapseType } from "./MenuCollapse";
+
+export interface MenuProps extends React.HTMLAttributes<HTMLElement> {
+  children: React.ReactNode;
+}
+
+interface MenuComponent
+  extends React.ForwardRefExoticComponent<
+    MenuProps & React.RefAttributes<HTMLElement>
+  > {
+  Collapse: MenuCollapseType;
+  Item: MenuItemType;
+}
+
+const Menu = forwardRef<HTMLElement, MenuProps>(
+  ({ children, className, ...rest }, ref) => (
+      <nav
+        {...rest}
+        role="navigation"
+        ref={ref}
+        className={cl("navds-menu", className)}
+      >
+        <MenuItems>{children}</MenuItems>
+      </nav>
+    )
+) as MenuComponent;
+
+Menu.Collapse = Collapse;
+Menu.Item = Item;
+
+export default Menu;

package/src/menu/MenuCollapse.tsx

@@ -0,0 +1,80 @@
+import React, {
+  createContext,
+  forwardRef,
+  HTMLAttributes,
+  useContext,
+  useState,
+} from "react";
+import cl from "classnames";
+import { Expand, ExpandFilled } from "@navikt/ds-icons";
+import MenuItems from "./MenuItems";
+
+export const NestingContext = createContext<{ depth: number }>({ depth: 1 });
+
+const NestingProvider = ({ children }) => {
+  const context = useContext(NestingContext);
+
+  return (
+    <NestingContext.Provider
+      value={{
+        depth: context.depth + 1,
+      }}
+    >
+      {children}
+    </NestingContext.Provider>
+  );
+};
+
+export interface MenuCollapseProps extends HTMLAttributes<HTMLDivElement> {
+  title: string;
+  defaultOpen?: boolean;
+  children: React.ReactNode;
+}
+
+export type MenuCollapseType = React.ForwardRefExoticComponent<
+  MenuCollapseProps & React.RefAttributes<HTMLDivElement>
+>;
+
+const Collapse: MenuCollapseType = forwardRef(
+  ({ children, defaultOpen = false, title, className, ...rest }, ref) => {
+    const [isOpen, setIsOpen] = useState(defaultOpen);
+    const context = useContext(NestingContext);
+
+    return (
+      <div
+        {...rest}
+        ref={ref}
+        className={cl("navds-menu-collapse", className, {
+          "navds-menu-collapse--open": isOpen,
+        })}
+      >
+        <button
+          onClick={() => setIsOpen(!isOpen)}
+          className="navds-menu-collapse__button"
+        >
+          {title}
+          <Expand
+            title={isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff"}
+            className="navds-menu-collapse__expand-icon"
+          />
+          <ExpandFilled
+            title={isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff"}
+            className="navds-menu-collapse__expand-icon navds-menu-collapse__expand-icon--filled"
+          />
+        </button>
+        <NestingProvider>
+          {isOpen && (
+            <MenuItems
+              data-depth={context.depth}
+              className="navds-menu__list--inner"
+            >
+              {children}
+            </MenuItems>
+          )}
+        </NestingProvider>
+      </div>
+    );
+  }
+);
+
+export default Collapse;

package/src/{accordion-menu/AccordionMenuItem.tsx → menu/MenuItem.tsx}

@@ -2,7 +2,7 @@ import React, { forwardRef } from "react";
 import { OverridableComponent } from "..";
 import cl from "classnames";
 
-export interface AccordionMenuItemProps
+export interface MenuItemProps
   extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
   children: React.ReactNode;
   /**
@@ -12,12 +12,12 @@ export interface AccordionMenuItemProps
   active?: boolean;
 }
 
-export type AccordionMenuItemType = OverridableComponent<
-  AccordionMenuItemProps,
+export type MenuItemType = OverridableComponent<
+  MenuItemProps,
   HTMLAnchorElement
 >;
 
-const Item: AccordionMenuItemType = forwardRef(
+const Item: MenuItemType = forwardRef(
   (
     { children, as: Component = "a", active = false, className, ...rest },
     ref
@@ -25,8 +25,8 @@ const Item: AccordionMenuItemType = forwardRef(
     return (
       <Component
         ref={ref}
-        className={cl("navds-accordion-menu-item", className, {
-          "navds-accordion-menu-item--active": active,
+        className={cl("navds-menu-item", className, {
+          "navds-menu-item--active": active,
         })}
         {...rest}
       >

package/src/menu/MenuItems.tsx

@@ -0,0 +1,21 @@
+import cl from "classnames";
+import React from "react";
+
+const MenuItems = ({
+  children,
+  className,
+  ...rest
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) => (
+  <ul {...rest} className={cl("navds-menu__list", className)}>
+    {React.Children.toArray(children).map((child, i) => (
+      <li key={i} className="navds-menu__list-item">
+        {child}
+      </li>
+    ))}
+  </ul>
+);
+
+export default MenuItems;

package/src/menu/index.ts

@@ -0,0 +1,3 @@
+export { default as Menu, MenuProps } from "./Menu";
+export { MenuCollapseProps } from "./MenuCollapse";
+export { MenuItemProps } from "./MenuItem";

package/src/menu/stories/menu.stories.mdx

@@ -0,0 +1,93 @@
+import { Meta, Canvas } from "@storybook/addon-docs";
+import { Menu } from "../../index";
+
+<Meta title="ds-react/menu/intro" />
+
+# Hvordan ta i bruk Menu
+
+```jsx
+<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.Collapse title="Proin">
+      <Menu.Item href="#nulla">Nulla</Menu.Item>
+      <Menu.Item href="#luctus">Luctus</Menu.Item>
+    </Menu.Collapse>
+  </Menu.Collapse>
+</Menu>
+```
+
+<Canvas>
+  <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">Justo</Menu.Item>
+      <Menu.Collapse title="Proin">
+        <Menu.Item href="#nulla">Nulla</Menu.Item>
+        <Menu.Item href="#luctus">Luctus</Menu.Item>
+      </Menu.Collapse>
+    </Menu.Collapse>
+  </Menu>
+</Canvas>
+
+## Elementer i menyen
+
+Menyen har to typer elementer man kan bruke: `Collapse` for nesting og `Item` for navigasjonslenker på siden.
+
+<Canvas>
+  <div>
+    <h2>Item</h2>
+    <Menu>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+    </Menu>
+    <h2>Collapses + Item</h2>
+    <Menu>
+      <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">Justo</Menu.Item>
+        <Menu.Collapse title="Proin">
+          <Menu.Item href="#nulla">Nulla</Menu.Item>
+          <Menu.Item href="#luctus">Luctus</Menu.Item>
+        </Menu.Collapse>
+      </Menu.Collapse>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+      <Menu.Item href="#leo">Lenke</Menu.Item>
+    </Menu>
+  </div>
+</Canvas>
+
+`Menu.Item` er implementert med `OverridableComponent`, noe som
+gjør at man kan ta i bruk eks react-router slik:
+
+```jsx
+<Menu.Item as={NavLink} activeClassName="navds-menu-item--active" to="/1">
+  Lenketekst
+</Menu.Item>
+```
+
+Her er `NavLink` fra `react-router-dom` brukt, og man får da
+samtidig bruke alle propsene til denne komponenten som da er `activeClassName` her.

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/table/Table.tsx

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