opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source
This commit is contained in:
Dan Harrin
2024-06-14 11:09:08 +01:00
parent 763cc66ca8 9d9b7b608e
commit d457bc3c60
13 changed files with 121 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/bug_report.yml
+1 -1
View File
@@ -89,7 +89,7 @@ body:
- type: input
id: reproduction
attributes:
label: Reproduction repository
label: Reproduction repository (issue will be closed if this is not valid)
description: The URL of a public GitHub repository which reproduces the problem. **Please do not link to your actual project**, what we need instead is a _minimal_ reproduction in a fresh project without any unnecessary code. This means it doesn\'t matter if your real project is private / confidential, since we want a link to a separate, isolated reproduction. This allows us to fix the problem much quicker. **This issue will be automatically closed and not reviewed if this is missing. Please make sure to format the URL starting with `https://github.com` - only repositories hosted on GitHub are accepted.** [Need a headstart? We have a template Filament project for you.](https://filament-issue.unitedbycode.com)
validations:
required: true
.github/workflows/manage-issue.yml
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
- uses: actions/github-script@v3
with:
script: |
const URL_REGEXP = /### Reproduction repository[\r\n]+([^#]+)###/m
const URL_REGEXP = /### Reproduction repository \(issue will be closed if this is not valid\)[\r\n]+([^#]+)###/m
const REPRO_STEPS_REGEXP = /### Steps to reproduce[\r\n]+([^#]+)###/m
const LABEL_NEEDS_MORE_INFORMATION = 'needs more info'
const LABEL_UNCONFIRMED = 'unconfirmed'
packages/actions/resources/lang/ar/export.php
+1 -1
View File
@@ -12,7 +12,7 @@ return [
'columns' => [
'label' => 'العواميد',
'label' => 'الأعمدة',
'form' => [
packages/actions/resources/lang/ar/import.php
+3
View File
@@ -13,6 +13,9 @@ return [
'file' => [
'label' => 'ملف',
'placeholder' => 'تحميل ملف CSV',
'rules' => [
'duplicate_columns' => '{0} يجب ألا يحتوي الملف على أكثر من عنوان عمود فارغ واحد.|{1,*} يجب ألا يحتوي الملف على عناوين أعمدة مكررة: :columns.',
],
],
'columns' => [
packages/forms/dist/components/date-time-picker.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/forms/dist/components/rich-editor.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
packages/forms/resources/js/components/date-time-picker.js
+2
View File
@@ -1,9 +1,11 @@
import dayjs from 'dayjs/esm'
import advancedFormat from 'dayjs/plugin/advancedFormat'
import customParseFormat from 'dayjs/plugin/customParseFormat'
import localeData from 'dayjs/plugin/localeData'
import timezone from 'dayjs/plugin/timezone'
import utc from 'dayjs/plugin/utc'
dayjs.extend(advancedFormat)
dayjs.extend(customParseFormat)
dayjs.extend(localeData)
dayjs.extend(timezone)
packages/forms/resources/js/components/rich-editor.js
+2 -2
View File
@@ -54,7 +54,7 @@ export default function richEditorFormComponent({ state }) {
init: function () {
this.$refs.trixValue.value = this.state
this.$refs.trix.editor?.loadHTML(this.state)
this.$refs.trix.editor?.loadHTML(this.state ?? '')
this.$watch('state', () => {
if (document.activeElement === this.$refs.trix) {
@@ -62,7 +62,7 @@ export default function richEditorFormComponent({ state }) {
}
this.$refs.trixValue.value = this.state
this.$refs.trix.editor?.loadHTML(this.state)
this.$refs.trix.editor?.loadHTML(this.state ?? '')
})
},
}
packages/forms/resources/lang/ar/components.php
+48
View File
@@ -12,16 +12,64 @@ return [
'add' => [
'label' => 'إضافة إلى :label',
'modal' => [
'heading' => 'إضافة إلى :label',
'actions' => [
'add' => [
'label' => 'إضافة',
],
],
],
],
'add_between' => [
'label' => 'إدراج بين الوحدات',
'modal' => [
'heading' => 'إضافة إلى :label',
'actions' => [
'add' => [
'label' => 'إضافة',
],
],
],
],
'delete' => [
'label' => 'حذف',
],
'edit' => [
'label' => 'تعديل',
'modal' => [
'heading' => 'تعديل القسم',
'actions' => [
'save' => [
'label' => 'حفظ التغييرات',
],
],
],
],
'reorder' => [
'label' => 'نقل',
],
packages/panels/resources/lang/ar/layout.php
+8
View File
@@ -52,4 +52,12 @@ return [
],
'avatar' => [
'alt' => 'صورة شخصية لـ :name',
],
'logo' => [
'alt' => ':name شعار',
],
];
packages/panels/resources/lang/ar/unsaved-changes-alert.php
+7
View File
@@ -0,0 +1,7 @@
<?php
return [
'body' => 'توجد لديك تغييرات غير محفوظة. هل أنت متأكد من أنك تريد مغادرة هذه الصفحة؟',
];
packages/support/resources/lang/ar/components/pagination.php
+8
View File
@@ -22,10 +22,18 @@ return [
'actions' => [
'first' => [
'label' => 'الأولي',
],
'go_to_page' => [
'label' => 'انتقل إلى صفحة :page',
],
'last' => [
'label' => 'الأخيرة',
],
'next' => [
'label' => 'التالي',
],
packages/support/resources/views/components/dropdown/index.blade.php
+38 -36
View File
@@ -45,40 +45,42 @@
{{ $trigger }}
</div>
<div
x-cloak
x-float{{ $placement ? ".placement.{$placement}" : '' }}{{ $size ? '.size' : '' }}.flip{{ $shift ? '.shift' : '' }}{{ $teleport ? '.teleport' : '' }}{{ $offset ? '.offset' : '' }}="{ offset: {{ $offset }}, {{ $size ? ('size: ' . $sizeConfig) : '' }} }"
x-ref="panel"
x-transition:enter-start="opacity-0"
x-transition:leave-end="opacity-0"
@if ($attributes->has('wire:key'))
wire:ignore.self
wire:key="{{ $attributes->get('wire:key') }}.panel"
@endif
@class([
'fi-dropdown-panel absolute z-10 w-screen divide-y divide-gray-100 rounded-lg bg-white shadow-lg ring-1 ring-gray-950/5 transition dark:divide-white/5 dark:bg-gray-900 dark:ring-white/10',
match ($width) {
// These max width classes need to be `!important` otherwise they will be usurped by the Floating UI "size" middleware.
MaxWidth::ExtraSmall, 'xs' => '!max-w-xs',
MaxWidth::Small, 'sm' => '!max-w-sm',
MaxWidth::Medium, 'md' => '!max-w-md',
MaxWidth::Large, 'lg' => '!max-w-lg',
MaxWidth::ExtraLarge, 'xl' => '!max-w-xl',
MaxWidth::TwoExtraLarge, '2xl' => '!max-w-2xl',
MaxWidth::ThreeExtraLarge, '3xl' => '!max-w-3xl',
MaxWidth::FourExtraLarge, '4xl' => '!max-w-4xl',
MaxWidth::FiveExtraLarge, '5xl' => '!max-w-5xl',
MaxWidth::SixExtraLarge, '6xl' => '!max-w-6xl',
MaxWidth::SevenExtraLarge, '7xl' => '!max-w-7xl',
null => '!max-w-[14rem]',
default => $width,
},
'overflow-y-auto' => $maxHeight || $size,
])
@style([
"max-height: {$maxHeight}" => $maxHeight,
])
>
{{ $slot }}
</div>
@if (! \Filament\Support\is_slot_empty($slot))
<div
x-cloak
x-float{{ $placement ? ".placement.{$placement}" : '' }}{{ $size ? '.size' : '' }}.flip{{ $shift ? '.shift' : '' }}{{ $teleport ? '.teleport' : '' }}{{ $offset ? '.offset' : '' }}="{ offset: {{ $offset }}, {{ $size ? ('size: ' . $sizeConfig) : '' }} }"
x-ref="panel"
x-transition:enter-start="opacity-0"
x-transition:leave-end="opacity-0"
@if ($attributes->has('wire:key'))
wire:ignore.self
wire:key="{{ $attributes->get('wire:key') }}.panel"
@endif
@class([
'fi-dropdown-panel absolute z-10 w-screen divide-y divide-gray-100 rounded-lg bg-white shadow-lg ring-1 ring-gray-950/5 transition dark:divide-white/5 dark:bg-gray-900 dark:ring-white/10',
match ($width) {
// These max width classes need to be `!important` otherwise they will be usurped by the Floating UI "size" middleware.
MaxWidth::ExtraSmall, 'xs' => '!max-w-xs',
MaxWidth::Small, 'sm' => '!max-w-sm',
MaxWidth::Medium, 'md' => '!max-w-md',
MaxWidth::Large, 'lg' => '!max-w-lg',
MaxWidth::ExtraLarge, 'xl' => '!max-w-xl',
MaxWidth::TwoExtraLarge, '2xl' => '!max-w-2xl',
MaxWidth::ThreeExtraLarge, '3xl' => '!max-w-3xl',
MaxWidth::FourExtraLarge, '4xl' => '!max-w-4xl',
MaxWidth::FiveExtraLarge, '5xl' => '!max-w-5xl',
MaxWidth::SixExtraLarge, '6xl' => '!max-w-6xl',
MaxWidth::SevenExtraLarge, '7xl' => '!max-w-7xl',
null => '!max-w-[14rem]',
default => $width,
},
'overflow-y-auto' => $maxHeight || $size,
])
@style([
"max-height: {$maxHeight}" => $maxHeight,
])
>
{{ $slot }}
</div>
@endif
</div>