@navikt/ds-react 0.14.14 → 0.15.0

package/cjs/accordion/AccordionHeader.js

@@ -54,12 +54,12 @@ const AccordionHeader = (0, react_1.forwardRef)((_a, ref) => {
         context.toggleOpen();
         onClick && onClick(e);
     };
-    return (react_1.default.createElement("button", Object.assign({ ref: ref, id: context.buttonId, className: (0, classnames_1.default)("navds-accordion__header", className, "navds-heading", "navds-heading--small"), onClick: handleClick }, rest),
+    return (react_1.default.createElement("button", Object.assign({}, rest, { ref: ref, id: context.buttonId, className: (0, classnames_1.default)("navds-accordion__header", className, "navds-heading", "navds-heading--small"), onClick: handleClick, "aria-expanded": context.open }),
         children,
-        react_1.default.createElement(ds_icons_1.Expand, { title: context.open ? "Lukk panel ikon" : "Åpne panel ikon", className: (0, classnames_1.default)("navds-accordion__expand-icon", {
+        react_1.default.createElement(ds_icons_1.Expand, { "aria-hidden": true, className: (0, classnames_1.default)("navds-accordion__expand-icon", {
                 "navds-accordion__expand-icon--flip": context.open,
             }) }),
-        react_1.default.createElement(ds_icons_1.ExpandFilled, { title: context.open ? "Lukk panel ikon" : "Åpne panel ikon", className: (0, classnames_1.default)("navds-accordion__expand-icon", "navds-accordion__expand-icon--filled", {
+        react_1.default.createElement(ds_icons_1.ExpandFilled, { "aria-hidden": true, className: (0, classnames_1.default)("navds-accordion__expand-icon", "navds-accordion__expand-icon--filled", {
                 "navds-accordion__expand-icon--flip": context.open,
             }) })));
 });

package/cjs/index.js

@@ -11,7 +11,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./accordion"), exports);
-__exportStar(require("./accordion-menu"), exports);
 __exportStar(require("./alert"), exports);
 __exportStar(require("./button"), exports);
 __exportStar(require("./form"), exports);
@@ -21,6 +20,7 @@ __exportStar(require("./guide-panel"), exports);
 __exportStar(require("./link"), exports);
 __exportStar(require("./link-panel"), exports);
 __exportStar(require("./loader"), exports);
+__exportStar(require("./menu"), exports);
 __exportStar(require("./modal"), exports);
 __exportStar(require("./panel"), exports);
 __exportStar(require("./popover"), exports);

package/cjs/{accordion-menu/AccordionMenu.js → menu/Menu.js}

@@ -36,13 +36,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const classnames_1 = __importDefault(require("classnames"));
 const MenuItems_1 = __importDefault(require("./MenuItems"));
-const AccordionMenuCollapsable_1 = __importDefault(require("./AccordionMenuCollapsable"));
-const AccordionMenuItem_1 = __importDefault(require("./AccordionMenuItem"));
-const AccordionMenu = (0, react_1.forwardRef)((_a, ref) => {
+const MenuItem_1 = __importDefault(require("./MenuItem"));
+const MenuCollapse_1 = __importDefault(require("./MenuCollapse"));
+const Menu = (0, react_1.forwardRef)((_a, ref) => {
     var { children, className } = _a, rest = __rest(_a, ["children", "className"]);
-    return (react_1.default.createElement("nav", Object.assign({ role: "navigation", ref: ref, className: (0, classnames_1.default)("navds-accordion-menu", className) }, rest),
+    return (react_1.default.createElement("nav", Object.assign({}, rest, { role: "navigation", ref: ref, className: (0, classnames_1.default)("navds-menu", className) }),
         react_1.default.createElement(MenuItems_1.default, null, children)));
 });
-AccordionMenu.Collapsable = AccordionMenuCollapsable_1.default;
-AccordionMenu.Item = AccordionMenuItem_1.default;
-exports.default = AccordionMenu;
+Menu.Collapse = MenuCollapse_1.default;
+Menu.Item = MenuItem_1.default;
+exports.default = Menu;

package/cjs/{accordion-menu/AccordionMenuCollapsable.js → menu/MenuCollapse.js}

@@ -33,19 +33,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NestingContext = void 0;
 const react_1 = __importStar(require("react"));
 const classnames_1 = __importDefault(require("classnames"));
 const ds_icons_1 = require("@navikt/ds-icons");
 const MenuItems_1 = __importDefault(require("./MenuItems"));
-const Collapsable = (0, react_1.forwardRef)((_a, ref) => {
+exports.NestingContext = (0, react_1.createContext)({ depth: 1 });
+const NestingProvider = ({ children }) => {
+    const context = (0, react_1.useContext)(exports.NestingContext);
+    return (react_1.default.createElement(exports.NestingContext.Provider, { value: {
+            depth: context.depth + 1,
+        } }, children));
+};
+const Collapse = (0, react_1.forwardRef)((_a, ref) => {
     var { children, defaultOpen = false, title, className } = _a, rest = __rest(_a, ["children", "defaultOpen", "title", "className"]);
     const [isOpen, setIsOpen] = (0, react_1.useState)(defaultOpen);
-    return (react_1.default.createElement("div", Object.assign({ ref: ref, className: (0, classnames_1.default)("navds-accordion-menu-collapsable", className, {
-            "navds-accordion-menu-collapsable--open": isOpen,
-        }) }, rest),
-        react_1.default.createElement("button", { onClick: () => setIsOpen(!isOpen), className: "navds-accordion-menu-collapsable__button" },
+    const context = (0, react_1.useContext)(exports.NestingContext);
+    return (react_1.default.createElement("div", Object.assign({}, rest, { ref: ref, className: (0, classnames_1.default)("navds-menu-collapse", className, {
+            "navds-menu-collapse--open": isOpen,
+        }) }),
+        react_1.default.createElement("button", { onClick: () => setIsOpen(!isOpen), className: "navds-menu-collapse__button" },
             title,
-            react_1.default.createElement(ds_icons_1.Expand, { title: isOpen ? "Pil peker opp" : "Pil peker ned", className: "navds-accordion-menu-collapsable__expand-icon" })),
-        isOpen && react_1.default.createElement(MenuItems_1.default, null, children)));
+            react_1.default.createElement(ds_icons_1.Expand, { title: isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff", className: "navds-menu-collapse__expand-icon" }),
+            react_1.default.createElement(ds_icons_1.ExpandFilled, { title: isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff", className: "navds-menu-collapse__expand-icon navds-menu-collapse__expand-icon--filled" })),
+        react_1.default.createElement(NestingProvider, null, isOpen && (react_1.default.createElement(MenuItems_1.default, { "data-depth": context.depth, className: "navds-menu__list--inner" }, children)))));
 });
-exports.default = Collapsable;
+exports.default = Collapse;

package/cjs/{accordion-menu/AccordionMenuItem.js → menu/MenuItem.js}

@@ -37,8 +37,8 @@ const react_1 = __importStar(require("react"));
 const classnames_1 = __importDefault(require("classnames"));
 const Item = (0, react_1.forwardRef)((_a, ref) => {
     var { children, as: Component = "a", active = false, className } = _a, rest = __rest(_a, ["children", "as", "active", "className"]);
-    return (react_1.default.createElement(Component, Object.assign({ ref: ref, className: (0, classnames_1.default)("navds-accordion-menu-item", className, {
-            "navds-accordion-menu-item--active": active,
+    return (react_1.default.createElement(Component, Object.assign({ ref: ref, className: (0, classnames_1.default)("navds-menu-item", className, {
+            "navds-menu-item--active": active,
         }) }, rest), children));
 });
 exports.default = Item;

package/cjs/menu/MenuItems.js

@@ -0,0 +1,23 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const classnames_1 = __importDefault(require("classnames"));
+const react_1 = __importDefault(require("react"));
+const MenuItems = (_a) => {
+    var { children, className } = _a, rest = __rest(_a, ["children", "className"]);
+    return (react_1.default.createElement("ul", Object.assign({}, rest, { className: (0, classnames_1.default)("navds-menu__list", className) }), react_1.default.Children.toArray(children).map((child, i) => (react_1.default.createElement("li", { key: i, className: "navds-menu__list-item" }, child)))));
+};
+exports.default = MenuItems;

package/cjs/menu/index.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Menu = void 0;
+var Menu_1 = require("./Menu");
+Object.defineProperty(exports, "Menu", { enumerable: true, get: function () { return __importDefault(Menu_1).default; } });

package/cjs/menu/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "main": "./index.js",
+  "module": "../../esm/menu/index.js",
+  "types": "../../esm/menu/index.d.ts"
+}

package/esm/accordion/AccordionHeader.js

@@ -30,12 +30,12 @@ const AccordionHeader = forwardRef((_a, ref) => {
         context.toggleOpen();
         onClick && onClick(e);
     };
-    return (React.createElement("button", Object.assign({ ref: ref, id: context.buttonId, className: cl("navds-accordion__header", className, "navds-heading", "navds-heading--small"), onClick: handleClick }, rest),
+    return (React.createElement("button", Object.assign({}, rest, { ref: ref, id: context.buttonId, className: cl("navds-accordion__header", className, "navds-heading", "navds-heading--small"), onClick: handleClick, "aria-expanded": context.open }),
         children,
-        React.createElement(Expand, { title: context.open ? "Lukk panel ikon" : "Åpne panel ikon", className: cl("navds-accordion__expand-icon", {
+        React.createElement(Expand, { "aria-hidden": true, className: cl("navds-accordion__expand-icon", {
                 "navds-accordion__expand-icon--flip": context.open,
             }) }),
-        React.createElement(ExpandFilled, { title: context.open ? "Lukk panel ikon" : "Åpne panel ikon", className: cl("navds-accordion__expand-icon", "navds-accordion__expand-icon--filled", {
+        React.createElement(ExpandFilled, { "aria-hidden": true, className: cl("navds-accordion__expand-icon", "navds-accordion__expand-icon--filled", {
                 "navds-accordion__expand-icon--flip": context.open,
             }) })));
 });

package/esm/accordion/AccordionHeader.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccordionHeader.js","sourceRoot":"","sources":["../../src/accordion/AccordionHeader.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAclD,MAAM,eAAe,GAAwB,UAAU,CACrD,CAAC,EAA6C,EAAE,GAAG,EAAE,EAAE;QAAtD,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,OAAW,EAAN,IAAI,cAA3C,0CAA6C,CAAF;IAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;IAExB,MAAM,WAAW,GAAG,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAEnD,qBAAqB,CAAC,GAAG,EAAE;QACzB,WAAW,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;IACvE,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAEzB,IAAI,OAAO,KAAK,IAAI,EAAE;QACpB,OAAO,CAAC,KAAK,CACX,8DAA8D,CAC/D,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,CAClB,CAAkD,EAClD,EAAE;QACF,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,OAAO,CACL,8CACE,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,CAAC,QAAQ,EACpB,SAAS,EAAE,EAAE,CACX,yBAAyB,EACzB,SAAS,EACT,eAAe,EACf,sBAAsB,CACvB,EACD,OAAO,EAAE,WAAW,IAChB,IAAI;QAEP,QAAQ;QACT,oBAAC,MAAM,IACL,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,EAC3D,SAAS,EAAE,EAAE,CAAC,8BAA8B,EAAE;gBAC5C,oCAAoC,EAAE,OAAO,CAAC,IAAI;aACnD,CAAC,GACF;QACF,oBAAC,YAAY,IACX,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,EAC3D,SAAS,EAAE,EAAE,CACX,8BAA8B,EAC9B,sCAAsC,EACtC;gBACE,oCAAoC,EAAE,OAAO,CAAC,IAAI;aACnD,CACF,GACD,CACK,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"AccordionHeader.js","sourceRoot":"","sources":["../../src/accordion/AccordionHeader.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAclD,MAAM,eAAe,GAAwB,UAAU,CACrD,CAAC,EAA6C,EAAE,GAAG,EAAE,EAAE;QAAtD,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,OAAW,EAAN,IAAI,cAA3C,0CAA6C,CAAF;IAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;IAExB,MAAM,WAAW,GAAG,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAEnD,qBAAqB,CAAC,GAAG,EAAE;QACzB,WAAW,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;IACvE,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAEzB,IAAI,OAAO,KAAK,IAAI,EAAE;QACpB,OAAO,CAAC,KAAK,CACX,8DAA8D,CAC/D,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,CAClB,CAAkD,EAClD,EAAE;QACF,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,OAAO,CACL,gDACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,CAAC,QAAQ,EACpB,SAAS,EAAE,EAAE,CACX,yBAAyB,EACzB,SAAS,EACT,eAAe,EACf,sBAAsB,CACvB,EACD,OAAO,EAAE,WAAW,mBACL,OAAO,CAAC,IAAI;QAE1B,QAAQ;QACT,oBAAC,MAAM,yBAEL,SAAS,EAAE,EAAE,CAAC,8BAA8B,EAAE;gBAC5C,oCAAoC,EAAE,OAAO,CAAC,IAAI;aACnD,CAAC,GACF;QACF,oBAAC,YAAY,yBAEX,SAAS,EAAE,EAAE,CACX,8BAA8B,EAC9B,sCAAsC,EACtC;gBACE,oCAAoC,EAAE,OAAO,CAAC,IAAI;aACnD,CACF,GACD,CACK,CACV,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/esm/index.d.ts

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

package/esm/index.js

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

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AAEvB,6BAA6B;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AAEvB,6BAA6B;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC"}

package/esm/menu/Menu.d.ts

@@ -0,0 +1,12 @@
+import React from "react";
+import { MenuItemType } from "./MenuItem";
+import { 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;
+}
+declare const Menu: MenuComponent;
+export default Menu;

package/esm/{accordion-menu/AccordionMenu.js → menu/Menu.js}

@@ -12,14 +12,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { forwardRef } from "react";
 import cl from "classnames";
 import MenuItems from "./MenuItems";
-import Collapsable from "./AccordionMenuCollapsable";
-import Item from "./AccordionMenuItem";
-const AccordionMenu = forwardRef((_a, ref) => {
+import Item from "./MenuItem";
+import Collapse from "./MenuCollapse";
+const Menu = forwardRef((_a, ref) => {
     var { children, className } = _a, rest = __rest(_a, ["children", "className"]);
-    return (React.createElement("nav", Object.assign({ role: "navigation", ref: ref, className: cl("navds-accordion-menu", className) }, rest),
+    return (React.createElement("nav", Object.assign({}, rest, { role: "navigation", ref: ref, className: cl("navds-menu", className) }),
         React.createElement(MenuItems, null, children)));
 });
-AccordionMenu.Collapsable = Collapsable;
-AccordionMenu.Item = Item;
-export default AccordionMenu;
-//# sourceMappingURL=AccordionMenu.js.map
+Menu.Collapse = Collapse;
+Menu.Item = Item;
+export default Menu;
+//# sourceMappingURL=Menu.js.map

package/esm/menu/Menu.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../src/menu/Menu.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,IAAsB,MAAM,YAAY,CAAC;AAChD,OAAO,QAA8B,MAAM,gBAAgB,CAAC;AAc5D,MAAM,IAAI,GAAG,UAAU,CACrB,CAAC,EAAgC,EAAE,GAAG,EAAE,EAAE;QAAzC,EAAE,QAAQ,EAAE,SAAS,OAAW,EAAN,IAAI,cAA9B,yBAAgC,CAAF;IAAY,OAAA,CACvC,6CACM,IAAI,IACR,IAAI,EAAC,YAAY,EACjB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;QAEtC,oBAAC,SAAS,QAAE,QAAQ,CAAa,CAC7B,CACP,CAAA;CAAA,CACa,CAAC;AAEnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;AACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;AAEjB,eAAe,IAAI,CAAC"}

package/esm/menu/MenuCollapse.d.ts

@@ -0,0 +1,12 @@
+import React, { HTMLAttributes } from "react";
+export declare const NestingContext: React.Context<{
+    depth: number;
+}>;
+export interface MenuCollapseProps extends HTMLAttributes<HTMLDivElement> {
+    title: string;
+    defaultOpen?: boolean;
+    children: React.ReactNode;
+}
+export declare type MenuCollapseType = React.ForwardRefExoticComponent<MenuCollapseProps & React.RefAttributes<HTMLDivElement>>;
+declare const Collapse: MenuCollapseType;
+export default Collapse;

package/esm/menu/MenuCollapse.js

@@ -0,0 +1,37 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React, { createContext, forwardRef, useContext, useState, } from "react";
+import cl from "classnames";
+import { Expand, ExpandFilled } from "@navikt/ds-icons";
+import MenuItems from "./MenuItems";
+export const NestingContext = createContext({ depth: 1 });
+const NestingProvider = ({ children }) => {
+    const context = useContext(NestingContext);
+    return (React.createElement(NestingContext.Provider, { value: {
+            depth: context.depth + 1,
+        } }, children));
+};
+const Collapse = forwardRef((_a, ref) => {
+    var { children, defaultOpen = false, title, className } = _a, rest = __rest(_a, ["children", "defaultOpen", "title", "className"]);
+    const [isOpen, setIsOpen] = useState(defaultOpen);
+    const context = useContext(NestingContext);
+    return (React.createElement("div", Object.assign({}, rest, { ref: ref, className: cl("navds-menu-collapse", className, {
+            "navds-menu-collapse--open": isOpen,
+        }) }),
+        React.createElement("button", { onClick: () => setIsOpen(!isOpen), className: "navds-menu-collapse__button" },
+            title,
+            React.createElement(Expand, { title: isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff", className: "navds-menu-collapse__expand-icon" }),
+            React.createElement(ExpandFilled, { title: isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff", className: "navds-menu-collapse__expand-icon navds-menu-collapse__expand-icon--filled" })),
+        React.createElement(NestingProvider, null, isOpen && (React.createElement(MenuItems, { "data-depth": context.depth, className: "navds-menu__list--inner" }, children)))));
+});
+export default Collapse;
+//# sourceMappingURL=MenuCollapse.js.map

package/esm/menu/MenuCollapse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuCollapse.js","sourceRoot":"","sources":["../../src/menu/MenuCollapse.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EACZ,aAAa,EACb,UAAU,EAEV,UAAU,EACV,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;AAE7E,MAAM,eAAe,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvC,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE3C,OAAO,CACL,oBAAC,cAAc,CAAC,QAAQ,IACtB,KAAK,EAAE;YACL,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,CAAC;SACzB,IAEA,QAAQ,CACe,CAC3B,CAAC;AACJ,CAAC,CAAC;AAYF,MAAM,QAAQ,GAAqB,UAAU,CAC3C,CAAC,EAA4D,EAAE,GAAG,EAAE,EAAE;QAArE,EAAE,QAAQ,EAAE,WAAW,GAAG,KAAK,EAAE,KAAK,EAAE,SAAS,OAAW,EAAN,IAAI,cAA1D,iDAA4D,CAAF;IACzD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE3C,OAAO,CACL,6CACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE,SAAS,EAAE;YAC9C,2BAA2B,EAAE,MAAM;SACpC,CAAC;QAEF,gCACE,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EACjC,SAAS,EAAC,6BAA6B;YAEtC,KAAK;YACN,oBAAC,MAAM,IACL,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,sBAAsB,EACjE,SAAS,EAAC,kCAAkC,GAC5C;YACF,oBAAC,YAAY,IACX,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,sBAAsB,EACjE,SAAS,EAAC,2EAA2E,GACrF,CACK;QACT,oBAAC,eAAe,QACb,MAAM,IAAI,CACT,oBAAC,SAAS,kBACI,OAAO,CAAC,KAAK,EACzB,SAAS,EAAC,yBAAyB,IAElC,QAAQ,CACC,CACb,CACe,CACd,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/esm/menu/MenuItem.d.ts

@@ -0,0 +1,13 @@
+import React from "react";
+import { OverridableComponent } from "..";
+export interface MenuItemProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
+    children: React.ReactNode;
+    /**
+     * Sets active styling if true
+     * @default false
+     */
+    active?: boolean;
+}
+export declare type MenuItemType = OverridableComponent<MenuItemProps, HTMLAnchorElement>;
+declare const Item: MenuItemType;
+export default Item;

package/esm/{accordion-menu/AccordionMenuItem.js → menu/MenuItem.js}

@@ -13,9 +13,9 @@ import React, { forwardRef } from "react";
 import cl from "classnames";
 const Item = forwardRef((_a, ref) => {
     var { children, as: Component = "a", active = false, className } = _a, rest = __rest(_a, ["children", "as", "active", "className"]);
-    return (React.createElement(Component, Object.assign({ ref: ref, className: cl("navds-accordion-menu-item", className, {
-            "navds-accordion-menu-item--active": active,
+    return (React.createElement(Component, Object.assign({ ref: ref, className: cl("navds-menu-item", className, {
+            "navds-menu-item--active": active,
         }) }, rest), children));
 });
 export default Item;
-//# sourceMappingURL=AccordionMenuItem.js.map
+//# sourceMappingURL=MenuItem.js.map

package/esm/menu/MenuItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/menu/MenuItem.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,MAAM,YAAY,CAAC;AAiB5B,MAAM,IAAI,GAAiB,UAAU,CACnC,CACE,EAAqE,EACrE,GAAG,EACH,EAAE;QAFF,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,GAAG,GAAG,EAAE,MAAM,GAAG,KAAK,EAAE,SAAS,OAAW,EAAN,IAAI,cAAnE,yCAAqE,CAAF;IAGnE,OAAO,CACL,oBAAC,SAAS,kBACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,iBAAiB,EAAE,SAAS,EAAE;YAC1C,yBAAyB,EAAE,MAAM;SAClC,CAAC,IACE,IAAI,GAEP,QAAQ,CACC,CACb,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/esm/{accordion-menu → menu}/MenuItems.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
-declare const MenuItems: ({ children }: {
+declare const MenuItems: ({ children, className, ...rest }: {
     children: React.ReactNode;
+    className?: string | undefined;
 }) => JSX.Element;
 export default MenuItems;

package/esm/menu/MenuItems.js

@@ -0,0 +1,19 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import cl from "classnames";
+import React from "react";
+const MenuItems = (_a) => {
+    var { children, className } = _a, rest = __rest(_a, ["children", "className"]);
+    return (React.createElement("ul", Object.assign({}, rest, { className: cl("navds-menu__list", className) }), React.Children.toArray(children).map((child, i) => (React.createElement("li", { key: i, className: "navds-menu__list-item" }, child)))));
+};
+export default MenuItems;
+//# sourceMappingURL=MenuItems.js.map

package/esm/menu/MenuItems.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuItems.js","sourceRoot":"","sources":["../../src/menu/MenuItems.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,SAAS,GAAG,CAAC,EAOlB,EAAE,EAAE;QAPc,EACjB,QAAQ,EACR,SAAS,OAKV,EAJI,IAAI,cAHU,yBAIlB,CADQ;IAIH,OAAA,CACJ,4CAAQ,IAAI,IAAE,SAAS,EAAE,EAAE,CAAC,kBAAkB,EAAE,SAAS,CAAC,KACvD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAClD,4BAAI,GAAG,EAAE,CAAC,EAAE,SAAS,EAAC,uBAAuB,IAC1C,KAAK,CACH,CACN,CAAC,CACC,CACN,CAAA;CAAA,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/esm/menu/index.d.ts

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

package/esm/menu/index.js

@@ -0,0 +1,2 @@
+export { default as Menu } from "./Menu";
+//# sourceMappingURL=index.js.map

package/esm/menu/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/menu/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,IAAI,EAAa,MAAM,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "0.14.14",
+  "version": "0.15.0",
   "private": false,
   "description": "NAV designsystem react components",
   "author": "NAV Designsystem team",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^4.12.3",
-    "@navikt/ds-icons": "^0.7.3",
+    "@navikt/ds-icons": "^0.8.0",
     "@popperjs/core": "^2.10.1",
     "classnames": "^2.2.6",
     "react-collapse": "^5.1.0",
@@ -64,5 +64,5 @@
     "@types/react": "^17.0.30",
     "react": "^17.0.0"
   },
-  "gitHead": "9597c24328f81e62cd8b67ec8ab26bfaf3b0cebe"
+  "gitHead": "eceaa7e65907270047c4c0728370b1e606261aee"
 }

package/src/accordion/AccordionHeader.tsx

@@ -43,6 +43,7 @@ const AccordionHeader: AccordionHeaderType = forwardRef(
 
     return (
       <button
+        {...rest}
         ref={ref}
         id={context.buttonId}
         className={cl(
@@ -52,17 +53,17 @@ const AccordionHeader: AccordionHeaderType = forwardRef(
           "navds-heading--small"
         )}
         onClick={handleClick}
-        {...rest}
+        aria-expanded={context.open}
       >
         {children}
         <Expand
-          title={context.open ? "Lukk panel ikon" : "Åpne panel ikon"}
+          aria-hidden
           className={cl("navds-accordion__expand-icon", {
             "navds-accordion__expand-icon--flip": context.open,
           })}
         />
         <ExpandFilled
-          title={context.open ? "Lukk panel ikon" : "Åpne panel ikon"}
+          aria-hidden
           className={cl(
             "navds-accordion__expand-icon",
             "navds-accordion__expand-icon--filled",

package/src/accordion/accordion.stories.tsx

@@ -0,0 +1,90 @@
+import React, { useState } from "react";
+import AccordionContent from "./AccordionContent";
+import AccordionHeader from "./AccordionHeader";
+import AccordionItem from "./AccordionItem";
+import { Accordion } from ".";
+
+export default {
+  title: "ds-react/accordion",
+  component: Accordion,
+  subcomponents: {
+    AccordionItem,
+    AccordionContent,
+    AccordionHeader,
+  },
+};
+
+export const All = () => {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <>
+      <h1>Accordion</h1>
+      <h2>Controlled</h2>
+      <Accordion>
+        <Accordion.Item open={open}>
+          <Accordion.Header onClick={() => setOpen(!open)}>
+            Accordion header text
+          </Accordion.Header>
+          <Accordion.Content>
+            Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
+            officia laboris voluptate officia pariatur.Lorem est ex anim velit
+            occaecat nisi qui nostrud sit consectetur consectetur officia
+            nostrud ullamco. Est ex duis proident nostrud elit qui laborum anim
+            minim eu eiusmod. Veniam in nostrud sunt tempor velit incididunt
+            sint ex dolor qui velit id eu. Deserunt magna sunt velit in. Est
+            exercitation id cillum qui do. Minim adipisicing nostrud commodo
+            proident occaecat aliquip nulla anim proident reprehenderit. Magna
+            ipsum officia veniam cupidatat duis veniam dolore reprehenderit
+            mollit velit.Ut consequat commodo minim occaecat id pariatur. Nisi
+            enim tempor laborum commodo. Tempor sit quis nostrud eu cupidatat
+            sunt commodo reprehenderit irure deserunt eiusmod ipsum.
+            Exercitation quis commodo cillum eiusmod eiusmod. Do laborum qui
+            proident commodo adipisicing eiusmod id.
+          </Accordion.Content>
+        </Accordion.Item>
+      </Accordion>
+      <h2>Un-controlled</h2>
+      <Accordion>
+        <Accordion.Item>
+          <Accordion.Header>Accordion header text</Accordion.Header>
+          <Accordion.Content>
+            Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
+            officia laboris voluptate officia pariatur.Lorem est ex anim velit
+            occaecat nisi qui nostrud sit consectetur consectetur officia
+            nostrud ullamco. Est ex duis proident nostrud elit qui laborum anim
+            minim eu eiusmod. Veniam in nostrud sunt tempor velit incididunt
+            sint ex dolor qui velit id eu. Deserunt magna sunt velit in. Est
+            exercitation id cillum qui do. Minim adipisicing nostrud commodo
+            proident occaecat aliquip nulla anim proident reprehenderit. Magna
+            ipsum officia veniam cupidatat duis veniam dolore reprehenderit
+            mollit velit.Ut consequat commodo minim occaecat id pariatur. Nisi
+            enim tempor laborum commodo. Tempor sit quis nostrud eu cupidatat
+            sunt commodo reprehenderit irure deserunt eiusmod ipsum.
+            Exercitation quis commodo cillum eiusmod eiusmod. Do laborum qui
+            proident commodo adipisicing eiusmod id.
+          </Accordion.Content>
+        </Accordion.Item>
+        <Accordion.Item>
+          <Accordion.Header>Accordion header text</Accordion.Header>
+          <Accordion.Content>
+            Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
+            officia laboris voluptate officia pariatur.Lorem est ex anim velit
+            occaecat nisi qui nostrud sit consectetur consectetur officia
+            nostrud ullamco. Est ex duis proident nostrud elit qui laborum anim
+            minim eu eiusmod. Veniam in nostrud sunt tempor velit incididunt
+            sint ex dolor qui velit id eu. Deserunt magna sunt velit in. Est
+            exercitation id cillum qui do. Minim adipisicing nostrud commodo
+            proident occaecat aliquip nulla anim proident reprehenderit. Magna
+            ipsum officia veniam cupidatat duis veniam dolore reprehenderit
+            mollit velit.Ut consequat commodo minim occaecat id pariatur. Nisi
+            enim tempor laborum commodo. Tempor sit quis nostrud eu cupidatat
+            sunt commodo reprehenderit irure deserunt eiusmod ipsum.
+            Exercitation quis commodo cillum eiusmod eiusmod. Do laborum qui
+            proident commodo adipisicing eiusmod id.
+          </Accordion.Content>
+        </Accordion.Item>
+      </Accordion>
+    </>
+  );
+};

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

@@ -1,6 +1,6 @@
 import React from "react";
-import { Alert } from "..";
-import { BodyLong, Heading } from "../..";
+import { Alert } from ".";
+import { BodyLong, Heading } from "..";
 
 export default {
   title: "ds-react/alert",

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 {

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,6 +8,7 @@ export * from "./guide-panel";
 export * from "./link";
 export * from "./link-panel";
 export * from "./loader";
+export * from "./menu";
 export * from "./modal";
 export * from "./panel";
 export * from "./popover";

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;