Merge branch '3.x' into actually-hide-hidden-item-actions

filamentphp · May 9, 2024 · 7b3ba50 · 7b3ba50
2 parents d14fff5 + b5de297
commit 7b3ba50
Show file tree

Hide file tree

Showing 21 changed files with 296 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
         "sortablejs": "^1.15.0",
         "tailwindcss": "^3.4.0",
         "tippy.js": "^6.3.7",
-        "trix": "^2.1.1",
+        "trix": "^1.3.1",
         "uuid-browser": "^3.1.0",
         "vanilla-colorful": "^0.6.2"
     }

diff --git a/packages/actions/resources/lang/ja/export.php b/packages/actions/resources/lang/ja/export.php
@@ -0,0 +1,77 @@
+<?php
+
+return [
+
+    'label' => 'エクスポート',
+
+    'modal' => [
+
+        'heading' => 'エクスポート :label',
+
+        'form' => [
+
+            'columns' => [
+
+                'label' => 'カラム',
+
+                'form' => [
+
+                    'is_enabled' => [
+                        'label' => ':column が有効になりました',
+                    ],
+
+                    'label' => [
+                        'label' => ':column ラベル',
+                    ],
+
+                ],
+
+            ],
+
+        ],
+
+        'actions' => [
+
+            'export' => [
+                'label' => 'エクスポート',
+            ],
+
+        ],
+
+    ],
+
+    'notifications' => [
+
+        'completed' => [
+
+            'title' => 'エクスポート完了',
+
+            'actions' => [
+
+                'download_csv' => [
+                    'label' => 'csv形式をダウンロード',
+                ],
+
+                'download_xlsx' => [
+                    'label' => 'xlsx形式をダウンロード',
+                ],
+
+            ],
+
+        ],
+
+        'max_rows' => [
+            'title' => 'エクスポートするデータが大きすぎます',
+            'body' => '一度に:count行を超える行をエクスポートすることはできません。',
+        ],
+
+        'started' => [
+            'title' => 'エクスポート開始',
+            'body' => 'エクスポートが開始され、:count行がバックグラウンドで処理されます。',
+        ],
+
+    ],
+
+    'file_name' => 'export-:export_id-:model',
+
+];
diff --git a/packages/actions/resources/lang/ja/import.php b/packages/actions/resources/lang/ja/import.php
@@ -0,0 +1,77 @@
+<?php
+
+return [
+
+    'label' => 'インポート',
+
+    'modal' => [
+
+        'heading' => 'インポート :label',
+
+        'form' => [
+
+            'file' => [
+                'label' => 'File',
+                'placeholder' => 'CSVファイルをアップロード',
+            ],
+
+            'columns' => [
+                'label' => 'カラム',
+                'placeholder' => '列を選択',
+            ],
+
+        ],
+
+        'actions' => [
+
+            'download_example' => [
+                'label' => 'サンプルCSVファイルをダウンロード',
+            ],
+
+            'import' => [
+                'label' => 'インポート',
+            ],
+
+        ],
+
+    ],
+
+    'notifications' => [
+
+        'completed' => [
+
+            'title' => 'インポート完了',
+
+            'actions' => [
+
+                'download_failed_rows_csv' => [
+                    'label' => '失敗した行に関する情報のダウンロード',
+                ],
+
+            ],
+
+        ],
+
+        'max_rows' => [
+            'title' => 'CSVファイルが大きすぎます',
+            'body' => '一度に:count行を超える行をインポートすることはできません。',
+        ],
+
+        'started' => [
+            'title' => 'インポート開始',
+            'body' => 'インポートが開始され、:count行がバックグラウンドで処理されます。',
+        ],
+
+    ],
+
+    'example_csv' => [
+        'file_name' => ':importer-example',
+    ],
+
+    'failure_csv' => [
+        'file_name' => 'import-:import_id-:csv_name-failed-rows',
+        'error_header' => 'エラー',
+        'system_error' => 'システムエラーです。サポートにお問い合わせください。',
+    ],
+
+];
diff --git a/packages/forms/dist/components/markdown-editor.js b/packages/forms/dist/components/markdown-editor.js
diff --git a/packages/forms/dist/components/rich-editor.css b/packages/forms/dist/components/rich-editor.css
diff --git a/packages/forms/resources/js/components/markdown-editor.js b/packages/forms/resources/js/components/markdown-editor.js
@@ -90,6 +90,7 @@ export default function markdownEditorFormComponent({
     maxHeight,
     minHeight,
     placeholder,
+    setUpUsing,
     state,
     translations,
     toolbarButtons,
@@ -210,6 +211,10 @@ export default function markdownEditorFormComponent({
 
                 Alpine.raw(this.editor).value(this.state ?? '')
             })
+
+            if (setUpUsing) {
+                setUpUsing(this)
+            }
         },
 
         destroy: function () {

diff --git a/packages/forms/resources/lang/ja/components.php b/packages/forms/resources/lang/ja/components.php
@@ -419,6 +419,31 @@
         'placeholder' => '新規タグ',
     ],
 
+    'text_input' => [
+
+        'actions' => [
+
+            'hide_password' => [
+                'label' => 'パスワードを非表示',
+            ],
+
+            'show_password' => [
+                'label' => 'パスワードを表示',
+            ],
+
+        ],
+
+    ],
+
+    'toggle_buttons' => [
+
+        'boolean' => [
+            'true' => 'はい',
+            'false' => 'いいえ',
+        ],
+
+    ],
+
     'wizard' => [
 
         'actions' => [

diff --git a/packages/infolists/docs/03-entries/01-getting-started.md b/packages/infolists/docs/03-entries/01-getting-started.md
@@ -19,6 +19,20 @@ public function infolist(Infolist $infolist): Infolist
 }
 ```
 
+If you're inside a [panel builder resource](../../panels/resources), the `infolist()` method should be static:
+
+```php
+use Filament\Infolists\Infolist;
+
+public static function infolist(Infolist $infolist): Infolist
+{
+    return $infolist
+        ->schema([
+            // ...
+        ]);
+}
+```
+
 Entries may be created using the static `make()` method, passing its unique name. You may use "dot notation" to access entries within relationships.
 
 ```php

diff --git a/packages/infolists/resources/lang/ja/components.php b/packages/infolists/resources/lang/ja/components.php
@@ -15,6 +15,24 @@
 
         ],
 
+        'key_value' => [
+
+            'columns' => [
+
+                'key' => [
+                    'label' => 'キー',
+                ],
+
+                'value' => [
+                    'label' => '値',
+                ],
+
+            ],
+
+            'placeholder' => 'エントリがありません',
+
+        ],
+
     ],
 
 ];
