Closed mergify[bot] closed 2 weeks ago
Cherry-pick of a9c1b0b6a9ae2675b4a02146a57fd3fe93bab15d has failed:
On branch mergify/bp/release/4.16.x/pr-980
Your branch is up to date with 'origin/release/4.16.x'.
You are currently cherry-picking commit a9c1b0b6a.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
new file: common/changes/@itwin/appui-react/fix-events-in-new-toolbars_2024-08-23-06-28.json
modified: ui/appui-react/src/appui-react/hooks/useConditionalProp.tsx
new file: ui/appui-react/src/test/hooks/useConditionalProp.test.tsx
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: docs/changehistory/NextVersion.md
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Changes
Same problem as in #967. Noticed when debugging booster code. Studio recently enabled new toolbars so the problem now occured.
Testing
Added test for
useConditionalProp
.This is an automatic backport of pull request #980 done by Mergify.