Merge pull request #965 from dnum-mi/develop

Develop

.github/workflows/run-tests.yml

@@ -19,11 +19,11 @@ jobs:
  VITE_APP_GIT_SHA: ${{github.sha}}
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  - name: Setup Node.js
- uses: actions/setup-node@v2
+ uses: actions/setup-node@v4
  with:
- node-version: 20
+ node-version: 22
  - name: Install pnpm
  run: npm i -g pnpm
  - name: Install dependencies

package.json

@@ -88,6 +88,7 @@
  "@commitlint/cli": "^19.4.1",
  "@commitlint/config-conventional": "^19.4.1",
  "@iconify/vue": "^4.1.2",
+ "@playwright/test": "1.48.1",
  "@storybook/addon-a11y": "^8.3.0",
  "@storybook/addon-docs": "^8.3.0",
  "@storybook/addon-essentials": "^8.3.0",
@@ -130,7 +131,6 @@
  "lint-staged": "^15.2.10",
  "npm-run-all": "^4.1.5",
  "p-debounce": "^4.0.0",
- "playwright": "^1.47.0",
  "publint": "^0.2.10",
  "regenerator-runtime": "^0.14.1",
  "rimraf": "^6.0.1",

src/components/DsfrDataTable/DsfrDataTable.vue

@@ -64,8 +64,10 @@ const pages = computed<Page[]>(() => props.pages ?? Array.from({ length: pageCou
 const lowestLimit = computed(() => currentPage.value * rowsPerPage.value)
 const highestLimit = computed(() => (currentPage.value + 1) * rowsPerPage.value)
 
+const sortedBy = defineModel<string | undefined>('sortedBy', { default: undefined })
+const sortedDesc = defineModel('sortedDesc', { default: false })
 function defaultSortFn (a: string | DsfrDataTableRow, b: string | DsfrDataTableRow) {
- const key = props.sorted as string
+ const key = sortedBy.value ?? props.sorted
  // @ts-expect-error TS7015
  if (((a as DsfrDataTableRow)[key] ?? a) < ((b as DsfrDataTableRow)[key] ?? b)) {
  return -1
@@ -76,9 +78,6 @@ function defaultSortFn (a: string | DsfrDataTableRow, b: string | DsfrDataTableR
  }
  return 0
 }
-
-const sortedBy = defineModel<string | undefined>('sortedBy', { default: undefined })
-const sortedDesc = defineModel('sortedDesc', { default: false })
 function sortBy (key: string) {
  if (!props.sortableRows || (Array.isArray(props.sortableRows) && !props.sortableRows.includes(key))) {
  return

src/components/DsfrHeader/DsfrHeader.types.ts

@@ -20,7 +20,6 @@ export type DsfrHeaderMenuLinkProps = {
  * @deprecated Use the prop `to` instead
  */
  path?: string
- class?: string | Record<string, string> | Array<string | Record<string, string>>
 }
 
 export type DsfrHeaderProps = {
@@ -34,7 +33,7 @@ export type DsfrHeaderProps = {
  operatorImgSrc?: string
  operatorImgStyle?: StyleValue
  placeholder?: string
- quickLinks?: DsfrHeaderMenuLinkProps[]
+ quickLinks?: (DsfrHeaderMenuLinkProps & HTMLAttributes)[]
  languageSelector?: DsfrLanguageSelectorProps
  searchLabel?: string
  quickLinksAriaLabel?: string

src/components/DsfrHeader/DsfrHeader.vue

@@ -242,15 +242,13 @@ provide(registerNavigationLinkKey, () => {
  @select="languageSelector.currentLanguage = $event.codeIso"
  />
  </template>
- <nav role="navigation">
- <DsfrHeaderMenuLinks
- v-if="menuOpened"
- role="navigation"
- :links="quickLinks"
- :nav-aria-label="quickLinksAriaLabel"
- @link-click="onQuickLinkClick"
- />
- </nav>
+ <DsfrHeaderMenuLinks
+ v-if="menuOpened"
+ role="navigation"
+ :links="quickLinks"
+ :nav-aria-label="quickLinksAriaLabel"
+ @link-click="onQuickLinkClick"
+ />
  </div>
 
  <template v-if="modalOpened">

src/components/DsfrSelect/DsfrSelect.vue

@@ -71,7 +71,7 @@ const messageType = computed(() => {
  @change="$emit('update:modelValue', ($event.target as HTMLInputElement)?.value)"
  >
  <option
- :selected="modelValue == null"
+ :selected="!options.some(option => typeof option !== 'object' || option === null ? option === modelValue : option.value === modelValue)"
  disabled
  hidden
  >

src/components/DsfrTooltip/DsfrTooltip.vue

@@ -126,6 +126,7 @@ const onClick = () => {
 
 <template>
  <component
+ v-bind="$attrs"
  :is="onHover ? 'a' : 'button'"
  :id="`link-${id}`"
  ref="source"