@navikt/ds-react 1.3.30 → 1.3.32

package/cjs/form/radio/Radio.js

@@ -34,6 +34,7 @@ const useRadio_1 = require("./useRadio");
 exports.Radio = (0, react_1.forwardRef)((props, ref) => {
     const { inputProps, size, hasError } = (0, useRadio_1.useRadio)(props);
     const Description = size === "medium" ? __1.BodyShort : __1.Detail;
+    console.log(inputProps.id);
     return (react_1.default.createElement("div", { className: (0, clsx_1.default)(props.className, "navds-radio", `navds-radio--${size}`, {
             "navds-radio--error": hasError,
             "navds-radio--disabled": inputProps.disabled,

package/cjs/util/useId.js

@@ -1,8 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useId = void 0;
 //https://github.com/mui/material-ui/blob/master/packages/mui-utils/src/useId.ts
-const react_1 = require("react");
+const react_1 = __importStar(require("react"));
 let globalId = 0;
 function useGlobalId(idOverride) {
     const [defaultId, setDefaultId] = (0, react_1.useState)(idOverride);
@@ -19,6 +42,10 @@ function useGlobalId(idOverride) {
     }, [defaultId]);
     return id;
 }
+// eslint-disable-next-line no-useless-concat -- Workaround for https://github.com/webpack/webpack/issues/14814
+const maybeReactUseId = react_1.default[
+// eslint-disable-next-line no-useless-concat
+"useId" + ""];
 /**
  *
  * @example <div id={useId()} />
@@ -26,7 +53,12 @@ function useGlobalId(idOverride) {
  * @returns {string}
  */
 function useId(idOverride) {
+    var _a;
+    if (maybeReactUseId !== undefined) {
+        const reactId = maybeReactUseId();
+        return idOverride !== null && idOverride !== void 0 ? idOverride : reactId.replace(/(:)/g, "");
+    }
     // eslint-disable-next-line react-hooks/rules-of-hooks -- `useId` is invariant at runtime.
-    return useGlobalId(idOverride);
+    return (_a = useGlobalId(idOverride)) !== null && _a !== void 0 ? _a : "";
 }
 exports.useId = useId;

package/esm/form/radio/Radio.js

@@ -5,6 +5,7 @@ import { useRadio } from "./useRadio";
 export const Radio = forwardRef((props, ref) => {
     const { inputProps, size, hasError } = useRadio(props);
     const Description = size === "medium" ? BodyShort : Detail;
+    console.log(inputProps.id);
     return (React.createElement("div", { className: cl(props.className, "navds-radio", `navds-radio--${size}`, {
             "navds-radio--error": hasError,
             "navds-radio--disabled": inputProps.disabled,

package/esm/form/radio/Radio.js.map

@@ -1 +1 @@
-{"version":3,"file":"Radio.js","sourceRoot":"","sources":["../../../src/form/radio/Radio.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmBtC,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,CAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC3E,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,gBAAgB,IAAI,EAAE,EAAE;YACpE,oBAAoB,EAAE,QAAQ;YAC9B,uBAAuB,EAAE,UAAU,CAAC,QAAQ;SAC7C,CAAC;QAEF,+CACM,IAAI,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,EAChD,UAAU,IACd,SAAS,EAAC,oBAAoB,EAC9B,GAAG,EAAE,GAAG,IACR;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,oBAAoB;YAC3D,8BAAM,SAAS,EAAC,sBAAsB;gBACpC,oBAAC,SAAS,IAAC,EAAE,EAAC,MAAM,EAAC,IAAI,EAAE,IAAI,IAC5B,KAAK,CAAC,QAAQ,CACL;gBACX,KAAK,CAAC,WAAW,IAAI,CACpB,oBAAC,WAAW,IACV,EAAE,EAAC,MAAM,EACT,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,0BAA0B,IAEnC,KAAK,CAAC,WAAW,CACN,CACf,CACI,CACD,CACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Radio.js","sourceRoot":"","sources":["../../../src/form/radio/Radio.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmBtC,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,CAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC3E,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3B,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,gBAAgB,IAAI,EAAE,EAAE;YACpE,oBAAoB,EAAE,QAAQ;YAC9B,uBAAuB,EAAE,UAAU,CAAC,QAAQ;SAC7C,CAAC;QAEF,+CACM,IAAI,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,EAChD,UAAU,IACd,SAAS,EAAC,oBAAoB,EAC9B,GAAG,EAAE,GAAG,IACR;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,oBAAoB;YAC3D,8BAAM,SAAS,EAAC,sBAAsB;gBACpC,oBAAC,SAAS,IAAC,EAAE,EAAC,MAAM,EAAC,IAAI,EAAE,IAAI,IAC5B,KAAK,CAAC,QAAQ,CACL;gBACX,KAAK,CAAC,WAAW,IAAI,CACpB,oBAAC,WAAW,IACV,EAAE,EAAC,MAAM,EACT,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,0BAA0B,IAEnC,KAAK,CAAC,WAAW,CACN,CACf,CACI,CACD,CACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,KAAK,CAAC"}

package/esm/util/useId.js

@@ -1,5 +1,5 @@
 //https://github.com/mui/material-ui/blob/master/packages/mui-utils/src/useId.ts
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 let globalId = 0;
 function useGlobalId(idOverride) {
     const [defaultId, setDefaultId] = useState(idOverride);
@@ -16,6 +16,10 @@ function useGlobalId(idOverride) {
     }, [defaultId]);
     return id;
 }
+// eslint-disable-next-line no-useless-concat -- Workaround for https://github.com/webpack/webpack/issues/14814
+const maybeReactUseId = React[
+// eslint-disable-next-line no-useless-concat
+"useId" + ""];
 /**
  *
  * @example <div id={useId()} />
@@ -23,7 +27,12 @@ function useGlobalId(idOverride) {
  * @returns {string}
  */
 export function useId(idOverride) {
+    var _a;
+    if (maybeReactUseId !== undefined) {
+        const reactId = maybeReactUseId();
+        return idOverride !== null && idOverride !== void 0 ? idOverride : reactId.replace(/(:)/g, "");
+    }
     // eslint-disable-next-line react-hooks/rules-of-hooks -- `useId` is invariant at runtime.
-    return useGlobalId(idOverride);
+    return (_a = useGlobalId(idOverride)) !== null && _a !== void 0 ? _a : "";
 }
 //# sourceMappingURL=useId.js.map

package/esm/util/useId.js.map

@@ -1 +1 @@
-{"version":3,"file":"useId.js","sourceRoot":"","sources":["../../src/util/useId.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,IAAI,QAAQ,GAAG,CAAC,CAAC;AACjB,SAAS,WAAW,CAAC,UAAmB;IACtC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,EAAE,GAAG,UAAU,IAAI,SAAS,CAAC;IACnC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,IAAI,IAAI,EAAE;YACrB,6CAA6C;YAC7C,6DAA6D;YAC7D,+BAA+B;YAC/B,wHAAwH;YACxH,QAAQ,IAAI,CAAC,CAAC;YACd,YAAY,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC;SACtC;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAChB,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CAAC,UAAmB;IACvC,0FAA0F;IAC1F,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"useId.js","sourceRoot":"","sources":["../../src/util/useId.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEnD,IAAI,QAAQ,GAAG,CAAC,CAAC;AACjB,SAAS,WAAW,CAAC,UAAmB;IACtC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,EAAE,GAAG,UAAU,IAAI,SAAS,CAAC;IACnC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,IAAI,IAAI,EAAE;YACrB,6CAA6C;YAC7C,6DAA6D;YAC7D,+BAA+B;YAC/B,wHAAwH;YACxH,QAAQ,IAAI,CAAC,CAAC;YACd,YAAY,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC;SACtC;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAChB,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,+GAA+G;AAC/G,MAAM,eAAe,GAAgC,KAAa;AAChE,6CAA6C;AAC7C,OAAO,GAAG,EAAE,CACb,CAAC;AACF;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CAAC,UAAmB;;IACvC,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;QAClC,OAAO,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;KAClD;IACD,0FAA0F;IAC1F,OAAO,MAAA,WAAW,CAAC,UAAU,CAAC,mCAAI,EAAE,CAAC;AACvC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "description": "NAV designsystem react components",
   "author": "NAV Designsystem team",
   "license": "MIT",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@floating-ui/react-dom-interactions": "0.9.2",
-    "@navikt/ds-icons": "^1.3.30",
+    "@navikt/ds-icons": "^1.3.32",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",
@@ -75,5 +75,5 @@
       "optional": true
     }
   },
-  "gitHead": "12a0a4baaab8f0598c62cd67fb3ddc82d67f3f72"
+  "gitHead": "02268671f3e31886dfe17f54778b06e92fcf2562"
 }

package/src/date/datepicker/datepicker.stories.tsx

@@ -251,3 +251,13 @@ export const DisabledInput = () => {
     </div>
   );
 };
+
+export const ErrorInput = () => {
+  return (
+    <div style={{ display: "flex", gap: "1rem" }}>
+      <DatePicker>
+        <DatePicker.Input error="feilmelding" label="Velg dato" />
+      </DatePicker>
+    </div>
+  );
+};

package/src/date/datepicker/datepicker.test.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react/jsx-pascal-case */
-import { render, screen } from "@testing-library/react";
+import { render } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import React from "react";
 import { UNSAFE_DatePicker, UNSAFE_useDatepicker } from "..";

package/src/form/radio/Radio.tsx

@@ -26,6 +26,7 @@ export const Radio = forwardRef<HTMLInputElement, RadioProps>((props, ref) => {
 
   const Description = size === "medium" ? BodyShort : Detail;
 
+  console.log(inputProps.id);
   return (
     <div
       className={cl(props.className, "navds-radio", `navds-radio--${size}`, {

package/src/util/useId.ts

@@ -1,5 +1,5 @@
 //https://github.com/mui/material-ui/blob/master/packages/mui-utils/src/useId.ts
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 
 let globalId = 0;
 function useGlobalId(idOverride?: string): string | undefined {
@@ -18,6 +18,11 @@ function useGlobalId(idOverride?: string): string | undefined {
   return id;
 }
 
+// eslint-disable-next-line no-useless-concat -- Workaround for https://github.com/webpack/webpack/issues/14814
+const maybeReactUseId: undefined | (() => string) = (React as any)[
+  // eslint-disable-next-line no-useless-concat
+  "useId" + ""
+];
 /**
  *
  * @example <div id={useId()} />
@@ -25,6 +30,10 @@ function useGlobalId(idOverride?: string): string | undefined {
  * @returns {string}
  */
 export function useId(idOverride?: string): string | undefined {
+  if (maybeReactUseId !== undefined) {
+    const reactId = maybeReactUseId();
+    return idOverride ?? reactId.replace(/(:)/g, "");
+  }
   // eslint-disable-next-line react-hooks/rules-of-hooks -- `useId` is invariant at runtime.
-  return useGlobalId(idOverride);
+  return useGlobalId(idOverride) ?? "";
 }