Merge pull request #395 from bem/replace-position__issue-394

BEMHTML: fix position with replace()
bem · Dec 12, 2016 · 71cca07 · 71cca07
2 parents e3221e9 + b32094e
commit 71cca07
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 2 deletions.
diff --git a/lib/bemxjst/tree.js b/lib/bemxjst/tree.js
@@ -80,12 +80,13 @@ ReplaceMatch.prototype.wrapBody = function wrapBody(body) {
 
   if (typeof body !== 'function') {
     return function inlineAdaptor() {
-      return applyCtx(body);
+      return applyCtx(body, { position: this.position - 1 });
     };
   }
 
   return function replaceAdaptor() {
-    return applyCtx(body.call(this, this, this.ctx));
+    return applyCtx(body.call(this, this, this.ctx),
+                    { position: this.position - 1 });
   };
 };
 

diff --git a/test/bemcontext-position-test.js b/test/bemcontext-position-test.js
@@ -113,4 +113,69 @@ describe('BEMContext this.position', function() {
     { block: 'a1', content: { block: 'a2', content: { block: 'a3' } } },
     '<div class="a1 1"><div class="a2 1"><div class="a3 1"></div></div></div>');
   });
+
+  it('should calc position with replace()', function() {
+    test(function() {
+      block('a').replace()({ block: 'b' });
+      block('b')
+        .match(function(self) { return self.isFirst(); })
+        .addMods()({ first: 'yes' });
+
+      block('b')
+        .match(function(self) { return self.isLast(); })
+        .addMods()({ last: 'yes' });
+    },
+    [ { block: 'a' }, { block: 'a' }, { block: 'a' } ],
+    '<div class="b b_first_yes"></div><div class="b"></div>' +
+      '<div class="b b_last_yes"></div>');
+  });
+
+
+  it('should calc position with appendContent()', function() {
+    test(function() {
+      block('a').appendContent()({ block: 'b', mix: 'added' });
+
+      block('b')(
+        match(function(self) { return self.isFirst(); })
+        .addMods()({ first: 'yes' }),
+
+        match(function(self) { return self.isLast(); })
+        .addMods()({ last: 'yes' }),
+
+        cls()(function() {
+          return 'p_' + this.position;
+        })
+      );
+    },
+    { block: 'a', content: [ { block: 'b' }, { block: 'b' } ] },
+    '<div class="a">' +
+      '<div class="b b_first_yes p_1"></div>' +
+      '<div class="b p_2"></div>' +
+      '<div class="b b_last_yes added p_3"></div>' +
+    '</div>');
+  });
+
+  it('should calc position with prependContent()', function() {
+    test(function() {
+      block('a').prependContent()({ block: 'b', mix: 'added' });
+
+      block('b')(
+        match(function(self) { return self.isFirst(); })
+        .addMods()({ first: 'yes' }),
+
+        match(function(self) { return self.isLast(); })
+        .addMods()({ last: 'yes' }),
+
+        cls()(function() {
+          return 'p_' + this.position;
+        })
+      );
+    },
+    { block: 'a', content: [ { block: 'b' }, { block: 'b' } ] },
+    '<div class="a">' +
+      '<div class="b b_first_yes added p_1"></div>' +
+      '<div class="b p_2"></div>' +
+      '<div class="b b_last_yes p_3"></div>' +
+    '</div>');
+  });
 });