Skip to content

Commit 48a9e17

Browse files
committed
Revert "wrap button in span with tabIndex, in order not to lose focus in safari"
This reverts commit a857ec5.
1 parent f797e62 commit 48a9e17

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

src/scripts/DateInput.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -312,17 +312,15 @@ class DateInputInner extends Component<
312312
onChange={this.onInputChange}
313313
onBlur={this.onInputBlur}
314314
/>
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>
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+
/>
326324
</div>
327325
);
328326
}

src/scripts/Lookup.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -280,17 +280,15 @@ export class LookupSearch extends Component<LookupSearchProps> {
280280
onChange={this.onInputChange}
281281
onBlur={this.onInputBlur}
282282
/>
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>
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+
/>
294292
</div>
295293
);
296294
}

0 commit comments

Comments
 (0)