@navikt/ds-react 2.8.6 → 2.8.8

package/cjs/form/checkbox/Checkbox.js

@@ -27,18 +27,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Checkbox = void 0;
-const react_1 = __importStar(require("react"));
 const clsx_1 = __importDefault(require("clsx"));
+const react_1 = __importStar(require("react"));
+const typography_1 = require("../../typography");
+const util_1 = require("../../util");
 const useCheckbox_1 = __importDefault(require("./useCheckbox"));
-const __1 = require("../..");
 exports.Checkbox = (0, react_1.forwardRef)((props, ref) => {
     const { inputProps, hasError, size } = (0, useCheckbox_1.default)(props);
-    const Description = size === "medium" ? __1.BodyShort : __1.Detail;
+    const Description = size === "medium" ? typography_1.BodyLong : typography_1.Detail;
     return (react_1.default.createElement("div", { className: (0, clsx_1.default)(props.className, "navds-checkbox", `navds-checkbox--${size}`, {
             "navds-checkbox--error": hasError,
             "navds-checkbox--disabled": inputProps.disabled,
         }) },
-        react_1.default.createElement("input", Object.assign({}, (0, __1.omit)(props, [
+        react_1.default.createElement("input", Object.assign({}, (0, util_1.omit)(props, [
             "children",
             "size",
             "error",
@@ -62,7 +63,7 @@ exports.Checkbox = (0, react_1.forwardRef)((props, ref) => {
             react_1.default.createElement("span", { className: (0, clsx_1.default)("navds-checkbox__content", {
                     "navds-sr-only": props.hideLabel,
                 }) },
-                react_1.default.createElement(__1.BodyShort, { as: "span", size: size }, props.children),
-                props.description && (react_1.default.createElement(Description, { as: "span", size: "small", className: "navds-checkbox__description" }, props.description))))));
+                react_1.default.createElement(typography_1.BodyShort, { as: "span", size: size }, props.children),
+                props.description && (react_1.default.createElement(Description, { as: "span", className: "navds-checkbox__description" }, props.description))))));
 });
 exports.default = exports.Checkbox;

package/cjs/form/radio/Radio.js

@@ -29,19 +29,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Radio = void 0;
 const clsx_1 = __importDefault(require("clsx"));
 const react_1 = __importStar(require("react"));
-const __1 = require("../..");
+const typography_1 = require("../../typography");
+const util_1 = require("../../util");
 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;
+    const Description = size === "medium" ? typography_1.BodyLong : typography_1.Detail;
     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,
         }) },
-        react_1.default.createElement("input", Object.assign({}, (0, __1.omit)(props, ["children", "size", "description"]), inputProps, { className: "navds-radio__input", ref: ref })),
+        react_1.default.createElement("input", Object.assign({}, (0, util_1.omit)(props, ["children", "size", "description"]), inputProps, { className: "navds-radio__input", ref: ref })),
         react_1.default.createElement("label", { htmlFor: inputProps.id, className: "navds-radio__label" },
             react_1.default.createElement("span", { className: "navds-radio__content" },
-                react_1.default.createElement(__1.BodyShort, { as: "span", size: size }, props.children),
-                props.description && (react_1.default.createElement(Description, { as: "span", size: "small", className: "navds-radio__description" }, props.description))))));
+                react_1.default.createElement(typography_1.BodyShort, { as: "span", size: size }, props.children),
+                props.description && (react_1.default.createElement(Description, { as: "span", className: "navds-radio__description" }, props.description))))));
 });
 exports.default = exports.Radio;

package/esm/form/Fieldset/useFieldset.d.ts

@@ -10,5 +10,5 @@ export declare const useFieldset: (props: any) => {
     hasError: boolean;
     errorId: string;
     inputDescriptionId: string;
-    size: "medium" | "small";
+    size: "small" | "medium";
 };

package/esm/form/checkbox/Checkbox.js

@@ -1,10 +1,11 @@
-import React, { forwardRef } from "react";
 import cl from "clsx";
+import React, { forwardRef } from "react";
+import { BodyLong, BodyShort, Detail } from "../../typography";
+import { omit } from "../../util";
 import useCheckbox from "./useCheckbox";
-import { BodyShort, Detail, omit } from "../..";
 export const Checkbox = forwardRef((props, ref) => {
     const { inputProps, hasError, size } = useCheckbox(props);
-    const Description = size === "medium" ? BodyShort : Detail;
+    const Description = size === "medium" ? BodyLong : Detail;
     return (React.createElement("div", { className: cl(props.className, "navds-checkbox", `navds-checkbox--${size}`, {
             "navds-checkbox--error": hasError,
             "navds-checkbox--disabled": inputProps.disabled,
@@ -34,7 +35,7 @@ export const Checkbox = forwardRef((props, ref) => {
                     "navds-sr-only": props.hideLabel,
                 }) },
                 React.createElement(BodyShort, { as: "span", size: size }, props.children),
-                props.description && (React.createElement(Description, { as: "span", size: "small", className: "navds-checkbox__description" }, props.description))))));
+                props.description && (React.createElement(Description, { as: "span", className: "navds-checkbox__description" }, props.description))))));
 });
 export default Checkbox;
 //# sourceMappingURL=Checkbox.js.map

