chore: upgrade hds 4.2.0

City-of-Helsinki · Feb 17, 2025 · ca0d912 · ca0d912
1 parent e5ebe87
commit ca0d912
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 64 deletions.
diff --git a/apps/admin-ui/package.json b/apps/admin-ui/package.json
@@ -40,8 +40,8 @@
     "eslint-config-custom": "workspace:*",
     "form-data": "^4.0.0",
     "graphql": "^16.9.0",
-    "hds-core": "^4.1.0",
-    "hds-react": "^4.1.0",
+    "hds-core": "^4.2.0",
+    "hds-react": "^4.2.0",
     "i18next": "^23.15.1",
     "lodash": "^4.17.21",
     "next": "15.1.7",

diff --git a/apps/admin-ui/src/spa/applications/[id]/index.tsx b/apps/admin-ui/src/spa/applications/[id]/index.tsx
@@ -377,7 +377,6 @@ function RejectOptionButton({
     return null;
   }
   return (
-    // @ts-expect-error -- HDS incorrect typing for ButtonVariant.Supplementary
     <Button
       size={ButtonSize.Small}
       variant={loading ? ButtonVariant.Clear : ButtonVariant.Supplementary}

diff --git a/apps/ui/package.json b/apps/ui/package.json
@@ -26,9 +26,9 @@
     "eslint-config-custom": "workspace:*",
     "focus-trap-react": "^10.2.3",
     "graphql": "^16.9.0",
-    "hds-core": "^4.1.0",
-    "hds-design-tokens": "^4.1.0",
-    "hds-react": "^4.1.0",
+    "hds-core": "^4.2.0",
+    "hds-design-tokens": "^4.2.0",
+    "hds-react": "^4.2.0",
     "i18next": "^23.15.1",
     "lodash": "^4.17.21",
     "next": "15.1.7",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -22,7 +22,7 @@
     "date-fns": "^4.1.0",
     "eslint-config-custom": "workspace:*",
     "focus-trap-react": "^10.2.3",
-    "hds-react": "^4.1.0",
+    "hds-react": "^4.2.0",
     "i18next": "^23.15.1",
     "lodash": "^4.17.21",
     "next": "15.1.7",

diff --git a/packages/common/src/components/form/ControlledSelect.tsx b/packages/common/src/components/form/ControlledSelect.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { defaultFilter, Option, Select } from "hds-react";
+import { defaultFilter, Option, Select, Tooltip } from "hds-react";
 import { useTranslation } from "next-i18next";
 import {
   type Control,
@@ -46,8 +46,7 @@ export function ControlledSelect<T extends FieldValues>({
   style,
   className,
   clearable,
-  // ignore till HDS provides an upstream fix
-  tooltip: _,
+  tooltip,
   helper: assistive,
   multiselect,
   disabled,
@@ -121,9 +120,12 @@ export function ControlledSelect<T extends FieldValues>({
         error,
         assistive,
         language,
-        // FIXME tooltip is missing is an upstream issue
-        // tooltipText: tooltip,
       }}
+      tooltip={
+        tooltip != null && tooltip !== "" ? (
+          <Tooltip>{tooltip}</Tooltip>
+        ) : undefined
+      }
       value={toHDSValue(options, value)}
       options={options.map(convertOptionToHDS)}
       onChange={handleChange}

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml