Skip to content

Use svgicon for scrolltrack #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhui wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use svgicon for scrolltrack #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0438d84
Use svgicon
Aug 13, 2019
8c4732e
tests
Aug 13, 2019
5d5487d
update
Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
250 changes: 50 additions & 200 deletions src/components/NavigationPills/__tests__/__snapshots__/NavigationPills.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,12 @@ exports[`renders NavigationPills correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
<div
className="rmq-16b35912"
Expand Down Expand Up @@ -357,27 +342,12 @@ exports[`renders NavigationPills correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
</div>
</div>
Expand Down Expand Up @@ -444,27 +414,12 @@ exports[`renders NavigationPills wihtout label correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
<div
className="rmq-16b35912"
Expand Down Expand Up @@ -744,27 +699,12 @@ exports[`renders NavigationPills wihtout label correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
</div>
</div>
Expand Down Expand Up @@ -831,27 +771,12 @@ exports[`renders NavigationPills with each pill's elementAttributes correctly 1`
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
<div
className="rmq-16b35912"
Expand Down Expand Up @@ -1153,27 +1078,12 @@ exports[`renders NavigationPills with each pill's elementAttributes correctly 1`
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
</div>
</div>
Expand Down Expand Up @@ -1240,27 +1150,12 @@ exports[`renders NavigationPills with elementAttributes correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
<div
className="rmq-16b35912"
Expand Down Expand Up @@ -1552,27 +1447,12 @@ exports[`renders NavigationPills with elementAttributes correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
</div>
</div>
Expand Down Expand Up @@ -1639,27 +1519,12 @@ exports[`renders NavigationPills with inner elementAttributes correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
<div
className="rmq-16b35912"
Expand Down Expand Up @@ -1951,27 +1816,12 @@ exports[`renders NavigationPills with inner elementAttributes correctly 1`] = `
}
}
>
<i
<test-file-stub
aria-hidden={true}
data-radium={true}
style={
Object {
"fontFamily": "ic-icons",
"fontSize": "20px",
"fontSmoothing": "antialiased",
"fontStyle": "normal",
"fontVariant": "normal",
"fontWeight": "normal",
"lineHeight": "1",
"osxFontSmoothing": "grayscale",
"position": "relative",
"speak": "none",
"textTransform": "none",
}
}
>
</i>
fill="currentColor"
height="18px"
width="18px"
/>
</button>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/ScrollTrack/ScrollTrack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ScrollTrackPropTypes from './ScrollTrackPropTypes'
import { isNodeEnv } from '../../utils/detectFeature'
import debounce from '../../utils/debounce'
import CircleButton from '../Buttons/CircleButton'
import Icon from '../Icon/Icon'
import SVGIcon from '../SVGIcon/SVGIcon'

const noOp = () => {} // eslint-disable-line no-empty-function

Expand Down Expand Up @@ -372,7 +372,7 @@ class ScrollTrack extends Component {
]}
ref={node => (this.nextButton = node)}
>
{nextButtonContent || <Icon name="arrowRightSmallBold" style={{ fontSize: '20px' }} />}
{nextButtonContent || <SVGIcon name="arrowRight" size="small" />}
</CircleButton>
)
}
Expand All @@ -397,7 +397,7 @@ class ScrollTrack extends Component {
]}
ref={node => (this.backButton = node)}
>
{backButtonContent || <Icon name="arrowLeftSmallBold" style={{ fontSize: '20px' }} />}
{backButtonContent || <SVGIcon name="arrowLeft" size="small" />}
</CircleButton>
)
}
Expand Down
Loading