fix: use closest parent/child pair in ancestor/descendant ralations (#69

)
wechat-miniprogram · Jul 24, 2023 · c8c9361 · c8c9361
1 parent bf9f7b3
commit c8c9361
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/glass-easel/src/relation.ts b/glass-easel/src/relation.ts
@@ -225,6 +225,7 @@ export class Relation {
                         break
                       }
                     }
+                    if (newLink) break
                   }
                 }
               }

diff --git a/glass-easel/tests/legacy/relation.test.js b/glass-easel/tests/legacy/relation.test.js
@@ -393,6 +393,59 @@ describe('Component Relations', function () {
       expect(c3.getRelationNodes('')).toStrictEqual([])
     })
 
+    it('should link cascade ancestors and descendants', function () {
+      var ancestorBeh = regBeh({})
+      var descendantBeh = regBeh({})
+      regElem({
+        is: 'relation-ancestor-b',
+        behaviors: [ancestorBeh],
+        relations: {
+          'relation-b': {
+            target: descendantBeh,
+            type: 'descendant',
+            linked: function (target) {
+              expect(this).toBe(target.parentNode)
+              callOrder.push(this.id)
+            },
+          },
+        },
+      })
+      regElem({
+        is: 'relation-descendant-b',
+        behaviors: [descendantBeh],
+        relations: {
+          'relation-b': {
+            target: ancestorBeh,
+            type: 'ancestor',
+            linked: function (target) {
+              expect(target).toBe(this.parentNode)
+              callOrder.push(this.id)
+            },
+          },
+        },
+      })
+      regElem({
+        is: 'relation-ancestor-descendant',
+        template: `
+          <relation-ancestor-b id="p1">
+            <relation-descendant-b id="c1">
+              <relation-ancestor-b id="p2">
+                <relation-descendant-b id="c2" />
+              </relation-ancestor-b>
+            </relation-descendant-b>
+          </relation-ancestor-b>
+        `,
+      })
+      var elem = createElem('relation-ancestor-descendant')
+      var callOrder = []
+      glassEasel.Element.pretendAttached(elem)
+      expect(callOrder).toStrictEqual(['p1', 'c1', 'p2', 'c2'])
+      expect(elem.$.p1.getRelationNodes('relation-b')).toStrictEqual([elem.$.c1])
+      expect(elem.$.c1.getRelationNodes('relation-b')).toStrictEqual([elem.$.p1])
+      expect(elem.$.p2.getRelationNodes('relation-b')).toStrictEqual([elem.$.c2])
+      expect(elem.$.c2.getRelationNodes('relation-b')).toStrictEqual([elem.$.p2])
+    })
+
     it('should trigger linkFailed handler when cannot link two nodes', function () {
       regElem({
         is: 'relation-cnt-failed',