Invert performMouseInput { scroll(2f) } [224992993]

Fixed

Bug

Status Update

No update yet.

Description

ig...@jetbrains.com

created issue #1

Mar 16, 2022 07:38PM

Jetpack Compose version: 3621f0a7 Jetpack Compose component used: performMouseInput, scroll

In https://android-review.googlesource.com/c/platform/frameworks/support/+/1913489 we inverted vertical mouse scroll, because on Android when we scroll down (the top touch point of the wheel moves to the user), scrollX is positive, but it should be negative.

In tests when we make artificial scroll event, we should invert x axis too (to avoid confusion).

See for example the test: https://android-review.googlesource.com/c/platform/frameworks/support/+/1994356/3/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/pointer/OnPointerEventTest.kt#155

Now it is:

rule.onNodeWithTag(tag).performMouseInput {
    scroll(2f)
}
assertThat(events.last().changes.first().scrollDelta).isEqualTo(Offset(0f, -2f))

But it should be:

rule.onNodeWithTag(tag).performMouseInput {
    scroll(2f)
}
assertThat(events.last().changes.first().scrollDelta).isEqualTo(Offset(0f, 2f))

Comments

ig...@jetbrains.com <ig...@jetbrains.com> #2Mar 16, 2022 07:40PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019

Change the way to detect mismatch between POJO and query

This fixes cursor mismatch warnings with expandProjection.

Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8

M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt

https://android-review.googlesource.com/1123258

https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1

je...@google.com <je...@google.com> #3Apr 22, 2022 10:36AM

The following changes were cherrypicked through Coastguard (

https://android-build.googleplex.com/coastguard/)
Release Track: (

https://android-build.googleplex.com/coastguard/dashboard/6093116828680192/#/cherrypickHistory/all)
Created: 2019-10-14 17:23:42.610596+00:00
Changes: aosp/1123258

ig...@jetbrains.com <ig...@jetbrains.com> #4Apr 22, 2022 02:06PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020

Re-factor how errors are dismissed when query is re-written

This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (

b/140759491

).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.

This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.

Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f

M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt

https://android-review.googlesource.com/1288456

Message last modified on Apr 22, 2022 02:07PM

ig...@jetbrains.com <ig...@jetbrains.com> #5Apr 22, 2022 02:14PM

Platforms produce different signs

Because of that, we have to invert signs on some platform, so behaviour is the same on all platforms:

call test scroll -> [start of platform code] -> invert delta -> nativeScroll -> invert delta -> [end of platform code] -> scroll the list

We chose to invert the delta on Android, because two other platforms have opposite sign (desktop/web), and because the usual coordinate system starts from top to bottom.

Message last modified on Apr 22, 2022 02:24PM

je...@google.com <je...@google.com> #6Apr 22, 2022 04:55PM

On second thought, I think you're right. It does make more sense if scroll(2f) yields a scrollDelta of 2f. Will update my review accordingly

ap...@google.com <ap...@google.com> #7Apr 28, 2022 07:12PM

Project: platform/frameworks/support
Branch: androidx-main

commit f7459926705b1c79810fa321844f060d2d4276f1
Author: Igor Demin <igor.demin@jetbrains.com>
Date: Thu Apr 21 17:35:32 2022

Invert delta in MouseInjectionScope.scroll for vertical scroll

Similar to

https://android-review.googlesource.com/c/platform/frameworks/support/+/1913489

Bug: 224992993
RelNote: MouseInjectionScope.scroll(delta = someDelta) is now inverted on Android if we scroll vertically (if someDelta is positive, it will scroll downward)
Test: ./gradlew buildOnServer
Change-Id: Ifb697a9ae8bc05a2d54d0a6cb4018713e156baf8

M compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/InputDispatcher.kt
M compose/ui/ui-test/src/test/kotlin/androidx/compose/ui/test/inputdispatcher/MouseEventsTest.kt
M compose/ui/ui-test/src/androidMain/kotlin/androidx/compose/ui/test/AndroidInputDispatcher.android.kt
M compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ScrollableTest.kt
M compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/MouseInjectionScope.kt

https://android-review.googlesource.com/2071209

je...@google.com <je...@google.com> Apr 4, 2024 06:18PM

Marked as fixed.