Merge branch '3.x' of https://github.com/filamentphp/filament into 3.x

filamentphp · Mar 21, 2024 · 5d4f3be · 5d4f3be
2 parents 6f8e7b2 + 6598883
commit 5d4f3be
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,7 @@
 name: Bug report
 description: Report a problem you're experiencing
 labels: bug,unconfirmed,low priority
-projects: ["filamentphp/2"]
+projects: ['filamentphp/2']
 body:
   - type: markdown
     attributes:

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,27 +1,15 @@
-<!-- Please fill the entire template and make sure that all checkboxes are checked. -->
+<!-- FILL OUT ALL RELEVANT SECTIONS, OR THE PULL REQUEST WILL BE CLOSED. -->
 
 ## Description
 
-<!-- Explain the goal of this pull request by describing the issue it fixes or the need for the new or updated functionality. -->
+<!-- Describe the addressed issue or the need for the new or updated functionality. -->
 
-<!-- Replace this comment with your description. -->
+## Visual changes
 
-- [ ] Visual changes (if any) are shown using screenshots/recordings of before and after.
+<!-- Add screenshots/recordings of before and after. -->
 
-## Code style
-
-<!-- Make sure code style follows the rest of the codebase. -->
-
-- [ ] `composer cs` command has been run.
-
-## Testing
-
-<!-- Ensure changes in this PR don't break existing functionality by testing it properly, either manually or by adding software tests. -->
-
-- [ ] Changes have been tested.
-
-## Documentation
-
-<!-- If new functionality has been added or existing functionality changed, please update the documentation. -->
+## Functional changes
 
+- [ ] Code style has been fixed by running the `composer cs` command.
+- [ ] Changes have been tested to not break existing functionality.
 - [ ] Documentation is up-to-date.
diff --git a/packages/forms/resources/views/components/builder.blade.php b/packages/forms/resources/views/components/builder.blade.php
@@ -237,7 +237,7 @@ class="absolute -top-3 left-3 px-1 text-sm font-medium"
             </ul>
         @endif
 
-        @if ($isAddable)
+        @if ($isAddable && $addAction->isVisible())
             <x-filament-forms::builder.block-picker
                 :action="$addAction"
                 :blocks="$blockPickerBlocks"

diff --git a/packages/forms/resources/views/components/rich-editor.blade.php b/packages/forms/resources/views/components/rich-editor.blade.php
@@ -54,12 +54,14 @@ class="fi-fo-rich-editor fi-disabled prose block w-full max-w-none rounded-lg bg
                     )
                 "
                 x-on:trix-change="
+                    let value = $event.target.value
+                
                     $nextTick(() => {
                         if (! $refs.trix) {
                             return
                         }
 
-                        state = $event.target.value
+                        state = value
                     })
                 "
                 @if ($isLiveDebounced())

diff --git a/packages/support/composer.json b/packages/support/composer.json
@@ -20,7 +20,7 @@
         "spatie/color": "^1.5",
         "spatie/invade": "^1.0|^2.0",
         "spatie/laravel-package-tools": "^1.9",
-        "symfony/html-sanitizer": "^6.1"
+        "symfony/html-sanitizer": "^6.1|^7.0"
     },
     "autoload": {
         "files": [