Skip to content
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

Jump to bottom

Remove system.cssTransform #1258

Merged
merged 2 commits into from Apr 13, 2019
Merged

Remove system.cssTransform #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
467f690
Remove prefixing CSS transforms in JS
louh Apr 11, 2019
07cbf84
SkyBackground, Segment: add vendor prefixes in React
louh Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions assets/scripts/app/SkyBackground.jsx
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@ class SkyBackground extends React.PureComponent {
static propTypes = {
scrollPos: PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
system: PropTypes.object.isRequired,
environment: PropTypes.string.isRequired
}

Expand Down Expand Up @@ -37,32 +36,37 @@ class SkyBackground extends React.PureComponent {
this.currentBackgroundEl.current.classList.add('sky-transition-in')
}

updateStreetSkyBackground = (isFront, scrollPos) => {
transformSkyBackground = (isFront, scrollPos) => {
let style = ''

if (isFront) {
const frontPos = -scrollPos * 0.5
style = 'translateX(' + frontPos + 'px)'
} else {
const rearPos = -scrollPos * 0.25
style = 'translateX(' + rearPos + 'px)'
}
return style

return {
WebkitTransform: style,
transform: style
}
}

render () {
const { height, scrollPos, system, environment } = this.props
const { height, scrollPos, environment } = this.props
const environs = getEnvirons(environment)
const prevEnvirons = getEnvirons(this.state.prevEnvirons)

const skyStyle = {
height: `${height}px`
}
const frontCloudStyle = {
[system.cssTransform]: this.updateStreetSkyBackground(true, scrollPos),
...this.transformSkyBackground(true, scrollPos),
opacity: environs.cloudOpacity || null
}
const rearCloudStyle = {
[system.cssTransform]: this.updateStreetSkyBackground(false, scrollPos),
...this.transformSkyBackground(false, scrollPos),
opacity: environs.cloudOpacity || null
}

Expand Down Expand Up @@ -102,7 +106,6 @@ class SkyBackground extends React.PureComponent {

function mapStateToProps (state) {
return {
system: state.system,
environment: state.street.environment
}
}
Expand Down
6 changes: 3 additions & 3 deletions assets/scripts/segments/Segment.jsx
View file
Open in desktop
Expand Up @@ -47,7 +47,6 @@ export class Segment extends React.Component {
updatePerspective: PropTypes.func,

// Provided by store
cssTransform: PropTypes.string,
locale: PropTypes.string,
infoBubbleHovered: PropTypes.bool,
descriptionVisible: PropTypes.bool,
Expand Down Expand Up @@ -235,13 +234,15 @@ export class Segment extends React.Component {

const actualWidth = this.calculateSegmentWidths(RESIZE_TYPE_INITIAL)
const elementWidth = actualWidth * TILE_SIZE
const translate = 'translateX(' + this.props.segmentPos + 'px)'

const segmentStyle = {
width: elementWidth + 'px',
// In a street, certain segments have stacking priority over others (expressed as z-index).
// Setting a z-index here will clobber a separate z-index (applied via CSS) when hovered by mouse pointer
zIndex: (this.props.isDragging) ? 0 : segmentInfo.zIndex,
[this.props.cssTransform]: 'translateX(' + this.props.segmentPos + 'px)'
WebkitTransform: translate,
transform: translate
}

const dataAttributes = {
Expand Down Expand Up @@ -310,7 +311,6 @@ export class Segment extends React.Component {

function mapStateToProps (state) {
return {
cssTransform: state.system.cssTransform,
locale: state.locale.locale,
infoBubbleHovered: state.infoBubble.mouseInside,
descriptionVisible: state.infoBubble.descriptionVisible,
Expand Down
10 changes: 5 additions & 5 deletions assets/scripts/segments/__tests__/Segment.test.js
View file
Open in desktop
Expand Up @@ -61,29 +61,29 @@ describe('Segment', () => {
})
})
it('renders the units correctly', () => {
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} units={SETTINGS_UNITS_IMPERIAL} cssTransform={'transform'} segmentPos={1} />)
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} units={SETTINGS_UNITS_IMPERIAL} segmentPos={1} />)
expect(wrapper).toMatchSnapshot()
})
it('renders active segment correctly', () => {
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} cssTransform={'transform'} segmentPos={1} />)
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} segmentPos={1} />)
expect(wrapper).toMatchSnapshot()
})
it('renders segment warnings outside correctly', () => {
segment.warnings = {}
segment.warnings[SEGMENT_WARNING_OUTSIDE] = 'warning'
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} cssTransform={'transform'} segmentPos={1} />)
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} segmentPos={1} />)
expect(wrapper).toMatchSnapshot()
})
it('renders segment warnings correctly', () => {
segment.warnings = {}
segment.warnings[SEGMENT_WARNING_WIDTH_TOO_SMALL] = 'warning'
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} cssTransform={'transform'} segmentPos={1} />)
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} segmentPos={1} />)
expect(wrapper).toMatchSnapshot()
})
it('renders segment warnings width too large correctly', () => {
segment.warnings = {}
segment.warnings[SEGMENT_WARNING_WIDTH_TOO_LARGE] = 'warning'
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} cssTransform={'transform'} segmentPos={1} />)
const wrapper = shallow(<Segment connectDropTarget={connectDropTarget} connectDragSource={connectDragSource} segment={segment} actualWidth={1} updateSegmentData={updateSegmentData} connectDragPreview={connectDragPreview} isDragging={false} dataNo={10} activeSegment={10} segmentPos={1} />)
expect(wrapper).toMatchSnapshot()
})
})
5 changes: 5 additions & 0 deletions assets/scripts/segments/__tests__/__snapshots__/Segment.test.js.snap
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ exports[`Segment renders active segment correctly 1`] = `
onMouseLeave={[Function]}
style={
Object {
"WebkitTransform": "translateX(1px)",
"transform": "translateX(1px)",
"width": "12px",
"zIndex": 1,
Expand Down Expand Up @@ -80,6 +81,7 @@ exports[`Segment renders segment warnings correctly 1`] = `
onMouseLeave={[Function]}
style={
Object {
"WebkitTransform": "translateX(1px)",
"transform": "translateX(1px)",
"width": "12px",
"zIndex": 1,
Expand Down Expand Up @@ -152,6 +154,7 @@ exports[`Segment renders segment warnings outside correctly 1`] = `
onMouseLeave={[Function]}
style={
Object {
"WebkitTransform": "translateX(1px)",
"transform": "translateX(1px)",
"width": "12px",
"zIndex": 1,
Expand Down Expand Up @@ -224,6 +227,7 @@ exports[`Segment renders segment warnings width too large correctly 1`] = `
onMouseLeave={[Function]}
style={
Object {
"WebkitTransform": "translateX(1px)",
"transform": "translateX(1px)",
"width": "12px",
"zIndex": 1,
Expand Down Expand Up @@ -296,6 +300,7 @@ exports[`Segment renders the units correctly 1`] = `
onMouseLeave={[Function]}
style={
Object {
"WebkitTransform": "translateX(1px)",
"transform": "translateX(1px)",
"width": "12px",
"zIndex": 1,
Expand Down
3 changes: 1 addition & 2 deletions assets/scripts/store/reducers/system.js
View file
Open in desktop
Expand Up @@ -12,8 +12,7 @@ const initialState = {
noInternet: false,
viewportWidth: window.innerWidth,
viewportHeight: window.innerHeight,
devicePixelRatio: window.devicePixelRatio || 1.0,
cssTransform: (Modernizr && Modernizr.prefixed('transform')) || 'transform'
devicePixelRatio: window.devicePixelRatio || 1.0
}

const system = (state = initialState, action) => {
Expand Down