diff --git a/packages/panels/docs/01-installation.md b/packages/panels/docs/01-installation.md
@@ -119,6 +119,8 @@ php artisan vendor:publish --tag=filament-actions-translations
 
 php artisan vendor:publish --tag=filament-forms-translations
 
+php artisan vendor:publish --tag=filament-infolists-translations
+
 php artisan vendor:publish --tag=filament-notifications-translations
 
 php artisan vendor:publish --tag=filament-tables-translations

diff --git a/packages/panels/resources/lang/ja/layout.php b/packages/panels/resources/lang/ja/layout.php
@@ -52,4 +52,12 @@
 
     ],
 
+    'avatar' => [
+        'alt' => ':nameのアバター',
+    ],
+
+    'logo' => [
+        'alt' => ':nameロゴ',
+    ],
+
 ];
diff --git a/packages/panels/resources/lang/ja/pages/dashboard.php b/packages/panels/resources/lang/ja/pages/dashboard.php
@@ -8,11 +8,11 @@
 
         'filter' => [
 
-            'label' => 'フィルター',
+            'label' => 'フィルタ',
 
             'modal' => [
 
-                'heading' => 'フィルター',
+                'heading' => 'フィルタ',
 
                 'actions' => [
 

diff --git a/packages/panels/resources/lang/ja/unsaved-changes-alert.php b/packages/panels/resources/lang/ja/unsaved-changes-alert.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+    'body' => '未保存の変更があります。このページを離れてもよろしいですか？',
+
+];
diff --git a/packages/support/resources/lang/ja/components/pagination.php b/packages/support/resources/lang/ja/components/pagination.php
@@ -22,10 +22,18 @@
 
     'actions' => [
 
+        'first' => [
+            'label' => '最初',
+        ],
+
         'go_to_page' => [
             'label' => ':pageページへ移動',
         ],
 
+        'last' => [
+            'label' => '最後',
+        ],
+
         'next' => [
             'label' => '次',
         ],

diff --git a/packages/support/resources/views/components/badge.blade.php b/packages/support/resources/views/components/badge.blade.php
@@ -81,7 +81,8 @@
         x-data="{}"
     @endif
     @if ($keyBindings)
-        x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
+        x-bind:id="$id('key-bindings')"
+        x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
     @endif
     @if ($hasTooltip)
         x-tooltip="{

diff --git a/packages/support/resources/views/components/button/index.blade.php b/packages/support/resources/views/components/button/index.blade.php
@@ -183,7 +183,8 @@
         x-data="{}"
     @endif
     @if ($keyBindings)
-        x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
+        x-bind:id="$id('key-bindings')"
+        x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
     @endif
     @if ($hasTooltip)
         x-tooltip="{

diff --git a/packages/support/resources/views/components/dropdown/list/item.blade.php b/packages/support/resources/views/components/dropdown/list/item.blade.php
@@ -102,7 +102,8 @@
             x-data="{}"
         @endif
         @if ($keyBindings)
-            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
+            x-bind:id="$id('key-bindings')"
+            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
         @endif
         @if ($hasTooltip)
             x-tooltip="{
@@ -182,7 +183,8 @@ class="{{ $imageClasses }}"
             x-data="{}"
         @endif
         @if ($keyBindings)
-            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
+            x-bind:id="$id('key-bindings')"
+            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
         @endif
         @if ($hasTooltip)
             x-tooltip="{
@@ -233,7 +235,8 @@ class="{{ $imageClasses }}"
                 x-data="{}"
             @endif
             @if ($keyBindings)
-                x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
+                x-bind:id="$id('key-bindings')"
+                x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
             @endif
             @if ($hasTooltip)
                 x-tooltip="{