Merge pull request #1072 from fabulous-dev/revert-1071-improve-memo-reuse

Revert "Include Memo.KeyData in CanReuseMemo"

Author: TimLariviere

CHANGELOG.md

@@ -9,11 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 _No unreleased changes_
 
-## [2.4.2] - 2024-03-04
-
-### Changed
-- Include Memo.KeyData in CanReuseMemo by @TimLariviere (https://github.com/fabulous-dev/Fabulous/pull/1071)
-
 ## [2.4.1] - 2024-01-29
 
 ### Added
@@ -60,8 +55,7 @@ _No unreleased changes_
 ### Changed
 - Fabulous.XamarinForms & Fabulous.MauiControls have been moved been out of the Fabulous repository. Find them in their own repositories: [https://github.com/fabulous-dev/Fabulous.XamarinForms](https://github.com/fabulous-dev/Fabulous.XamarinForms) / [https://github.com/fabulous-dev/Fabulous.MauiControls](https://github.com/fabulous-dev/Fabulous.MauiControls)
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous/compare/2.4.2...HEAD
-[2.4.2]: https://github.com/fabulous-dev/Fabulous/releases/tag/2.4.2
+[unreleased]: https://github.com/fabulous-dev/Fabulous/compare/2.4.1...HEAD
 [2.4.1]: https://github.com/fabulous-dev/Fabulous/releases/tag/2.4.1
 [2.4.0]: https://github.com/fabulous-dev/Fabulous/releases/tag/2.4.0
 [2.3.2]: https://github.com/fabulous-dev/Fabulous/releases/tag/2.3.2

src/Fabulous.Tests/APISketchTests/APISketchTests.fs

@@ -445,7 +445,6 @@ module MemoTests =
             instance.ProcessMessage(SetMemoPart 99)
 
             // rerendered because of memo key changed
-            let memoLabel = find<TestLabel> tree "memo" :> IText
             Assert.AreEqual(2, renderCount)
             Assert.AreEqual("99", memoLabel.Text)
 
@@ -535,11 +534,11 @@ module MemoTests =
 
             let labelAgain = find<TestLabel> tree "label"
 
-            // not same instance
-            Assert.AreNotSame(label, labelAgain)
+            // same instance
+            Assert.AreSame(label, labelAgain)
 
             // just changes text but kept the same color
-            Assert.AreEqual([ TextSet "two"; ColorSet "blue" ], labelAgain.changeList)
+            Assert.AreEqual([ TextSet "one"; ColorSet "blue"; TextSet "two" ], label.changeList)
 
 
 

src/Fabulous/Memo.fs

@@ -59,11 +59,7 @@ module Memo =
         | _ -> failwith "Memo widget cannot have extra attributes"
 
     let internal canReuseMemoizedWidget prev next =
-        let prevMemoData = getMemoData prev
-        let currMemoData = getMemoData next
-
-        prevMemoData.MarkerType = currMemoData.MarkerType
-        && prevMemoData.KeyData = currMemoData.KeyData
+        (getMemoData prev).MarkerType = (getMemoData next).MarkerType
 
     let internal MemoAttribute: SimpleScalarAttributeDefinition<MemoData> =
         { Key = MemoAttributeKey