@navikt/ds-react 8.0.1 → 8.2.0

package/src/date/monthpicker/parts/MonthPicker.Button.tsx

@@ -6,7 +6,7 @@ import {
   setYear,
 } from "date-fns";
 import React, { useEffect, useRef } from "react";
-import { cl } from "../../../util/className";
+import { cl } from "../../../utils/helpers";
 import { dateIsInCurrentMonth, isMatch } from "../../date-utils";
 import { useMonthPickerContext } from "../MonthPicker.context";
 import { nextEnabled } from "../MonthPicker.util";

package/src/date/monthpicker/parts/MonthPicker.Standalone.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../../util/className";
-import { useDateLocale, useI18n } from "../../../util/i18n/i18n.hooks";
+import { cl } from "../../../utils/helpers";
+import { useDateLocale, useI18n } from "../../../utils/i18n/i18n.hooks";
 import {
   DateTranslationContextProvider,
   getLocaleFromString,

package/src/dialog/backdrop/DialogBackdropInternal.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../util/className";
-import { createTransitionStatusAttribute } from "../../util/hooks/useTransitionStatus";
+import { cl } from "../../utils/helpers";
+import { createTransitionStatusAttribute } from "../../utils/hooks";
 import { useDialogContext } from "../root/DialogRoot.context";
 
 type DialogBackdropInternalProps = Omit<

package/src/dialog/body/DialogBody.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 
 type DialogBodyProps = React.HTMLAttributes<HTMLDivElement>;
 

package/src/dialog/close-trigger/DialogCloseTrigger.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { Slot } from "../../slot/Slot";
-import { composeEventHandlers } from "../../util/composeEventHandlers";
+import { Slot } from "../../utils/components/slot/Slot";
+import { composeEventHandlers } from "../../utils/helpers";
 import { useDialogContext } from "../root/DialogRoot.context";
 
 interface DialogCloseTriggerProps

package/src/dialog/description/DialogDescription.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
 import { BodyShort } from "../../typography";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 import { useDialogContext } from "../root/DialogRoot.context";
 
 type DialogDescriptionProps = React.HTMLAttributes<HTMLParagraphElement>;

package/src/dialog/footer/DialogFooter.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 
 type DialogFooterProps = React.HTMLAttributes<HTMLDivElement>;
 

package/src/dialog/header/DialogHeader.tsx

@@ -1,8 +1,8 @@
 import React, { forwardRef } from "react";
 import { XMarkIcon } from "@navikt/aksel-icons";
 import { Button } from "../../button";
-import { cl } from "../../util/className";
-import { useI18n } from "../../util/i18n/i18n.hooks";
+import { cl } from "../../utils/helpers";
+import { useI18n } from "../../utils/i18n/i18n.hooks";
 import { DialogCloseTrigger } from "../close-trigger/DialogCloseTrigger";
 
 interface DialogHeaderProps extends React.HTMLAttributes<HTMLDivElement> {

package/src/dialog/popup/DialogPopupInternal.tsx

@@ -1,13 +1,15 @@
 import React, { forwardRef } from "react";
 import { BoxNew, type BoxNewProps } from "../../layout/box";
 import { DismissableLayer } from "../../overlays/dismissablelayer/DismissableLayer";
-import { cl } from "../../util/className";
-import { FocusBoundary } from "../../util/focus-boundary/FocusBoundary";
-import { FocusGuards } from "../../util/focus-guards/FocusGuards";
-import { useMergeRefs } from "../../util/hooks";
-import { useOpenChangeAnimationComplete } from "../../util/hooks/useOpenChangeAnimationComplete";
-import { useScrollLock } from "../../util/hooks/useScrollLock";
-import { createTransitionStatusAttribute } from "../../util/hooks/useTransitionStatus";
+import { FocusBoundary } from "../../utils/components/focus-boundary/FocusBoundary";
+import { FocusGuards } from "../../utils/components/focus-guards/FocusGuards";
+import { cl } from "../../utils/helpers";
+import {
+  createTransitionStatusAttribute,
+  useMergeRefs,
+  useOpenChangeAnimationComplete,
+  useScrollLock,
+} from "../../utils/hooks";
 import { useDialogContext } from "../root/DialogRoot.context";
 
 type DialogPosition = "center" | "bottom" | "left" | "right" | "fullscreen";

package/src/dialog/root/DialogRoot.context.ts

@@ -1,5 +1,5 @@
-import { createStrictContext } from "../../util/create-strict-context";
-import type { TransitionStatus } from "../../util/hooks/useTransitionStatus";
+import { createStrictContext } from "../../utils/helpers";
+import type { TransitionStatus } from "../../utils/hooks";
 
 interface DialogContextProps {
   /**

package/src/dialog/root/DialogRoot.tsx

@@ -1,8 +1,10 @@
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { useId } from "../../util";
-import { useControllableState } from "../../util/hooks/useControllableState";
-import { useEventCallback } from "../../util/hooks/useEventCallback";
-import { useTransitionStatus } from "../../util/hooks/useTransitionStatus";
+import { useId } from "../../utils-external";
+import {
+  useControllableState,
+  useEventCallback,
+  useTransitionStatus,
+} from "../../utils/hooks";
 import { DialogBody } from "../body/DialogBody";
 import { DialogCloseTrigger } from "../close-trigger/DialogCloseTrigger";
 import { DialogDescription } from "../description/DialogDescription";

package/src/dialog/title/DialogTitle.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
 import { Heading } from "../../typography";
-import { useClientLayoutEffect, useId } from "../../util";
-import { cl } from "../../util/className";
+import { useClientLayoutEffect, useId } from "../../utils-external";
+import { cl } from "../../utils/helpers";
 import { useDialogContext } from "../root/DialogRoot.context";
 
 type DialogTitleProps = React.HTMLAttributes<HTMLHeadingElement>;

package/src/dialog/trigger/DialogTrigger.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
-import { Slot } from "../../slot/Slot";
-import { composeEventHandlers } from "../../util/composeEventHandlers";
-import { useMergeRefs } from "../../util/hooks";
+import { Slot } from "../../utils/components/slot/Slot";
+import { composeEventHandlers } from "../../utils/helpers";
+import { useMergeRefs } from "../../utils/hooks";
 import { useDialogContext } from "../root/DialogRoot.context";
 
 type DialogTriggerProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {

package/src/dropdown/Dropdown.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { useControllableState } from "../util/hooks/useControllableState";
+import { useControllableState } from "../utils/hooks";
 import Menu, { MenuType } from "./Menu";
 import Toggle from "./Toggle";
 import { DropdownContext } from "./context";

package/src/dropdown/Menu/Divider.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 
 export const Divider = forwardRef<
   HTMLHRElement,

package/src/dropdown/Menu/GroupedList/GroupedHeading.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../../util/className";
+import { cl } from "../../../utils/helpers";
 
 export interface GroupedHeadingProps
   extends React.HTMLAttributes<HTMLDetailsElement> {

package/src/dropdown/Menu/GroupedList/GroupedItem.tsx

@@ -1,7 +1,6 @@
 import React, { forwardRef, useContext } from "react";
-import { cl } from "../../../util/className";
-import { composeEventHandlers } from "../../../util/composeEventHandlers";
-import { OverridableComponent } from "../../../util/types";
+import type { OverridableComponent } from "../../../utils-external";
+import { cl, composeEventHandlers } from "../../../utils/helpers";
 import { DropdownContext } from "../../context";
 
 export interface GroupedItemProps

package/src/dropdown/Menu/GroupedList/index.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../../util/className";
-import { OverridableComponent } from "../../../util/types";
+import type { OverridableComponent } from "../../../utils-external";
+import { cl } from "../../../utils/helpers";
 import GroupedHeading, { GroupedHeadingProps } from "./GroupedHeading";
 import GroupedItem, { GroupedItemProps } from "./GroupedItem";
 

package/src/dropdown/Menu/List/Item.tsx

@@ -1,7 +1,6 @@
 import React, { forwardRef, useContext } from "react";
-import { cl } from "../../../util/className";
-import { composeEventHandlers } from "../../../util/composeEventHandlers";
-import { OverridableComponent } from "../../../util/types";
+import type { OverridableComponent } from "../../../utils-external";
+import { cl, composeEventHandlers } from "../../../utils/helpers";
 import { DropdownContext } from "../../context";
 
 export interface ListItemProps extends React.ButtonHTMLAttributes<HTMLElement> {

package/src/dropdown/Menu/List/index.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../../util/className";
-import { OverridableComponent } from "../../../util/types";
+import type { OverridableComponent } from "../../../utils-external";
+import { cl } from "../../../utils/helpers";
 import ListItem, { ListItemProps } from "./Item";
 
 export interface ListProps extends React.HTMLAttributes<HTMLUListElement> {

package/src/dropdown/Menu/index.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef, useContext } from "react";
 import { Popover } from "../../popover";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 import { DropdownContext } from "../context";
 import Divider from "./Divider";
 import GroupedList, { GroupedListType } from "./GroupedList";

package/src/dropdown/Toggle.tsx

@@ -1,6 +1,5 @@
 import React, { forwardRef, useContext } from "react";
-import { cl } from "../util/className";
-import { composeEventHandlers } from "../util/composeEventHandlers";
+import { cl, composeEventHandlers } from "../utils/helpers";
 import { DropdownContext } from "./context";
 
 export interface DropdownToggleProps

package/src/expansion-card/ExpansionCard.tsx

@@ -1,8 +1,8 @@
 import React, { forwardRef, useRef } from "react";
 import type { AkselColor } from "../types";
-import { cl } from "../util/className";
-import { useControllableState } from "../util/hooks";
-import { OverridableComponent } from "../util/types";
+import type { OverridableComponent } from "../utils-external";
+import { cl } from "../utils/helpers";
+import { useControllableState } from "../utils/hooks";
 import ExpansionCardContent, {
   ExpansionCardContentProps,
 } from "./ExpansionCardContent";

package/src/expansion-card/ExpansionCardContent.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef, useContext } from "react";
 import { useThemeInternal } from "../theme/Theme";
 import { BodyLong } from "../typography";
-import { cl } from "../util/className";
+import { cl } from "../utils/helpers";
 import { ExpansionCardContext } from "./context";
 
 export interface ExpansionCardContentProps

package/src/expansion-card/ExpansionCardDescription.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef, useContext } from "react";
 import { BodyLong } from "../typography";
-import { cl } from "../util/className";
+import { cl } from "../utils/helpers";
 import { ExpansionCardContext } from "./context";
 
 export interface ExpansionCardDescriptionProps

package/src/expansion-card/ExpansionCardHeader.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef, useContext } from "react";
 import { ChevronDownIcon } from "@navikt/aksel-icons";
-import { cl } from "../util/className";
-import { useI18n } from "../util/i18n/i18n.hooks";
+import { cl } from "../utils/helpers";
+import { useI18n } from "../utils/i18n/i18n.hooks";
 import { ExpansionCardContext } from "./context";
 
 export interface ExpansionCardHeaderProps

package/src/expansion-card/ExpansionCardTitle.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { cl } from "../util/className";
-import { OverridableComponent } from "../util/types";
+import type { OverridableComponent } from "../utils-external";
+import { cl } from "../utils/helpers";
 
 export interface ExpansionCardTitleProps
   extends React.HTMLAttributes<HTMLHeadingElement> {

package/src/form/ReadOnlyIcon.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { PadlockLockedFillIcon } from "@navikt/aksel-icons";
-import { useI18n } from "../util/i18n/i18n.hooks";
+import { useI18n } from "../utils/i18n/i18n.hooks";
 
 export const ReadOnlyIcon = () => {
   return (

package/src/form/checkbox/Checkbox.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
 import { BodyShort } from "../../typography";
-import { omit, useId } from "../../util";
-import { cl } from "../../util/className";
+import { omit, useId } from "../../utils-external";
+import { cl } from "../../utils/helpers";
 import { ReadOnlyIconWithTitle } from "../ReadOnlyIcon";
 import { CheckboxProps } from "./types";
 import useCheckbox from "./useCheckbox";

package/src/form/checkbox/CheckboxGroup.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, forwardRef, useContext, useState } from "react";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 import { Fieldset, FieldsetProps } from "../fieldset";
 import { FieldsetContext } from "../fieldset/context";
 

package/src/form/checkbox/useCheckbox.ts

@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { omit } from "../../util";
+import { omit } from "../../utils-external";
 import { useFormField } from "../useFormField";
 import { CheckboxGroupContext } from "./CheckboxGroup";
 import { CheckboxProps } from "./types";

package/src/form/combobox/Combobox.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
 import { Floating } from "../../overlays/floating/Floating";
 import { BodyShort, ErrorMessage, Label } from "../../typography";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 import { ReadOnlyIconWithTitle } from "../ReadOnlyIcon";
 import ComboboxWrapper from "./ComboboxWrapper";
 import FilteredOptions from "./FilteredOptions/FilteredOptions";

package/src/form/combobox/ComboboxWrapper.tsx

@@ -1,5 +1,5 @@
 import React, { useRef, useState } from "react";
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 import { useInputContext } from "./Input/Input.context";
 
 type ComboboxWrapperProps = {

package/src/form/combobox/FilteredOptions/AddNewOption.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import { PlusIcon } from "@navikt/aksel-icons";
 import { BodyShort, Label } from "../../../typography";
-import { cl } from "../../../util/className";
-import { useI18n } from "../../../util/i18n/i18n.hooks";
+import { cl } from "../../../utils/helpers";
+import { useI18n } from "../../../utils/i18n/i18n.hooks";
 import { useInputContext } from "../Input/Input.context";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import { isInList, toComboboxOption } from "../combobox-utils";

package/src/form/combobox/FilteredOptions/FilteredOptions.tsx

@@ -1,8 +1,8 @@
 import React, { useRef, useState } from "react";
 import { DismissableLayer } from "../../../overlays/dismissablelayer/DismissableLayer";
 import { Floating } from "../../../overlays/floating/Floating";
-import { useClientLayoutEffect } from "../../../util";
-import { cl } from "../../../util/className";
+import { useClientLayoutEffect } from "../../../utils-external";
+import { cl } from "../../../utils/helpers";
 import { useInputContext } from "../Input/Input.context";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import AddNewOption from "./AddNewOption";

package/src/form/combobox/FilteredOptions/FilteredOptionsItem.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { CheckmarkIcon } from "@navikt/aksel-icons";
 import { BodyShort } from "../../../typography";
-import { cl } from "../../../util/className";
+import { cl } from "../../../utils/helpers";
 import { useInputContext } from "../Input/Input.context";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import { isInList } from "../combobox-utils";

package/src/form/combobox/FilteredOptions/LoadingMessage.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { Loader } from "../../../loader";
-import { useI18n } from "../../../util/i18n/i18n.hooks";
+import { useI18n } from "../../../utils/i18n/i18n.hooks";
 import { useInputContext } from "../Input/Input.context";
 import filteredOptionsUtil from "./filtered-options-util";
 

package/src/form/combobox/FilteredOptions/MaxSelectedMessage.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { useI18n } from "../../../util/i18n/i18n.hooks";
+import { useI18n } from "../../../utils/i18n/i18n.hooks";
 import { useInputContext } from "../Input/Input.context";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import filteredOptionsUtil from "./filtered-options-util";

package/src/form/combobox/FilteredOptions/NoSearchHitsMessage.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { useI18n } from "../../../util/i18n/i18n.hooks";
+import { useI18n } from "../../../utils/i18n/i18n.hooks";
 import { useInputContext } from "../Input/Input.context";
 import filteredOptionsUtil from "./filtered-options-util";
 

package/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx

@@ -1,7 +1,7 @@
 import React, { SetStateAction, useCallback, useMemo, useState } from "react";
-import { cl } from "../../../util/className";
-import { createStrictContext } from "../../../util/create-strict-context";
-import { useClientLayoutEffect, usePrevious } from "../../../util/hooks";
+import { useClientLayoutEffect } from "../../../utils-external";
+import { cl, createStrictContext } from "../../../utils/helpers";
+import { usePrevious } from "../../../utils/hooks";
 import { useInputContext } from "../Input/Input.context";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import { toComboboxOption } from "../combobox-utils";

package/src/form/combobox/Input/Input.context.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useRef, useState } from "react";
-import { createStrictContext } from "../../../util/create-strict-context";
-import { useClientLayoutEffect } from "../../../util/hooks";
+import { useClientLayoutEffect } from "../../../utils-external";
+import { createStrictContext } from "../../../utils/helpers";
 import { FormFieldType, useFormField } from "../../useFormField";
 import { ComboboxProps } from "../types";
 

package/src/form/combobox/Input/Input.tsx

@@ -4,10 +4,9 @@ import React, {
   useCallback,
   useRef,
 } from "react";
-import { omit } from "../../../util";
-import { cl } from "../../../util/className";
-import { composeEventHandlers } from "../../../util/composeEventHandlers";
-import { useMergeRefs } from "../../../util/hooks";
+import { omit } from "../../../utils-external";
+import { cl, composeEventHandlers } from "../../../utils/helpers";
+import { useMergeRefs } from "../../../utils/hooks";
 import filteredOptionsUtil from "../FilteredOptions/filtered-options-util";
 import { useFilteredOptionsContext } from "../FilteredOptions/filteredOptionsContext";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";

package/src/form/combobox/Input/InputController.tsx

@@ -3,8 +3,8 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 import React, { forwardRef } from "react";
 import { Floating } from "../../../overlays/floating/Floating";
-import { cl } from "../../../util/className";
-import { useMergeRefs } from "../../../util/hooks";
+import { cl } from "../../../utils/helpers";
+import { useMergeRefs } from "../../../utils/hooks";
 import { useFilteredOptionsContext } from "../FilteredOptions/filteredOptionsContext";
 import SelectedOptions from "../SelectedOptions/SelectedOptions";
 import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";

package/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { createStrictContext } from "../../../util/create-strict-context";
-import { usePrevious } from "../../../util/hooks";
+import { createStrictContext } from "../../../utils/helpers";
+import { usePrevious } from "../../../utils/hooks";
 import { useInputContext } from "../Input/Input.context";
 import { isInList } from "../combobox-utils";
 import { useComboboxCustomOptions } from "../customOptionsContext";

package/src/form/combobox/__tests__/combobox.test.tsx

@@ -2,8 +2,8 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import React from "react";
 import { describe, expect, test, vi } from "vitest";
-import { useId } from "../../../util";
-import nb from "../../../util/i18n/locales/nb";
+import { useId } from "../../../utils-external";
+import nb from "../../../utils/i18n/locales/nb";
 import { ComboboxProps, UNSAFE_Combobox } from "../index";
 
 const options = [

package/src/form/combobox/customOptionsContext.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from "react";
-import { createStrictContext } from "../../util/create-strict-context";
+import { createStrictContext } from "../../utils/helpers";
 import { useInputContext } from "./Input/Input.context";
 import { ComboboxOption } from "./types";
 

package/src/form/confirmation-panel/ConfirmationPanel.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
 import { BodyLong, ErrorMessage } from "../../typography";
-import { cl } from "../../util/className";
-import { useId } from "../../util/hooks";
+import { useId } from "../../utils-external";
+import { cl } from "../../utils/helpers";
 import { Checkbox, CheckboxProps } from "../checkbox";
 import { useFormField } from "../useFormField";
 

package/src/form/error-summary/ErrorSummary.tsx

@@ -1,9 +1,8 @@
 import React, { HTMLAttributes, forwardRef, useRef } from "react";
 import { BodyShort, Heading } from "../../typography";
-import { cl } from "../../util/className";
-import { composeEventHandlers } from "../../util/composeEventHandlers";
-import { useMergeRefs } from "../../util/hooks";
-import { useI18n } from "../../util/i18n/i18n.hooks";
+import { cl, composeEventHandlers } from "../../utils/helpers";
+import { useMergeRefs } from "../../utils/hooks";
+import { useI18n } from "../../utils/i18n/i18n.hooks";
 import ErrorSummaryItem from "./ErrorSummaryItem";
 
 export interface ErrorSummaryProps

package/src/form/error-summary/ErrorSummaryItem.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
-import { cl } from "../../util/className";
-import { OverridableComponent } from "../../util/types";
+import type { OverridableComponent } from "../../utils-external";
+import { cl } from "../../utils/helpers";
 
 export interface ErrorSummaryItemProps
   extends React.AnchorHTMLAttributes<HTMLAnchorElement> {

package/src/form/fieldset/Fieldset.tsx

@@ -1,7 +1,7 @@
 import React, { FieldsetHTMLAttributes, forwardRef, useContext } from "react";
 import { BodyShort, ErrorMessage, Label } from "../../typography";
-import { omit, useId } from "../../util";
-import { cl } from "../../util/className";
+import { omit, useId } from "../../utils-external";
+import { cl } from "../../utils/helpers";
 import { ReadOnlyIcon, ReadOnlyIconWithTitle } from "../ReadOnlyIcon";
 import { FormFieldProps } from "../useFormField";
 import { FieldsetContext } from "./context";

package/src/form/fieldset/useFieldset.ts

@@ -1,4 +1,4 @@
-import { cl } from "../../util/className";
+import { cl } from "../../utils/helpers";
 import {
   type FormFieldProps,
   containsReadMore,

package/src/form/file-upload/FileUpload.context.tsx

@@ -1,5 +1,5 @@
-import { createStrictContext } from "../../util/create-strict-context";
-import { ComponentTranslation } from "../../util/i18n/i18n.types";
+import { createStrictContext } from "../../utils/helpers";
+import { ComponentTranslation } from "../../utils/i18n/i18n.types";
 
 export type FileUploadLocaleContextProps = {
   translations?: ComponentTranslation<"FileUpload">;

package/src/form/file-upload/FileUpload.tsx

@@ -1,6 +1,6 @@
 import React, { HTMLAttributes, forwardRef } from "react";
-import { cl } from "../../util/className";
-import { ComponentTranslation } from "../../util/i18n/i18n.types";
+import { cl } from "../../utils/helpers";
+import { ComponentTranslation } from "../../utils/i18n/i18n.types";
 import { FileUploadLocaleContextProvider } from "./FileUpload.context";
 import Trigger from "./parts/Trigger";
 import Dropzone from "./parts/dropzone/Dropzone";

package/src/form/file-upload/parts/Trigger.tsx

@@ -1,5 +1,5 @@
 import React, { forwardRef } from "react";
-import { Slot } from "../../../slot/Slot";
+import { Slot } from "../../../utils/components/slot/Slot";
 import { FileUploadBaseProps } from "../FileUpload.types";
 import { useFileUpload } from "../useFileUpload";
 

package/src/form/file-upload/parts/dropzone/Dropzone.tsx

@@ -5,11 +5,9 @@ import React, { forwardRef } from "react";
 import { CircleSlashIcon, CloudUpIcon } from "@navikt/aksel-icons";
 import { Button } from "../../../../button";
 import { BodyShort, ErrorMessage, Label } from "../../../../typography";
-import { cl } from "../../../../util/className";
-import { composeEventHandlers } from "../../../../util/composeEventHandlers";
-import { useId } from "../../../../util/hooks";
-import { useI18n } from "../../../../util/i18n/i18n.hooks";
-import { omit } from "../../../../util/omit";
+import { omit, useId } from "../../../../utils-external";
+import { cl, composeEventHandlers } from "../../../../utils/helpers";
+import { useI18n } from "../../../../utils/i18n/i18n.hooks";
 import { useFormField } from "../../../useFormField";
 import { useFileUploadTranslation } from "../../FileUpload.context";
 import { useFileUpload } from "../../useFileUpload";

package/src/form/file-upload/parts/dropzone/dropzone.types.ts

@@ -1,4 +1,4 @@
-import { ComponentTranslation } from "../../../../util/i18n/i18n.types";
+import type { ComponentTranslation } from "../../../../utils/i18n/i18n.types";
 import { FormFieldProps } from "../../../useFormField";
 import { FileUploadBaseProps } from "../../FileUpload.types";