Skip to content

Commit a857ec5

Browse files
committed
wrap button in span with tabIndex, in order not to lose focus in safari
1 parent f59a1ac commit a857ec5

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

src/scripts/DateInput.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,15 +312,17 @@ class DateInputInner extends Component<
312312
onChange={this.onInputChange}
313313
onBlur={this.onInputBlur}
314314
/>
315-
<Button
316-
type='icon'
317-
icon='event'
318-
disabled={props.disabled}
319-
className='slds-input__icon slds-input__icon_right'
320-
tabIndex={-1}
321-
onClick={props.disabled ? undefined : this.onDateIconClick}
322-
onBlur={this.onInputBlur}
323-
/>
315+
<span style={{ outline: 0 }} tabIndex={-1} onBlur={this.onInputBlur}>
316+
<Button
317+
type='icon'
318+
icon='event'
319+
disabled={props.disabled}
320+
className='slds-input__icon slds-input__icon_right'
321+
tabIndex={-1}
322+
onClick={props.disabled ? undefined : this.onDateIconClick}
323+
onBlur={this.onInputBlur}
324+
/>
325+
</span>
324326
</div>
325327
);
326328
}

src/scripts/Lookup.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -280,15 +280,17 @@ export class LookupSearch extends Component<LookupSearchProps> {
280280
onChange={this.onInputChange}
281281
onBlur={this.onInputBlur}
282282
/>
283-
<Button
284-
type='icon'
285-
icon='search'
286-
disabled={props.disabled}
287-
className='slds-input__icon slds-input__icon_right'
288-
tabIndex={-1}
289-
onClick={props.disabled ? undefined : this.onLookupIconClick}
290-
onBlur={this.onInputBlur}
291-
/>
283+
<span style={{ outline: 0 }} tabIndex={-1} onBlur={this.onInputBlur}>
284+
<Button
285+
type='icon'
286+
icon='search'
287+
disabled={props.disabled}
288+
className='slds-input__icon slds-input__icon_right'
289+
tabIndex={-1}
290+
onClick={props.disabled ? undefined : this.onLookupIconClick}
291+
onBlur={this.onInputBlur}
292+
/>
293+
</span>
292294
</div>
293295
);
294296
}

0 commit comments

Comments
 (0)