fix(ModalPage, ModalCard): add prop disableFocusTrap to fix conflict with several FocusTraps
#8248
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ct with several FocusTraps
github-actions
bot
added
the
patch
size-limit report 📦
|
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. |
e2e tests |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #8248 +/- ##
=======================================
Coverage 95.53% 95.54%
=======================================
Files 404 404
Lines 11559 11559
Branches 3837 3837
=======================================
+ Hits 11043 11044 +1
+ Misses 516 515 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
👀 Docs deployed
Commit 9151df4 |
|
Единственно, теперь у нас две вариации свойств, которые что-то отключают: |
EldarMuhamethanov
dismissed stale reviews from inomdzhon and andrey-medvedev-vk
via
a079326
Действительно, лучше переименовать, чтобы потом потом не пришлось |
inomdzhon
changed the title
focusTrapDisabled to fix conflict with several FocusTrapsdisableFocusTrap to fix conflict with several FocusTraps
inomdzhon
approved these changes
Feb 11, 2025
EldarMuhamethanov
deleted the
e.muhamethanov/8244/fix-focus-traps-conflict
branch
❌ PatchНе удалось автоматически применить исправление на ветке 7.1-stable.
Чтобы изменение попало в ветку 7.1-stable, выполните следующие действия:
git stash # опционально
git fetch origin 7.1-stable
git checkout -b patch/pr8248 origin/7.1-stable
git cherry-pick --no-commit 59c9515ab92faf34a54bdb141f1a0cb18baf755a
git checkout HEAD **/__image_snapshots__/*.png
git diff --quiet HEAD || git commit --no-verify --no-edit
git push --set-upstream origin patch/pr8248
gh pr create --base 7.1-stable --title "patch: pr8248" --body "- patch #8248" |
EldarMuhamethanov
added a commit
that referenced
this pull request
Feb 12, 2025
…ct with several FocusTraps (#8248) * fix(ModalPage, ModalCard): add prop `focusTrapDisabled` to fix conflict with several FocusTraps * doc(ModalPage,ModalCard): fix documentation * doc(ModalPage,ModalCard): fix docs * doc(ModalPage,ModalCard): fix docs * fix: rename `focusTrapDisabled` to `disableFocusTrap` # Conflicts: # packages/vkui/src/components/ModalCard/ModalCard.test.tsx # packages/vkui/src/components/ModalCard/ModalCardInternal.tsx # packages/vkui/src/components/ModalPage/ModalPage.test.tsx # packages/vkui/src/components/ModalPage/types.ts
Merged
EldarMuhamethanov
added a commit
that referenced
this pull request
Feb 12, 2025
…ct with several FocusTraps (#8248) (#8261) * fix(ModalPage, ModalCard): add prop `focusTrapDisabled` to fix conflict with several FocusTraps * doc(ModalPage,ModalCard): fix documentation * doc(ModalPage,ModalCard): fix docs * doc(ModalPage,ModalCard): fix docs * fix: rename `focusTrapDisabled` to `disableFocusTrap` # Conflicts: # packages/vkui/src/components/ModalCard/ModalCard.test.tsx # packages/vkui/src/components/ModalCard/ModalCardInternal.tsx # packages/vkui/src/components/ModalPage/ModalPage.test.tsx # packages/vkui/src/components/ModalPage/types.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FocusTrap#8244Описание
Сейчас, когда поверх одной модалки открывается другая, получается что одновременно начинают работать два
FocusTrap, которые начинают конфликтовать и работать некорректно. При нажатииTabфокус перескакивает с одной модалки на другую. Нужно придумать, как решить эту проблемуИзменения
ModalPageиModalCardсвойствоdisableFocusTrap, которое позволяет отключать захват фокуса, когда, например, одна модалка перекрывается другойdisableFocusTrapdisableFocusTrapRelease notes
Улучшения
disableFocusTrapдля отключения захвата фокусаНужно для кейса, когда поверх одной модалки открывается другая, чтобы несколько
FocusTrapне конфликтовали между собойdisableFocusTrapдля отключения захвата фокусаНужно для кейса, когда поверх одной модалки открывается другая, чтобы несколько
FocusTrapне конфликтовали между собойИсправления
FocusTrap-ов при нескольких открытых модалках