Commit 2bea515

committed

Merge branch 'release/2.4.1'

2 parents cd6c34f + 23bc17e commit 2bea515Copy full SHA for 2bea515

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -88,8 +88,8 @@ The following are all props that can be passed to the `<Parallax>` component:
`88`	`88`
`89`	`89`	`\| Name \| Type \| Default \| Description \|`
`90`	`90`	`\| -------------- \| :-----------------------------: \| :------- \| ------------------------------------------------------------------------------------------------------------------ \|`
`91`		-\| x \| `Array` of `String` or `Number` \| `[0, 0]` \| Offsets on x-axis in `%` or `px`. If no unit is passed percent is assumed. Percent is based on the elements width. \|
`92`		-\| y \| `Array` of `String` or `Number` \| `[0, 0]` \| Offsets on y-axis in `%` or `px`. If no unit is passed percent is assumed. Percent is based on the elements width. \|
	`91`	+\| x \| `Array` of `String` or `Number` \| `[0, 0]` \| Initial and final offsets on x-axis in `%` or `px`. If no unit is passed percent is assumed. Percent is based on the elements width. \|
	`92`	+\| y \| `Array` of `String` or `Number` \| `[0, 0]` \| Initial and final offsets on y-axis in `%` or `px`. If no unit is passed percent is assumed. Percent is based on the elements width. \|
`93`	`93`	\| className \| `String` \| \| Optionally pass additional class names to be added to the outermost parallax element. \|
`94`	`94`	\| disabled \| `Boolean` \| `false` \| Disables parallax effects on individual elements when `true`. \|
`95`	`95`	\| styleInner \| `Object` \| \| Optionally pass a style object to be added to the innermost parallax element. \|

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-scroll-parallax",`
`3`		`- "version": "2.4.0",`
	`3`	`+ "version": "2.4.1",`
`4`	`4`	`"description": "React components to create parallax scroll effects for banners, images or any other DOM elements.",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,10 @@ function ParallaxController({ scrollAxis = VERTICAL, scrollContainer }) {`
`197`	`197`	`* Updates all parallax element attributes and positions.`
`198`	`198`	`*/`
`199`	`199`	`this.update = function() {`
	`200`	`+ const nx = hasScrollContainer ? viewEl.scrollLeft : window.pageXOffset;`
	`201`	`+ const ny = hasScrollContainer ? viewEl.scrollTop : window.pageYOffset;`
	`202`	`+ scroll.setScroll(nx, ny);`
	`203`	`+`
`200`	`204`	`_setViewSize();`
`201`	`205`	`_updateAllElements({ updateCache: true });`
`202`	`206`	`};`

Comments

(0)