package/esm/form/checkbox/Checkbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/Checkbox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAqChD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAChC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACb,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,KAAK,CAAC,SAAS,EACf,gBAAgB,EAChB,mBAAmB,IAAI,EAAE,EACzB;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,UAAU,CAAC,QAAQ;SAChD,CACF;QAED,+CACM,IAAI,CAAC,KAAK,EAAE;YACd,UAAU;YACV,MAAM;YACN,OAAO;YACP,aAAa;YACb,WAAW;YACX,eAAe;YACf,SAAS;SACV,CAAC,EACE,UAAU,IACd,IAAI,EAAC,UAAU,EACf,SAAS,EAAC,uBAAuB,kBACnB,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAChE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE;;gBACV,IAAI,EAAE,EAAE;oBACN,EAAE,CAAC,aAAa,GAAG,MAAA,KAAK,CAAC,aAAa,mCAAI,KAAK,CAAC;iBACjD;gBAED,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;oBAC7B,GAAG,CAAC,EAAE,CAAC,CAAC;iBACT;qBAAM,IAAI,GAAG,IAAI,IAAI,EAAE;oBACtB,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;iBAClB;YACH,CAAC,IACD;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,uBAAuB;YAC9D,8BACE,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE;oBACvC,eAAe,EAAE,KAAK,CAAC,SAAS;iBACjC,CAAC;gBAEF,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,6BAA6B,IAEtC,KAAK,CAAC,WAAW,CACN,CACf,CACI,CACD,CACJ,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/Checkbox.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,OAAO,WAAW,MAAM,eAAe,CAAC;AAqCxC,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAChC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACb,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAE1D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,KAAK,CAAC,SAAS,EACf,gBAAgB,EAChB,mBAAmB,IAAI,EAAE,EACzB;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,UAAU,CAAC,QAAQ;SAChD,CACF;QAED,+CACM,IAAI,CAAC,KAAK,EAAE;YACd,UAAU;YACV,MAAM;YACN,OAAO;YACP,aAAa;YACb,WAAW;YACX,eAAe;YACf,SAAS;SACV,CAAC,EACE,UAAU,IACd,IAAI,EAAC,UAAU,EACf,SAAS,EAAC,uBAAuB,kBACnB,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAChE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE;;gBACV,IAAI,EAAE,EAAE;oBACN,EAAE,CAAC,aAAa,GAAG,MAAA,KAAK,CAAC,aAAa,mCAAI,KAAK,CAAC;iBACjD;gBAED,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;oBAC7B,GAAG,CAAC,EAAE,CAAC,CAAC;iBACT;qBAAM,IAAI,GAAG,IAAI,IAAI,EAAE;oBACtB,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;iBAClB;YACH,CAAC,IACD;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,uBAAuB;YAC9D,8BACE,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE;oBACvC,eAAe,EAAE,KAAK,CAAC,SAAS;iBACjC,CAAC;gBAEF,oBAAC,SAAS,IAAC,EAAE,EAAC,MAAM,EAAC,IAAI,EAAE,IAAI,IAC5B,KAAK,CAAC,QAAQ,CACL;gBACX,KAAK,CAAC,WAAW,IAAI,CACpB,oBAAC,WAAW,IAAC,EAAE,EAAC,MAAM,EAAC,SAAS,EAAC,6BAA6B,IAC3D,KAAK,CAAC,WAAW,CACN,CACf,CACI,CACD,CACJ,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/esm/form/checkbox/useCheckbox.d.ts

@@ -16,6 +16,6 @@ declare const useCheckbox: ({ children, ...props }: CheckboxProps) => {
     hasError: boolean;
     errorId: string;
     inputDescriptionId: string;
-    size: "medium" | "small";
+    size: "small" | "medium";
 };
 export default useCheckbox;

package/esm/form/radio/Radio.js

@@ -1,10 +1,11 @@
 import cl from "clsx";
 import React, { forwardRef } from "react";
