File tree Expand file tree Collapse file tree 2 files changed +20
-8
lines changed
ui-color-picker/src/ColorPicker
ui-svg-images/src/InlineSVG Expand file tree Collapse file tree 2 files changed +20
-8
lines changed Original file line number Diff line number Diff line change 2626/** @jsxFrag React.Fragment */
2727import React , { Component } from 'react'
2828
29- import { withStyle , jsx } from '@instructure/emotion'
29+ import { withStyle , jsx , InstUISettingsProvider } from '@instructure/emotion'
3030import { warn , error } from '@instructure/console'
3131import { omitProps } from '@instructure/ui-react-utils'
3232import { testable } from '@instructure/ui-testable'
@@ -389,9 +389,22 @@ class ColorPicker extends Component<ColorPickerProps, ColorPickerState> {
389389 < span >
390390 < span css = { styles ?. label } > { label } </ span >
391391 < 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 >
395408 </ span >
396409 </ span >
397410 ) : (
Original file line number Diff line number Diff line change @@ -116,14 +116,14 @@ class InlineSVG extends Component<InlineSVGProps> {
116116 }
117117
118118 get labelledBy ( ) {
119- const ids = [ ]
119+ const ids : string [ ] = [ ]
120120
121121 if ( this . props . title ) {
122- ids . push ( this . titleId )
122+ ids . push ( this . titleId as string )
123123 }
124124
125125 if ( this . props . description ) {
126- ids . push ( this . descId )
126+ ids . push ( this . descId as string )
127127 }
128128
129129 return ids . length > 0 ? ids . join ( ' ' ) : undefined
@@ -150,7 +150,6 @@ class InlineSVG extends Component<InlineSVGProps> {
150150 title,
151151 description,
152152 focusable,
153- children,
154153 src,
155154 styles,
156155 ...props
You can’t perform that action at this time.
0 commit comments