Add button autofocus prop to confirm modal #11756

ghost · 2018-08-15T17:47:10Z

ant-design-bot · 2018-08-15T17:53:34Z

Deploy preview for ant-design ready!

Built with commit 1d505f5

https://deploy-preview-11756--ant-design.netlify.com

afc163 · 2018-08-16T02:47:06Z

components/modal/confirm.tsx

@@ -9,6 +9,7 @@ import { getConfirmLocale } from './locale';
 interface ConfirmDialogProps extends ModalFuncProps {
  afterClose?: () => void;
  close: (...args: any[]) => void;
+  autoFocusBtn: 'ok' | 'cancel';


Consider #11055 and we can set autoFocusBtn to null|false|undefined for no focused button.

autoFocusBtn => autoFocusButton

afc163 · 2018-08-16T02:47:45Z

components/modal/confirm.tsx

@@ -28,6 +29,7 @@ const ConfirmDialog = (props: ConfirmDialogProps) => {
  const okText = props.okText ||
    (okCancel ? runtimeLocale.okText : runtimeLocale.justOkText);
  const cancelText = props.cancelText || runtimeLocale.cancelText;
+  const focus = props.autoFocusBtn || 'ok';


Don't rename autoFocusBtn;

afc163 · 2018-08-16T02:47:58Z

ci failed

ghost · 2018-08-17T00:32:56Z

@afc163 Done.
Don't know about ci failure, errors don't seem related to these changes at all.

afc163 · 2018-08-17T03:01:00Z

Don't forget update API documentation.

abenhamdine · 2018-08-17T05:11:37Z

components/modal/confirm.tsx

@@ -9,6 +9,7 @@ import { getConfirmLocale } from './locale';
 interface ConfirmDialogProps extends ModalFuncProps {
  afterClose?: () => void;
  close: (...args: any[]) => void;
+  autoFocusButton?: any;


Why not:

autoFocusButton?: null | 'ok' | 'cancel'

?

ghost · 2018-08-17T12:36:17Z

@afc163 Can I add this feature to Modal component aswell?

afc163 · 2018-08-17T13:03:05Z

@erwin-k That is cool

ghost · 2018-08-17T19:19:06Z

@afc163 In the end didn't do it for Modal component cause it'd only focus on first open.

picodoth · 2018-08-18T02:59:54Z

components/modal/confirm.tsx

@@ -28,6 +29,7 @@ const ConfirmDialog = (props: ConfirmDialogProps) => {
  const okText = props.okText ||
    (okCancel ? runtimeLocale.okText : runtimeLocale.justOkText);
  const cancelText = props.cancelText || runtimeLocale.cancelText;
+  const autoFocusButton = props.autoFocusButton === null ? false : props.autoFocusButton || 'ok'


~~why do we need this line? We can simply use props.autoFocusButton directly.~~

const { autoFocusButton = 'ok' } = this.props;

Wouldn't that give 'ok' when null is passed? Passing null serves to disable autofocus in this case.

picodoth · 2018-08-18T03:03:57Z

components/modal/index.en-US.md

@@ -62,6 +62,7 @@ The properties of the object are follows:

 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
+| autoFocusButton | Specify which button to autofocus | null\|string: `ok` `cancel` | `ok` |


afc163 · 2018-08-22T15:09:18Z

ci is still broken.

ghost · 2018-08-23T22:55:23Z

@afc163 I don't know about the failures, looks like it has nothing to do with these files. I have no time to investigate all that just for a pull request.

afc163 · 2018-08-24T04:13:56Z

Try rebase feature-3.9.0

aaronplanell · 2018-09-03T07:21:31Z

Hello everyone,

Sorry, It's not related with this issue but I want to add a feature in the branch feature-3.9.0 and the button is not available. Instead of the button I have another one with the text "View #11756" and the link to this pull request. Is the branch blocked?

Thanks.

afc163 · 2018-09-03T07:30:09Z

Try rebase feature branch now.

aaronplanell · 2018-09-03T08:16:29Z

Sorry @afc163 , how can I rebase the feature branch if I cannot download the code?

afc163 · 2018-09-03T08:23:11Z

feature-3.9.0 has been merged, you can checkout feature branch if you want to add new features.

aaronplanell · 2018-09-03T08:51:11Z

Hello @afc163 ,

Maybe this is one of the problems with the PR of the thread:

I fork the Ant Design project.
I switch to the feature branch.
I run nmp install
I run npm t

There is a snapshot that fails:

Summary of all failing tests
 FAIL  components/tree/__tests__/demo.test.js
  ● renders ./components/tree/demo/basic.md correctly

    expect(value).toMatchSnapshot()

    Received value does not match stored snapshot "renders ./components/tree/demo/basic.md correctly 1".

    - Snapshot
    + Received

Maybe this is the original problem and the reason because @erwin-k cannot merge 3 commits into ant-design:feature from erwin-k:feature-3.9.0.

It seems that before a previous change the Treenode Switcher was closed by default and now it is opened but the snapshots have not being updated.

codecov · 2018-09-29T09:07:12Z

Codecov Report

Merging #11756 into feature will increase coverage by <.01%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           feature   #11756      +/-   ##
===========================================
+ Coverage    92.31%   92.31%   +<.01%     
===========================================
  Files          211      211              
  Lines         5542     5543       +1     
  Branches      1594     1556      -38     
===========================================
+ Hits          5116     5117       +1     
- Misses         420      422       +2     
+ Partials         6        4       -2

Impacted Files	Coverage Δ
components/modal/Modal.tsx	`79.31% <ø> (ø)`	⬆️
components/modal/confirm.tsx	`93.02% <100%> (+0.16%)`	⬆️
components/transfer/index.tsx	`87.91% <0%> (ø)`	⬆️
components/time-picker/index.tsx	`81.96% <0%> (ø)`	⬆️

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 fcb546e...1d505f5. Read the comment docs.

afc163 reviewed Aug 16, 2018

View reviewed changes

afc163 closed this Aug 16, 2018

afc163 reopened this Aug 16, 2018

afc163 mentioned this pull request Aug 16, 2018

Added auto focus prop for Modal functions. #11055

Closed

abenhamdine suggested changes Aug 17, 2018

View reviewed changes

picodoth reviewed Aug 18, 2018

View reviewed changes

afc163 changed the base branch from feature-3.9.0 to feature September 3, 2018 08:20

Erwin Kort and others added 2 commits September 29, 2018 16:42

Add button autofocus prop to confirm modal

78a654b

improve typing

1d505f5

yesmeck merged commit 2d8f9cc into ant-design:feature Sep 29, 2018

afc163 mentioned this pull request Nov 19, 2018

Modal: hover not working for 'ok' button in confirm modal #11052

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add button autofocus prop to confirm modal #11756

Add button autofocus prop to confirm modal #11756

ghost commented Aug 15, 2018

ant-design-bot commented Aug 15, 2018 •

edited

afc163 Aug 16, 2018

afc163 Aug 16, 2018

afc163 Aug 16, 2018

afc163 commented Aug 16, 2018

ghost commented Aug 17, 2018

afc163 commented Aug 17, 2018

abenhamdine Aug 17, 2018 •

edited

ghost commented Aug 17, 2018 •

edited by ghost

afc163 commented Aug 17, 2018

ghost commented Aug 17, 2018

picodoth Aug 18, 2018 •

edited

ghost Aug 18, 2018

picodoth Aug 18, 2018

afc163 commented Aug 22, 2018

ghost commented Aug 23, 2018

afc163 commented Aug 24, 2018

aaronplanell commented Sep 3, 2018

afc163 commented Sep 3, 2018

aaronplanell commented Sep 3, 2018

afc163 commented Sep 3, 2018

aaronplanell commented Sep 3, 2018 •

edited

codecov bot commented Sep 29, 2018 •

edited

Add button autofocus prop to confirm modal #11756

Add button autofocus prop to confirm modal #11756

Conversation

ghost commented Aug 15, 2018

ant-design-bot commented Aug 15, 2018 • edited

afc163 Aug 16, 2018

Choose a reason for hiding this comment

afc163 Aug 16, 2018

Choose a reason for hiding this comment

afc163 Aug 16, 2018

Choose a reason for hiding this comment

afc163 commented Aug 16, 2018

ghost commented Aug 17, 2018

afc163 commented Aug 17, 2018

abenhamdine Aug 17, 2018 • edited

Choose a reason for hiding this comment

ghost commented Aug 17, 2018 • edited by ghost

afc163 commented Aug 17, 2018

ghost commented Aug 17, 2018

picodoth Aug 18, 2018 • edited

Choose a reason for hiding this comment

ghost Aug 18, 2018

Choose a reason for hiding this comment

picodoth Aug 18, 2018

Choose a reason for hiding this comment

afc163 commented Aug 22, 2018

ghost commented Aug 23, 2018

afc163 commented Aug 24, 2018

aaronplanell commented Sep 3, 2018

afc163 commented Sep 3, 2018

aaronplanell commented Sep 3, 2018

afc163 commented Sep 3, 2018

aaronplanell commented Sep 3, 2018 • edited

codecov bot commented Sep 29, 2018 • edited

Codecov Report

ant-design-bot commented Aug 15, 2018 •

edited

abenhamdine Aug 17, 2018 •

edited

ghost commented Aug 17, 2018 •

edited by ghost

picodoth Aug 18, 2018 •

edited

aaronplanell commented Sep 3, 2018 •

edited

codecov bot commented Sep 29, 2018 •

edited