Skip to content

Commit 067e282

Browse files
committed
Remove isFormEvent
1 parent c149188 commit 067e282

File tree

2 files changed

+22
-121
lines changed

2 files changed

+22
-121
lines changed

lib/src/react_client/event_helpers.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -772,13 +772,6 @@ extension SyntheticEventTypeHelpers on SyntheticEvent {
772772
/// Uses Duck Typing to detect if the event instance is a [SyntheticFocusEvent].
773773
bool get isFocusEvent => hasProperty(this, 'relatedTarget') && !hasProperty(this, 'button');
774774

775-
/// Uses Duck Typing to detect if the event instance is a [SyntheticFormEvent].
776-
///
777-
/// __NOTE:__ This getter is here for completeness, but because the interface for form events
778-
/// is the same as that of a [SyntheticEvent] (the base for all other synthetic event types),
779-
/// via Duck Typing every [SyntheticEvent] is considered a [SyntheticFormEvent].
780-
bool get isFormEvent => true;
781-
782775
/// Uses Duck Typing to detect if the event instance is a [SyntheticMouseEvent].
783776
bool get isMouseEvent => hasProperty(this, 'button');
784777

test/react_client/event_helpers_test.dart

Lines changed: 22 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,74 +1654,31 @@ main() {
16541654
// A little verbose, but this tests that every `eventTypeTester` only returns `true` for the event type being passed in.
16551655
//
16561656
// The complexity comes in because there's always 1 `expect` that should return `true`, which is the actual `currentEventTypeBeingTested`.
1657-
// Then, on top of that, if the `currentEventTypeBeingTested` is a `SyntheticFormEvent`, every `expect` should return true. This is why
1658-
// every event is wrapped in a set with the `SyntheticFormEvent` enum property.
16591657
test('when the event is a different type', () {
1660-
Set<SyntheticEventType> eventToTestWithFormEvent(SyntheticEventType eventToTest) =>
1661-
{eventToTest, SyntheticEventType.syntheticFormEvent};
1662-
1663-
expect(
1664-
eventTypeTester(createSyntheticClipboardEvent()),
1665-
eventToTestWithFormEvent(SyntheticEventType.syntheticClipboardEvent)
1666-
.contains(currentEventTypeBeingTested)
1667-
? isTrue
1668-
: isFalse);
1669-
expect(
1670-
eventTypeTester(createSyntheticKeyboardEvent()),
1671-
eventToTestWithFormEvent(SyntheticEventType.syntheticKeyboardEvent)
1672-
.contains(currentEventTypeBeingTested)
1673-
? isTrue
1674-
: isFalse);
1675-
expect(
1676-
eventTypeTester(createSyntheticCompositionEvent()),
1677-
eventToTestWithFormEvent(SyntheticEventType.syntheticCompositionEvent)
1678-
.contains(currentEventTypeBeingTested)
1679-
? isTrue
1680-
: isFalse);
1681-
expect(
1682-
eventTypeTester(createSyntheticFocusEvent()),
1683-
eventToTestWithFormEvent(SyntheticEventType.syntheticFocusEvent).contains(currentEventTypeBeingTested)
1684-
? isTrue
1685-
: isFalse);
1658+
expect(eventTypeTester(createSyntheticClipboardEvent()),
1659+
currentEventTypeBeingTested == SyntheticEventType.syntheticClipboardEvent ? isTrue : isFalse);
1660+
expect(eventTypeTester(createSyntheticKeyboardEvent()),
1661+
currentEventTypeBeingTested == SyntheticEventType.syntheticKeyboardEvent ? isTrue : isFalse);
1662+
expect(eventTypeTester(createSyntheticCompositionEvent()),
1663+
currentEventTypeBeingTested == SyntheticEventType.syntheticCompositionEvent ? isTrue : isFalse);
1664+
expect(eventTypeTester(createSyntheticFocusEvent()),
1665+
currentEventTypeBeingTested == SyntheticEventType.syntheticFocusEvent ? isTrue : isFalse);
16861666
expect(eventTypeTester(createSyntheticFormEvent()),
16871667
currentEventTypeBeingTested == SyntheticEventType.syntheticFormEvent ? isTrue : isFalse);
1688-
expect(
1689-
eventTypeTester(createSyntheticMouseEvent()),
1690-
eventToTestWithFormEvent(SyntheticEventType.syntheticMouseEvent).contains(currentEventTypeBeingTested)
1691-
? isTrue
1692-
: isFalse);
1693-
expect(
1694-
eventTypeTester(createSyntheticPointerEvent()),
1695-
eventToTestWithFormEvent(SyntheticEventType.syntheticPointerEvent).contains(currentEventTypeBeingTested)
1696-
? isTrue
1697-
: isFalse);
1698-
expect(
1699-
eventTypeTester(createSyntheticTouchEvent()),
1700-
eventToTestWithFormEvent(SyntheticEventType.syntheticTouchEvent).contains(currentEventTypeBeingTested)
1701-
? isTrue
1702-
: isFalse);
1703-
expect(
1704-
eventTypeTester(createSyntheticTransitionEvent()),
1705-
eventToTestWithFormEvent(SyntheticEventType.syntheticTransitionEvent)
1706-
.contains(currentEventTypeBeingTested)
1707-
? isTrue
1708-
: isFalse);
1709-
expect(
1710-
eventTypeTester(createSyntheticAnimationEvent()),
1711-
eventToTestWithFormEvent(SyntheticEventType.syntheticAnimationEvent)
1712-
.contains(currentEventTypeBeingTested)
1713-
? isTrue
1714-
: isFalse);
1715-
expect(
1716-
eventTypeTester(createSyntheticUIEvent()),
1717-
eventToTestWithFormEvent(SyntheticEventType.syntheticUIEvent).contains(currentEventTypeBeingTested)
1718-
? isTrue
1719-
: isFalse);
1720-
expect(
1721-
eventTypeTester(createSyntheticWheelEvent()),
1722-
eventToTestWithFormEvent(SyntheticEventType.syntheticWheelEvent).contains(currentEventTypeBeingTested)
1723-
? isTrue
1724-
: isFalse);
1668+
expect(eventTypeTester(createSyntheticMouseEvent()),
1669+
currentEventTypeBeingTested == SyntheticEventType.syntheticMouseEvent ? isTrue : isFalse);
1670+
expect(eventTypeTester(createSyntheticPointerEvent()),
1671+
currentEventTypeBeingTested == SyntheticEventType.syntheticPointerEvent ? isTrue : isFalse);
1672+
expect(eventTypeTester(createSyntheticTouchEvent()),
1673+
currentEventTypeBeingTested == SyntheticEventType.syntheticTouchEvent ? isTrue : isFalse);
1674+
expect(eventTypeTester(createSyntheticTransitionEvent()),
1675+
currentEventTypeBeingTested == SyntheticEventType.syntheticTransitionEvent ? isTrue : isFalse);
1676+
expect(eventTypeTester(createSyntheticAnimationEvent()),
1677+
currentEventTypeBeingTested == SyntheticEventType.syntheticAnimationEvent ? isTrue : isFalse);
1678+
expect(eventTypeTester(createSyntheticUIEvent()),
1679+
currentEventTypeBeingTested == SyntheticEventType.syntheticUIEvent ? isTrue : isFalse);
1680+
expect(eventTypeTester(createSyntheticWheelEvent()),
1681+
currentEventTypeBeingTested == SyntheticEventType.syntheticWheelEvent ? isTrue : isFalse);
17251682
});
17261683

17271684
test('when the event is the base class', () {
@@ -1822,55 +1779,6 @@ main() {
18221779
});
18231780
});
18241781

1825-
group('isFormEvent', () {
1826-
group('returns true when', () {
1827-
test('returns true for any synthetic event type', () {
1828-
final e1 = createSyntheticEvent();
1829-
expect(e1.isFormEvent, isTrue);
1830-
1831-
final e2 = createSyntheticClipboardEvent();
1832-
expect(e2.isFormEvent, isTrue);
1833-
1834-
final e3 = createSyntheticKeyboardEvent();
1835-
expect(e3.isFormEvent, isTrue);
1836-
1837-
final e4 = createSyntheticCompositionEvent();
1838-
expect(e4.isFormEvent, isTrue);
1839-
1840-
final e5 = createSyntheticFocusEvent();
1841-
expect(e5.isFormEvent, isTrue);
1842-
1843-
final e6 = createSyntheticFormEvent();
1844-
expect(e6.isFormEvent, isTrue);
1845-
1846-
final e7 = createSyntheticMouseEvent();
1847-
expect(e7.isFormEvent, isTrue);
1848-
1849-
final e8 = createSyntheticPointerEvent();
1850-
expect(e8.isFormEvent, isTrue);
1851-
1852-
final e9 = createSyntheticTouchEvent();
1853-
expect(e9.isFormEvent, isTrue);
1854-
1855-
final e10 = createSyntheticTransitionEvent();
1856-
expect(e10.isFormEvent, isTrue);
1857-
1858-
final e11 = createSyntheticAnimationEvent();
1859-
expect(e11.isFormEvent, isTrue);
1860-
1861-
final e12 = createSyntheticUIEvent();
1862-
expect(e12.isFormEvent, isTrue);
1863-
1864-
final e13 = createSyntheticWheelEvent();
1865-
expect(e13.isFormEvent, isTrue);
1866-
});
1867-
});
1868-
1869-
group('correctly returns false', () {
1870-
commonFalseTests((e) => e.isFormEvent, SyntheticEventType.syntheticFormEvent);
1871-
});
1872-
});
1873-
18741782
group('isMouseEvent', () {
18751783
group('returns true when', () {
18761784
test('the event is considered "empty"', () {

0 commit comments

Comments
 (0)