Merge remote-tracking branch 'origin/master'

OlehDutchenko · Sep 7, 2024 · 0a056bc · 0a056bc
2 parents a7d6e1a + d7acfc0
commit 0a056bc
Show file tree

Hide file tree

Showing 3 changed files with 5,033 additions and 13 deletions.
diff --git a/lib/create-sort.js b/lib/create-sort.js
@@ -22,6 +22,9 @@ const maxHeight = /\(\s*max(-device)?-height|\(\s*height\s*<(=)?/i;
 const isMinHeight = _testQuery(minMaxHeight, maxMinHeight, minHeight);
 const isMaxHeight = _testQuery(maxMinHeight, minMaxHeight, maxHeight);
 
+const lessThan = /<(?!=)/;
+const grtrThan = />(?!=)/;
+
 const isPrint = /print/i;
 const isPrintOnly = /^print$/i;
 
@@ -202,6 +205,25 @@ module.exports = function createSort(configuration) {
 				return -1;
 			}
 
+			if (lengthA === lengthB) {
+				if (maxA && maxB) {
+					if (lessThan.test(a) && !lessThan.test(b)) {
+						return 1;
+					}
+					if (!lessThan.test(a) && lessThan.test(b)) {
+						return -1;
+					}
+				}
+				if (minA && minB) {
+					if (grtrThan.test(a) && !grtrThan.test(b)) {
+						return 1;
+					}
+					if (!grtrThan.test(a) && grtrThan.test(b)) {
+						return -1;
+					}
+				}
+			}
+
 			return a.localeCompare(b);
 		}
 	}
@@ -263,6 +285,25 @@ module.exports = function createSort(configuration) {
 				return -1;
 			}
 
+			if (lengthA === lengthB) {
+				if (maxA && maxB) {
+					if (lessThan.test(a) && !lessThan.test(b)) {
+						return 1;
+					}
+					if (!lessThan.test(a) && lessThan.test(b)) {
+						return -1;
+					}
+				}
+				if (minA && minB) {
+					if (grtrThan.test(a) && !grtrThan.test(b)) {
+						return 1;
+					}
+					if (!grtrThan.test(a) && grtrThan.test(b)) {
+						return -1;
+					}
+				}
+			}
+
 			return -a.localeCompare(b);
 		}
 	};