From c21f7fe111a8d4af0541e66903576dd6d95e1b10 Mon Sep 17 00:00:00 2001
From: Vadim <korobeinikovv@mail.ru>
Date: Sun, 12 Sep 2021 18:55:28 +0300
Subject: [PATCH] #69 : Code cleanup

---
 src/utils/page.js      | 55 +++++++++++++++++++++---------------------
 src/utils/page.test.js | 12 +++++----
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/utils/page.js b/src/utils/page.js
index cd0c103..f66051f 100644
--- a/src/utils/page.js
+++ b/src/utils/page.js
@@ -2,15 +2,6 @@ import {
   getValueInRange,
 } from './math'
 
-export function applyParticleSizes({
-  particlesContainerChildren,
-  particleWidth,
-}) {
-  for (let particleIndex=0; particleIndex<particlesContainerChildren.length; particleIndex++) {
-    particlesContainerChildren[particleIndex].style.minWidth = `${particleWidth}px`
-    particlesContainerChildren[particleIndex].style.maxWidth = `${particleWidth}px`
-  }
-}
 
 // getCurrentPageIndexByCurrentParticleIndex
 
@@ -58,24 +49,6 @@ export function getCurrentPageIndexByCurrentParticleIndex({
     })
 }
 
-// TODO: think about case if particlesCount < particlesToShow and particlesCount < particlesToScroll
-export function getPartialPageSize({
-  particlesToScroll,
-  particlesToShow,
-  particlesCountWithoutClones, 
-}) {
-  const overlap = particlesToScroll - particlesToShow
-  let particlesCount = particlesToShow
-
-  while(true) {
-    const diff = particlesCountWithoutClones - particlesCount - overlap
-    if (diff < particlesToShow) {
-      return diff
-    }
-    particlesCount += particlesToShow + overlap
-  }
-}
-
 // getPagesCountByParticlesCount
 
 export function _getPagesCountByParticlesCountInfinite({
@@ -162,6 +135,34 @@ export function getParticleIndexByPageIndex({
     })
 }
 
+export function applyParticleSizes({
+  particlesContainerChildren,
+  particleWidth,
+}) {
+  for (let particleIndex=0; particleIndex<particlesContainerChildren.length; particleIndex++) {
+    particlesContainerChildren[particleIndex].style.minWidth = `${particleWidth}px`
+    particlesContainerChildren[particleIndex].style.maxWidth = `${particleWidth}px`
+  }
+}
+
+// TODO: think about case if particlesCount < particlesToShow and particlesCount < particlesToScroll
+export function getPartialPageSize({
+  particlesToScroll,
+  particlesToShow,
+  particlesCountWithoutClones, 
+}) {
+  const overlap = particlesToScroll - particlesToShow
+  let particlesCount = particlesToShow
+
+  while(true) {
+    const diff = particlesCountWithoutClones - particlesCount - overlap
+    if (diff < particlesToShow) {
+      return diff
+    }
+    particlesCount += particlesToShow + overlap
+  }
+}
+
 export function createResizeObserver(onResize) {
   return new ResizeObserver(entries => {
     onResize({
diff --git a/src/utils/page.test.js b/src/utils/page.test.js
index 88ca38b..a6cce2d 100644
--- a/src/utils/page.test.js
+++ b/src/utils/page.test.js
@@ -1,10 +1,12 @@
 import {
   getPartialPageSize,
-  _getCurrentPageIndexByCurrentParticleIndexInfinite
-  // getCurrentPageIndex,
-  // getPagesCountByParticlesCount,
-  // getParticleIndexByPageIndexInfinite,
-  // getParticleIndexByPageIndexLimited,
+  getPartialPageSize,
+  _getCurrentPageIndexByCurrentParticleIndexInfinite,
+  _getCurrentPageIndexByCurrentParticleIndexLimited,
+  _getPagesCountByParticlesCountInfinite,
+  _getPagesCountByParticlesCountLimited,
+  _getParticleIndexByPageIndexInfinite,
+  _getParticleIndexByPageIndexLimited,
 } from './page.js'
 
 describe('getPartialPageSize', () => {