-import { BodyShort, Detail, omit } from "../..";
+import { BodyLong, BodyShort, Detail } from "../../typography";
+import { omit } from "../../util";
 import { useRadio } from "./useRadio";
 export const Radio = forwardRef((props, ref) => {
     const { inputProps, size, hasError } = useRadio(props);
-    const Description = size === "medium" ? BodyShort : Detail;
+    const Description = size === "medium" ? BodyLong : Detail;
     return (React.createElement("div", { className: cl(props.className, "navds-radio", `navds-radio--${size}`, {
             "navds-radio--error": hasError,
             "navds-radio--disabled": inputProps.disabled,
@@ -13,7 +14,7 @@ export const Radio = forwardRef((props, ref) => {
         React.createElement("label", { htmlFor: inputProps.id, className: "navds-radio__label" },
             React.createElement("span", { className: "navds-radio__content" },
                 React.createElement(BodyShort, { as: "span", size: size }, props.children),
-                props.description && (React.createElement(Description, { as: "span", size: "small", className: "navds-radio__description" }, props.description))))));
+                props.description && (React.createElement(Description, { as: "span", className: "navds-radio__description" }, props.description))))));
 });
 export default Radio;
 //# sourceMappingURL=Radio.js.map

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,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,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,EAAE,MAAM,MAAM,CAAC;AACtB,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,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,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IAE1D,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,IAAC,EAAE,EAAC,MAAM,EAAC,SAAS,EAAC,0BAA0B,IACxD,KAAK,CAAC,WAAW,CACN,CACf,CACI,CACD,CACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,KAAK,CAAC"}

package/esm/form/radio/useRadio.d.ts

@@ -19,5 +19,5 @@ export declare const useRadio: (props: RadioProps) => {
     hasError: boolean;
     errorId: string;
     inputDescriptionId: string;
-    size: "medium" | "small";
+    size: "small" | "medium";
 };

package/esm/form/useFormField.d.ts

@@ -34,7 +34,7 @@ export declare const useFormField: (props: FormFieldProps, prefix: string) => {
     hasError: boolean;
     errorId: string;
     inputDescriptionId: string;
-    size: "medium" | "small";
+    size: "small" | "medium";
     inputProps: {
         id: string;
         "aria-invalid": boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "description": "Aksel react-components for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@floating-ui/react": "0.17.0",
-    "@navikt/aksel-icons": "^2.8.6",
-    "@navikt/ds-icons": "^2.8.6",
+    "@navikt/aksel-icons": "^2.8.8",
+    "@navikt/ds-icons": "^2.8.8",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",

package/src/form/checkbox/Checkbox.tsx

@@ -1,8 +1,9 @@
-import React, { forwardRef, InputHTMLAttributes } from "react";
 import cl from "clsx";
-import useCheckbox from "./useCheckbox";
+import React, { forwardRef, InputHTMLAttributes } from "react";
+import { BodyLong, BodyShort, Detail } from "../../typography";
+import { omit } from "../../util";
 import { FormFieldProps } from "../useFormField";
-import { BodyShort, Detail, omit } from "../..";
+import useCheckbox from "./useCheckbox";
 
 export interface CheckboxProps
   extends FormFieldProps,
@@ -43,7 +44,7 @@ export const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
   (props, ref) => {
     const { inputProps, hasError, size } = useCheckbox(props);
 
-    const Description = size === "medium" ? BodyShort : Detail;
+    const Description = size === "medium" ? BodyLong : Detail;
 
     return (
       <div
@@ -93,11 +94,7 @@ export const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
               {props.children}
             </BodyShort>
             {props.description && (
-              <Description
-                as="span"
-                size="small"
-                className="navds-checkbox__description"
-              >
+              <Description as="span" className="navds-checkbox__description">
                 {props.description}
               </Description>
             )}

package/src/form/radio/Radio.tsx

@@ -1,6 +1,7 @@
 import cl from "clsx";
 import React, { forwardRef, InputHTMLAttributes } from "react";
-import { BodyShort, Detail, omit } from "../..";
+import { BodyLong, BodyShort, Detail } from "../../typography";
+import { omit } from "../../util";
 import { FormFieldProps } from "../useFormField";
 import { useRadio } from "./useRadio";
 
@@ -24,7 +25,7 @@ export interface RadioProps
 export const Radio = forwardRef<HTMLInputElement, RadioProps>((props, ref) => {
   const { inputProps, size, hasError } = useRadio(props);
 
-  const Description = size === "medium" ? BodyShort : Detail;
+  const Description = size === "medium" ? BodyLong : Detail;
 
   return (
     <div
@@ -45,11 +46,7 @@ export const Radio = forwardRef<HTMLInputElement, RadioProps>((props, ref) => {
             {props.children}
           </BodyShort>
           {props.description && (
-            <Description
-              as="span"
-              size="small"
-              className="navds-radio__description"
-            >
+            <Description as="span" className="navds-radio__description">
               {props.description}
             </Description>
           )}