From 03fcaac7f244a05d3e688881fa709ac3e7d90757 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Thu, 12 Jun 2025 15:19:53 +0100
Subject: [PATCH] fix: Grammarly diffing issues

---
 .../resources/views/components/textarea.blade.php    |  5 +++++
 packages/forms/src/Components/Textarea.php           |  2 ++
 .../resources/views/components/modal/index.blade.php | 12 ++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/packages/forms/resources/views/components/textarea.blade.php b/packages/forms/resources/views/components/textarea.blade.php
index d84aa0ee5f..bbdf465e04 100644
--- a/packages/forms/resources/views/components/textarea.blade.php
+++ b/packages/forms/resources/views/components/textarea.blade.php
@@ -51,6 +51,11 @@
                     x-on:resize.window="resize()"
                 @endif
                 x-model="state"
+                @if ($isGrammarlyDisabled())
+                    data-gramm="false"
+                    data-gramm_editor="false"
+                    data-enable-grammarly="false"
+                @endif
                 {{ $getExtraAlpineAttributeBag() }}
                 {{
                     $getExtraInputAttributeBag()
diff --git a/packages/forms/src/Components/Textarea.php b/packages/forms/src/Components/Textarea.php
index bc4cf6f090..3c701a3cd5 100644
--- a/packages/forms/src/Components/Textarea.php
+++ b/packages/forms/src/Components/Textarea.php
@@ -3,10 +3,12 @@
 namespace Filament\Forms\Components;
 
 use Closure;
+use Filament\Forms\Components\Concerns\CanDisableGrammarly;
 use Filament\Support\Concerns\HasExtraAlpineAttributes;
 
 class Textarea extends Field implements Contracts\CanBeLengthConstrained
 {
+    use CanDisableGrammarly;
     use Concerns\CanBeAutocompleted;
     use Concerns\CanBeLengthConstrained;
     use Concerns\CanBeReadOnly;
diff --git a/packages/support/resources/views/components/modal/index.blade.php b/packages/support/resources/views/components/modal/index.blade.php
index 4a2a642f42..d87d412dd9 100644
--- a/packages/support/resources/views/components/modal/index.blade.php
+++ b/packages/support/resources/views/components/modal/index.blade.php
@@ -176,6 +176,9 @@
                         x-transition:leave-start="scale-100 opacity-100"
                         x-transition:leave-end="scale-95 opacity-0"
                     @endif
+                    @if (filled($id))
+                        wire:key="{{ isset($this) ? "{$this->getId()}." : '' }}modal.{{ $id }}.window"
+                    @endif
                     {{
                         ($extraModalWindowAttributeBag ?? new \Illuminate\View\ComponentAttributeBag)->class([
                             'fi-modal-window pointer-events-auto relative row-start-2 flex w-full cursor-default flex-col bg-white shadow-xl ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10',
@@ -215,6 +218,9 @@
                 >
                     @if ($heading || $header)
                         <div
+                            @if (filled($id))
+                                wire:key="{{ isset($this) ? "{$this->getId()}." : '' }}modal.{{ $id }}.header"
+                            @endif
                             @class([
                                 'fi-modal-header flex px-6 pt-6',
                                 'pb-6' => (! $hasSlot) && (! $hasFooter),
@@ -323,6 +329,9 @@
 
                     @if ($hasSlot)
                         <div
+                            @if (filled($id))
+                                wire:key="{{ isset($this) ? "{$this->getId()}." : '' }}modal.{{ $id }}.content"
+                            @endif
                             @class([
                                 'fi-modal-content flex flex-col gap-y-4 py-6',
                                 'flex-1' => ($width === MaxWidth::Screen) || $slideOver,
@@ -336,6 +345,9 @@
 
                     @if ($hasFooter)
                         <div
+                            @if (filled($id))
+                                wire:key="{{ isset($this) ? "{$this->getId()}." : '' }}modal.{{ $id }}.footer"
+                            @endif
                             @class([
                                 'fi-modal-footer w-full',
                                 'pe-6 ps-[5.25rem]' => $hasIcon && ($alignment === Alignment::Start) && ($footerActionsAlignment !== Alignment::Center) && (! $stickyFooter),