fix Modal and Confirm cannot auto focus #1838

zxyao145 · 2021-08-13T15:37:34Z

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language	Changelog
🇺🇸 English	fix Modal and Confirm cannot auto focus
🇨🇳 Chinese	修复 Modal 和 Confirm 无法自动focus的bug

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

Doc is updated/provided or not needed
Demo is updated/provided or not needed
Changelog is provided or not needed

github-actions · 2021-08-13T15:37:49Z

codecov · 2021-08-13T15:46:39Z

Codecov Report

Merging #1838 (af2a08e) into master (ba14f93) will increase coverage by 23.54%.
The diff coverage is 0.00%.

❗ Current head af2a08e differs from pull request most recent head 38cc438. Consider uploading reports for the commit 38cc438 to get more accurate results

@@             Coverage Diff             @@
##           master    #1838       +/-   ##
===========================================
+ Coverage    0.00%   23.54%   +23.54%     
===========================================
  Files         479      495       +16     
  Lines       31277    23246     -8031     
  Branches        0      122      +122     
===========================================
+ Hits            0     5474     +5474     
+ Misses      31277    17769    -13508     
- Partials        0        3        +3

Impacted Files	Coverage Δ
...s/core/JsInterop/modules/components/modalHelper.ts	`0.00% <0.00%> (ø)`
components/modal/config/ConfirmOptions.cs	`0.00% <0.00%> (ø)`
components/modal/confirmDialog/Confirm.razor	`0.00% <0.00%> (ø)`
components/modal/confirmDialog/Confirm.razor.cs	`0.00% <0.00%> (ø)`
components/modal/core/Dialog.razor	`0.00% <ø> (ø)`
components/modal/core/Dialog.razor.cs	`0.00% <0.00%> (ø)`
components/modal/modalDialog/Modal.razor.cs	`0.00% <0.00%> (ø)`
components/card/Card.razor	`0.00% <0.00%> (ø)`
components/form/Form.razor	`0.00% <0.00%> (ø)`
components/rate/Rate.razor	`0.00% <0.00%> (ø)`
... and 445 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ba14f93...38cc438. Read the comment docs.

ElderJames · 2021-08-17T14:51:13Z

Please set AutoFocusButton default to Ok.

