@draftbit/core 47.5.3-99e727.2 → 47.5.3-cda36f.2
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/src/components/Progress/LinearProgress/LinearProgress.js +9 -4
- package/lib/src/components/Progress/LinearProgress/LinearProgress.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/components/Progress/LinearProgress/LinearProgress.js +9 -4
- package/src/components/Progress/LinearProgress/LinearProgress.js.map +1 -1
- package/src/components/Progress/LinearProgress/LinearProgress.tsx +11 -7
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@draftbit/core",
|
|
3
|
-
"version": "47.5.3-
|
|
3
|
+
"version": "47.5.3-cda36f.2+cda36f1",
|
|
4
4
|
"description": "Core (non-native) Components",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"types": "lib/src/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@date-io/date-fns": "^1.3.13",
|
|
43
43
|
"@draftbit/react-theme-provider": "^2.1.1",
|
|
44
|
-
"@draftbit/types": "^47.5.3-
|
|
44
|
+
"@draftbit/types": "^47.5.3-cda36f.2+cda36f1",
|
|
45
45
|
"@expo/vector-icons": "^13.0.0",
|
|
46
46
|
"@material-ui/core": "^4.11.0",
|
|
47
47
|
"@material-ui/pickers": "^3.2.10",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
],
|
|
98
98
|
"testEnvironment": "node"
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "cda36f15a7ef96a90a35d0fbbdb3df7b92a4587a"
|
|
101
101
|
}
|
|
@@ -15,20 +15,25 @@ export const LinearProgress = ({ theme, minimumValue = 0, maximumValue = 100, va
|
|
|
15
15
|
const maxThickness = Math.max(thickness, trackThickness);
|
|
16
16
|
const thicknessOffset = maxThickness / 2; // This offset guarantees nothing is cut off by view bounds
|
|
17
17
|
const progressLineWidth = svgContainerWidth - thicknessOffset;
|
|
18
|
+
console.log("LINE WIDTH ", progressLineWidth);
|
|
18
19
|
const trackProgressLineWidth = svgContainerWidth - thicknessOffset;
|
|
19
20
|
const currentFillPercentage = value / (maximumValue + minimumValue);
|
|
21
|
+
console.log("PERC", currentFillPercentage);
|
|
20
22
|
const currentProgressLineWidth = useSharedValue(currentFillPercentage * progressLineWidth);
|
|
21
23
|
const progressLineAnimatedProps = useAnimatedProps(() => {
|
|
22
24
|
const isBelowMinWidth = currentProgressLineWidth.value <= thicknessOffset;
|
|
25
|
+
console.log("RECEIVED", currentProgressLineWidth.value);
|
|
23
26
|
return {
|
|
24
|
-
x2: Math.min(progressLineWidth, currentProgressLineWidth.value),
|
|
27
|
+
x2: withTiming(Math.min(progressLineWidth, currentProgressLineWidth.value), //Prevents going beyond the max width,
|
|
28
|
+
{
|
|
29
|
+
duration: isAnimated ? animationDuration : 0,
|
|
30
|
+
}),
|
|
25
31
|
strokeOpacity: isBelowMinWidth ? 0.0 : 1.0,
|
|
26
32
|
};
|
|
27
33
|
});
|
|
28
34
|
React.useEffect(() => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
});
|
|
35
|
+
console.log("UPDATING TO", progressLineWidth * currentFillPercentage);
|
|
36
|
+
currentProgressLineWidth.value = progressLineWidth * currentFillPercentage;
|
|
32
37
|
}, [
|
|
33
38
|
value,
|
|
34
39
|
progressLineWidth,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LinearProgress.js","sourceRoot":"","sources":["LinearProgress.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,EAAE,EAAE,IAAI,EAAa,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,QAAQ,EAAE,EACf,gBAAgB,EAChB,cAAc,EACd,UAAU,GACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,0BAA0B,GAE3B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,cAAc,GAAiC,CAAC,EAC3D,KAAK,EACL,YAAY,GAAG,CAAC,EAChB,YAAY,GAAG,GAAG,EAClB,KAAK,GAAG,YAAY,EACpB,SAAS,GAAG,EAAE,EACd,cAAc,GAAG,SAAS,EAC1B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAC5B,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EACjC,YAAY,GAAG,CAAC,EAChB,SAAS,GAAG,IAAI,EAChB,iBAAiB,GAAG,0BAA0B,EAC9C,UAAU,GAAG,IAAI,EACjB,OAAO,GAAG,OAAO,EACjB,YAAY,GAAG,OAAO,EACtB,SAAS,EACT,cAAc,EACd,OAAO,EACP,YAAY,EACZ,UAAU,EACV,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,KAAK,EACL,MAAM,GACP,EAAE,EAAE;IACH,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEpE,MAAM,SAAS,GACb,SAAS,KAAK,SAAS;QACrB,CAAC,CAAC,GAAG,SAAS,IAAI,OAAO,IAAI,SAAS,EAAE;QACxC,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,cAAc,GAClB,cAAc,KAAK,SAAS;QAC1B,CAAC,CAAC,GAAG,cAAc,IAAI,YAAY,IAAI,cAAc,EAAE;QACvD,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,2DAA2D;IAErG,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,eAAe,CAAC;IAC9D,MAAM,sBAAsB,GAAG,iBAAiB,GAAG,eAAe,CAAC;IAEnE,MAAM,qBAAqB,GAAG,KAAK,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC,CAAC;IACpE,MAAM,wBAAwB,GAAG,cAAc,CAC7C,qBAAqB,GAAG,iBAAiB,CAC1C,CAAC;IAEF,MAAM,yBAAyB,GAAG,gBAAgB,CAAY,GAAG,EAAE;QACjE,MAAM,eAAe,GAAG,wBAAwB,CAAC,KAAK,IAAI,eAAe,CAAC;QAC1E,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"LinearProgress.js","sourceRoot":"","sources":["LinearProgress.tsx"],"names":[],"mappings":"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"}
|
|
@@ -55,28 +55,32 @@ export const LinearProgress: React.FC<ValueProgressProps> = ({
|
|
|
55
55
|
const thicknessOffset = maxThickness / 2; // This offset guarantees nothing is cut off by view bounds
|
|
56
56
|
|
|
57
57
|
const progressLineWidth = svgContainerWidth - thicknessOffset;
|
|
58
|
+
console.log("LINE WIDTH ", progressLineWidth);
|
|
58
59
|
const trackProgressLineWidth = svgContainerWidth - thicknessOffset;
|
|
59
60
|
|
|
60
61
|
const currentFillPercentage = value / (maximumValue + minimumValue);
|
|
62
|
+
console.log("PERC", currentFillPercentage);
|
|
61
63
|
const currentProgressLineWidth = useSharedValue(
|
|
62
64
|
currentFillPercentage * progressLineWidth
|
|
63
65
|
);
|
|
64
66
|
|
|
65
67
|
const progressLineAnimatedProps = useAnimatedProps<LineProps>(() => {
|
|
66
68
|
const isBelowMinWidth = currentProgressLineWidth.value <= thicknessOffset;
|
|
69
|
+
console.log("RECEIVED", currentProgressLineWidth.value);
|
|
67
70
|
return {
|
|
68
|
-
x2:
|
|
71
|
+
x2: withTiming(
|
|
72
|
+
Math.min(progressLineWidth, currentProgressLineWidth.value), //Prevents going beyond the max width,
|
|
73
|
+
{
|
|
74
|
+
duration: isAnimated ? animationDuration : 0,
|
|
75
|
+
}
|
|
76
|
+
),
|
|
69
77
|
strokeOpacity: isBelowMinWidth ? 0.0 : 1.0,
|
|
70
78
|
};
|
|
71
79
|
});
|
|
72
80
|
|
|
73
81
|
React.useEffect(() => {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
{
|
|
77
|
-
duration: isAnimated ? animationDuration : 0,
|
|
78
|
-
}
|
|
79
|
-
);
|
|
82
|
+
console.log("UPDATING TO", progressLineWidth * currentFillPercentage);
|
|
83
|
+
currentProgressLineWidth.value = progressLineWidth * currentFillPercentage;
|
|
80
84
|
}, [
|
|
81
85
|
value,
|
|
82
86
|
progressLineWidth,
|