Skip to content

Commit 55e28e5

Browse files
adityasharatfacebook-github-bot
adityasharat
authored and
facebook-github-bot
committed
Rename fields in LithoNode
Summary: Rename fields in LithoNode Reviewed By: astreet Differential Revision: D78284004 fbshipit-source-id: 49fc6f85a9bea35df472151c80ccd19cfcd59fe6
1 parent a0724cb commit 55e28e5

File tree

7 files changed

+76
-78
lines changed

7 files changed

+76
-78
lines changed

‎litho-core/src/main/java/com/facebook/litho/CommonProps.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -925,22 +925,22 @@ class CommonProps : LayoutProps, Equivalence<CommonProps?> {
925925
node.wrapInView()
926926
}
927927
if ((privateFlags and PFLAG_VISIBLE_HANDLER_IS_SET).toLong() != 0L) {
928-
node.visibleHandler(visibleHandler)
928+
node.addVisibleEventListener(visibleHandler)
929929
}
930930
if ((privateFlags and PFLAG_FOCUSED_HANDLER_IS_SET).toLong() != 0L) {
931-
node.focusedHandler(focusedHandler)
931+
node.addFocusedVisibleEventListener(focusedHandler)
932932
}
933933
if ((privateFlags and PFLAG_FULL_IMPRESSION_HANDLER_IS_SET).toLong() != 0L) {
934-
node.fullImpressionHandler(fullImpressionHandler)
934+
node.addFullImpressionEventListener(fullImpressionHandler)
935935
}
936936
if ((privateFlags and PFLAG_INVISIBLE_HANDLER_IS_SET).toLong() != 0L) {
937-
node.invisibleHandler(invisibleHandler)
937+
node.addInvisibleEventListener(invisibleHandler)
938938
}
939939
if ((privateFlags and PFLAG_UNFOCUSED_HANDLER_IS_SET).toLong() != 0L) {
940-
node.unfocusedHandler(unfocusedHandler)
940+
node.addUnfocusedVisibleEventListener(unfocusedHandler)
941941
}
942942
if (privateFlags and PFLAG_VISIBILITY_CHANGED_HANDLER_IS_SET != 0) {
943-
node.visibilityChangedHandler(visibilityChangedHandler)
943+
node.addVisibilityChangedEventListener(visibilityChangedHandler)
944944
}
945945
if ((privateFlags and PFLAG_TRANSITION_KEY_IS_SET).toLong() != 0L) {
946946
node.transitionKey(transitionKey, transitionOwnerKey)

‎litho-core/src/main/java/com/facebook/litho/DeferredLithoNode.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ constructor(
8989
target.wrapInView()
9090
}
9191
if (privateFlags and PFLAG_VISIBLE_HANDLER_IS_SET != 0L) {
92-
target.visibleHandler(visibleHandler)
92+
target.addVisibleEventListener(onVisible)
9393
}
9494
if (privateFlags and PFLAG_FOCUSED_HANDLER_IS_SET != 0L) {
95-
target.focusedHandler(focusedHandler)
95+
target.addFocusedVisibleEventListener(onFocusedVisible)
9696
}
9797
if (privateFlags and PFLAG_FULL_IMPRESSION_HANDLER_IS_SET != 0L) {
98-
target.fullImpressionHandler(fullImpressionHandler)
98+
target.addFullImpressionEventListener(onFullImpression)
9999
}
100100
if (privateFlags and PFLAG_INVISIBLE_HANDLER_IS_SET != 0L) {
101-
target.invisibleHandler(invisibleHandler)
101+
target.addInvisibleEventListener(onInvisible)
102102
}
103103
if (privateFlags and PFLAG_UNFOCUSED_HANDLER_IS_SET != 0L) {
104-
target.unfocusedHandler(unfocusedHandler)
104+
target.addUnfocusedVisibleEventListener(onUnfocusedVisible)
105105
}
106106
if (privateFlags and PFLAG_VISIBLE_RECT_CHANGED_HANDLER_IS_SET != 0L) {
107-
target.visibilityChangedHandler(visibilityChangedHandler)
107+
target.addVisibilityChangedEventListener(onVisibilityChanged)
108108
}
109109
if (testKey != null) {
110110
target.testKey(testKey)

‎litho-core/src/main/java/com/facebook/litho/LithoNode.kt

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -137,22 +137,22 @@ open class LithoNode : Node<LithoLayoutContext>, Cloneable {
137137
var nodeInfo: NodeInfo? = null
138138
internal set
139139

140-
var visibleHandler: EventHandler<VisibleEvent>? = null
140+
var onVisible: EventHandler<VisibleEvent>? = null
141141
internal set
142142

143-
var focusedHandler: EventHandler<FocusedVisibleEvent>? = null
143+
var onFocusedVisible: EventHandler<FocusedVisibleEvent>? = null
144144
internal set
145145

146-
var unfocusedHandler: EventHandler<UnfocusedVisibleEvent>? = null
146+
var onUnfocusedVisible: EventHandler<UnfocusedVisibleEvent>? = null
147147
internal set
148148

149-
var fullImpressionHandler: EventHandler<FullImpressionVisibleEvent>? = null
149+
var onFullImpression: EventHandler<FullImpressionVisibleEvent>? = null
150150
internal set
151151

152-
var invisibleHandler: EventHandler<InvisibleEvent>? = null
152+
var onInvisible: EventHandler<InvisibleEvent>? = null
153153
internal set
154154

155-
var visibilityChangedHandler: EventHandler<VisibilityChangedEvent>? = null
155+
var onVisibilityChanged: EventHandler<VisibilityChangedEvent>? = null
156156
internal set
157157

158158
var background: Drawable? = null
@@ -680,28 +680,13 @@ open class LithoNode : Node<LithoLayoutContext>, Cloneable {
680680
flexDirection = direction
681681
}
682682

683-
fun focusedHandler(focusedHandler: EventHandler<FocusedVisibleEvent>?) {
684-
privateFlags = privateFlags or PFLAG_FOCUSED_HANDLER_IS_SET
685-
this.focusedHandler = addVisibilityHandler(this.focusedHandler, focusedHandler)
686-
}
687-
688683
fun layerType(@LayerType type: Int, paint: Paint?) {
689684
if (type != LayerType.LAYER_TYPE_NOT_SET) {
690685
layerType = type
691686
layerPaint = paint
692687
}
693688
}
694689

695-
fun visibilityOutputTag(visibilityOutputTag: String?) {
696-
this.visibilityOutputTag = visibilityOutputTag
697-
}
698-
699-
fun fullImpressionHandler(fullImpressionHandler: EventHandler<FullImpressionVisibleEvent>?) {
700-
privateFlags = privateFlags or PFLAG_FULL_IMPRESSION_HANDLER_IS_SET
701-
this.fullImpressionHandler =
702-
addVisibilityHandler(this.fullImpressionHandler, fullImpressionHandler)
703-
}
704-
705690
fun getChildAt(index: Int): LithoNode = children[index]
706691

707692
fun mutableNodeInfo(): NodeInfo {
@@ -758,20 +743,6 @@ open class LithoNode : Node<LithoLayoutContext>, Cloneable {
758743

759744
fun hasTransitionKey(): Boolean = !transitionKey.isNullOrEmpty()
760745

761-
fun hasVisibilityHandlers(): Boolean =
762-
visibleHandler != null ||
763-
focusedHandler != null ||
764-
unfocusedHandler != null ||
765-
fullImpressionHandler != null ||
766-
invisibleHandler != null ||
767-
visibilityChangedHandler != null
768-
769-
fun invisibleHandler(invisibleHandler: EventHandler<InvisibleEvent>?): LithoNode {
770-
privateFlags = privateFlags or PFLAG_INVISIBLE_HANDLER_IS_SET
771-
this.invisibleHandler = addVisibilityHandler(this.invisibleHandler, invisibleHandler)
772-
return this
773-
}
774-
775746
fun justifyContent(justifyContent: YogaJustify) {
776747
this.justifyContent = justifyContent
777748
}
@@ -817,20 +788,35 @@ open class LithoNode : Node<LithoLayoutContext>, Cloneable {
817788
transitionKeyType = type
818789
}
819790

820-
fun unfocusedHandler(unfocusedHandler: EventHandler<UnfocusedVisibleEvent>?) {
791+
fun addUnfocusedVisibleEventListener(callback: EventHandler<UnfocusedVisibleEvent>?) {
821792
privateFlags = privateFlags or PFLAG_UNFOCUSED_HANDLER_IS_SET
822-
this.unfocusedHandler = addVisibilityHandler(this.unfocusedHandler, unfocusedHandler)
793+
this.onUnfocusedVisible = addVisibilityHandler(this.onUnfocusedVisible, callback)
823794
}
824795

825-
fun visibilityChangedHandler(visibilityChangedHandler: EventHandler<VisibilityChangedEvent>?) {
796+
fun addVisibilityChangedEventListener(callback: EventHandler<VisibilityChangedEvent>?) {
826797
privateFlags = privateFlags or PFLAG_VISIBLE_RECT_CHANGED_HANDLER_IS_SET
827-
this.visibilityChangedHandler =
828-
addVisibilityHandler(this.visibilityChangedHandler, visibilityChangedHandler)
798+
this.onVisibilityChanged = addVisibilityHandler(this.onVisibilityChanged, callback)
829799
}
830800

831-
fun visibleHandler(visibleHandler: EventHandler<VisibleEvent>?) {
801+
fun addVisibleEventListener(callback: EventHandler<VisibleEvent>?) {
832802
privateFlags = privateFlags or PFLAG_VISIBLE_HANDLER_IS_SET
833-
this.visibleHandler = addVisibilityHandler(this.visibleHandler, visibleHandler)
803+
this.onVisible = addVisibilityHandler(this.onVisible, callback)
804+
}
805+
806+
fun addInvisibleEventListener(callback: EventHandler<InvisibleEvent>?): LithoNode {
807+
privateFlags = privateFlags or PFLAG_INVISIBLE_HANDLER_IS_SET
808+
this.onInvisible = addVisibilityHandler(this.onInvisible, callback)
809+
return this
810+
}
811+
812+
fun addFocusedVisibleEventListener(callback: EventHandler<FocusedVisibleEvent>?) {
813+
privateFlags = privateFlags or PFLAG_FOCUSED_HANDLER_IS_SET
814+
this.onFocusedVisible = addVisibilityHandler(this.onFocusedVisible, callback)
815+
}
816+
817+
fun addFullImpressionEventListener(callback: EventHandler<FullImpressionVisibleEvent>?) {
818+
privateFlags = privateFlags or PFLAG_FULL_IMPRESSION_HANDLER_IS_SET
819+
this.onFullImpression = addVisibilityHandler(this.onFullImpression, callback)
834820
}
835821

836822
fun visibleHeightRatio(visibleHeightRatio: Float) {
@@ -841,6 +827,18 @@ open class LithoNode : Node<LithoLayoutContext>, Cloneable {
841827
this.visibleWidthRatio = visibleWidthRatio
842828
}
843829

830+
fun hasVisibilityHandlers(): Boolean =
831+
onVisible != null ||
832+
onFocusedVisible != null ||
833+
onUnfocusedVisible != null ||
834+
onFullImpression != null ||
835+
onInvisible != null ||
836+
onVisibilityChanged != null
837+
838+
fun visibilityOutputTag(visibilityOutputTag: String?) {
839+
this.visibilityOutputTag = visibilityOutputTag
840+
}
841+
844842
fun wrap(wrap: YogaWrap) {
845843
yogaWrap = wrap
846844
}

‎litho-core/src/main/java/com/facebook/litho/LithoReducer.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ internal object LithoReducer {
310310
): VisibilityOutput {
311311

312312
val onVisible =
313-
node.visibleHandler?.let {
313+
node.onVisible?.let {
314314
VisibilityEventCallbackData(
315315
widthRatio = node.visibleWidthRatio,
316316
heightRatio = node.visibleHeightRatio,
@@ -319,39 +319,39 @@ internal object LithoReducer {
319319
}
320320

321321
val onFocusedVisible =
322-
node.focusedHandler?.let {
322+
node.onFocusedVisible?.let {
323323
VisibilityEventCallbackData(
324324
widthRatio = node.visibleWidthRatio,
325325
heightRatio = node.visibleHeightRatio,
326326
callback = it,
327327
)
328328
}
329329
val onUnfocusedVisible =
330-
node.unfocusedHandler?.let {
330+
node.onUnfocusedVisible?.let {
331331
VisibilityEventCallbackData(
332332
widthRatio = node.visibleWidthRatio,
333333
heightRatio = node.visibleHeightRatio,
334334
callback = it,
335335
)
336336
}
337337
val onFullImpression =
338-
node.fullImpressionHandler?.let {
338+
node.onFullImpression?.let {
339339
VisibilityEventCallbackData(
340340
widthRatio = node.visibleWidthRatio,
341341
heightRatio = node.visibleHeightRatio,
342342
callback = it,
343343
)
344344
}
345345
val onInvisible =
346-
node.invisibleHandler?.let {
346+
node.onInvisible?.let {
347347
VisibilityEventCallbackData(
348348
widthRatio = node.visibleWidthRatio,
349349
heightRatio = node.visibleHeightRatio,
350350
callback = it,
351351
)
352352
}
353353
val onVisibilityChange =
354-
node.visibilityChangedHandler?.let {
354+
node.onVisibilityChanged?.let {
355355
VisibilityEventCallbackData(
356356
widthRatio = node.visibleWidthRatio,
357357
heightRatio = node.visibleHeightRatio,

‎litho-it/src/test/com/facebook/litho/CommonPropsTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ class CommonPropsTest {
229229
assertThat(node.nodeInfo).isNotNull
230230
assertThat(node.visibleHeightRatio).isEqualTo(55f)
231231
assertThat(node.visibleWidthRatio).isEqualTo(56f)
232-
assertThat(node.visibleHandler).isEqualTo(visibleHandler)
233-
assertThat(node.focusedHandler).isEqualTo(focusedHandler)
234-
assertThat(node.unfocusedHandler).isEqualTo(unfocusedHandler)
235-
assertThat(node.fullImpressionHandler).isEqualTo(fullImpressionHandler)
236-
assertThat(node.invisibleHandler).isEqualTo(invisibleHandler)
237-
assertThat(node.visibilityChangedHandler).isEqualTo(visibleRectChangedHandler)
232+
assertThat(node.onVisible).isEqualTo(visibleHandler)
233+
assertThat(node.onFocusedVisible).isEqualTo(focusedHandler)
234+
assertThat(node.onUnfocusedVisible).isEqualTo(unfocusedHandler)
235+
assertThat(node.onFullImpression).isEqualTo(fullImpressionHandler)
236+
assertThat(node.onInvisible).isEqualTo(invisibleHandler)
237+
assertThat(node.onVisibilityChanged).isEqualTo(visibleRectChangedHandler)
238238
assertThat(node.transitionKey).isEqualTo("transitionKey")
239239
assertThat(node.testKey).isEqualTo("testKey")
240240
assertThat(node.stateListAnimator).isEqualTo(stateListAnimator)

‎litho-it/src/test/com/facebook/litho/LayoutStateCreateTreeTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -488,12 +488,12 @@ class LayoutStateCreateTreeTest {
488488
verify(node)?.applyNodeInfo(anyOrNull())
489489
verify(node)?.visibleHeightRatio(55f)
490490
verify(node)?.visibleWidthRatio(56f)
491-
verify(node)?.visibleHandler(visibleHandler)
492-
verify(node)?.focusedHandler(focusedHandler)
493-
verify(node)?.unfocusedHandler(unfocusedHandler)
494-
verify(node)?.fullImpressionHandler(fullImpressionHandler)
495-
verify(node)?.invisibleHandler(invisibleHandler)
496-
verify(node)?.visibilityChangedHandler(visibleRectChangedHandler)
491+
verify(node)?.addVisibleEventListener(visibleHandler)
492+
verify(node)?.addFocusedVisibleEventListener(focusedHandler)
493+
verify(node)?.addUnfocusedVisibleEventListener(unfocusedHandler)
494+
verify(node)?.addFullImpressionEventListener(fullImpressionHandler)
495+
verify(node)?.addInvisibleEventListener(invisibleHandler)
496+
verify(node)?.addVisibilityChangedEventListener(visibleRectChangedHandler)
497497
verify(node)?.transitionKey(eq("transitionKey"), anyOrNull<String>())
498498
verify(node)?.transitionKeyType(Transition.TransitionKeyType.GLOBAL)
499499
verify(node)?.testKey("testKey")

‎litho-it/src/test/com/facebook/litho/LithoNodeTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,12 @@ class LithoNodeTest {
302302
orig.duplicateParentState(true)
303303
orig.background(ColorDrawable())
304304
orig.foreground(null)
305-
orig.visibleHandler(null)
306-
orig.focusedHandler(null)
307-
orig.fullImpressionHandler(null)
308-
orig.invisibleHandler(null)
309-
orig.unfocusedHandler(null)
310-
orig.visibilityChangedHandler(null)
305+
orig.addVisibleEventListener(null)
306+
orig.addFocusedVisibleEventListener(null)
307+
orig.addFullImpressionEventListener(null)
308+
orig.addInvisibleEventListener(null)
309+
orig.addUnfocusedVisibleEventListener(null)
310+
orig.addVisibilityChangedEventListener(null)
311311
orig.transferInto(dest)
312312
assertThat(isFlagSet(dest, "PFLAG_IMPORTANT_FOR_ACCESSIBILITY_IS_SET")).isTrue
313313
assertThat(isFlagSet(dest, "PFLAG_BACKGROUND_IS_SET")).isTrue

0 commit comments

Comments
 (0)