Repository navigation
Commit a140353
Announce PopupMenuButton with a child as a button
PopupMenuButton only exposed button semantics when it built its own
IconButton. When a child was supplied, the widget just wrapped the
child in a Tooltip and an InkWell, so the semantics node had a tap
action but no button flag and no enabled state. Assistive technologies
therefore did not announce it as a button, and disabled buttons looked
enabled. The expanded state was also dropped entirely when
ButtonStyle.tapTargetSize was MaterialTapTargetSize.padded, because
that branch returned early before the Semantics wrapper was added.
The child branch now always wraps the result in a single Semantics
widget that marks the popup menu button as a button, reports the
enabled state and keeps the expanded state, for both tap target sizes.
Ported from flutter/flutter#191700, which is blocked by the Material
code freeze.
Fixes flutter/flutter#1470431 parent 469b97b commit a140353
3 files changed
Lines changed: 119 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1797 | 1797 | | |
1798 | 1798 | | |
1799 | 1799 | | |
| 1800 | + | |
1800 | 1801 | | |
1801 | | - | |
| 1802 | + | |
1802 | 1803 | | |
1803 | 1804 | | |
1804 | 1805 | | |
1805 | 1806 | | |
1806 | | - | |
| 1807 | + | |
1807 | 1808 | | |
1808 | 1809 | | |
1809 | | - | |
| 1810 | + | |
| 1811 | + | |
| 1812 | + | |
| 1813 | + | |
| 1814 | + | |
| 1815 | + | |
| 1816 | + | |
| 1817 | + | |
| 1818 | + | |
| 1819 | + | |
1810 | 1820 | | |
1811 | 1821 | | |
1812 | 1822 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1410 | 1410 | | |
1411 | 1411 | | |
1412 | 1412 | | |
| 1413 | + | |
| 1414 | + | |
| 1415 | + | |
1413 | 1416 | | |
1414 | 1417 | | |
| 1418 | + | |
1415 | 1419 | | |
1416 | 1420 | | |
1417 | 1421 | | |
| |||
1443 | 1447 | | |
1444 | 1448 | | |
1445 | 1449 | | |
| 1450 | + | |
| 1451 | + | |
| 1452 | + | |
1446 | 1453 | | |
1447 | 1454 | | |
| 1455 | + | |
| 1456 | + | |
| 1457 | + | |
| 1458 | + | |
| 1459 | + | |
| 1460 | + | |
| 1461 | + | |
| 1462 | + | |
| 1463 | + | |
| 1464 | + | |
| 1465 | + | |
| 1466 | + | |
| 1467 | + | |
| 1468 | + | |
| 1469 | + | |
| 1470 | + | |
| 1471 | + | |
| 1472 | + | |
| 1473 | + | |
| 1474 | + | |
| 1475 | + | |
| 1476 | + | |
| 1477 | + | |
| 1478 | + | |
| 1479 | + | |
| 1480 | + | |
| 1481 | + | |
| 1482 | + | |
| 1483 | + | |
| 1484 | + | |
| 1485 | + | |
| 1486 | + | |
| 1487 | + | |
| 1488 | + | |
| 1489 | + | |
| 1490 | + | |
| 1491 | + | |
| 1492 | + | |
| 1493 | + | |
| 1494 | + | |
| 1495 | + | |
| 1496 | + | |
| 1497 | + | |
| 1498 | + | |
| 1499 | + | |
| 1500 | + | |
| 1501 | + | |
| 1502 | + | |
| 1503 | + | |
| 1504 | + | |
| 1505 | + | |
| 1506 | + | |
| 1507 | + | |
| 1508 | + | |
| 1509 | + | |
| 1510 | + | |
| 1511 | + | |
| 1512 | + | |
| 1513 | + | |
| 1514 | + | |
| 1515 | + | |
| 1516 | + | |
| 1517 | + | |
| 1518 | + | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
| 1522 | + | |
| 1523 | + | |
| 1524 | + | |
| 1525 | + | |
| 1526 | + | |
| 1527 | + | |
| 1528 | + | |
| 1529 | + | |
| 1530 | + | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
| 1536 | + | |
| 1537 | + | |
| 1538 | + | |
| 1539 | + | |
| 1540 | + | |
| 1541 | + | |
| 1542 | + | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
1448 | 1551 | | |
1449 | 1552 | | |
1450 | 1553 | | |
| |||
0 commit comments