Skip to content

Commit

Permalink
removed resetCurrentSlide true from resize and added a test for the same
Browse files Browse the repository at this point in the history
  • Loading branch information
@abhinavdalal
abhinavdalal committed Mar 14, 2020
1 parent 79921c8 commit 51e0adc
Show file tree
Hide file tree
Showing 27 changed files with 383 additions and 267 deletions.
15 changes: 3 additions & 12 deletions coverage/clover.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1570047189631" clover="3.2.0">
<project timestamp="1570047189631" name="All files">
<metrics statements="6" coveredstatements="5" conditionals="4" coveredconditionals="4" methods="2" coveredmethods="1" elements="12" coveredelements="10" complexity="0" loc="6" ncloc="6" packages="1" files="1" classes="1"/>
<file name="CustomDot.tsx" path="/Users/yi.a.zhuang/Desktop/projects/react-multi-carousel/test/integration/components/CustomDot.tsx">
<metrics statements="6" coveredstatements="5" conditionals="4" coveredconditionals="4" methods="2" coveredmethods="1"/>
<line num="1" count="1" type="stmt"/>
<line num="3" count="46" type="stmt"/>
<line num="4" count="46" type="stmt"/>
<line num="5" count="46" type="stmt"/>
<line num="12" count="0" type="stmt"/>
<line num="18" count="1" type="stmt"/>
</file>
<coverage generated="1584195972884" clover="3.2.0">
<project timestamp="1584195972884" name="All files">
<metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0" elements="0" coveredelements="0" complexity="0" loc="0" ncloc="0" packages="0" files="0" classes="0"/>
</project>
</coverage>
3 changes: 1 addition & 2 deletions coverage/coverage-final.json
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
{"/Users/yi.a.zhuang/Desktop/projects/react-multi-carousel/test/integration/components/CustomDot.tsx": {"path":"/Users/yi.a.zhuang/Desktop/projects/react-multi-carousel/test/integration/components/CustomDot.tsx","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":31}},"1":{"start":{"line":3,"column":18},"end":{"line":16,"column":1}},"2":{"start":{"line":3,"column":21},"end":{"line":3,"column":28}},"3":{"start":{"line":3,"column":30},"end":{"line":3,"column":36}},"4":{"start":{"line":3,"column":38},"end":{"line":3,"column":43}},"5":{"start":{"line":3,"column":45},"end":{"line":3,"column":58}},"6":{"start":{"line":4,"column":10},"end":{"line":4,"column":22}},"7":{"start":{"line":5,"column":2},"end":{"line":15,"column":4}},"8":{"start":{"line":12,"column":23},"end":{"line":12,"column":null}},"9":{"start":{"line":18,"column":0},"end":{"line":18,"column":25}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":3,"column":18},"end":{"line":3,"column":19}},"loc":{"start":{"line":3,"column":60},"end":{"line":16,"column":1}}},"1":{"name":"(anonymous_1)","decl":{"start":{"line":12,"column":17},"end":{"line":12,"column":23}},"loc":{"start":{"line":12,"column":17},"end":{"line":12,"column":30}}}},"branchMap":{"0":{"loc":{"start":{"line":8,"column":36},"end":{"line":8,"column":42}},"type":"cond-expr","locations":[{"start":{"line":8,"column":36},"end":{"line":8,"column":42}},{"start":{"line":8,"column":45},"end":{"line":8,"column":54}}]},"1":{"loc":{"start":{"line":11,"column":38},"end":{"line":11,"column":44}},"type":"cond-expr","locations":[{"start":{"line":11,"column":38},"end":{"line":11,"column":44}},{"start":{"line":11,"column":47},"end":{"line":11,"column":56}}]}},"s":{"0":1,"1":1,"2":46,"3":46,"4":46,"5":46,"6":46,"7":46,"8":0,"9":1},"f":{"0":46,"1":0},"b":{"0":[4,42],"1":[4,42]}}
}
{}
35 changes: 11 additions & 24 deletions coverage/lcov-report/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@ <h1>
</h1>
<div class='clearfix'>
<div class='fl pad1y space-right2'>
<span class="strong">90% </span>
<span class="strong">Unknown% </span>
<span class="quiet">Statements</span>
<span class='fraction'>9/10</span>
<span class='fraction'>0/0</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="strong">Unknown% </span>
<span class="quiet">Branches</span>
<span class='fraction'>4/4</span>
<span class='fraction'>0/0</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">50% </span>
<span class="strong">Unknown% </span>
<span class="quiet">Functions</span>
<span class='fraction'>1/2</span>
<span class='fraction'>0/0</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">83.33% </span>
<span class="strong">Unknown% </span>
<span class="quiet">Lines</span>
<span class='fraction'>5/6</span>
<span class='fraction'>0/0</span>
</div>
</div>
<p class="quiet">
Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
</p>
</div>
<div class='status-line high'></div>
<div class='status-line medium'></div>
<div class="pad1">
<table class="coverage-summary">
<thead>
Expand All @@ -61,26 +61,13 @@ <h1>
<th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
</tr>
</thead>
<tbody><tr>
<td class="file high" data-value="CustomDot.tsx"><a href="CustomDot.tsx.html">CustomDot.tsx</a></td>
<td data-value="90" class="pic high"><div class="chart"><div class="cover-fill" style="width: 90%;"></div><div class="cover-empty" style="width:10%;"></div></div></td>
<td data-value="90" class="pct high">90%</td>
<td data-value="10" class="abs high">9/10</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="4" class="abs high">4/4</td>
<td data-value="50" class="pct medium">50%</td>
<td data-value="2" class="abs medium">1/2</td>
<td data-value="83.33" class="pct high">83.33%</td>
<td data-value="6" class="abs high">5/6</td>
</tr>

