Skip to content

Commit

Permalink
Merge branch '3.x' into pr/8831
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Oct 15, 2023
2 parents f3a1cd5 + 4b5620a commit 99b9aab
Show file tree
Hide file tree
Showing 89 changed files with 1,154 additions and 461 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
<a href="https://php.net"><img alt="PHP 8.1" src="https://img.shields.io/badge/PHP-8.1-777BB4?style=for-the-badge&logo=php"></a>
</p>

<p align="center">
<a href="https://trendshift.io/repositories/238" target="_blank"><img src="https://trendshift.io/api/badge/repositories/238" alt="filamentphp%2Ffilament | Trendshift" style="width: 250px; height: 55px;" /></a>
</p>

Filament is a collection of full-stack components for accelerated Laravel development. They are beautifully designed, intuitive to use, and fully extensible - the perfect starting point for your next Laravel app. Why waste time building the same features over and over again?

## Packages
Expand Down
15 changes: 11 additions & 4 deletions docs-assets/app/app/Livewire/ActionsDemo.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ public function iconButtonAction(): Action
->iconButton();
}

public function badgeAction(): Action
{
return Action::make('badge')
->label('Edit')
->badge();
}

public function dangerAction(): Action
{
return Action::make('danger')
Expand Down Expand Up @@ -69,17 +76,17 @@ public function iconAfterAction(): Action
->iconPosition(IconPosition::After);
}

public function badgeAction(): Action
public function badgedAction(): Action
{
return Action::make('badge')
return Action::make('badged')
->iconButton()
->icon('heroicon-m-funnel')
->badge(5);
}

public function successBadgeAction(): Action
public function successBadgedAction(): Action
{
return Action::make('successBadge')
return Action::make('successBadged')
->iconButton()
->icon('heroicon-m-funnel')
->badge(5)
Expand Down
2 changes: 1 addition & 1 deletion docs-assets/app/public/css/filament/filament/app.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs-assets/app/public/css/filament/forms/forms.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
function t({initialHeight:e}){return{render:function(){this.$el.scrollHeight>0&&(this.$el.style.height=e+"rem",this.$el.style.height=this.$el.scrollHeight+"px")}}}export{t as default};
function t({initialHeight:e}){return{init:function(){this.render()},render:function(){this.$el.scrollHeight>0&&(this.$el.style.height=e+"rem",this.$el.style.height=this.$el.scrollHeight+"px")}}}export{t as default};

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs-assets/app/public/js/filament/support/async-alpine.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs-assets/app/public/js/filament/support/support.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions docs-assets/app/resources/views/livewire/actions.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
{{ $this->iconButtonAction }}
</div>

<div id="badgeAction" class="p-16 flex items-center justify-center max-w-xl">
{{ $this->badgeAction }}
</div>

<div id="dangerAction" class="p-16 flex items-center justify-center max-w-xl">
{{ $this->dangerAction }}
</div>
Expand All @@ -28,12 +32,12 @@
{{ $this->iconAfterAction }}
</div>

<div id="badgeAction" class="p-16 flex items-center justify-center max-w-xl">
{{ $this->badgeAction }}
<div id="badgedAction" class="p-16 flex items-center justify-center max-w-xl">
{{ $this->badgedAction }}
</div>

<div id="successBadgeAction" class="p-16 flex items-center justify-center max-w-xl">
{{ $this->successBadgeAction }}
<div id="successBadgedAction" class="p-16 flex items-center justify-center max-w-xl">
{{ $this->successBadgedAction }}
</div>

<div id="outlinedAction" class="p-16 flex items-center justify-center max-w-xl">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 15 additions & 6 deletions docs-assets/screenshots/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ export default {
await page.hover('#iconButtonAction button')
},
},
'actions/trigger-button/badge': {
url: 'actions',
selector: '#badgeAction',
viewport: {
width: 1920,
height: 640,
deviceScaleFactor: 3,
},
},
'actions/trigger-button/danger': {
url: 'actions',
selector: '#dangerAction',
Expand Down Expand Up @@ -65,28 +74,28 @@ export default {
deviceScaleFactor: 3,
},
},
'actions/trigger-button/badge': {
'actions/trigger-button/badged': {
url: 'actions',
selector: '#badgeAction',
selector: '#badgedAction',
viewport: {
width: 1920,
height: 640,
deviceScaleFactor: 3,
},
before: async (page) => {
await page.hover('#badgeAction button')
await page.hover('#badgedAction button')
},
},
'actions/trigger-button/success-badge': {
'actions/trigger-button/success-badged': {
url: 'actions',
selector: '#successBadgeAction',
selector: '#successBadgedAction',
viewport: {
width: 1920,
height: 640,
deviceScaleFactor: 3,
},
before: async (page) => {
await page.hover('#successBadgeAction button')
await page.hover('#successBadgedAction button')
},
},
'actions/trigger-button/outlined': {
Expand Down
Loading

0 comments on commit 99b9aab

Please sign in to comment.