Skip to content
This repository was archived by the owner on Aug 15, 2025. It is now read-only.

Commit 3f56e2d

Browse files
[fix]: Focus conflict when use editor inside Jetstream modal
1 parent b718ef7 commit 3f56e2d

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.github/workflows/run-tests.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@ name: run-tests
22

33
on:
44
push:
5-
branches: [1.x]
5+
branches: [ 1.x ]
66
pull_request:
7-
branches: [1.x]
7+
branches: [ 1.x ]
88

99
jobs:
1010
test:
1111
strategy:
1212
fail-fast: true
1313
matrix:
14-
os: [ubuntu-latest, windows-latest]
15-
php: [8.2, 8.1]
16-
laravel: [10.*, 9.*]
17-
stability: [prefer-lowest, prefer-stable]
14+
os: [ ubuntu-latest ]
15+
php: [ 8.2, 8.1 ]
16+
laravel: [ 10.*, 9.* ]
17+
stability: [ prefer-lowest, prefer-stable ]
1818
include:
1919
- laravel: 10.*
2020
testbench: 8.*
21-
carbon: ^2.63
2221
- laravel: 9.*
2322
testbench: 7.*
24-
carbon: ^2.63
2523

2624
runs-on: ${{ matrix.os }}
2725
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
@@ -44,11 +42,8 @@ jobs:
4442
4543
- name: Install dependencies
4644
run: |
47-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
45+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4846
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4947
50-
- name: List Installed Dependencies
51-
run: composer show -D
52-
5348
- name: Execute tests
5449
run: vendor/bin/pest --ci

resources/views/.gitkeep

Whitespace-only changes.

resources/views/tiny-editor.blade.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,23 @@ class="relative z-0"
7171
editor.on('OpenWindow', function(e) {
7272
target = e.target.container.closest('.filament-modal')
7373
if (target) target.setAttribute('x-trap.noscroll', 'false')
74+
75+
target = e.target.container.closest('.jetstream-modal')
76+
if (target) {
77+
targetDiv = target.children[1]
78+
targetDiv.setAttribute('x-trap.inert.noscroll', 'false')
79+
}
7480
})
7581
7682
editor.on('CloseWindow', function(e) {
7783
target = e.target.container.closest('.filament-modal')
7884
if (target) target.setAttribute('x-trap.noscroll', 'isOpen')
85+
86+
target = e.target.container.closest('.jetstream-modal')
87+
if (target) {
88+
targetDiv = target.children[1]
89+
targetDiv.setAttribute('x-trap.inert.noscroll', 'show')
90+
}
7991
})
8092
8193
function putCursorToEnd() {

0 commit comments

Comments
 (0)