* fix(module: table): fix initial load and render (#1835) * fix(module: table): fix initial load and render * delete the useless method * chore: remove redundant semi-colons (#1812) Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): checked state didn't follow the value change (#1841) * fix(module: menu): menu item click event should be triggered when menu selectable is false (#1843) * fix(module: tag): Tag component style parameters are not rendered (#1847) * fix(module: tag): Tag component style parameters are not rendered (#1846) * fix(module: tag): change call GetStyle in OnParameterSet Co-authored-by: haojiajun <haojiajun@vanelink.net> * fix(module: tree): SelectedNodeChanged would be fired twice twice (#1849) * fix(module: table): prevent propagation of expand button click events (#1850) * changelog 0.9.2 (#1851) * feat(module: upload): add method parameter (#1853) * add method parameter to upload component * update documentation * add test Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> * fix(module: table): avoid `OnChange` being called multiple times during initialization (#1855) * fix(module: table): avoid OnChange being called multiple times during initialisation * fix indent * fix(module: table): didn't refresh when using client side data source (#1858) * feat(module: table): add TheSameDateWith condition operator for DateTime column (#1856) * use date in datetime filter * fix spelling errors * Restore changes and add Date and Month FilterCompareOperator * hide time when filter date or month * Remove the month FilterCompareOperator * add locale data Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): option change does not lock checkboxes (#1863) * fix(module: table): ignore milliseconds when applying the datetime filter (#1864) * remove milliseconds when filtering * remove the milliseconds when set the datetime filter value Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: input-number): default value binding (#1871) * fix(module: input-number): default value binding * fix default value * fix(module: autocomplete): overlay is showing for AutoCompleteSearch (#1860) * fix(module:autocomplete): overlay is showing for AutoCompleteSearch * translate comments * code cleanup Co-authored-by: ElderJames <shunjiey@hotmail.com> * fix(module: tag): rename `CheckedChange` to `CheckedChanged` (#1876) * Update Tag compliance with Blazor conventions Add the missing 'd' to CheckedChanged callback in order to properly support two ways binding on the Checked property * Fix references to renamed method in Tag component * Update tests for Tag Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: James Yeung <shunjiey@hotmail.com> * feat(module: menu): Add IconTemplate for menu item (#1879) * docs: update CONTRIBUTING (#1882) * feat(module: breadcrumb): add `Href` parameter and overlay dropdown (#1859) * Setup breadcrumb dropdown * Setup breadcrumb href * fix dropdown style * fix dropdown trigger class * fix tests Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: table): call `StateHasChanged` in `InternalReload` (#1874) (#1875) * fix(module: table): not automatically load with ActionColumn (#1883) Fixed an issue where a table would not automatically load after initialization when an ActionColumn was used. * feat(module: table): add nested table demo (#1884) * fix(module: modal): auto focus the ok button and remove the focus of the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled * fix(module: table): fix the format issue of datetime samedate filter (#1889) * changelog 0.9.3 (#1890) Co-authored-by: Simon Cropp <simon.cropp@gmail.com> Co-authored-by: JohnHao421 <544106829@qq.com> Co-authored-by: haojiajun <haojiajun@vanelink.net> Co-authored-by: Noah Potash <digitalnugget@gmail.com> Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> Co-authored-by: SmallY <45689960+iamSmallY@users.noreply.github.com> Co-authored-by: Andrzej Bakun <andrzej@neelyc.com.cy> Co-authored-by: Stefano Driussi <stedri@gmail.com> Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: Guyiming <guyiming2011@126.com> Co-authored-by: YongQuanRao <79885120+JamesGit-hash@users.noreply.github.com> Co-authored-by: Maksim <maksalmak@gmail.com> Co-authored-by: Nikolay Krondev <nikolaykrondev@users.noreply.github.com> Co-authored-by: zxyao <zxyao145@gmail.com> Co-authored-by: anranruye <54608128+anranruye@users.noreply.github.com>

…the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled

* fix(module: table): fix initial load and render (#1835) * fix(module: table): fix initial load and render * delete the useless method * chore: remove redundant semi-colons (#1812) Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): checked state didn't follow the value change (#1841) * fix(module: menu): menu item click event should be triggered when menu selectable is false (#1843) * fix(module: tag): Tag component style parameters are not rendered (#1847) * fix(module: tag): Tag component style parameters are not rendered (#1846) * fix(module: tag): change call GetStyle in OnParameterSet Co-authored-by: haojiajun <haojiajun@vanelink.net> * fix(module: tree): SelectedNodeChanged would be fired twice twice (#1849) * fix(module: table): prevent propagation of expand button click events (#1850) * changelog 0.9.2 (#1851) * feat(module: upload): add method parameter (#1853) * add method parameter to upload component * update documentation * add test Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> * fix(module: table): avoid `OnChange` being called multiple times during initialization (#1855) * fix(module: table): avoid OnChange being called multiple times during initialisation * fix indent * fix(module: table): didn't refresh when using client side data source (#1858) * feat(module: table): add TheSameDateWith condition operator for DateTime column (#1856) * use date in datetime filter * fix spelling errors * Restore changes and add Date and Month FilterCompareOperator * hide time when filter date or month * Remove the month FilterCompareOperator * add locale data Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): option change does not lock checkboxes (#1863) * fix(module: table): ignore milliseconds when applying the datetime filter (#1864) * remove milliseconds when filtering * remove the milliseconds when set the datetime filter value Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: input-number): default value binding (#1871) * fix(module: input-number): default value binding * fix default value * fix(module: autocomplete): overlay is showing for AutoCompleteSearch (#1860) * fix(module:autocomplete): overlay is showing for AutoCompleteSearch * translate comments * code cleanup Co-authored-by: ElderJames <shunjiey@hotmail.com> * fix(module: tag): rename `CheckedChange` to `CheckedChanged` (#1876) * Update Tag compliance with Blazor conventions Add the missing 'd' to CheckedChanged callback in order to properly support two ways binding on the Checked property * Fix references to renamed method in Tag component * Update tests for Tag Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: James Yeung <shunjiey@hotmail.com> * feat(module: menu): Add IconTemplate for menu item (#1879) * docs: update CONTRIBUTING (#1882) * feat(module: breadcrumb): add `Href` parameter and overlay dropdown (#1859) * Setup breadcrumb dropdown * Setup breadcrumb href * fix dropdown style * fix dropdown trigger class * fix tests Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: table): call `StateHasChanged` in `InternalReload` (#1874) (#1875) * fix(module: table): not automatically load with ActionColumn (#1883) Fixed an issue where a table would not automatically load after initialization when an ActionColumn was used. * feat(module: table): add nested table demo (#1884) * fix(module: modal): auto focus the ok button and remove the focus of the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled * fix(module: table): fix the format issue of datetime samedate filter (#1889) * changelog 0.9.3 (#1890) Co-authored-by: Simon Cropp <simon.cropp@gmail.com> Co-authored-by: JohnHao421 <544106829@qq.com> Co-authored-by: haojiajun <haojiajun@vanelink.net> Co-authored-by: Noah Potash <digitalnugget@gmail.com> Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> Co-authored-by: SmallY <45689960+iamSmallY@users.noreply.github.com> Co-authored-by: Andrzej Bakun <andrzej@neelyc.com.cy> Co-authored-by: Stefano Driussi <stedri@gmail.com> Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: Guyiming <guyiming2011@126.com> Co-authored-by: YongQuanRao <79885120+JamesGit-hash@users.noreply.github.com> Co-authored-by: Maksim <maksalmak@gmail.com> Co-authored-by: Nikolay Krondev <nikolaykrondev@users.noreply.github.com> Co-authored-by: zxyao <zxyao145@gmail.com> Co-authored-by: anranruye <54608128+anranruye@users.noreply.github.com>

…the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled

* fix(module: table): fix initial load and render (#1835) * fix(module: table): fix initial load and render * delete the useless method * chore: remove redundant semi-colons (#1812) Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): checked state didn't follow the value change (#1841) * fix(module: menu): menu item click event should be triggered when menu selectable is false (#1843) * fix(module: tag): Tag component style parameters are not rendered (#1847) * fix(module: tag): Tag component style parameters are not rendered (#1846) * fix(module: tag): change call GetStyle in OnParameterSet Co-authored-by: haojiajun <haojiajun@vanelink.net> * fix(module: tree): SelectedNodeChanged would be fired twice twice (#1849) * fix(module: table): prevent propagation of expand button click events (#1850) * changelog 0.9.2 (#1851) * feat(module: upload): add method parameter (#1853) * add method parameter to upload component * update documentation * add test Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> * fix(module: table): avoid `OnChange` being called multiple times during initialization (#1855) * fix(module: table): avoid OnChange being called multiple times during initialisation * fix indent * fix(module: table): didn't refresh when using client side data source (#1858) * feat(module: table): add TheSameDateWith condition operator for DateTime column (#1856) * use date in datetime filter * fix spelling errors * Restore changes and add Date and Month FilterCompareOperator * hide time when filter date or month * Remove the month FilterCompareOperator * add locale data Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): option change does not lock checkboxes (#1863) * fix(module: table): ignore milliseconds when applying the datetime filter (#1864) * remove milliseconds when filtering * remove the milliseconds when set the datetime filter value Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: input-number): default value binding (#1871) * fix(module: input-number): default value binding * fix default value * fix(module: autocomplete): overlay is showing for AutoCompleteSearch (#1860) * fix(module:autocomplete): overlay is showing for AutoCompleteSearch * translate comments * code cleanup Co-authored-by: ElderJames <shunjiey@hotmail.com> * fix(module: tag): rename `CheckedChange` to `CheckedChanged` (#1876) * Update Tag compliance with Blazor conventions Add the missing 'd' to CheckedChanged callback in order to properly support two ways binding on the Checked property * Fix references to renamed method in Tag component * Update tests for Tag Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: James Yeung <shunjiey@hotmail.com> * feat(module: menu): Add IconTemplate for menu item (#1879) * docs: update CONTRIBUTING (#1882) * feat(module: breadcrumb): add `Href` parameter and overlay dropdown (#1859) * Setup breadcrumb dropdown * Setup breadcrumb href * fix dropdown style * fix dropdown trigger class * fix tests Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: table): call `StateHasChanged` in `InternalReload` (#1874) (#1875) * fix(module: table): not automatically load with ActionColumn (#1883) Fixed an issue where a table would not automatically load after initialization when an ActionColumn was used. * feat(module: table): add nested table demo (#1884) * fix(module: modal): auto focus the ok button and remove the focus of the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled * fix(module: table): fix the format issue of datetime samedate filter (#1889) * changelog 0.9.3 (#1890) Co-authored-by: Simon Cropp <simon.cropp@gmail.com> Co-authored-by: JohnHao421 <544106829@qq.com> Co-authored-by: haojiajun <haojiajun@vanelink.net> Co-authored-by: Noah Potash <digitalnugget@gmail.com> Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> Co-authored-by: SmallY <45689960+iamSmallY@users.noreply.github.com> Co-authored-by: Andrzej Bakun <andrzej@neelyc.com.cy> Co-authored-by: Stefano Driussi <stedri@gmail.com> Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: Guyiming <guyiming2011@126.com> Co-authored-by: YongQuanRao <79885120+JamesGit-hash@users.noreply.github.com> Co-authored-by: Maksim <maksalmak@gmail.com> Co-authored-by: Nikolay Krondev <nikolaykrondev@users.noreply.github.com> Co-authored-by: zxyao <zxyao145@gmail.com> Co-authored-by: anranruye <54608128+anranruye@users.noreply.github.com>

…the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled

* fix(module: table): fix initial load and render (#1835) * fix(module: table): fix initial load and render * delete the useless method * chore: remove redundant semi-colons (#1812) Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): checked state didn't follow the value change (#1841) * fix(module: menu): menu item click event should be triggered when menu selectable is false (#1843) * fix(module: tag): Tag component style parameters are not rendered (#1847) * fix(module: tag): Tag component style parameters are not rendered (#1846) * fix(module: tag): change call GetStyle in OnParameterSet Co-authored-by: haojiajun <haojiajun@vanelink.net> * fix(module: tree): SelectedNodeChanged would be fired twice twice (#1849) * fix(module: table): prevent propagation of expand button click events (#1850) * changelog 0.9.2 (#1851) * feat(module: upload): add method parameter (#1853) * add method parameter to upload component * update documentation * add test Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> * fix(module: table): avoid `OnChange` being called multiple times during initialization (#1855) * fix(module: table): avoid OnChange being called multiple times during initialisation * fix indent * fix(module: table): didn't refresh when using client side data source (#1858) * feat(module: table): add TheSameDateWith condition operator for DateTime column (#1856) * use date in datetime filter * fix spelling errors * Restore changes and add Date and Month FilterCompareOperator * hide time when filter date or month * Remove the month FilterCompareOperator * add locale data Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: checkbox): option change does not lock checkboxes (#1863) * fix(module: table): ignore milliseconds when applying the datetime filter (#1864) * remove milliseconds when filtering * remove the milliseconds when set the datetime filter value Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: input-number): default value binding (#1871) * fix(module: input-number): default value binding * fix default value * fix(module: autocomplete): overlay is showing for AutoCompleteSearch (#1860) * fix(module:autocomplete): overlay is showing for AutoCompleteSearch * translate comments * code cleanup Co-authored-by: ElderJames <shunjiey@hotmail.com> * fix(module: tag): rename `CheckedChange` to `CheckedChanged` (#1876) * Update Tag compliance with Blazor conventions Add the missing 'd' to CheckedChanged callback in order to properly support two ways binding on the Checked property * Fix references to renamed method in Tag component * Update tests for Tag Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: James Yeung <shunjiey@hotmail.com> * feat(module: menu): Add IconTemplate for menu item (#1879) * docs: update CONTRIBUTING (#1882) * feat(module: breadcrumb): add `Href` parameter and overlay dropdown (#1859) * Setup breadcrumb dropdown * Setup breadcrumb href * fix dropdown style * fix dropdown trigger class * fix tests Co-authored-by: James Yeung <shunjiey@hotmail.com> * fix(module: table): call `StateHasChanged` in `InternalReload` (#1874) (#1875) * fix(module: table): not automatically load with ActionColumn (#1883) Fixed an issue where a table would not automatically load after initialization when an ActionColumn was used. * feat(module: table): add nested table demo (#1884) * fix(module: modal): auto focus the ok button and remove the focus of the trigger button (#1838) * fix: second opening of focus in modal fails if DestroyOnClose is false * fix: confirm cannot get focus element * fix: set ConfirmAutoFocusButton is OK * fix: module ImagePreview cannot close on second click * fix: blur active element when comfirm focus element is disabled * fix(module: table): fix the format issue of datetime samedate filter (#1889) * changelog 0.9.3 (#1890) Co-authored-by: Simon Cropp <simon.cropp@gmail.com> Co-authored-by: JohnHao421 <544106829@qq.com> Co-authored-by: haojiajun <haojiajun@vanelink.net> Co-authored-by: Noah Potash <digitalnugget@gmail.com> Co-authored-by: Noah Potash <noah.potash@outbreaklabs.com> Co-authored-by: SmallY <45689960+iamSmallY@users.noreply.github.com> Co-authored-by: Andrzej Bakun <andrzej@neelyc.com.cy> Co-authored-by: Stefano Driussi <stedri@gmail.com> Co-authored-by: Stefano Drussi <stefano.driussi@hotmail.it> Co-authored-by: Guyiming <guyiming2011@126.com> Co-authored-by: YongQuanRao <79885120+JamesGit-hash@users.noreply.github.com> Co-authored-by: Maksim <maksalmak@gmail.com> Co-authored-by: Nikolay Krondev <nikolaykrondev@users.noreply.github.com> Co-authored-by: zxyao <zxyao145@gmail.com> Co-authored-by: anranruye <54608128+anranruye@users.noreply.github.com>

pr-triage bot added the PR: unreviewed label Aug 13, 2021

zxyao145 mentioned this pull request Aug 13, 2021

Confirm Modal keyboard events issue #1762

Closed

zxyao145 requested a review from ElderJames August 14, 2021 13:51

ElderJames linked an issue Aug 14, 2021 that may be closed by this pull request

Confirm Modal keyboard events issue #1762

Closed

zxyao145 force-pushed the issue/1762 branch from 0a65883 to b5da197 Compare August 20, 2021 13:38

zxyao145 added 5 commits August 21, 2021 14:54

fix: second opening of focus in modal fails if DestroyOnClose is false

a19a7b1

fix: confirm cannot get focus element

ab514e0

fix: set ConfirmAutoFocusButton is OK

39121c0

fix: module ImagePreview cannot close on second click

8c42ae4

fix: blur active element when comfirm focus element is disabled

af2a08e

zxyao145 force-pushed the issue/1762 branch from 9faa350 to af2a08e Compare August 21, 2021 06:55

ElderJames approved these changes Aug 28, 2021

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Aug 28, 2021

Merge branch 'master' into issue/1762

38cc438

pr-triage bot added PR: unreviewed and removed PR: reviewed-approved labels Aug 28, 2021

ElderJames enabled auto-merge (squash) August 28, 2021 15:21

ElderJames merged commit f6441a1 into ant-design-blazor:master Aug 28, 2021

pr-triage bot added PR: merged and removed PR: unreviewed labels Aug 28, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix Modal and Confirm cannot auto focus #1838

fix Modal and Confirm cannot auto focus #1838

zxyao145 commented Aug 13, 2021

github-actions bot commented Aug 13, 2021 •

edited

codecov bot commented Aug 13, 2021 •

edited

ElderJames commented Aug 17, 2021

fix Modal and Confirm cannot auto focus #1838

fix Modal and Confirm cannot auto focus #1838

Conversation

zxyao145 commented Aug 13, 2021

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self Check before Merge

github-actions bot commented Aug 13, 2021 • edited

codecov bot commented Aug 13, 2021 • edited

Codecov Report

ElderJames commented Aug 17, 2021

github-actions bot commented Aug 13, 2021 •

edited

codecov bot commented Aug 13, 2021 •

edited