Version Packages (#2132 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Removable chips type now defaults to button (#2124 )
2026-10-13 17:22:02 +00:00 · 2023-08-03 13:30:24 +02:00 · 2023-08-03 11:41:31 +02:00 · 2023-08-03 10:53:25 +02:00 · 2023-08-02 15:35:28 +02:00 · 2023-08-02 12:43:19 +02:00
29 changed files with 1925 additions and 1090 deletions
@@ -10,6 +10,11 @@ module.exports = (indexers) => {
  const exampleIndexer = async (fileName: string, opts) => {
    let code = readFileSync(fileName, "utf-8").toString();

+    code = code
+      .split("\n")
+      .filter((line) => !line.includes("withDsExample"))
+      .join("\n");
+
    code = code.replace("export const args =", "const args =");

    code += `\nexport default { title: "Eksempler/${fileName
@@ -1,5 +1,4 @@
 const storyIndexers = require("./indexer");
-
 const path = require("path");
 const { mergeConfig } = require("vite");

@@ -59,15 +58,11 @@ module.exports = {
  },
  async viteFinal(config) {
    return mergeConfig(config, {
-      define: { "process.env": {} },
+      define: {
+        "process.env": {},
+      },
      resolve: {
        alias: [
-          /*
-          // Example
-          {
-            find: "@components",
-            replacement: path.resolve(__dirname, "./src/components"),
-          }, */
          {
            find: "components",
            replacement: path.resolve(
@@ -1,5 +1,7 @@
 # @navikt/aksel-icons

+## 4.7.3
+
 ## 4.7.2

 ## 4.7.1
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/aksel-icons",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "author": "Aksel | NAV",
  "homepage": "https://aksel.nav.no/ikoner",
  "repository": {
@@ -1,5 +1,7 @@
 # @navikt/aksel-stylelint

+## 4.7.3
+
 ## 4.7.2

 ## 4.7.1
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/aksel-stylelint",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "author": "Aksel | NAV",
  "homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
  "repository": {
@@ -35,8 +35,8 @@
    "dev": "yarn watch:lint"
  },
  "devDependencies": {
-    "@navikt/ds-css": "^4.7.2",
-    "@navikt/ds-tokens": "^4.7.2",
+    "@navikt/ds-css": "^4.7.3",
+    "@navikt/ds-tokens": "^4.7.3",
    "@types/jest": "^29.0.0",
    "concurrently": "7.2.1",
    "copyfiles": "2.4.1",
@@ -1,5 +1,12 @@
 # @navikt/aksel

+## 4.7.3
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@4.7.3
+
 ## 4.7.2

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/aksel",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "description": "Aksel command line interface. Handles css-imports, codemods and more",
  "author": "Aksel | NAV designsystem team",
  "license": "MIT",
@@ -29,7 +29,7 @@
  },
  "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
  "dependencies": {
-    "@navikt/ds-css": "4.7.2",
+    "@navikt/ds-css": "4.7.3",
    "axios": "1.3.6",
    "chalk": "4.1.0",
    "clipboardy": "^2.3.0",
@@ -1,5 +1,7 @@
 # @navikt/ds-css

+## 4.7.3
+
 ## 4.7.2

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/ds-css",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "description": "CSS for NAV Designsystem",
  "author": "Aksel | NAV designsystem team",
  "keywords": [
@@ -27,7 +27,7 @@
    "css:get-version": "node config/get-version.js"
  },
  "devDependencies": {
-    "@navikt/ds-tokens": "^4.7.2",
+    "@navikt/ds-tokens": "^4.7.3",
    "cssnano": "6.0.0",
    "fast-glob": "3.2.11",
    "lodash": "4.17.21",
@@ -1,5 +1,14 @@
 # @navikt/ds-react

+## 4.7.3
+
+### Patch Changes
+
+- Chips: Removable Chips submitter ikke forms ved klikk lengre ([#2124](https://github.com/navikt/aksel/pull/2124))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.7.3
+
 ## 4.7.2

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/ds-react",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "description": "Aksel react-components for NAV designsystem",
  "author": "Aksel | NAV designsystem team",
  "license": "MIT",
@@ -38,7 +38,7 @@
  },
  "dependencies": {
    "@floating-ui/react": "0.24.1",
-    "@navikt/aksel-icons": "^4.7.2",
+    "@navikt/aksel-icons": "^4.7.3",
    "@radix-ui/react-tabs": "1.0.0",
    "@radix-ui/react-toggle-group": "1.0.0",
    "clsx": "^1.2.1",
@@ -1,7 +1,6 @@
 import { XMarkIcon } from "@navikt/aksel-icons";
 import cl from "clsx";
 import React, { forwardRef } from "react";
-import { OverridableComponent } from "../util/OverridableComponent";

 export interface RemovableChipsProps
  extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -22,26 +21,27 @@ export interface RemovableChipsProps
  onDelete?: () => void;
 }

-export const RemovableChips: OverridableComponent<
-  RemovableChipsProps,
-  HTMLButtonElement
-> = forwardRef(
+export const RemovableChips = forwardRef<
+  HTMLButtonElement,
+  RemovableChipsProps
+>(
  (
    {
      className,
      children,
      variant = "action",
-      as: Component = "button",
      removeLabel = "slett",
      onDelete,
+      type = "button",
      ...rest
    },
    ref
  ) => {
    return (
-      <Component
+      <button
        {...rest}
        ref={ref}
+        type={type}
        className={cl(
          "navds-chips__chip navds-chips__removable navds-chips--icon-right",
          className,
@@ -57,7 +57,7 @@ export const RemovableChips: OverridableComponent<
        <span className="navds-chips__removable-icon">
          <XMarkIcon aria-hidden />
        </span>
-      </Component>
+      </button>
    );
  }
 );
@@ -5,7 +5,7 @@ import { useId } from "..";
 export interface LoaderProps extends SVGProps<SVGSVGElement> {
  /**
   * Changes Loader width/height
-   * 64px | 40px | 32px | 24px | 20px | 16px
+   * 88px | 64px | 40px | 32px | 24px | 20px | 16px
   * @default "medium"
   */
  size?:
@@ -1,5 +1,7 @@
 # @navikt/ds-tailwind

+## 4.7.3
+
 ## 4.7.2

 ## 4.7.1
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/ds-tailwind",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "description": "Tailwind config based on @navikt/ds-tokens",
  "author": "Aksel | NAV designsystem team",
  "keywords": [
@@ -22,7 +22,7 @@
    "directory": "@navikt/core/tailwind"
  },
  "devDependencies": {
-    "@navikt/ds-tokens": "^4.7.2",
+    "@navikt/ds-tokens": "^4.7.3",
    "@types/jest": "^29.0.0",
    "color": "4.2.3",
    "jest": "^29.0.0",
@@ -1,5 +1,7 @@
 # @navikt/ds-tokens

+## 4.7.3
+
 ## 4.7.2

 ## 4.7.1
@@ -1,6 +1,6 @@
 {
  "name": "@navikt/ds-tokens",
-  "version": "4.7.2",
+  "version": "4.7.3",
  "description": "Design-tokens for NAV designsystem",
  "author": "Aksel | NAV designsystem team",
  "keywords": [
@@ -1,5 +1,11 @@
 # Changelog

+## 4.7.3
+
+### @navikt/ds-react
+
+- Chips: Removable Chips submitter ikke forms ved klikk lengre ([#2124](https://github.com/navikt/aksel/pull/2124))
+
 ## 4.7.2

 ### @navikt/ds-css
@@ -15,11 +15,11 @@
    "website"
  ],
  "dependencies": {
-    "@navikt/aksel-icons": "^4.7.2",
-    "@navikt/ds-css": "^4.7.2",
-    "@navikt/ds-react": "^4.7.2",
-    "@navikt/ds-tailwind": "^4.7.2",
-    "@navikt/ds-tokens": "^4.7.2"
+    "@navikt/aksel-icons": "^4.7.3",
+    "@navikt/ds-css": "^4.7.3",
+    "@navikt/ds-react": "^4.7.3",
+    "@navikt/ds-tailwind": "^4.7.3",
+    "@navikt/ds-tokens": "^4.7.3"
  },
  "devDependencies": {
    "prettier-plugin-tailwindcss": "^0.2.3"
@@ -75,7 +75,7 @@ export const WithSidebar = ({
    <>
      <Header />
      <div className="bg-bg-default">
-        <div className="mx-auto mb-24 mt-6 flex w-full max-w-screen-2xl gap-6">
+        <div className="mx-auto mb-24 flex w-full max-w-screen-2xl gap-6 pt-6">
          <Sidebar kategori={pageType.type} links={sidebar} />
          <div className="relative w-full">
            <main
@@ -1,5 +1,7 @@
 import { Button, DatePicker } from "@navikt/ds-react";
 import { withDsExample } from "components/website-modules/examples/withDsExample";
+import format from "date-fns/format";
+import nbLocale from "date-fns/locale/nb";
 import { useState } from "react";

 const Example = () => {
@@ -20,7 +22,9 @@ const Example = () => {
      {days && (
        <div className="pt-4">
          {days.map((x) => (
-            <div key={x.toString()}>{x.toDateString()}</div>
+            <div key={x.toString()}>
+              {format(x, "dd.MM.yyyy", { locale: nbLocale })}
+            </div>
          ))}
        </div>
      )}
@@ -1,5 +1,7 @@
 import { DatePicker, useRangeDatepicker } from "@navikt/ds-react";
 import { withDsExample } from "components/website-modules/examples/withDsExample";
+import format from "date-fns/format";
+import nbLocale from "date-fns/locale/nb";

 const Example = () => {
  const { datepickerProps, toInputProps, fromInputProps, selectedRange } =
@@ -18,8 +20,14 @@ const Example = () => {
      </DatePicker>
      {selectedRange && (
        <div className="pt-4">
-          <div>{selectedRange?.from && selectedRange.from.toDateString()}</div>
-          <div>{selectedRange?.to && selectedRange.to.toDateString()}</div>
+          <div>
+            {selectedRange?.from &&
+              format(selectedRange.from, "dd.MM.yyyy", { locale: nbLocale })}
+          </div>
+          <div>
+            {selectedRange?.to &&
+              format(selectedRange.to, "dd.MM.yyyy", { locale: nbLocale })}
+          </div>
        </div>
      )}
    </div>
@@ -1,5 +1,7 @@
 import { DatePicker, useDatepicker } from "@navikt/ds-react";
 import { withDsExample } from "components/website-modules/examples/withDsExample";
+import format from "date-fns/format";
+import nbLocale from "date-fns/locale/nb";

 const Example = () => {
  const { datepickerProps, inputProps, selectedDay } = useDatepicker({
@@ -12,7 +14,9 @@ const Example = () => {
      <DatePicker {...datepickerProps}>
        <DatePicker.Input {...inputProps} label="Velg dato" />
      </DatePicker>
-      <div className="pt-4">{selectedDay && selectedDay.toDateString()}</div>
+      <div className="pt-4">
+        {selectedDay && format(selectedDay, "dd.MM.yyyy", { locale: nbLocale })}
+      </div>
    </div>
  );
 };
@@ -7,6 +7,8 @@ import {
 } from "@navikt/ds-react";
 import { withDsExample } from "components/website-modules/examples/withDsExample";
 import { useEffect, useState } from "react";
+import format from "date-fns/format";
+import nbLocale from "date-fns/locale/nb";

 const Example = () => {
  const [open, setOpen] = useState(false);
@@ -40,7 +42,8 @@ const Example = () => {
              <DatePicker.Input {...inputProps} label="Velg dato" />
            </DatePicker>
            <div className="pt-4">
-              {selectedDay && selectedDay.toDateString()}
+              {selectedDay &&
+                format(selectedDay, "dd.MM.yyyy", { locale: nbLocale })}
            </div>
          </div>
        </Modal.Content>
@@ -1,5 +1,7 @@
 import { DatePicker, useDatepicker } from "@navikt/ds-react";
 import { withDsExample } from "components/website-modules/examples/withDsExample";
+import format from "date-fns/format";
+import nbLocale from "date-fns/locale/nb";

 const Example = () => {
  const { datepickerProps, inputProps, selectedDay } = useDatepicker({
@@ -13,7 +15,9 @@ const Example = () => {
      <DatePicker {...datepickerProps}>
        <DatePicker.Input {...inputProps} label="Velg dato" />
      </DatePicker>
-      <div className="pt-4">{selectedDay && selectedDay.toDateString()}</div>
+      <div className="pt-4">
+        {selectedDay && format(selectedDay, "dd.MM.yyyy", { locale: nbLocale })}
+      </div>
    </div>
  );
 };
@@ -10,8 +10,8 @@
    "preview": "vite preview"
  },
  "dependencies": {
-    "@navikt/ds-css": "4.7.2",
-    "@navikt/ds-react": "4.7.2",
+    "@navikt/ds-css": "4.7.3",
+    "@navikt/ds-react": "4.7.3",
    "react": "^18.0.0",
    "react-dom": "^18.0.0"
  },
@@ -211,21 +211,21 @@
  },
  "devDependencies": {
    "@changesets/cli": "2.25.0",
-    "@storybook/addon-a11y": "7.0.4",
-    "@storybook/addon-actions": "7.0.4",
-    "@storybook/addon-essentials": "7.0.4",
-    "@storybook/addon-interactions": "7.0.4",
-    "@storybook/addon-storysource": "7.0.4",
-    "@storybook/addons": "7.0.4",
-    "@storybook/csf-tools": "7.0.4",
+    "@storybook/addon-a11y": "7.2.0",
+    "@storybook/addon-actions": "7.2.0",
+    "@storybook/addon-essentials": "7.2.0",
+    "@storybook/addon-interactions": "7.2.0",
+    "@storybook/addon-storysource": "7.2.0",
+    "@storybook/addons": "7.2.0",
+    "@storybook/csf-tools": "7.2.0",
    "@storybook/jest": "^0.1.0",
-    "@storybook/react": "7.0.4",
-    "@storybook/react-vite": "7.0.4",
-    "@storybook/testing-library": "^0.1.0",
-    "@storybook/theming": "7.0.4",
+    "@storybook/react": "7.2.0",
+    "@storybook/react-vite": "7.2.0",
+    "@storybook/testing-library": "^0.2.0",
+    "@storybook/theming": "7.2.0",
    "@svitejs/changesets-changelog-github-compact": "^1.1.0",
    "@typescript-eslint/parser": "^5.41.0",
-    "@whitespace/storybook-addon-html": "^5.1.4",
+    "@whitespace/storybook-addon-html": "^5.1.6",
    "chromatic": "6.5.4",
    "concurrently": "7.2.1",
    "cross-env": "^7.0.0",
@@ -244,7 +244,7 @@
    "react": "^18.0.0",
    "react-docgen-typescript": "2.2.2",
    "react-dom": "^18.0.0",
-    "storybook": "7.0.4",
+    "storybook": "7.2.0",
    "stylelint": "^14.8.5",
    "stylelint-config-prettier": "^9.0.3",
    "stylelint-config-standard": "^25.0.0",
Author	SHA1	Message	Date
github-actions[bot]andgithub-actions[bot]	09ba52ea76	Version Packages (#2132 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2023-08-03 13:30:24 +02:00
Andreas Nordahl Ken Ken Vegard Haugstvedt	a82bccf707	Removable chips type now defaults to button (#2124 ) * Removable chips type now defaults to button * 📝 Changeset * 📝 Changeset update * Remove OverridableComponent from Chips.Removable. This component should always be a button, and it is not currently used in any other way. The reason for making this change now, is that we put type="button" on the Chip.Removable to prevent a submit event when the chip is clicked inside a form. --------- Co-authored-by: Ken <ken.aleksander@gmail.com> Co-authored-by: Ken <26967723+KenAJoh@users.noreply.github.com> Co-authored-by: Vegard Haugstvedt <it.vegard@gmail.com>	2023-08-03 11:41:31 +02:00
Ken	89ae778c24	🐛 Fikset lasting av aksel-eksempler i storybook	2023-08-03 10:53:25 +02:00
Ken	5b2669d35d	⬆️ Oppdatert storybook til 7.2 (#2128 )	2023-08-02 15:35:28 +02:00
Ken	8a82bb4a96	🐛 Fikset layout-bug på komponentsider for enkelte nettlesere	2023-08-02 12:43:19 +02:00
Ken	7871e0f95c	📝 Oppdatert datepicker-eksempler med formatering (#2125 )	2023-08-02 12:37:14 +02:00
dependabot[bot]	3182888a07	⬆️ Bump word-wrap from 1.2.3 to 1.2.4 (#2115 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-08-02 10:39:55 +02:00
Mathias S. Müller	f2742da085	Legg til manglende størrelsesbeskrivelse (#2121 )	2023-07-27 14:59:08 +02:00