-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Track the index of a ProtocolNode within its parent container (#1645)
This uses a new type, ProtocolChildren, to maintain a list of ProtocolNodes corresponding to a Widget.Children grouping. This class is mostly a copy of ChildrenNode from redwood-compose. In the future hopefully we can unify their logic.
- Loading branch information
1 parent
1473ab0
commit 7ac2071
Showing
6 changed files
with
248 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 140 additions & 0 deletions
140
...ocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ChildrenNodeIndexTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| /* | ||
| * Copyright (C) 2023 Square, Inc. | ||
| * | ||
| * 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 app.cash.redwood.protocol.widget | ||
|
|
||
| import app.cash.redwood.Modifier | ||
| import app.cash.redwood.RedwoodCodegenApi | ||
| import app.cash.redwood.protocol.ChildrenTag | ||
| import app.cash.redwood.protocol.EventSink | ||
| import app.cash.redwood.protocol.PropertyChange | ||
| import app.cash.redwood.widget.MutableListChildren | ||
| import app.cash.redwood.widget.Widget | ||
| import assertk.assertThat | ||
| import assertk.assertions.isEqualTo | ||
| import kotlin.test.Test | ||
|
|
||
| /** | ||
| * This class tests an implementation detail of [ProtocolChildren] which maintains the correct | ||
| * index value on its child [ProtocolNode]s. While it could conceivably be tested through public | ||
| * API it's far easier to validate the behavior this way. | ||
| */ | ||
| @OptIn(RedwoodCodegenApi::class) | ||
| class ChildrenNodeIndexTest { | ||
| private val root = ProtocolChildren(MutableListChildren<String>()) | ||
|
|
||
| @Test fun insert() { | ||
| val a = WidgetNode(StringWidget("a")) | ||
| assertThat(a.index).isEqualTo(-1) | ||
| root.insert(0, a) | ||
| assertThat(a.index).isEqualTo(0) | ||
|
|
||
| val b = WidgetNode(StringWidget("a")) | ||
| root.insert(1, b) | ||
| assertThat(a.index).isEqualTo(0) | ||
| assertThat(b.index).isEqualTo(1) | ||
|
|
||
| val c = WidgetNode(StringWidget("a")) | ||
| root.insert(0, c) | ||
| assertThat(c.index).isEqualTo(0) | ||
| assertThat(a.index).isEqualTo(1) | ||
| assertThat(b.index).isEqualTo(2) | ||
| } | ||
|
|
||
| @Test fun remove() { | ||
| val a = WidgetNode(StringWidget("a")) | ||
| val b = WidgetNode(StringWidget("b")) | ||
| val c = WidgetNode(StringWidget("c")) | ||
| val d = WidgetNode(StringWidget("d")) | ||
| val e = WidgetNode(StringWidget("e")) | ||
| root.insert(0, a) | ||
| root.insert(1, b) | ||
| root.insert(2, c) | ||
| root.insert(3, d) | ||
| root.insert(4, e) | ||
| assertThat(a.index).isEqualTo(0) | ||
| assertThat(b.index).isEqualTo(1) | ||
| assertThat(c.index).isEqualTo(2) | ||
| assertThat(d.index).isEqualTo(3) | ||
| assertThat(e.index).isEqualTo(4) | ||
|
|
||
| root.remove(2, 1) // c | ||
| assertThat(a.index).isEqualTo(0) | ||
| assertThat(b.index).isEqualTo(1) | ||
| assertThat(d.index).isEqualTo(2) | ||
| assertThat(e.index).isEqualTo(3) | ||
|
|
||
| root.remove(1, 2) // b, d | ||
| assertThat(a.index).isEqualTo(0) | ||
| assertThat(e.index).isEqualTo(1) | ||
|
|
||
| root.remove(1, 1) // e | ||
| assertThat(a.index).isEqualTo(0) | ||
| } | ||
|
|
||
| @Test fun move() { | ||
| val a = WidgetNode(StringWidget("a")) | ||
| val b = WidgetNode(StringWidget("b")) | ||
| val c = WidgetNode(StringWidget("c")) | ||
| val d = WidgetNode(StringWidget("d")) | ||
| val e = WidgetNode(StringWidget("e")) | ||
| root.insert(0, a) | ||
| root.insert(1, b) | ||
| root.insert(2, c) | ||
| root.insert(3, d) | ||
| root.insert(4, e) | ||
| assertThat(a.index).isEqualTo(0) | ||
| assertThat(b.index).isEqualTo(1) | ||
| assertThat(c.index).isEqualTo(2) | ||
| assertThat(d.index).isEqualTo(3) | ||
| assertThat(e.index).isEqualTo(4) | ||
|
|
||
| root.move(0, 5, 1) // a 0 --> 4 | ||
| assertThat(b.index).isEqualTo(0) | ||
| assertThat(c.index).isEqualTo(1) | ||
| assertThat(d.index).isEqualTo(2) | ||
| assertThat(e.index).isEqualTo(3) | ||
| assertThat(a.index).isEqualTo(4) | ||
|
|
||
| root.move(1, 4, 2) // c,d 1 --> 2 | ||
| assertThat(b.index).isEqualTo(0) | ||
| assertThat(e.index).isEqualTo(1) | ||
| assertThat(c.index).isEqualTo(2) | ||
| assertThat(d.index).isEqualTo(3) | ||
| assertThat(a.index).isEqualTo(4) | ||
|
|
||
| root.move(2, 1, 3) // c,d,a 2 --> 1 | ||
| assertThat(b.index).isEqualTo(0) | ||
| assertThat(c.index).isEqualTo(1) | ||
| assertThat(d.index).isEqualTo(2) | ||
| assertThat(a.index).isEqualTo(3) | ||
| assertThat(e.index).isEqualTo(4) | ||
| } | ||
| } | ||
|
|
||
| @OptIn(RedwoodCodegenApi::class) | ||
| private class WidgetNode(override val widget: StringWidget) : ProtocolNode<String>() { | ||
| override fun apply(change: PropertyChange, eventSink: EventSink) { | ||
| throw UnsupportedOperationException() | ||
| } | ||
|
|
||
| override fun children(tag: ChildrenTag): ProtocolChildren<String>? { | ||
| throw UnsupportedOperationException() | ||
| } | ||
| } | ||
|
|
||
| private class StringWidget(override val value: String) : Widget<String> { | ||
| override var modifier: Modifier = Modifier | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters