Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/jetstream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.1.2
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.1.3
Choose a head ref
  • 4 commits
  • 6 files changed
  • 5 contributors

Commits on Jun 4, 2024

  1. Update CHANGELOG

    taylorotwell authored and github-actions[bot] committed Jun 4, 2024

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0308f8d View commit details
  2. Add nullable types from Pint (#1499)

    ahinkle authored Jun 4, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4039f1d View commit details

Commits on Jul 2, 2024

  1. Refactor from switch statement to match statement for dropdown blade …

    …component (#1509)
    
    * Refactor switch statement to match statement
    
    * Refactor switch statement to match statement
    
    * Update dropdown.blade.php
    
    ---------
    
    Co-authored-by: Taylor Otwell <taylor@laravel.com>
    phingoc1 and taylorotwell authored Jul 2, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    121122c View commit details

Commits on Jul 9, 2024

  1. Fix modal closing on Escape key when closeable is false (#1510)

    ChazyTheBest authored Jul 9, 2024
    Copy the full SHA
    37ea36c View commit details
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v5.1.1...5.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v5.1.2...5.x)

## [v5.1.2](https://github.com/laravel/jetstream/compare/v5.1.1...v5.1.2) - 2024-05-30

* Fixed an issue causing missing column two_factor_confirmed_at when migrations executed during installation. by [@ravibpatel](https://github.com/ravibpatel) in https://github.com/laravel/jetstream/pull/1496

## [v5.1.1](https://github.com/laravel/jetstream/compare/v5.1.0...v5.1.1) - 2024-05-13

2 changes: 1 addition & 1 deletion database/factories/UserFactory.php
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ public function unverified(): static
/**
* Indicate that the user should have a personal team.
*/
public function withPersonalTeam(callable $callback = null): static
public function withPersonalTeam(?callable $callback = null): static
{
if (! Features::hasTeamFeatures()) {
return $this->state([]);
2 changes: 1 addition & 1 deletion stubs/app/Actions/Jetstream/AddTeamMember.php
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ class AddTeamMember implements AddsTeamMembers
/**
* Add a new team member to the given team.
*/
public function add(User $user, Team $team, string $email, string $role = null): void
public function add(User $user, Team $team, string $email, ?string $role = null): void
{
Gate::forUser($user)->authorize('addTeamMember', $team);

2 changes: 1 addition & 1 deletion stubs/app/Actions/Jetstream/InviteTeamMember.php
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ class InviteTeamMember implements InvitesTeamMembers
/**
* Invite a new team member to the given team.
*/
public function invite(User $user, Team $team, string $email, string $role = null): void
public function invite(User $user, Team $team, string $email, ?string $role = null): void
{
Gate::forUser($user)->authorize('addTeamMember', $team);

8 changes: 6 additions & 2 deletions stubs/inertia/resources/js/Components/Modal.vue
Original file line number Diff line number Diff line change
@@ -41,8 +41,12 @@ const close = () => {
};
const closeOnEscape = (e) => {
if (e.key === 'Escape' && props.show) {
close();
if (e.key === 'Escape') {
e.preventDefault();
if (props.show) {
close();
}
}
};
30 changes: 9 additions & 21 deletions stubs/livewire/resources/views/components/dropdown.blade.php
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
@props(['align' => 'right', 'width' => '48', 'contentClasses' => 'py-1 bg-white dark:bg-gray-700', 'dropdownClasses' => ''])

@php
switch ($align) {
case 'left':
$alignmentClasses = 'ltr:origin-top-left rtl:origin-top-right start-0';
break;
case 'top':
$alignmentClasses = 'origin-top';
break;
case 'none':
case 'false':
$alignmentClasses = '';
break;
case 'right':
default:
$alignmentClasses = 'ltr:origin-top-right rtl:origin-top-left end-0';
break;
}
$alignmentClasses = match ($align) {
'left' => 'ltr:origin-top-left rtl:origin-top-right start-0',
'top' => 'origin-top',
'none', 'false' => '',
default => 'ltr:origin-top-right rtl:origin-top-left end-0',
};
switch ($width) {
case '48':
$width = 'w-48';
break;
}
$width = match ($width) {
'48' => 'w-48',
};
@endphp

<div class="relative" x-data="{ open: false }" @click.away="open = false" @close.stop="open = false">