@@ -1569,16 +1569,21 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnASingleLineLeftToRight {
1569
1569
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (300 , 0 , 100 , 100 ) position: 3U ],
1570
1570
]];
1571
1571
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1572
- XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 100 , 100 ),
1572
+ if (@available (iOS 17 , *)) {
1573
+ XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 100 , 100 ),
1574
+ [inputView firstRectForRange: singleRectRange]));
1575
+ } else {
1576
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1573
1577
[inputView firstRectForRange: singleRectRange]));
1578
+ }
1574
1579
1575
1580
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 3 )];
1576
1581
1577
1582
if (@available (iOS 17 , *)) {
1578
1583
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 300 , 100 ),
1579
1584
[inputView firstRectForRange: multiRectRange]));
1580
1585
} else {
1581
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1586
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1582
1587
[inputView firstRectForRange: multiRectRange]));
1583
1588
}
1584
1589
@@ -1598,15 +1603,20 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnASingleLineRightToLeft {
1598
1603
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (0 , 0 , 100 , 100 ) position: 3U ],
1599
1604
]];
1600
1605
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1606
+ if (@available (iOS 17 , *)) {
1601
1607
XCTAssertTrue (CGRectEqualToRect (CGRectMake (200 , 0 , 100 , 100 ),
1602
1608
[inputView firstRectForRange: singleRectRange]));
1609
+ } else {
1610
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1611
+ [inputView firstRectForRange: singleRectRange]));
1612
+ }
1603
1613
1604
1614
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 3 )];
1605
1615
if (@available (iOS 17 , *)) {
1606
1616
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 300 , 100 ),
1607
1617
[inputView firstRectForRange: multiRectRange]));
1608
1618
} else {
1609
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , 0 , 100 , 100 ) ,
1619
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1610
1620
[inputView firstRectForRange: multiRectRange]));
1611
1621
}
1612
1622
@@ -1630,16 +1640,21 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnMultipleLinesLeftToRight {
1630
1640
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (300 , 100 , 100 , 100 ) position: 7U ],
1631
1641
]];
1632
1642
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1643
+ if (@available (iOS 17 , *)) {
1633
1644
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 100 , 100 ),
1634
1645
[inputView firstRectForRange: singleRectRange]));
1646
+ } else {
1647
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1648
+ [inputView firstRectForRange: singleRectRange]));
1649
+ }
1635
1650
1636
1651
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 4 )];
1637
1652
1638
1653
if (@available (iOS 17 , *)) {
1639
1654
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 300 , 100 ),
1640
1655
[inputView firstRectForRange: multiRectRange]));
1641
1656
} else {
1642
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1657
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1643
1658
[inputView firstRectForRange: multiRectRange]));
1644
1659
}
1645
1660
}
@@ -1659,15 +1674,20 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnMultipleLinesRightToLeft {
1659
1674
[FlutterTextSelectionRect selectionRectWithRect: CGRectMake (0 , 100 , 100 , 100 ) position: 7U ],
1660
1675
]];
1661
1676
FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 1 )];
1662
- XCTAssertTrue (CGRectEqualToRect (CGRectMake (200 , 0 , 100 , 100 ),
1677
+ if (@available (iOS 17 , *)) {
1678
+ XCTAssertTrue (CGRectEqualToRect (CGRectMake (200 , 0 , 100 , 100 ),
1679
+ [inputView firstRectForRange: singleRectRange]));
1680
+ } else {
1681
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1663
1682
[inputView firstRectForRange: singleRectRange]));
1683
+ }
1664
1684
1665
1685
FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange: NSMakeRange (1 , 4 )];
1666
1686
if (@available (iOS 17 , *)) {
1667
1687
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 300 , 100 ),
1668
1688
[inputView firstRectForRange: multiRectRange]));
1669
1689
} else {
1670
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , 0 , 100 , 100 ) ,
1690
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1671
1691
[inputView firstRectForRange: multiRectRange]));
1672
1692
}
1673
1693
}
@@ -1691,7 +1711,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnSingleLineWithVaryingMinYAndMax
1691
1711
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , -10 , 300 , 120 ),
1692
1712
[inputView firstRectForRange: multiRectRange]));
1693
1713
} else {
1694
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 10 , 100 , 80 ) ,
1714
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1695
1715
[inputView firstRectForRange: multiRectRange]));
1696
1716
}
1697
1717
}
@@ -1715,7 +1735,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectOnSingleLineWithVaryingMinYAndMax
1715
1735
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , -10 , 300 , 120 ),
1716
1736
[inputView firstRectForRange: multiRectRange]));
1717
1737
} else {
1718
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , - 10 , 100 , 120 ) ,
1738
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1719
1739
[inputView firstRectForRange: multiRectRange]));
1720
1740
}
1721
1741
}
@@ -1739,7 +1759,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsExceedingThre
1739
1759
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 300 , 100 ),
1740
1760
[inputView firstRectForRange: multiRectRange]));
1741
1761
} else {
1742
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1762
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1743
1763
[inputView firstRectForRange: multiRectRange]));
1744
1764
}
1745
1765
}
@@ -1763,7 +1783,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsExceedingThre
1763
1783
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 300 , 100 ),
1764
1784
[inputView firstRectForRange: multiRectRange]));
1765
1785
} else {
1766
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 200 , 0 , 100 , 100 ) ,
1786
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1767
1787
[inputView firstRectForRange: multiRectRange]));
1768
1788
}
1769
1789
}
@@ -1787,7 +1807,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsWithinThresho
1787
1807
XCTAssertTrue (CGRectEqualToRect (CGRectMake (100 , 0 , 400 , 140 ),
1788
1808
[inputView firstRectForRange: multiRectRange]));
1789
1809
} else {
1790
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 100 , 0 , 100 , 100 ) ,
1810
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1791
1811
[inputView firstRectForRange: multiRectRange]));
1792
1812
}
1793
1813
}
@@ -1811,7 +1831,7 @@ - (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsWithinThresho
1811
1831
XCTAssertTrue (CGRectEqualToRect (CGRectMake (0 , 0 , 400 , 140 ),
1812
1832
[inputView firstRectForRange: multiRectRange]));
1813
1833
} else {
1814
- XCTAssertTrue (CGRectEqualToRect (CGRectMake ( 300 , 0 , 100 , 100 ) ,
1834
+ XCTAssertTrue (CGRectEqualToRect (CGRectZero ,
1815
1835
[inputView firstRectForRange: multiRectRange]));
1816
1836
}
1817
1837
}
0 commit comments