</tbody>
<tbody></tbody>
</table>
</div><div class='push'></div><!-- for sticky footer -->
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Oct 02 2019 23:13:09 GMT+0300 (Eastern European Summer Time)
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Mar 14 2020 19:56:12 GMT+0530 (India Standard Time)
</div>
</div>
<script src="prettify.js"></script>
Expand Down
57 changes: 39 additions & 18 deletions coverage/lcov-report/src/utils/clones.ts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ <h1>
</h1>
<div class='clearfix'>
<div class='fl pad1y space-right2'>
<span class="strong">14.63% </span>
<span class="strong">13.79% </span>
<span class="quiet">Statements</span>
<span class='fraction'>12/82</span>
<span class='fraction'>12/87</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">19.23% </span>
<span class="strong">17.86% </span>
<span class="quiet">Branches</span>
<span class='fraction'>5/26</span>
<span class='fraction'>5/28</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">40% </span>
<span class="quiet">Functions</span>
<span class='fraction'>2/5</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">16% </span>
<span class="strong">15% </span>
<span class="quiet">Lines</span>
<span class='fraction'>12/75</span>
<span class='fraction'>12/80</span>
</div>
</div>
<p class="quiet">
Expand Down Expand Up @@ -224,8 +224,14 @@ <h1>
<a name='L176'></a><a href='#L176'>176</a>
<a name='L177'></a><a href='#L177'>177</a>
<a name='L178'></a><a href='#L178'>178</a>
<a name='L179'></a><a href='#L179'>179</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<a name='L179'></a><a href='#L179'>179</a>
<a name='L180'></a><a href='#L180'>180</a>
<a name='L181'></a><a href='#L181'>181</a>
<a name='L182'></a><a href='#L182'>182</a>
<a name='L183'></a><a href='#L183'>183</a>
<a name='L184'></a><a href='#L184'>184</a>
<a name='L185'></a><a href='#L185'>185</a>
<a name='L186'></a><a href='#L186'>186</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -330,6 +336,9 @@ <h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">3x</span>
<span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -366,6 +375,11 @@ <h1>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
Expand Down Expand Up @@ -404,7 +418,6 @@ <h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { CarouselInternalState, CarouselProps } from "../types";
&nbsp;
&nbsp;
/*
getOriginalCounterPart gets the index of the original children.
For example, we have an array [clones, originalChildren, clones];
Expand Down Expand Up @@ -491,8 +504,8 @@ <h1>
Otherwise, it means we only have a few items. Then we clone it 3 times.
*/
function getClones(slidesToShow: number, childrenArr: any[]) {
<span class="missing-if-branch" title="if path not taken" >I</span>if (childrenArr.length &lt; slidesToShow ) {
<span class="cstat-no" title="statement not covered" > return childrenArr; </span>
<span class="missing-if-branch" title="if path not taken" >I</span>if (childrenArr.length &lt; slidesToShow) {
<span class="cstat-no" title="statement not covered" > return childrenArr;</span>
}
if (childrenArr.length &gt; slidesToShow * 2) {
return [
Expand All @@ -501,13 +514,16 @@ <h1>
childrenArr.length
),
...childrenArr,
...childrenArr.slice(0, slidesToShow * 2),
...childrenArr.slice(0, slidesToShow * 2)
];
}
return [...childrenArr, ...childrenArr, ...childrenArr];
}
&nbsp;
function getInitialSlideInInifteMode(slidesToShow:number, childrenArr: any[]) {
function getInitialSlideInInfiniteMode(
slidesToShow: number,
childrenArr: any[]
) {
if (childrenArr.length &gt; slidesToShow * 2) {
return slidesToShow * 2;
} else {
Expand Down Expand Up @@ -536,10 +552,15 @@ <h1>
let nextSlide = <span class="cstat-no" title="statement not covered" >0;</span>
let nextPosition = <span class="cstat-no" title="statement not covered" >0;</span>
let isReachingTheEnd;
const isReachingTheStart = <span class="cstat-no" title="statement not covered" >currentSlide === 0;</span>
let isReachingTheStart = <span class="cstat-no" title="statement not covered" >currentSlide === 0;</span>
const originalFirstSlide =
<span class="cstat-no" title="statement not covered" > childrenArr.length - (childrenArr.length - slidesToShow * 2);</span>
<span class="cstat-no" title="statement not covered" > if (childrenArr.length &gt; slidesToShow * 2) {</span>
<span class="cstat-no" title="statement not covered" > if (childrenArr.length &lt; slidesToShow) {</span>
<span class="cstat-no" title="statement not covered" > nextSlide = 0;</span>
<span class="cstat-no" title="statement not covered" > nextPosition = 0;</span>
<span class="cstat-no" title="statement not covered" > isReachingTheEnd = false;</span>
<span class="cstat-no" title="statement not covered" > isReachingTheStart = false;</span>
} else <span class="cstat-no" title="statement not covered" >if (childrenArr.length &gt; slidesToShow * 2) {</span>
<span class="cstat-no" title="statement not covered" > isReachingTheEnd = currentSlide &gt;= originalFirstSlide + childrenArr.length;</span>
<span class="cstat-no" title="statement not covered" > if (isReachingTheEnd) {</span>
<span class="cstat-no" title="statement not covered" > nextSlide = currentSlide - childrenArr.length;</span>
Expand Down Expand Up @@ -569,7 +590,7 @@ <h1>
isReachingTheEnd,
isReachingTheStart,
nextSlide,
nextPosition,
nextPosition
};
}
&nbsp;
Expand All @@ -578,15 +599,15 @@ <h1>
getOriginalIndexLookupTableByClones,
getClones,
checkClonesPosition,
getInitialSlideInInifteMode
getInitialSlideInInfiniteMode
};
&nbsp;</pre></td></tr>
</table></pre>
<div class='push'></div><!-- for sticky footer -->
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Oct 02 2019 23:01:37 GMT+0300 (Eastern European Summer Time)
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Mar 14 2020 19:53:16 GMT+0530 (India Standard Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
Loading

0 comments on commit 51e0adc

Please sign in to comment.