Merge pull request #91 from shipt/development

shipt · May 13, 2024 · f14d8e6 · f14d8e6
2 parents 151b732 + 9a404f6
commit f14d8e6
Show file tree

Hide file tree

Showing 13 changed files with 780 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## v1.1.0
 
+- Use arc calculations to render range values https://github.com/shipt/segmented-arc-for-react-native/pull/86
+- Arc drawing fix https://github.com/shipt/segmented-arc-for-react-native/pull/87
+- Readme updates
+
+## v1.1.0
+
 - Add a support for scaling the display scale of arc segments https://github.com/shipt/segmented-arc-for-react-native/pull/70
 - Dependency updates
 

diff --git a/README.md b/README.md
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -1673,7 +1673,7 @@
     nullthrows "^1.1.1"
 
 "@shipt/segmented-arc-for-react-native@file:..":
-  version "1.1.1"
+  version "1.2.1"
   dependencies:
     prop-types "^15.8.1"
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shipt/segmented-arc-for-react-native",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "type": "module",
   "description": "Segmented arc component for React Native ",
   "main": "src/index.js",

diff --git a/src/SegmentedArc.js b/src/SegmentedArc.js
@@ -27,6 +27,7 @@ export const SegmentedArc = ({
   rangesTextStyle = styles.rangeTextStyle,
   capInnerColor = '#28E037',
   capOuterColor = '#FFFFFF',
+  alignRangesWithSegments = true,
   children
 }) => {
   const [arcAnimatedValue] = useState(new Animated.Value(0));
@@ -147,6 +148,7 @@ export const SegmentedArc = ({
       <Svg width={svgWidth} height={svgHeight}>
         <SegmentedArcContext.Provider
           value={{
+            arcs,
             margin,
             center,
             filledArcWidth,
@@ -164,7 +166,8 @@ export const SegmentedArc = ({
             rangesTextColor,
             rangesTextStyle,
             capInnerColor,
-            capOuterColor
+            capOuterColor,
+            alignRangesWithSegments
           }}
         >
           {arcs.map((arc, index) => (
@@ -198,7 +201,8 @@ SegmentedArc.propTypes = {
       scale: PropTypes.number,
       filledColor: PropTypes.string.isRequired,
       emptyColor: PropTypes.string.isRequired,
-      data: PropTypes.object
+      data: PropTypes.object,
+      arcDegreeScale: PropTypes.number
     })
   ).isRequired,
   filledArcWidth: PropTypes.number,
@@ -216,7 +220,8 @@ SegmentedArc.propTypes = {
   rangesTextColor: PropTypes.string,
   rangesTextStyle: PropTypes.object,
   capInnerColor: PropTypes.string,
-  capOuterColor: PropTypes.string
+  capOuterColor: PropTypes.string,
+  alignRangesWithSegments: PropTypes.bool
 };
 export { SegmentedArcContext };
 export default SegmentedArc;