Merge pull request #2247 from dequelabs/release-3.5.4

Release 3.5.4

Author: WilcoFiers

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.5.4](https://github.com/dequelabs/axe-core/compare/v3.5.3...v3.5.4) (2020-05-22)
+
+### Bug Fixes
+
+- **get-element-stack:** properly calculate position of children of floated elements ([28a8c58](https://github.com/dequelabs/axe-core/commit/28a8c58b409461600da07eac164e5b0ca4744502))
+
 ### [3.5.3](https://github.com/dequelabs/axe-core/compare/v3.5.2...v3.5.3) (2020-03-31)
 
 ### Bug Fixes

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "axe-core",
-	"version": "3.5.3",
+	"version": "3.5.4",
 	"contributors": [
 		{
 			"name": "David Sturley",

lib/commons/dom/get-element-stack.js

@@ -141,6 +141,32 @@ function isStackingContext(vNode, parentVNode) {
 	return false;
 }
 
+/**
+ * Check if a node or one of it's parents is floated.
+ * Floating position should be inherited from the parent tree
+ * @see https://github.com/dequelabs/axe-core/issues/2222
+ */
+function isFloated(vNode) {
+	if (!vNode) {
+		return false;
+	}
+
+	if (vNode._isFloated !== undefined) {
+		return vNode._isFloated;
+	}
+
+	const floatStyle = vNode.getComputedStylePropertyValue('float');
+
+	if (floatStyle !== 'none') {
+		vNode._isFloated = true;
+		return true;
+	}
+
+	const floated = isFloated(vNode.parent);
+	vNode._isFloated = floated;
+	return floated;
+}
+
 /**
  * Return the index order of how to position this element. return nodes in non-positioned, floating, positioned order
  * References:
@@ -160,7 +186,7 @@ function getPositionOrder(vNode) {
 		}
 
 		// 4. the non-positioned floats.
-		if (vNode.getComputedStylePropertyValue('float') !== 'none') {
+		if (isFloated(vNode)) {
 			return 1;
 		}
 

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"name": "axe-core",
 	"description": "Accessibility engine for automated Web UI testing",
-	"version": "3.5.3",
+	"version": "3.5.4",
 	"license": "MPL-2.0",
 	"engines": {
 		"node": ">=4"

package.json

@@ -182,5 +182,9 @@
 	"3.5.3": {
 		"axe.js": "sha256-lO/Zp+gRgYruJbjyvHOfqWqqroJ2ogTLJ64DwunyUz4=",
 		"axe.min.js": "sha256-Oh5/ClgfAAKQWyCvlU3F+Ud6QDsS0myLJr866QFt67w="
+	},
+	"3.5.4": {
+		"axe.js": "sha256-4f1ZZbAr3xgoAputB3oZK5ASoazrNIw6SU2M1Nnb4bg=",
+		"axe.min.js": "sha256-XDhCakYtcQtOpujvhE876/a4fUyZjiKtNn8xniP03Ek="
 	}
 }

sri-history.json

@@ -85,6 +85,21 @@ describe('dom.getElementStack', function() {
 			assert.deepEqual(stack, ['4', '1', '2', 'target', 'fixture']);
 		});
 
+		it('should handle floating parent elements', function() {
+			fixture.innerHTML =
+				'<div id="1" style="float: left; background: #000000; color: #fff;">' +
+				'<div id="2"><span id="target">whole picture</span></div>' +
+				'</div>' +
+				'<div id="3">' +
+				'<div id="4" style="background: #f2f2f2;">English</div>' +
+				'</div>';
+
+			axe.testUtils.flatTreeSetup(fixture);
+			var target = fixture.querySelector('#target');
+			var stack = mapToIDs(getElementStack(target));
+			assert.deepEqual(stack, ['target', '2', '1', '4', '3', 'fixture']);
+		});
+
 		it('should handle z-index positioned elements in the same stacking context', function() {
 			// see https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Stacking_context_example_1
 			fixture.innerHTML =