Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next #223

Merged
merged 59 commits into from
Dec 5, 2024
Merged

Next #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2d5eb2c
Bump @radix-ui/react-collapsible from 1.1.0 to 1.1.1
dependabot[bot] Nov 18, 2024
419f087
Bump @radix-ui/react-alert-dialog from 1.1.1 to 1.1.2
dependabot[bot] Nov 18, 2024
e2b7f3a
Bump vite-tsconfig-paths from 4.3.2 to 5.1.2
dependabot[bot] Nov 18, 2024
765a60c
Bump vitest from 2.1.4 to 2.1.5
dependabot[bot] Nov 18, 2024
97e2e62
Merge pull request #205 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 18, 2024
b06f8cf
Merge pull request #206 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 18, 2024
4388ecf
Merge pull request #207 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 18, 2024
413d90e
Merge branch 'next' into dependabot/npm_and_yarn/next/vitest-2.1.5
jthrilly Nov 18, 2024
33e1c7e
Merge pull request #208 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 18, 2024
c6be298
Update package.json
jthrilly Nov 18, 2024
b34ce46
Bump @types/node from 20.16.5 to 22.9.0
dependabot[bot] Nov 18, 2024
eaeb503
Merge pull request #209 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 18, 2024
23c2049
Bump cross-spawn in the npm_and_yarn group across 1 directory
dependabot[bot] Nov 19, 2024
a126015
Merge pull request #211 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 20, 2024
02e35fa
make root redirect permanent
jthrilly Nov 20, 2024
e34a170
Merge pull request #213 from complexdatacollective/permanent-root-red…
jthrilly Nov 21, 2024
95552e3
Bump cross-spawn in the npm_and_yarn group across 1 directory
dependabot[bot] Nov 21, 2024
d6d9860
Merge pull request #215 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 21, 2024
eacebf6
Bump the npm_and_yarn group across 1 directory with 2 updates
dependabot[bot] Nov 22, 2024
c9085af
Merge pull request #216 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 24, 2024
7a1b864
Bump @types/archiver from 6.0.2 to 6.0.3
dependabot[bot] Nov 25, 2024
1a99df2
Bump knip from 5.30.2 to 5.37.2
dependabot[bot] Nov 25, 2024
e42a11c
Bump tailwind-merge from 2.5.4 to 2.5.5
dependabot[bot] Nov 25, 2024
921703c
Bump prettier-plugin-tailwindcss from 0.6.8 to 0.6.9
dependabot[bot] Nov 25, 2024
0897615
Merge pull request #218 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 25, 2024
fbf6d3a
Merge pull request #217 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 25, 2024
48af47d
Merge pull request #219 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 25, 2024
bb81a21
Merge pull request #220 from complexdatacollective/dependabot/npm_and…
jthrilly Nov 25, 2024
d241d11
upgrade to motion from framer-motion
jthrilly Nov 26, 2024
8242724
Merge pull request #222 from complexdatacollective/motion
jthrilly Nov 26, 2024
48f7aa1
run v4 beta migrate cool and fix default border colors
jthrilly Nov 28, 2024
a9e58ac
update interviewer sass @use statement to be at the top of the file;d…
jthrilly Nov 28, 2024
98396a1
knip
jthrilly Nov 28, 2024
1d60223
replace with lodash-es
jthrilly Nov 28, 2024
7e4401e
delete lodash-replacements
jthrilly Nov 28, 2024
d75c1ff
fix broken lodash-es imports
jthrilly Nov 28, 2024
400c53f
fix broken lodash-es imports
jthrilly Nov 28, 2024
f4527ce
further broken lodash-es imports
jthrilly Nov 28, 2024
40f5336
refactor to use es-toolkit
jthrilly Nov 28, 2024
ec696ea
fix external data loading
jthrilly Nov 28, 2024
cbe1787
fix session reducer
jthrilly Nov 28, 2024
67dfd88
ensure entity variables property is cast as empty object if it does n…
jthrilly Nov 28, 2024
b2a7df2
Merge pull request #227 from complexdatacollective/lodash-es
jthrilly Nov 28, 2024
1cf217a
Merge pull request #225 from complexdatacollective/tailwind-v4
jthrilly Nov 28, 2024
628f927
fix link color override for alert variants
jthrilly Nov 29, 2024
393413b
Bump motion from 11.11.17 to 11.12.0
dependabot[bot] Dec 2, 2024
2bee8d7
Bump react-dropzone from 14.2.3 to 14.3.5
dependabot[bot] Dec 2, 2024
cdc6d28
Bump react-hook-form from 7.53.0 to 7.53.2
dependabot[bot] Dec 2, 2024
78edf7d
Bump vitest from 2.1.5 to 2.1.7
dependabot[bot] Dec 2, 2024
80ff5e9
Merge pull request #233 from complexdatacollective/dependabot/npm_and…
jthrilly Dec 2, 2024
ea71bbe
Merge pull request #232 from complexdatacollective/dependabot/npm_and…
jthrilly Dec 2, 2024
38c2d95
Merge pull request #231 from complexdatacollective/dependabot/npm_and…
jthrilly Dec 2, 2024
b6b727b
Merge pull request #229 from complexdatacollective/dependabot/npm_and…
jthrilly Dec 2, 2024
04dcbba
Bump sass from 1.79.1 to 1.81.0
dependabot[bot] Dec 2, 2024
16aea7e
Merge pull request #230 from complexdatacollective/dependabot/npm_and…
jthrilly Dec 2, 2024
08a10ca
fix dialog and alert animation issues caused by tailwind 4 migration
jthrilly Dec 5, 2024
20168a3
bump version to 2.0.2
jthrilly Dec 5, 2024
d2f4791
correct fix for alert dialog animation classes
jthrilly Dec 5, 2024
58629b4
fix toast styling
jthrilly Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function Documentation() {
</Heading>
Visit our documentation site to learn more about Fresco.
</div>
<div className="flex min-w-32 flex-shrink-0 flex-col items-end justify-center">
<div className="flex min-w-32 shrink-0 flex-col items-end justify-center">
<a
href="https://documentation.networkcanvas.com/en/fresco"
target="_blank"
Expand All @@ -64,7 +64,7 @@ function Documentation() {
Read our guide on the basic workflow for using Fresco to conduct
your study.
</div>
<div className="flex min-w-32 flex-shrink-0 flex-col items-end justify-center">
<div className="flex min-w-32 shrink-0 flex-col items-end justify-center">
<a
href="https://documentation.networkcanvas.com/en/fresco/using-fresco"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion app/(blobs)/(setup)/_components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function OnboardSteps({ steps }: { steps: string[] }) {
);

return (
<div className="flex flex-shrink-0 flex-grow-0 flex-col gap-6 rounded-xl bg-white px-8 py-12">
<div className="flex shrink-0 grow-0 flex-col gap-6 rounded-xl bg-white px-8 py-12">
{steps.map((step, index) => (
<div
key={index}
Expand Down
2 changes: 1 addition & 1 deletion app/(blobs)/(setup)/setup/Setup.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { motion } from 'framer-motion';
import { motion } from 'motion/react';
import { parseAsInteger, useQueryState } from 'nuqs';
import { useEffect } from 'react';
import { containerClasses } from '~/components/ContainerClasses';
Expand Down
2 changes: 1 addition & 1 deletion app/(blobs)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function Layout({ children }: PropsWithChildren) {
/>
</Link>
</div>
<main className="flex flex-grow items-center justify-center">
<main className="flex grow items-center justify-center">
{children}
</main>
</div>
Expand Down
8 changes: 3 additions & 5 deletions app/(interview)/interview/_components/ServerSync.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import { debounce, isEqual } from 'lodash';
import { type ReactNode, useEffect, useState, useCallback } from 'react';
import { debounce, isEqual } from 'es-toolkit';
import { type ReactNode, useCallback, useEffect, useState } from 'react';
import { useSelector } from 'react-redux';
import type { SyncInterviewType } from '~/actions/interviews';
import usePrevious from '~/hooks/usePrevious';
Expand All @@ -26,9 +26,7 @@ const ServerSync = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
const debouncedSessionSync = useCallback(
debounce(serverSync, 2000, {
leading: true,
trailing: true,
maxWait: 10000,
edges: ['trailing', 'leading'],
}),
[serverSync],
);
Expand Down
4 changes: 2 additions & 2 deletions app/(interview)/interview/_components/SmallScreenOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const SmallScreenOverlay = () => {
}

return (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-[--nc-background] lg:hidden">
<div className="fixed inset-0 z-50 flex items-center justify-center bg-(--nc-background) lg:hidden">
<div className="flex max-w-[72ch] flex-col items-center justify-center p-6 text-center">
<Image
src="/images/too-small.svg"
Expand All @@ -23,7 +23,7 @@ const SmallScreenOverlay = () => {
To complete this interview, please use a device with a larger screen,
or maximize your browser window.
</Paragraph>
<Paragraph className="!mt-16">
<Paragraph className="mt-16!">
<strong>Note:</strong> it is not possible to complete this interview
using a mobile phone.
</Paragraph>
Expand Down
2 changes: 1 addition & 1 deletion app/(interview)/interview/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const metadata = {

function RootLayout({ children }: { children: React.ReactNode }) {
return (
<main className="flex h-[100vh] max-h-[100vh] flex-col bg-[--nc-background] text-[--nc-text]">
<main className="flex h-[100vh] max-h-[100vh] flex-col bg-(--nc-background) text-(--nc-text)">
<SmallScreenOverlay />
{children}
</main>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/_components/NavigationBar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { motion } from 'framer-motion';
import { motion } from 'motion/react';
import type { Route } from 'next';
import Image from 'next/image';
import Link from 'next/link';
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/_components/ProtocolUploader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import { AnimatePresence, motion } from 'framer-motion';
import { FileDown, Loader2 } from 'lucide-react';
import { AnimatePresence, motion } from 'motion/react';
import { useCallback } from 'react';
import { useDropzone } from 'react-dropzone';
import JobCard from '~/components/ProtocolImport/JobCard';
Expand Down Expand Up @@ -58,7 +58,7 @@ function ProtocolUploader({
className={cn(
isActive &&
cn(
'bg-gradient-to-r from-cyber-grape via-neon-coral to-cyber-grape text-white',
'bg-linear-to-r from-cyber-grape via-neon-coral to-cyber-grape text-white',
'pointer-events-none animate-background-gradient cursor-wait bg-[length:400%]',
),
className,
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/_components/SummaryStatistics/Icons.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const ProtocolIcon = () => (
<div className="flex aspect-[4/3] h-[40px] flex-col overflow-hidden rounded-[8px] bg-platinum">
<div className="flex aspect-4/3 h-[40px] flex-col overflow-hidden rounded-[8px] bg-platinum">
<div className="flex h-2/3 w-full flex-col justify-center gap-[3px] px-[6px]">
<div className="h-[4.5px] w-10/12 rounded-full bg-platinum-dark" />
<div className="h-[2.5px] w-3/12 rounded-full bg-platinum-dark" />
Expand All @@ -11,7 +11,7 @@ export const ProtocolIcon = () => (
);

export const InterviewIcon = () => (
<div className="flex aspect-[4/3] h-[40px] flex-col overflow-hidden rounded-[8px] bg-platinum">
<div className="flex aspect-4/3 h-[40px] flex-col overflow-hidden rounded-[8px] bg-platinum">
<div className="flex h-2/4 w-full flex-col justify-center gap-[3px] px-[6px]">
<div className="h-[4.5px] w-10/12 rounded-full bg-platinum-dark" />
<div className="h-[2.5px] w-3/12 rounded-full bg-platinum-dark" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import ExportOptionsView from './ExportOptionsView';

const ExportingStateAnimation = () => {
return (
<div className="fixed inset-0 z-[99] flex flex-col items-center justify-center gap-3 bg-background/80 text-primary">
<div className="fixed inset-0 z-99 flex flex-col items-center justify-center gap-3 bg-background/80 text-primary">
<div
className={cn(
cardClasses,
Expand Down
3 changes: 1 addition & 2 deletions app/dashboard/participants/_components/DropzoneField.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { isArray } from 'lodash';
import { FileCheck, FileText } from 'lucide-react';
import { useId } from 'react';
import { useDropzone } from 'react-dropzone';
Expand Down Expand Up @@ -41,7 +40,7 @@ export default function DropzoneField<T>({
return 'No CSV file selected. Please select a file.';
}

if (!isArray(value)) {
if (!Array.isArray(value)) {
return 'Invalid CSV. Please select a valid CSV file.';
}

Expand Down
2 changes: 1 addition & 1 deletion app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Quicksand } from 'next/font/google';
import { Toaster } from '~/components/ui/toaster';
import '~/styles/globals.scss';
import '~/styles/globals.css';

export const metadata = {
title: 'Network Canvas Fresco',
Expand Down
4 changes: 2 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { redirect } from 'next/navigation';
import { permanentRedirect } from 'next/navigation';

export default function Home() {
redirect('/dashboard');
permanentRedirect('/dashboard');
}
2 changes: 1 addition & 1 deletion components.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "styles/globals.scss",
"css": "styles/globals.css",
"baseColor": "slate",
"cssVariables": true
},
Expand Down
2 changes: 1 addition & 1 deletion components/ErrorReportNotifier.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AnimatePresence, motion } from 'framer-motion';
import { CheckIcon, Loader2, XCircle } from 'lucide-react';
import { AnimatePresence, motion } from 'motion/react';
import { useEffect, useRef, useState } from 'react';
import trackEvent from '~/lib/analytics';

Expand Down
6 changes: 3 additions & 3 deletions components/Feedback/FeedbackBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const FeedbackBanner = () => {
aria-hidden="true"
>
<div
className="aspect-[577/310] w-[36.0625rem] bg-gradient-to-r from-[#ff80b5] to-[#9089fc] opacity-30"
className="aspect-577/310 w-[36.0625rem] bg-linear-to-r from-[#ff80b5] to-[#9089fc] opacity-30"
style={{
clipPath:
'polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)',
Expand All @@ -41,7 +41,7 @@ const FeedbackBanner = () => {
aria-hidden="true"
>
<div
className="aspect-[577/310] w-[36.0625rem] bg-gradient-to-r from-[#ff80b5] to-[#9089fc] opacity-30"
className="aspect-577/310 w-[36.0625rem] bg-linear-to-r from-[#ff80b5] to-[#9089fc] opacity-30"
style={{
clipPath:
'polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)',
Expand All @@ -67,7 +67,7 @@ const FeedbackBanner = () => {
)}
<div
className={cn(
'flex flex-grow items-center gap-4 text-sm',
'flex grow items-center gap-4 text-sm',
isDashboard ? 'justify-center' : 'justify-end',
)}
>
Expand Down
2 changes: 1 addition & 1 deletion components/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function Link(props: LinkProps<LinkRestProps>) {
className="text-link group font-semibold transition-all duration-300 ease-in-out"
{...props}
>
<span className="from-link to-link bg-gradient-to-r bg-[length:0%_2px] bg-left-bottom bg-no-repeat pb-[2px] transition-all duration-200 ease-out group-hover:bg-[length:100%_2px]">
<span className="from-link to-link bg-linear-to-r bg-[length:0%_2px] bg-left-bottom bg-no-repeat pb-[2px] transition-all duration-200 ease-out group-hover:bg-[length:100%_2px]">
{props.children}
</span>
</NextLink>
Expand Down
10 changes: 5 additions & 5 deletions components/ProtocolImport/JobCard.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { CheckCircle, Loader2, XCircle } from 'lucide-react';
import { motion } from 'motion/react';
import { forwardRef, useEffect, useState } from 'react';
import ErrorDialog from '../ui/ErrorDialog';
import { CloseButton } from '../ui/CloseButton';
import { type ImportJob } from './JobReducer';
import { cn } from '~/utils/shadcn';
import { CheckCircle, Loader2, XCircle } from 'lucide-react';
import { Button } from '../ui/Button';
import { CloseButton } from '../ui/CloseButton';
import ErrorDialog from '../ui/ErrorDialog';
import Heading from '../ui/typography/Heading';
import Paragraph from '../ui/typography/Paragraph';
import { motion } from 'framer-motion';
import { type ImportJob } from './JobReducer';

type JobCardProps = {
job: ImportJob;
Expand Down
2 changes: 1 addition & 1 deletion components/data-table/data-table-faceted-filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export function DataTableFacetedFilter<TData, TValue>({
name="filter"
placeholder={title}
autoFocus
className="focus-visible:ring-ring flex w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50"
className="focus-visible:ring-ring flex w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-2xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50"
/>
<CommandList className="mt-1">
<CommandEmpty>No results found.</CommandEmpty>
Expand Down
4 changes: 2 additions & 2 deletions components/layout/SettingsSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function SettingsSection({
{children}
</div>
{controlArea && (
<div className="flex flex-shrink-0 flex-col items-end justify-center">
<div className="flex shrink-0 flex-col items-end justify-center">
{controlArea}
</div>
)}
Expand All @@ -52,7 +52,7 @@ export function SettingsSectionSkeleton({
<Skeleton className="h-12 w-3/4" />
</div>
{controlAreaSkelton && (
<div className="flex min-w-32 flex-shrink-0 flex-col items-end justify-center">
<div className="flex min-w-32 shrink-0 flex-col items-end justify-center">
{controlAreaSkelton}
</div>
)}
Expand Down
6 changes: 3 additions & 3 deletions components/ui/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const alertVariants = cva(
variants: {
variant: {
default: '',
info: 'border-info bg-info/10 [--link:var(--info)] [&>svg]:text-info',
info: 'bg-info/5 border-info text-info [--color-link:var(--color-info)] [&>svg]:text-info',
destructive:
'border-destructive bg-destructive/5 text-destructive dark:border-destructive [&>svg]:text-destructive [--link:var(--destructive)]',
'bg-destructive/5 border-destructive text-destructive [&>svg]:text-destructive [--color-link:var(--color-destructive)]',
success:
'border-success bg-success/10 text-success-foreground [&>svg]:text-success-foreground [--link:var(--success-foreground)]',
'bg-success/5 border-success text-success [&>svg]:text-success [--color-link:var(--color-success)]',
},
},
defaultVariants: {
Expand Down
11 changes: 3 additions & 8 deletions components/ui/AlertDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as React from 'react';
import { type VariantProps } from 'class-variance-authority';
import { buttonVariants } from '~/components/ui/Button';
import { cn } from '~/utils/shadcn';
import { dialogContentClasses, dialogOverlayClasses } from './dialog';
import Heading from './typography/Heading';
import { paragraphVariants } from './typography/Paragraph';

Expand All @@ -24,10 +25,7 @@ const AlertDialogOverlay = React.forwardRef<
// eslint-disable-next-line @typescript-eslint/no-unused-vars
>(({ className, children, ...props }, ref) => (
<AlertDialogPrimitive.Overlay
className={cn(
'fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
className,
)}
className={dialogOverlayClasses(className)}
{...props}
ref={ref}
/>
Expand All @@ -42,10 +40,7 @@ const AlertDialogContent = React.forwardRef<
<AlertDialogOverlay />
<AlertDialogPrimitive.Content
ref={ref}
className={cn(
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-card p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
className,
)}
className={dialogContentClasses(className)}
{...props}
/>
</AlertDialogPortal>
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { cn } from '~/utils/shadcn';
import { Skeleton } from './skeleton';

const buttonVariants = cva(
'inline-flex items-center justify-center rounded-full text-sm font-semibold 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 text-nowrap truncate text-foreground',
'inline-flex items-center justify-center rounded-full text-sm font-semibold ring-offset-background transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 text-nowrap truncate text-foreground',
{
variants: {
variant: {
Expand Down
2 changes: 1 addition & 1 deletion components/ui/CloseButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const CloseButton = ({
type="button"
onClick={onClick}
className={cn(
'rounded-sm ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted',
'rounded-sm ring-offset-background transition-opacity hover:opacity-100 focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted',
className,
)}
>
Expand Down
2 changes: 1 addition & 1 deletion components/ui/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
id={id}
type={type}
className={cn(
'focus-visible:ring-ring flex h-10 w-full rounded-input border border-border bg-input px-3 py-2 text-sm text-input-foreground ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
'focus-visible:ring-ring flex h-10 w-full rounded-input border border-border bg-input px-3 py-2 text-sm text-input-foreground ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
!!leftAdornment && 'pl-10',
!!rightAdornment && 'pr-10',
!!error && 'border-destructive',
Expand Down
2 changes: 1 addition & 1 deletion components/ui/badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '~/utils/shadcn';

const badgeVariants = cva(
'inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 flex-shrink-1',
'inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 flex-shrink-1',
{
variants: {
variant: {
Expand Down
2 changes: 1 addition & 1 deletion components/ui/checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Checkbox = React.forwardRef<
<CheckboxPrimitive.Root
ref={ref}
className={cn(
'peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
'peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
className,
)}
{...props}
Expand Down
4 changes: 2 additions & 2 deletions components/ui/command.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const CommandInput = React.forwardRef<
<CommandPrimitive.Input
ref={ref}
className={cn(
'flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50',
'flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50',
className,
)}
{...props}
Expand Down Expand Up @@ -100,7 +100,7 @@ const CommandItem = React.forwardRef<
<CommandPrimitive.Item
ref={ref}
className={cn(
'relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled=true]:pointer-events-none data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
'relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden data-[disabled=true]:pointer-events-none data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
className,
)}
{...props}
Expand Down
Loading
Loading