= ({ className, ...props }) => (
-> = ({ className, children, ...props }) => (
+ React.ComponentPropsWithoutRef & {
+ customClose?: React.JSX.Element;
+ preventAutoFocus?: boolean;
+ }
+> = ({ className, children, customClose, preventAutoFocus, ...props }) => (
e.preventDefault() : props.onOpenAutoFocus
+ }
+ onCloseAutoFocus={
+ preventAutoFocus ? (e) => e.preventDefault() : props.onOpenAutoFocus
+ }
{...props}
>
{children}
-
-
- Close
+
+ {customClose || (
+ <>
+
+ Close
+ >
+ )}
);
+
DialogContent.displayName = DialogPrimitive.Content.displayName;
const DialogHeader = ({
diff --git a/packages/ui/src/shadcn/tooltip.tsx b/packages/ui/src/shadcn/tooltip.tsx
index 1ab8c1f..606b9ef 100644
--- a/packages/ui/src/shadcn/tooltip.tsx
+++ b/packages/ui/src/shadcn/tooltip.tsx
@@ -6,8 +6,18 @@ import * as TooltipPrimitive from '@radix-ui/react-tooltip';
import { cn } from '../lib/utils';
-const TooltipProvider = TooltipPrimitive.Provider;
-
+function TooltipProvider({
+ delayDuration = 0,
+ ...props
+}: React.ComponentProps) {
+ return (
+
+ );
+}
const Tooltip = TooltipPrimitive.Root;
const TooltipTrigger = TooltipPrimitive.Trigger;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1837337..80b71bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -83,6 +83,9 @@ importers:
'@radix-ui/react-icons':
specifier: ^1.3.2
version: 1.3.2(react@19.1.0)
+ '@radix-ui/react-visually-hidden':
+ specifier: ^1.2.3
+ version: 1.2.3(@types/react-dom@19.1.5(@types/react@19.1.4))(@types/react@19.1.4)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
'@supabase/ssr':
specifier: ^0.6.1
version: 0.6.1(@supabase/supabase-js@2.49.4)
@@ -13116,7 +13119,7 @@ snapshots:
jest-worker@27.5.1:
dependencies:
- '@types/node': 24.0.3
+ '@types/node': 22.15.32
merge-stream: 2.0.0
supports-color: 8.1.1
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 550cb54..870bf33 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -17,6 +17,7 @@
"imageInputLabel": "Click here to upload an image",
"cancel": "Cancel",
"clear": "Clear",
+ "close": "Close",
"notFound": "Not Found",
"backToHomePage": "Back to Home Page",
"goBack": "Go Back",
@@ -59,6 +60,10 @@
"shoppingCart": "Shopping cart",
"search": "Search{{end}}",
"myActions": "My actions",
+ "healthPackageComparison": {
+ "label": "Health package comparison",
+ "description": "Alljärgnevalt on antud eelinfo (sugu, vanus ja kehamassiindeksi) põhjal tehtud personalne terviseauditi valik. Tabelis on võimalik soovitatud terviseuuringute paketile lisada üksikuid uuringuid juurde."
+ },
"routes": {
"home": "Home",
"overview": "Overview",
diff --git a/public/locales/en/product.json b/public/locales/en/product.json
index 72a305a..e2aaf81 100644
--- a/public/locales/en/product.json
+++ b/public/locales/en/product.json
@@ -11,5 +11,33 @@
"label": "Premium",
"description": "Sobib, kui soovid lisaks peamistele tervisenäitajatele ülevaadet, kas organismis on olulisemaid vitamiine ja mineraalaineid piisavalt."
},
- "nrOfAnalyses": "{{nr}} analyses"
+ "nrOfAnalyses": "{{nr}} analyses",
+ "clinicalBloodDraw": {
+ "label": "Kliiniline vereanalüüs",
+ "description": "Pending"
+ },
+ "crp": {
+ "label": "C-reaktiivne valk (CRP)",
+ "description": "Pending"
+ },
+ "ferritin": {
+ "label": "Ferritiin",
+ "description": "Pending"
+ },
+ "vitaminD": {
+ "label": "D-vitamiin",
+ "description": "Pending"
+ },
+ "glucose": {
+ "label": "Glükoos",
+ "description": "Pending"
+ },
+ "alat": {
+ "label": "Alaniini aminotransferaas",
+ "description": "Pending"
+ },
+ "ast": {
+ "label": "Aspartaadi aminotransferaas",
+ "description": "Pending"
+ }
}
\ No newline at end of file
diff --git a/public/locales/et/common.json b/public/locales/et/common.json
index a05a890..36da315 100644
--- a/public/locales/et/common.json
+++ b/public/locales/et/common.json
@@ -17,6 +17,7 @@
"imageInputLabel": "Click here to upload an image",
"cancel": "Cancel",
"clear": "Clear",
+ "close": "Sulge",
"notFound": "Not Found",
"backToHomePage": "Back to Home Page",
"goBack": "Tagasi",
@@ -59,6 +60,10 @@
"shoppingCart": "Ostukorv",
"search": "Otsi{{end}}",
"myActions": "Minu toimingud",
+ "healthPackageComparison": {
+ "label": "Tervisepakketide võrdlus",
+ "description": "Alljärgnevalt on antud eelinfo (sugu, vanus ja kehamassiindeksi) põhjal tehtud personalne terviseauditi valik. Tabelis on võimalik soovitatud terviseuuringute paketile lisada üksikuid uuringuid juurde."
+ },
"routes": {
"home": "Home",
"overview": "Ülevaade",
diff --git a/public/locales/et/product.json b/public/locales/et/product.json
index 52eeaa2..01876f9 100644
--- a/public/locales/et/product.json
+++ b/public/locales/et/product.json
@@ -11,5 +11,33 @@
"label": "Premium",
"description": "Sobib, kui soovid lisaks peamistele tervisenäitajatele ülevaadet, kas organismis on olulisemaid vitamiine ja mineraalaineid piisavalt."
},
- "nrOfAnalyses": "{{nr}} analüüsi"
+ "nrOfAnalyses": "{{nr}} analüüsi",
+ "clinicalBloodDraw": {
+ "label": "Kliiniline vereanalüüs",
+ "description": "Pending"
+ },
+ "crp": {
+ "label": "C-reaktiivne valk (CRP)",
+ "description": "Pending"
+ },
+ "ferritin": {
+ "label": "Ferritiin",
+ "description": "Pending"
+ },
+ "vitaminD": {
+ "label": "D-vitamiin",
+ "description": "Pending"
+ },
+ "glucose": {
+ "label": "Glükoos",
+ "description": "Pending"
+ },
+ "alat": {
+ "label": "Alaniini aminotransferaas",
+ "description": "Pending"
+ },
+ "ast": {
+ "label": "Aspartaadi aminotransferaas",
+ "description": "Pending"
+ }
}
\ No newline at end of file
diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
index 64026ee..f71e765 100644
--- a/public/locales/ru/common.json
+++ b/public/locales/ru/common.json
@@ -17,6 +17,7 @@
"imageInputLabel": "Click here to upload an image",
"cancel": "Cancel",
"clear": "Clear",
+ "close": "Close",
"notFound": "Not Found",
"backToHomePage": "Back to Home Page",
"goBack": "Go Back",
@@ -59,6 +60,10 @@
"shoppingCart": "Shopping cart",
"search": "Search{{end}}",
"myActions": "My actions",
+ "healthPackageComparison": {
+ "label": "Health package comparison",
+ "description": "Alljärgnevalt on antud eelinfo (sugu, vanus ja kehamassiindeksi) põhjal tehtud personalne terviseauditi valik. Tabelis on võimalik soovitatud terviseuuringute paketile lisada üksikuid uuringuid juurde."
+ },
"routes": {
"home": "Home",
"overview": "Overview",
diff --git a/public/locales/ru/product.json b/public/locales/ru/product.json
index 72a305a..e2aaf81 100644
--- a/public/locales/ru/product.json
+++ b/public/locales/ru/product.json
@@ -11,5 +11,33 @@
"label": "Premium",
"description": "Sobib, kui soovid lisaks peamistele tervisenäitajatele ülevaadet, kas organismis on olulisemaid vitamiine ja mineraalaineid piisavalt."
},
- "nrOfAnalyses": "{{nr}} analyses"
+ "nrOfAnalyses": "{{nr}} analyses",
+ "clinicalBloodDraw": {
+ "label": "Kliiniline vereanalüüs",
+ "description": "Pending"
+ },
+ "crp": {
+ "label": "C-reaktiivne valk (CRP)",
+ "description": "Pending"
+ },
+ "ferritin": {
+ "label": "Ferritiin",
+ "description": "Pending"
+ },
+ "vitaminD": {
+ "label": "D-vitamiin",
+ "description": "Pending"
+ },
+ "glucose": {
+ "label": "Glükoos",
+ "description": "Pending"
+ },
+ "alat": {
+ "label": "Alaniini aminotransferaas",
+ "description": "Pending"
+ },
+ "ast": {
+ "label": "Aspartaadi aminotransferaas",
+ "description": "Pending"
+ }
}
\ No newline at end of file