File tree 2 files changed +20
-8
lines changed
ui-color-picker/src/ColorPicker
ui-svg-images/src/InlineSVG
2 files changed +20
-8
lines changed Original file line number Diff line number Diff line change 26
26
/** @jsxFrag React.Fragment */
27
27
import React , { Component } from 'react'
28
28
29
- import { withStyle , jsx } from '@instructure/emotion'
29
+ import { withStyle , jsx , InstUISettingsProvider } from '@instructure/emotion'
30
30
import { warn , error } from '@instructure/console'
31
31
import { omitProps } from '@instructure/ui-react-utils'
32
32
import { testable } from '@instructure/ui-testable'
@@ -389,9 +389,22 @@ class ColorPicker extends Component<ColorPickerProps, ColorPickerState> {
389
389
< span >
390
390
< span css = { styles ?. label } > { label } </ span >
391
391
< span >
392
- < Tooltip renderTip = { tooltip } >
393
- < IconInfoLine tabIndex = { - 1 } />
394
- </ Tooltip >
392
+ < InstUISettingsProvider
393
+ theme = { {
394
+ themeOverrides : {
395
+ componentOverrides : {
396
+ // @ts -ignore "Object literal may only specify known properties..."
397
+ BaseButton : {
398
+ smallHeight : 'auto'
399
+ }
400
+ }
401
+ }
402
+ } }
403
+ >
404
+ < Tooltip renderTip = { < span aria-hidden = { true } > { tooltip } </ span > } >
405
+ < IconButton withBackground = { false } withBorder = { false } screenReaderLabel = { tooltip } size = "small" shape = "circle" width = "auto" renderIcon = { IconInfoLine } />
406
+ </ Tooltip >
407
+ </ InstUISettingsProvider >
395
408
</ span >
396
409
</ span >
397
410
) : (
Original file line number Diff line number Diff line change @@ -116,14 +116,14 @@ class InlineSVG extends Component<InlineSVGProps> {
116
116
}
117
117
118
118
get labelledBy ( ) {
119
- const ids = [ ]
119
+ const ids : string [ ] = [ ]
120
120
121
121
if ( this . props . title ) {
122
- ids . push ( this . titleId )
122
+ ids . push ( this . titleId as string )
123
123
}
124
124
125
125
if ( this . props . description ) {
126
- ids . push ( this . descId )
126
+ ids . push ( this . descId as string )
127
127
}
128
128
129
129
return ids . length > 0 ? ids . join ( ' ' ) : undefined
@@ -150,7 +150,6 @@ class InlineSVG extends Component<InlineSVGProps> {
150
150
title,
151
151
description,
152
152
focusable,
153
- children,
154
153
src,
155
154
styles,
156
155
...props
You can’t perform that action at this time.
0 commit comments