@@ -1539,16 +1539,21 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnASingleLineLeftToRight {
1539
1539
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (300 , 0 , 100 , 100 ) position: 3U ],
1540
1540
]];
1541
1541
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1542
- XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 100 , 100 ),
1542
+ if (@available (iOS 17 , *)) {
1543
+ XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 100 , 100 ),
1544
+ [inputView firstRectForRange: singleRectRange]));
1545
+ } else {
1546
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1543
1547
[inputView firstRectForRange: singleRectRange]));
1548
+ }
1544
1549
1545
1550
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 3 )];
1546
1551
1547
1552
if (@available (iOS 17 , *)) {
1548
1553
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 300 , 100 ),
1549
1554
[inputView firstRectForRange: multiRectRange]));
1550
1555
} else {
1551
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1556
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1552
1557
[inputView firstRectForRange: multiRectRange]));
1553
1558
}
1554
1559
@@ -1568,15 +1573,20 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnASingleLineRightToLeft {
1568
1573
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (0 , 0 , 100 , 100 ) position: 3U ],
1569
1574
]];
1570
1575
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1576
+ if (@available (iOS 17 , *)) {
1571
1577
XCTAssertTrue (CGRectEqualToRect (CGRectMake (200 , 0 , 100 , 100 ),
1572
1578
[inputView firstRectForRange: singleRectRange]));
1579
+ } else {
1580
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1581
+ [inputView firstRectForRange: singleRectRange]));
1582
+ }
1573
1583
1574
1584
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 3 )];
1575
1585
if (@available (iOS 17 , *)) {
1576
1586
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 300 , 100 ),
1577
1587
[inputView firstRectForRange: multiRectRange]));
1578
1588
} else {
1579
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , 0 , 100 , 100 ) ,
1589
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1580
1590
[inputView firstRectForRange: multiRectRange]));
1581
1591
}
1582
1592
@@ -1600,16 +1610,21 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnMultipleLinesLeftToRight {
1600
1610
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (300 , 100 , 100 , 100 ) position: 7U ],
1601
1611
]];
1602
1612
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1613
+ if (@available (iOS 17 , *)) {
1603
1614
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 100 , 100 ),
1604
1615
[inputView firstRectForRange: singleRectRange]));
1616
+ } else {
1617
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1618
+ [inputView firstRectForRange: singleRectRange]));
1619
+ }
1605
1620
1606
1621
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 4 )];
1607
1622
1608
1623
if (@available (iOS 17 , *)) {
1609
1624
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 300 , 100 ),
1610
1625
[inputView firstRectForRange: multiRectRange]));
1611
1626
} else {
1612
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1627
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1613
1628
[inputView firstRectForRange: multiRectRange]));
1614
1629
}
1615
1630
}
@@ -1629,15 +1644,20 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnMultipleLinesRightToLeft {
1629
1644
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (0 , 100 , 100 , 100 ) position: 7U ],
1630
1645
]];
1631
1646
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1632
- XCTAssertTrue (CGRectEqualToRect (CGRectMake (200 , 0 , 100 , 100 ),
1647
+ if (@available (iOS 17 , *)) {
1648
+ XCTAssertTrue (CGRectEqualToRect (CGRectMake (200 , 0 , 100 , 100 ),
1649
+ [inputView firstRectForRange: singleRectRange]));
1650
+ } else {
1651
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1633
1652
[inputView firstRectForRange: singleRectRange]));
1653
+ }
1634
1654
1635
1655
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 4 )];
1636
1656
if (@available (iOS 17 , *)) {
1637
1657
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 300 , 100 ),
1638
1658
[inputView firstRectForRange: multiRectRange]));
1639
1659
} else {
1640
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , 0 , 100 , 100 ) ,
1660
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1641
1661
[inputView firstRectForRange: multiRectRange]));
1642
1662
}
1643
1663
}
@@ -1661,7 +1681,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnSingleLineWithVaryingMinYAndMax
1661
1681
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , -10 , 300 , 120 ),
1662
1682
[inputView firstRectForRange: multiRectRange]));
1663
1683
} else {
1664
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 10 , 100 , 80 ) ,
1684
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1665
1685
[inputView firstRectForRange: multiRectRange]));
1666
1686
}
1667
1687
}
@@ -1685,7 +1705,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnSingleLineWithVaryingMinYAndMax
1685
1705
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , -10 , 300 , 120 ),
1686
1706
[inputView firstRectForRange: multiRectRange]));
1687
1707
} else {
1688
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , - 10 , 100 , 120 ) ,
1708
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1689
1709
[inputView firstRectForRange: multiRectRange]));
1690
1710
}
1691
1711
}
@@ -1709,7 +1729,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsExceedingThre
1709
1729
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 300 , 100 ),
1710
1730
[inputView firstRectForRange: multiRectRange]));
1711
1731
} else {
1712
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1732
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1713
1733
[inputView firstRectForRange: multiRectRange]));
1714
1734
}
1715
1735
}
@@ -1733,7 +1753,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsExceedingThre
1733
1753
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 300 , 100 ),
1734
1754
[inputView firstRectForRange: multiRectRange]));
1735
1755
} else {
1736
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , 0 , 100 , 100 ) ,
1756
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1737
1757
[inputView firstRectForRange: multiRectRange]));
1738
1758
}
1739
1759
}
@@ -1757,7 +1777,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsWithinThresho
1757
1777
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 400 , 140 ),
1758
1778
[inputView firstRectForRange: multiRectRange]));
1759
1779
} else {
1760
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1780
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1761
1781
[inputView firstRectForRange: multiRectRange]));
1762
1782
}
1763
1783
}
@@ -1781,7 +1801,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsWithinThresho
1781
1801
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 400 , 140 ),
1782
1802
[inputView firstRectForRange: multiRectRange]));
1783
1803
} else {
1784
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 300 , 0 , 100 , 100 ) ,
1804
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1785
1805
[inputView firstRectForRange: multiRectRange]));
1786
1806
}
1787
1807
}
0 commit comments