From ff2727500c16ab3ddc10732acf322b49672da852 Mon Sep 17 00:00:00 2001 From: "hrynevych.romann" Date: Thu, 11 Jan 2024 22:47:33 +0200 Subject: [PATCH 1/3] fix(Button): add 'whitespace-nowrap' to base styles --- apps/www/src/lib/registry/default/ui/button/index.ts | 2 +- apps/www/src/lib/registry/new-york/ui/button/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/www/src/lib/registry/default/ui/button/index.ts b/apps/www/src/lib/registry/default/ui/button/index.ts index 382c4f4f2..93a070084 100644 --- a/apps/www/src/lib/registry/default/ui/button/index.ts +++ b/apps/www/src/lib/registry/default/ui/button/index.ts @@ -3,7 +3,7 @@ import { cva } from 'class-variance-authority' export { default as Button } from './Button.vue' export const buttonVariants = cva( - 'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50', + 'inline-flex items-center justify-center rounded-md whitespace-nowrap text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50', { variants: { variant: { diff --git a/apps/www/src/lib/registry/new-york/ui/button/index.ts b/apps/www/src/lib/registry/new-york/ui/button/index.ts index aa543186b..be8da738b 100644 --- a/apps/www/src/lib/registry/new-york/ui/button/index.ts +++ b/apps/www/src/lib/registry/new-york/ui/button/index.ts @@ -3,7 +3,7 @@ import { cva } from 'class-variance-authority' export { default as Button } from './Button.vue' export const buttonVariants = cva( - 'inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50', + 'inline-flex items-center justify-center rounded-md whitespace-nowrap text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50', { variants: { variant: { From 2643f562cc33ebdfa2317b880bde0e99ddb6bd5b Mon Sep 17 00:00:00 2001 From: "hrynevych.romann" Date: Thu, 11 Jan 2024 22:48:21 +0200 Subject: [PATCH 2/3] refactor(Button): use VariantProps for Button Props instead of NonNullable --- apps/www/src/lib/registry/default/ui/button/Button.vue | 9 +++++++-- apps/www/src/lib/registry/new-york/ui/button/Button.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/www/src/lib/registry/default/ui/button/Button.vue b/apps/www/src/lib/registry/default/ui/button/Button.vue index 5a34b1b82..8bd713642 100644 --- a/apps/www/src/lib/registry/default/ui/button/Button.vue +++ b/apps/www/src/lib/registry/default/ui/button/Button.vue @@ -1,15 +1,20 @@ diff --git a/apps/www/src/lib/registry/new-york/ui/button/Button.vue b/apps/www/src/lib/registry/new-york/ui/button/Button.vue index 5a34b1b82..8bd713642 100644 --- a/apps/www/src/lib/registry/new-york/ui/button/Button.vue +++ b/apps/www/src/lib/registry/new-york/ui/button/Button.vue @@ -1,15 +1,20 @@ From ca76770cd93470f721c7b9d3c1bd5c434e4e0bb3 Mon Sep 17 00:00:00 2001 From: "hrynevych.romann" Date: Fri, 12 Jan 2024 22:24:40 +0200 Subject: [PATCH 3/3] fix(Select): add whitespace-nowrap and truncate to SelectTrigger --- apps/www/src/lib/registry/default/ui/select/SelectTrigger.vue | 2 +- apps/www/src/lib/registry/new-york/ui/select/SelectTrigger.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/www/src/lib/registry/default/ui/select/SelectTrigger.vue b/apps/www/src/lib/registry/default/ui/select/SelectTrigger.vue index c7ad67478..bb301915a 100644 --- a/apps/www/src/lib/registry/default/ui/select/SelectTrigger.vue +++ b/apps/www/src/lib/registry/default/ui/select/SelectTrigger.vue @@ -17,7 +17,7 @@ const props = withDefaults( v-bind="props" :class="[ cn( - 'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', + 'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 whitespace-nowrap [&>span]:truncate [&>span]:min-w-0', props.class, ), props.invalid diff --git a/apps/www/src/lib/registry/new-york/ui/select/SelectTrigger.vue b/apps/www/src/lib/registry/new-york/ui/select/SelectTrigger.vue index 15219cd11..00d471312 100644 --- a/apps/www/src/lib/registry/new-york/ui/select/SelectTrigger.vue +++ b/apps/www/src/lib/registry/new-york/ui/select/SelectTrigger.vue @@ -17,7 +17,7 @@ const props = withDefaults( v-bind="props" :class="[ cn( - 'flex h-9 w-full items-center justify-between rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50', + 'flex h-9 w-full items-center justify-between rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 whitespace-nowrap [&>span]:truncate [&>span]:min-w-0', props.class, ), props.invalid