https://1rosehip.atlassian.net/browse/RRS-106

mzusin · Jul 25, 2023 · abacfdf · abacfdf
1 parent 1b0ed2f
commit abacfdf
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 188 deletions.
diff --git a/dist/mz-react-round-slider.esm.js b/dist/mz-react-round-slider.esm.js
diff --git a/dist/mz-react-round-slider.esm.js.map b/dist/mz-react-round-slider.esm.js.map
diff --git a/dist/mz-react-round-slider.min.js b/dist/mz-react-round-slider.min.js
diff --git a/dist/mz-react-round-slider.min.js.map b/dist/mz-react-round-slider.min.js.map
diff --git a/src/core/index.tsx b/src/core/index.tsx
@@ -189,6 +189,12 @@ export const RoundSlider = (props: ISettings) => {
             if(nextAngle <= prevAngle) {
                 nextAngle += 360;
             }
+            else{
+                if(mod(prevAngle, 360) <= mod(nextAngle, 360)) {
+                    prevAngle = mod(prevAngle, 360);
+                    nextAngle = mod(nextAngle, 360);
+                }
+            }
 
             if(!isAngleInArc(prevAngle, nextAngle, newAngleDeg)){
                 newAngleDeg = getClosestEdge(

diff --git a/src/example/index.tsx b/src/example/index.tsx
@@ -370,7 +370,7 @@ export const test2PointersOnCircle = () => {
 export const testMultiplePointers = () => {
     return (
         <>
-            {/*<RoundSlider
+            <RoundSlider
                 pathRadius={ 150 }
                 pathStartAngle={ 0 }
                 pathEndAngle={ 180 }
@@ -467,7 +467,7 @@ export const testMultiplePointers = () => {
                         value: 90,
                     }
                 ]}
-            />*/}
+            />
 
             <RoundSlider
                 pathRadius={ 150 }
@@ -486,7 +486,7 @@ export const testMultiplePointers = () => {
                 ]}
             />
 
-            {/*<RoundSlider
+            <RoundSlider
                 pathRadius={ 150 }
                 pathStartAngle={ 270 }
                 pathEndAngle={ 0 }
@@ -518,7 +518,7 @@ export const testMultiplePointers = () => {
                         value: 90,
                     }
                 ]}
-            />*/}
+            />
         </>
     )
 };
@@ -1674,8 +1674,8 @@ const App = () => {
         <>
             {/*{ testInnerCircle() }*/}
             {/*{ TestSmallCircle() }*/}
-            { testMultiplePointers() }
-            {/*{ test2PointersOnCircle() }*/}
+            {/*{ testMultiplePointers() }*/}
+            { test2PointersOnCircle() }
             {/*{ testTicksProperties() }*/}
             {/*{ testCirclePathSegments() }*/}
             {/*{ testBorder() }*/}

diff --git a/test/browser/example.min.js b/test/browser/example.min.js
diff --git a/test/browser/example.min.js.map b/test/browser/example.min.js.map