Merge branch 'master' into feature/cases
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
'use client';
|
||||
|
||||
import { ChevronDown } from 'lucide-react';
|
||||
import React, { forwardRef } from 'react';
|
||||
import React, { forwardRef, useId } from 'react';
|
||||
|
||||
interface DropdownProps extends React.SelectHTMLAttributes<HTMLSelectElement> {
|
||||
label?: string;
|
||||
@@ -10,7 +10,8 @@ interface DropdownProps extends React.SelectHTMLAttributes<HTMLSelectElement> {
|
||||
|
||||
export const Dropdown = forwardRef<HTMLSelectElement, DropdownProps>(
|
||||
({ label, error, className = '', id, children, ...props }, ref) => {
|
||||
const selectId = id || `dropdown-${Math.random().toString(36).slice(2, 9)}`;
|
||||
const genId = useId();
|
||||
const selectId = id ?? genId;
|
||||
|
||||
return (
|
||||
<div className="w-full">
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// src/components/ui/Input.tsx
|
||||
'use client';
|
||||
|
||||
import React, { forwardRef, useId } from 'react';
|
||||
|
||||
interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
|
||||
@@ -9,8 +10,8 @@ interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
|
||||
|
||||
export const Input = forwardRef<HTMLInputElement, InputProps>(
|
||||
({ label, error, icon, className = '', id, ...props }, ref) => {
|
||||
const generatedId = useId();
|
||||
const inputId = id || generatedId;
|
||||
const genId = useId();
|
||||
const inputId = id ?? genId;
|
||||
|
||||
return (
|
||||
<div className="w-full">
|
||||
|
||||
Reference in New Issue
Block a user