Skip to content

[1.x] Improve React components #257

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 15, 2023
Merged

[1.x] Improve React components #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b213385
Improve component props
jessarcher Feb 15, 2023
9034745
Update usage of components
jessarcher Feb 15, 2023
193bc0f
Prevent adding an `undefined` class when no `className` is provided
jessarcher Feb 15, 2023
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
4 changes: 2 additions & 2 deletions stubs/inertia-react/resources/js/Components/ApplicationLogo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default function ApplicationLogo({ className }) {
export default function ApplicationLogo(props) {
return (
<svg className={className} viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg">
<svg {...props} viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg">
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z" />
</svg>
);
Expand Down
11 changes: 6 additions & 5 deletions stubs/inertia-react/resources/js/Components/Checkbox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
export default function Checkbox({ name, value, handleChange }) {
export default function Checkbox({ className = '', ...props }) {
return (
<input
{...props}
type="checkbox"
name={name}
value={value}
className="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800"
onChange={(e) => handleChange(e)}
className={
'rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 ' +
className
}
/>
);
}
9 changes: 4 additions & 5 deletions stubs/inertia-react/resources/js/Components/DangerButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
export default function DangerButton({ type = 'submit', className = '', processing, children, onClick }) {
export default function DangerButton({ className = '', disabled, children, ...props }) {
return (
<button
type={type}
onClick={onClick}
{...props}
className={
`inline-flex items-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150 ${
processing && 'opacity-25'
disabled && 'opacity-25'
} ` + className
}
disabled={processing}
disabled={disabled}
>
{children}
</button>
Expand Down
11 changes: 6 additions & 5 deletions stubs/inertia-react/resources/js/Components/Dropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@ const Content = ({ align = 'right', width = '48', contentClasses = 'py-1 bg-whit
);
};

const DropdownLink = ({ href, method, as, children }) => {
const DropdownLink = ({ className = '', children, ...props }) => {
return (
<Link
href={href}
method={method}
as={as}
className="block w-full px-4 py-2 text-left text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out"
{...props}
className={
'block w-full px-4 py-2 text-left text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out ' +
className
}
>
{children}
</Link>
Expand Down
8 changes: 6 additions & 2 deletions stubs/inertia-react/resources/js/Components/InputError.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
export default function InputError({ message, className = '' }) {
return message ? <p className={'text-sm text-red-600 dark:text-red-400 ' + className}>{message}</p> : null;
export default function InputError({ message, className = '', ...props }) {
return message ? (
<p {...props} className={'text-sm text-red-600 dark:text-red-400 ' + className}>
{message}
</p>
) : null;
}
4 changes: 2 additions & 2 deletions stubs/inertia-react/resources/js/Components/InputLabel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default function InputLabel({ forInput, value, className, children }) {
export default function InputLabel({ value, className = '', children, ...props }) {
return (
<label htmlFor={forInput} className={`block font-medium text-sm text-gray-700 dark:text-gray-300 ` + className}>
<label {...props} className={`block font-medium text-sm text-gray-700 dark:text-gray-300 ` + className}>
{value ? value : children}
</label>
);
Expand Down
12 changes: 7 additions & 5 deletions stubs/inertia-react/resources/js/Components/NavLink.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { Link } from '@inertiajs/react';

export default function NavLink({ href, active, children }) {
export default function NavLink({ active = false, className = '', children, ...props }) {
return (
<Link
href={href}
{...props}
className={
active
? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-gray-100 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out'
: 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:outline-none focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 transition duration-150 ease-in-out'
'inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium leading-5 transition duration-150 ease-in-out focus:outline-none ' +
(active
? 'border-indigo-400 dark:border-indigo-600 text-gray-900 dark:text-gray-100 focus:border-indigo-700 '
: 'border-transparent text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 ') +
className
}
>
{children}
Expand Down
9 changes: 4 additions & 5 deletions stubs/inertia-react/resources/js/Components/PrimaryButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
export default function PrimaryButton({ type = 'submit', className = '', processing, children, onClick }) {
export default function PrimaryButton({ className = '', disabled, children, ...props }) {
return (
<button
type={type}
onClick={onClick}
{...props}
className={
`inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150 ${
processing && 'opacity-25'
disabled && 'opacity-25'
} ` + className
}
disabled={processing}
disabled={disabled}
>
{children}
</button>
Expand Down
8 changes: 3 additions & 5 deletions stubs/inertia-react/resources/js/Components/ResponsiveNavLink.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { Link } from '@inertiajs/react';

export default function ResponsiveNavLink({ method = 'get', as = 'a', href, active = false, children }) {
export default function ResponsiveNavLink({ active = false, className = '', children, ...props }) {
return (
<Link
method={method}
as={as}
href={href}
{...props}
className={`w-full flex items-start pl-3 pr-4 py-2 border-l-4 ${
active
? 'border-indigo-400 dark:border-indigo-600 text-indigo-700 dark:text-indigo-300 bg-indigo-50 dark:bg-indigo-900/50 focus:text-indigo-800 dark:focus:text-indigo-200 focus:bg-indigo-100 dark:focus:bg-indigo-900 focus:border-indigo-700 dark:focus:border-indigo-300'
: 'border-transparent text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600'
} text-base font-medium focus:outline-none transition duration-150 ease-in-out`}
} text-base font-medium focus:outline-none transition duration-150 ease-in-out ${className}`}
>
{children}
</Link>
Expand Down
8 changes: 4 additions & 4 deletions stubs/inertia-react/resources/js/Components/SecondaryButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
export default function SecondaryButton({ type = 'button', className = '', processing, children, onClick }) {
export default function SecondaryButton({ type = 'button', className = '', disabled, children, ...props }) {
return (
<button
{...props}
type={type}
onClick={onClick}
className={
`inline-flex items-center px-4 py-2 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-500 rounded-md font-semibold text-xs text-gray-700 dark:text-gray-300 uppercase tracking-widest shadow-sm hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 disabled:opacity-25 transition ease-in-out duration-150 ${
processing && 'opacity-25'
disabled && 'opacity-25'
} ` + className
}
disabled={processing}
disabled={disabled}
>
{children}
</button>
Expand Down
14 changes: 3 additions & 11 deletions stubs/inertia-react/resources/js/Components/TextInput.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { forwardRef, useEffect, useRef } from 'react';

export default forwardRef(function TextInput(
{ type = 'text', name, id, value, className, autoComplete, required, isFocused, handleChange },
ref
) {
export default forwardRef(function TextInput({ type = 'text', className = '', isFocused = false, ...props }, ref) {
const input = ref ? ref : useRef();

useEffect(() => {
Expand All @@ -15,18 +12,13 @@ export default forwardRef(function TextInput(
return (
<div className="flex flex-col items-start">
<input
{...props}
type={type}
name={name}
id={id}
value={value}
className={
`border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm ` +
'border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm ' +
className
}
ref={input}
autoComplete={autoComplete}
required={required}
onChange={(e) => handleChange(e)}
/>
</div>
);
Expand Down
8 changes: 4 additions & 4 deletions stubs/inertia-react/resources/js/Pages/Auth/ConfirmPassword.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function ConfirmPassword() {
};
}, []);

const onHandleChange = (event) => {
const handleOnChange = (event) => {
setData(event.target.name, event.target.value);
};

Expand All @@ -37,7 +37,7 @@ export default function ConfirmPassword() {

<form onSubmit={submit}>
<div className="mt-4">
<InputLabel forInput="password" value="Password" />
<InputLabel htmlFor="password" value="Password" />

<TextInput
id="password"
Expand All @@ -46,14 +46,14 @@ export default function ConfirmPassword() {
value={data.password}
className="mt-1 block w-full"
isFocused={true}
handleChange={onHandleChange}
onChange={handleOnChange}
/>

<InputError message={errors.password} className="mt-2" />
</div>

<div className="flex items-center justify-end mt-4">
<PrimaryButton className="ml-4" processing={processing}>
<PrimaryButton className="ml-4" disabled={processing}>
Confirm
</PrimaryButton>
</div>
Expand Down
4 changes: 2 additions & 2 deletions stubs/inertia-react/resources/js/Pages/Auth/ForgotPassword.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ export default function ForgotPassword({ status }) {
value={data.email}
className="mt-1 block w-full"
isFocused={true}
handleChange={onHandleChange}
onChange={onHandleChange}
/>

<InputError message={errors.email} className="mt-2" />

<div className="flex items-center justify-end mt-4">
<PrimaryButton className="ml-4" processing={processing}>
<PrimaryButton className="ml-4" disabled={processing}>
Email Password Reset Link
</PrimaryButton>
</div>
Expand Down
14 changes: 7 additions & 7 deletions stubs/inertia-react/resources/js/Pages/Auth/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function Login({ status, canResetPassword }) {
};
}, []);

const onHandleChange = (event) => {
const handleOnChange = (event) => {
setData(event.target.name, event.target.type === 'checkbox' ? event.target.checked : event.target.value);
};

Expand All @@ -38,7 +38,7 @@ export default function Login({ status, canResetPassword }) {

<form onSubmit={submit}>
<div>
<InputLabel forInput="email" value="Email" />
<InputLabel htmlFor="email" value="Email" />

<TextInput
id="email"
Expand All @@ -48,14 +48,14 @@ export default function Login({ status, canResetPassword }) {
className="mt-1 block w-full"
autoComplete="username"
isFocused={true}
handleChange={onHandleChange}
onChange={handleOnChange}
/>

<InputError message={errors.email} className="mt-2" />
</div>

<div className="mt-4">
<InputLabel forInput="password" value="Password" />
<InputLabel htmlFor="password" value="Password" />

<TextInput
id="password"
Expand All @@ -64,15 +64,15 @@ export default function Login({ status, canResetPassword }) {
value={data.password}
className="mt-1 block w-full"
autoComplete="current-password"
handleChange={onHandleChange}
onChange={handleOnChange}
/>

<InputError message={errors.password} className="mt-2" />
</div>

<div className="block mt-4">
<label className="flex items-center">
<Checkbox name="remember" value={data.remember} handleChange={onHandleChange} />
<Checkbox name="remember" value={data.remember} onChange={handleOnChange} />
<span className="ml-2 text-sm text-gray-600 dark:text-gray-400">Remember me</span>
</label>
</div>
Expand All @@ -87,7 +87,7 @@ export default function Login({ status, canResetPassword }) {
</Link>
)}

<PrimaryButton className="ml-4" processing={processing}>
<PrimaryButton className="ml-4" disabled={processing}>
Log in
</PrimaryButton>
</div>
Expand Down
Loading