opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-10-29 18:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9084 from cheesegrits/3.x-onexpand-concealing

Browse Source 
Wrap all expand-concealing-component event code in $nextTick
This commit is contained in:
Dan Harrin
2023-10-14 12:44:46 +01:00
committed by GitHub
parent 65e8fd2933 2f7dadc01a
commit e970a7486e
5 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/forms/resources/views/components/builder.blade.php
+19 -17
View File
@@ -78,27 +78,29 @@
x-on:builder-expand.window="$event.detail === '{{ $statePath }}' && (isCollapsed = false)"
x-on:builder-collapse.window="$event.detail === '{{ $statePath }}' && (isCollapsed = true)"
x-on:expand-concealing-component.window="
error = $el.querySelector('[data-validation-error]')
$nextTick(() => {
error = $el.querySelector('[data-validation-error]')
if (! error) {
return
}
if (! error) {
return
}
isCollapsed = false
isCollapsed = false
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
})
"
x-sortable-item="{{ $uuid }}"
class="fi-fo-builder-item rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-white/5 dark:ring-white/10"
packages/forms/resources/views/components/repeater.blade.php
+19 -17
View File
@@ -79,27 +79,29 @@
isCollapsed: @js($isCollapsed($item)),
}"
x-on:expand-concealing-component.window="
error = $el.querySelector('[data-validation-error]')
$nextTick(() => {
error = $el.querySelector('[data-validation-error]')
if (! error) {
return
}
if (! error) {
return
}
isCollapsed = false
isCollapsed = false
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
})
"
x-on:repeater-expand.window="$event.detail === '{{ $statePath }}' && (isCollapsed = false)"
x-on:repeater-collapse.window="$event.detail === '{{ $statePath }}' && (isCollapsed = true)"
packages/forms/resources/views/components/tabs/tab.blade.php
+19 -17
View File
@@ -13,27 +13,29 @@
<div
x-bind:class="tab === @js($id) ? @js($visibleTabClasses) : @js($invisibleTabClasses)"
x-on:expand-concealing-component.window="
error = $el.querySelector('[data-validation-error]')
$nextTick(() => {
error = $el.querySelector('[data-validation-error]')
if (! error) {
return
}
if (! error) {
return
}
tab = @js($id)
tab = @js($id)
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
})
"
{{
$attributes
packages/forms/resources/views/components/wizard/step.blade.php
+22 -20
View File
@@ -13,31 +13,33 @@
<div
x-bind:class="step === @js($id) ? @js($visibleStepClasses) : @js($invisibleStepClasses)"
x-on:expand-concealing-component.window="
error = $el.querySelector('[data-validation-error]')
$nextTick(() => {
error = $el.querySelector('[data-validation-error]')
if (! error) {
return
}
if (! error) {
return
}
if (! isStepAccessible(step, @js($id))) {
return
}
if (! isStepAccessible(step, @js($id))) {
return
}
step = @js($id)
step = @js($id)
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
})
"
x-ref="step-{{ $id }}"
{{
packages/support/resources/views/components/section/index.blade.php
+19 -17
View File
@@ -31,27 +31,29 @@
@if ($collapsible)
x-on:collapse-section.window="if ($event.detail.id == $el.id) isCollapsed = true"
x-on:expand-concealing-component.window="
error = $el.querySelector('[data-validation-error]')
$nextTick(() => {
error = $el.querySelector('[data-validation-error]')
if (! error) {
return
}
if (! error) {
return
}
isCollapsed = false
isCollapsed = false
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
if (document.body.querySelector('[data-validation-error]') !== error) {
return
}
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
setTimeout(
() =>
$el.scrollIntoView({
behavior: 'smooth',
block: 'start',
inline: 'start',
}),
200,
)
})
"
x-on:open-section.window="if ($event.detail.id == $el.id) isCollapsed = false"
x-on:toggle-section.window="if ($event.detail.id == $el.id) isCollapsed = ! isCollapsed"