related-ui-components 2.4.5 → 2.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/components/ProgressBar/CircularProgressBar.js +2 -3
- package/lib/module/components/ProgressBar/CircularProgressBar.js.map +1 -1
- package/lib/typescript/src/components/ProgressBar/CircularProgressBar.d.ts +2 -2
- package/lib/typescript/src/components/ProgressBar/CircularProgressBar.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/ProgressBar/CircularProgressBar.tsx +6 -6
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
// CircularProgressBar.tsx
|
|
4
3
|
import React, { useEffect } from "react";
|
|
5
|
-
import { Canvas, matchFont, Path, Skia, Text } from "@shopify/react-native-skia";
|
|
4
|
+
import { Canvas, matchFont, Path, Skia, Text, useFont } from "@shopify/react-native-skia";
|
|
6
5
|
import { useSharedValue, withTiming, useDerivedValue, Easing } from "react-native-reanimated";
|
|
7
6
|
import { Platform } from "react-native";
|
|
8
7
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
@@ -28,7 +27,7 @@ const CircularProgressBar = ({
|
|
|
28
27
|
fontFamily: textFont || fontFamily,
|
|
29
28
|
fontSize: fontSize
|
|
30
29
|
};
|
|
31
|
-
const font = matchFont(fontStyle);
|
|
30
|
+
const font = textFont ? useFont(textFont, fontSize) : matchFont(fontStyle);
|
|
32
31
|
const radius = (size - strokeWidth) / 2;
|
|
33
32
|
const path = Skia.Path.Make();
|
|
34
33
|
path.addCircle(size / 2, size / 2, radius);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useEffect","Canvas","matchFont","Path","Skia","Text","useSharedValue","withTiming","useDerivedValue","Easing","Platform","jsx","_jsx","jsxs","_jsxs","CircularProgressBar","size","strokeWidth","progress","duration","backgroundColor","progressColor","lineCap","customText","textColor","fontSize","textFont","animatedProgress","fontFamily","select","ios","default","fontStyle","font","radius","path","Make","addCircle","value","easing","out","cubic","percentageText","Math","round","textToDisplay","undefined","textX","text","textWidth","measureText","width","textY","style","height","children","strokeCap","color","start","end","x","y"],"sourceRoot":"..\\..\\..\\..\\src","sources":["components/ProgressBar/CircularProgressBar.tsx"],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"names":["React","useEffect","Canvas","matchFont","Path","Skia","Text","useFont","useSharedValue","withTiming","useDerivedValue","Easing","Platform","jsx","_jsx","jsxs","_jsxs","CircularProgressBar","size","strokeWidth","progress","duration","backgroundColor","progressColor","lineCap","customText","textColor","fontSize","textFont","animatedProgress","fontFamily","select","ios","default","fontStyle","font","radius","path","Make","addCircle","value","easing","out","cubic","percentageText","Math","round","textToDisplay","undefined","textX","text","textWidth","measureText","width","textY","style","height","children","strokeCap","color","start","end","x","y"],"sourceRoot":"..\\..\\..\\..\\src","sources":["components/ProgressBar/CircularProgressBar.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import {
|
|
2
|
+
import { ImageRequireSource } from "react-native";
|
|
3
3
|
interface CircularProgressBarProps {
|
|
4
4
|
size?: number;
|
|
5
5
|
strokeWidth?: number;
|
|
@@ -11,7 +11,7 @@ interface CircularProgressBarProps {
|
|
|
11
11
|
customText?: string;
|
|
12
12
|
textColor?: string;
|
|
13
13
|
fontSize?: number;
|
|
14
|
-
textFont?:
|
|
14
|
+
textFont?: ImageRequireSource;
|
|
15
15
|
}
|
|
16
16
|
declare const CircularProgressBar: React.FC<CircularProgressBarProps>;
|
|
17
17
|
export default CircularProgressBar;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CircularProgressBar.d.ts","sourceRoot":"","sources":["../../../../../src/components/ProgressBar/CircularProgressBar.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CircularProgressBar.d.ts","sourceRoot":"","sources":["../../../../../src/components/ProgressBar/CircularProgressBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAezC,OAAO,EAAE,kBAAkB,EAAY,MAAM,cAAc,CAAC;AAE5D,UAAU,wBAAwB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAqF3D,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// CircularProgressBar.tsx
|
|
2
1
|
import React, { useEffect } from "react";
|
|
3
2
|
import {
|
|
4
3
|
Canvas,
|
|
5
|
-
DataSourceParam,
|
|
6
4
|
matchFont,
|
|
7
5
|
Path,
|
|
8
6
|
Skia,
|
|
@@ -15,7 +13,7 @@ import {
|
|
|
15
13
|
useDerivedValue,
|
|
16
14
|
Easing,
|
|
17
15
|
} from "react-native-reanimated";
|
|
18
|
-
import { Platform } from "react-native";
|
|
16
|
+
import { ImageRequireSource, Platform } from "react-native";
|
|
19
17
|
|
|
20
18
|
interface CircularProgressBarProps {
|
|
21
19
|
size?: number;
|
|
@@ -28,7 +26,7 @@ interface CircularProgressBarProps {
|
|
|
28
26
|
customText?: string;
|
|
29
27
|
textColor?: string;
|
|
30
28
|
fontSize?: number;
|
|
31
|
-
textFont?:
|
|
29
|
+
textFont?: ImageRequireSource;
|
|
32
30
|
}
|
|
33
31
|
|
|
34
32
|
const CircularProgressBar: React.FC<CircularProgressBarProps> = ({
|
|
@@ -47,13 +45,15 @@ const CircularProgressBar: React.FC<CircularProgressBarProps> = ({
|
|
|
47
45
|
const animatedProgress = useSharedValue(0);
|
|
48
46
|
|
|
49
47
|
const fontFamily = Platform.select({ ios: "Helvetica", default: "serif" });
|
|
50
|
-
|
|
48
|
+
|
|
51
49
|
const fontStyle = {
|
|
52
50
|
fontFamily: textFont || fontFamily,
|
|
53
51
|
fontSize: fontSize,
|
|
54
52
|
};
|
|
55
53
|
|
|
56
|
-
const font =
|
|
54
|
+
const font = textFont
|
|
55
|
+
? useFont(textFont, fontSize)
|
|
56
|
+
: matchFont(fontStyle as any);
|
|
57
57
|
|
|
58
58
|
const radius = (size - strokeWidth) / 2;
|
|
59
59
|
|