Compare commits

...
1 Commits
Author SHA1 Message Date
Halvor Haugan 50c2375815 feat(ComboboxSingle): release to preview 2026-11-20 15:07:10 +01:00
15 changed files with 59 additions and 39 deletions

No files matched your search

-6
View File
@@ -10,12 +10,8 @@ import "../@navikt/core/css/src/data-token-filter.css";
import dataTokenFilterStyles from "../@navikt/core/css/src/data-token-filter.css?inline";
import "../@navikt/core/css/src/data-toolbar.css";
import dataToolbarStyles from "../@navikt/core/css/src/data-toolbar.css?inline";
import "../@navikt/core/css/src/form/combo-box.css";
import combobox2Styles from "../@navikt/core/css/src/form/combo-box.css?inline";
import "../@navikt/core/css/src/index.css";
import dsStyles from "../@navikt/core/css/src/index.css?inline";
import "../@navikt/core/css/src/listbox.css";
import listboxStyles from "../@navikt/core/css/src/listbox.css?inline";
import { Provider } from "../@navikt/core/react/src/provider";
import type { Translations } from "../@navikt/core/react/src/utils/i18n/i18n.types";
import { en, nb, nn } from "../@navikt/core/react/src/utils/i18n/locales";
@@ -56,8 +52,6 @@ const StoryProviderDecorator = ({
const webComponentStyles = [
dataTokenFilterStyles,
dataToolbarStyles,
listboxStyles,
combobox2Styles,
dsStyles,
].join("\n");
-11
View File
@@ -220,17 +220,6 @@
* Option *
************************************************/
.aksel-combo-box__option:is([aria-selected="true"], [aria-selected="true"][data-virtual-focus="true"])
.aksel-listbox__option-inner {
background-color: var(--ax-bg-moderate-pressedA);
@media (forced-colors: active) {
background-color: SelectedItem;
color: SelectedItemText;
forced-color-adjust: none;
}
}
.aksel-combo-box__option-checkmark {
--__axc-combo-box-option-checkmark-size: 1.25rem;
+1
View File
@@ -10,5 +10,6 @@
@import "./textarea.css";
@import "./search.css";
@import "./combobox.css";
@import "./combo-box.css";
@import "./form-summary.css";
@import "./form-progress.css";
+5 -12
View File
@@ -1,6 +1,7 @@
@charset "UTF-8";
/* CSS is ordered by specificity, so that browsers without layers fall backs to good defaults */
@layer aksel.reset, aksel.theming, aksel.baseline, aksel.print, aksel.typography, aksel.components.core, aksel.components.core.loader, aksel.components.core.button, aksel.components.form, aksel.components.modules, aksel.layout;
/* ----------------------------- CSS foundations ---------------------------- */
@@ -12,20 +13,11 @@
/* ------------------------------- Components ------------------------------- */
@import "./theme.css" layer(aksel.components.core);
@import "./typography.css" layer(aksel.components.core);
@import "./typography.css" layer(aksel.components.core); /* Some components override typo */
@import "./chips.css" layer(aksel.components.core);
@import "./loader.css" layer(aksel.components.core.loader);
@import "./button.css" layer(aksel.components.core.button);
/**
* Most components depend on typo-styles, so we import them first.
*
* `./form/index.css` edits the following components:
* - Button
* - Chips
* To avoid specificity conflicts, we import those components before form.
*/
@import "./form/index.css" layer(aksel.components.form);
@import "./button.css" layer(aksel.components.core.button); /* Overrides Loader */
@import "./form/index.css" layer(aksel.components.form); /* Overrides Button and Chips */
@import "./accordion.css" layer(aksel.components.modules);
@import "./alert.css" layer(aksel.components.modules);
@import "./chat.css" layer(aksel.components.modules);
@@ -61,6 +53,7 @@
@import "./stepper.css" layer(aksel.components.modules);
@import "./table.css" layer(aksel.components.modules);
@import "./tabs.css" layer(aksel.components.modules);
@import "./listbox.css" layer(aksel.components.modules);
@import "./list.css" layer(aksel.components.modules);
/* --------------------------------- Layout --------------------------------- */
+10
View File
@@ -54,4 +54,14 @@
outline-color: Highlight;
}
}
.aksel-listbox__option[aria-selected="true"] & {
background-color: var(--ax-bg-moderate-pressedA);
@media (forced-colors: active) {
background-color: SelectedItem;
color: SelectedItemText;
forced-color-adjust: none;
}
}
}
@@ -0,0 +1,21 @@
import type { ComponentMetadata } from "../../utils/types/metadata";
import { ComboboxSingle } from "./";
const metadata: ComponentMetadata = {
name: "Combobox",
components: {
ComboboxSingle,
},
keywords: [
"combobox",
"select",
"multiselect",
"nedtrekksliste",
"dropdown",
"form",
"input",
],
related: ["Select", "Combobox-legacy"],
};
export { metadata };
@@ -11,7 +11,7 @@ type ComboboxFilterProps = Pick<
>;
export const ComboboxFilter = (props: ComboboxFilterProps) => {
const translate = useI18n("Combobox2");
const translate = useI18n("Combobox");
const { size } = useComboboxRootContext();
const {
filterString,
@@ -0,0 +1,2 @@
"use client";
export { ComboboxSingle } from "./Combobox";
@@ -74,7 +74,7 @@ function ComboboxListContent<
deferredFilterString,
liveRegionRef,
);
const translate = useI18n("Combobox2");
const translate = useI18n("Combobox");
if (children && typeof children !== "function") {
return children;
@@ -22,7 +22,7 @@ function useHitsAnnouncer(
deferredFilterString: string,
liveRegionRef: React.RefObject<HTMLDivElement | null>,
) {
const translate = useI18n("Combobox2");
const translate = useI18n("Combobox");
const oldFilterStringRef = useRef(deferredFilterString);
const timeout = useTimeout();
+1
View File
@@ -3,3 +3,4 @@ export { Lookup } from "./lookup/index-deprecated";
export { Badge } from "./badge/index-deprecated";
export { RadioCard, RadioCardGroup } from "./form/radio-card";
export { CheckboxCard, CheckboxCardGroup } from "./form/checkbox-card";
export { ComboboxSingle } from "./form/combo-box";
@@ -7,13 +7,6 @@ const internalTranslations = {
Combobox2: {
/** The "value" that is shown when multiple options are selected. */
selectedCount: "{count} valgt",
/** Label for filter input. Only visible to screen readers. */
filter: "Filtrer",
noHits: "Ingen treff",
/** Only announced to screen readers. */
oneHit: "Ett treff",
/** Only announced to screen readers. */
hitsCount: "{count} treff",
},
} satisfies Record<string, Record<string, string | Record<string, string>>>;
@@ -24,6 +24,10 @@ export default {
noMatches: "No search hits",
loading: "Searching…",
maxSelected: "{selected} of max {limit} are selected.",
filter: "Filter",
noHits: "No hits",
oneHit: "One hit",
hitsCount: "{count} hits",
},
CopyButton: {
title: "Copy",
@@ -31,6 +31,14 @@ export default {
/** Loader title */
loading: "Søker…",
maxSelected: "{selected} av maks {limit} er valgt.",
/** ComboboxSingle. Label for filter input. Only visible to screen readers. */
filter: "Filtrer",
/** ComboboxSingle */
noHits: "Ingen treff",
/** ComboboxSingle. Only announced to screen readers. */
oneHit: "Ett treff",
/** ComboboxSingle. Only announced to screen readers. */
hitsCount: "{count} treff",
},
CopyButton: {
title: "Kopier",
@@ -24,6 +24,10 @@ export default {
noMatches: "Ingen søketreff",
loading: "Søker…",
maxSelected: "{selected} av maks {limit} er valt.",
filter: "Filtrer",
noHits: "Ingen treff",
oneHit: "Eitt treff",
hitsCount: "{count} treff",
},
CopyButton: {
title: "Kopier",