Skip to content

Commit

Permalink
Delay tap indication inside scroll on iOS (#1173)
Browse files Browse the repository at this point in the history
## Proposed Changes
Make touch indication delay to be corresponding with iOS default delay
of UIScrollVIew.

Issue: JetBrains/compose-multiplatform#4324
  • Loading branch information
ASalavei authored Mar 11, 2024
1 parent a7ec6dc commit 0586715
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@

package androidx.compose.foundation

import androidx.compose.runtime.Composable
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.type
import androidx.compose.ui.node.CompositionLocalConsumerModifierNode
import org.jetbrains.skiko.SkikoKey
Expand All @@ -31,9 +28,6 @@ internal actual fun CompositionLocalConsumerModifierNode
return false
}

// TODO: b/168524931 - should this depend on the input device?
internal actual val TapIndicationDelay: Long = 0L

/**
* Whether the specified [KeyEvent] represents a user intent to perform a click.
* (eg. When you press Enter on a focused button, it should perform a click).
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package androidx.compose.foundation

// TODO: b/168524931 - should this depend on the input device?
internal actual val TapIndicationDelay: Long = 0L
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package androidx.compose.foundation

// TODO: b/168524931 - should this depend on the input device?
internal actual val TapIndicationDelay: Long = 0L
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package androidx.compose.foundation

// Equals to UIScrollView's delay with `delaysContentTouches` enabled.
internal actual val TapIndicationDelay: Long = 150L

0 comments on commit 0586715

Please sign in to comment.