@draftbit/core 50.2.4-573471.2 → 50.2.4
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/commonjs/components/BottomSheet/BottomSheet.js +1 -1
- package/lib/commonjs/components/SimpleStyleScrollables/SimpleStyleFlashList.js +1 -1
- package/lib/commonjs/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js +1 -1
- package/lib/commonjs/components/SimpleStyleScrollables/useSplitContentContainerStyles.js +1 -1
- package/lib/commonjs/utilities.js +1 -1
- package/lib/typescript/src/components/BottomSheet/BottomSheet.js +1 -12
- package/lib/typescript/src/components/BottomSheet/BottomSheet.js.map +1 -1
- package/lib/typescript/src/components/SimpleStyleScrollables/SimpleStyleFlashList.js +2 -2
- package/lib/typescript/src/components/SimpleStyleScrollables/SimpleStyleFlashList.js.map +1 -1
- package/lib/typescript/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js +2 -2
- package/lib/typescript/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js.map +1 -1
- package/lib/typescript/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.d.ts +1 -0
- package/lib/typescript/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js +47 -2
- package/lib/typescript/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js.map +1 -1
- package/lib/typescript/src/utilities.d.ts +1 -0
- package/lib/typescript/src/utilities.js +11 -0
- package/lib/typescript/src/utilities.js.map +1 -1
- package/lib/typescript/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/components/BottomSheet/BottomSheet.js +1 -12
- package/src/components/BottomSheet/BottomSheet.js.map +1 -1
- package/src/components/BottomSheet/BottomSheet.tsx +1 -13
- package/src/components/SimpleStyleScrollables/SimpleStyleFlashList.js +2 -2
- package/src/components/SimpleStyleScrollables/SimpleStyleFlashList.js.map +1 -1
- package/src/components/SimpleStyleScrollables/SimpleStyleFlashList.tsx +2 -2
- package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js +2 -2
- package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js.map +1 -1
- package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.tsx +2 -2
- package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js +47 -2
- package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js.map +1 -1
- package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.ts +55 -2
- package/src/utilities.js +11 -0
- package/src/utilities.js.map +1 -1
- package/src/utilities.ts +12 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@draftbit/core",
|
|
3
|
-
"version": "50.2.4
|
|
3
|
+
"version": "50.2.4",
|
|
4
4
|
"description": "Core (non-native) Components",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"types": "lib/typescript/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/theme": "
|
|
44
|
+
"@draftbit/theme": "50.2.4",
|
|
45
45
|
"@expo/vector-icons": "^14.0.0",
|
|
46
46
|
"@gorhom/bottom-sheet": "5.0.0-alpha.7",
|
|
47
47
|
"@material-ui/core": "^4.11.0",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
],
|
|
119
119
|
"testEnvironment": "node"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "4afc7544195a908be78cfd7564be1685453b7cea"
|
|
122
122
|
}
|
|
@@ -2,7 +2,7 @@ import React from "react";
|
|
|
2
2
|
import { StyleSheet, Dimensions, } from "react-native";
|
|
3
3
|
import BottomSheetComponent, { BottomSheetScrollView, } from "@gorhom/bottom-sheet";
|
|
4
4
|
import { useTheme } from "@draftbit/theme";
|
|
5
|
-
import { useDeepCompareMemo } from "../../utilities";
|
|
5
|
+
import { extractPercentNumber, useDeepCompareMemo } from "../../utilities";
|
|
6
6
|
const windowHeight = Dimensions.get("window").height;
|
|
7
7
|
// Clarification:
|
|
8
8
|
// Input of snap points is sorted top -> bottom where each value represents distance from top
|
|
@@ -61,17 +61,6 @@ function convertSnapPointsForNewImplementation(snapPoints) {
|
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
|
-
function extractPercentNumber(percentString) {
|
|
65
|
-
const percentRegex = /(\d+)?%/;
|
|
66
|
-
const matches = percentString.match(percentRegex);
|
|
67
|
-
if (matches === null || matches === void 0 ? void 0 : matches.length) {
|
|
68
|
-
const percentNumber = Number(matches[1]);
|
|
69
|
-
if (!isNaN(percentNumber)) {
|
|
70
|
-
return percentNumber;
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
return undefined;
|
|
74
|
-
}
|
|
75
64
|
const styles = StyleSheet.create({
|
|
76
65
|
contentContainerStyle: {
|
|
77
66
|
paddingHorizontal: 16,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,UAAU,EAIV,UAAU,GACX,MAAM,cAAc,CAAC;AAEtB,OAAO,oBAAoB,EAAE,EAC3B,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ import BottomSheetComponent, {
|
|
|
11
11
|
BottomSheetScrollView,
|
|
12
12
|
} from "@gorhom/bottom-sheet";
|
|
13
13
|
import { useTheme } from "@draftbit/theme";
|
|
14
|
-
import { useDeepCompareMemo } from "../../utilities";
|
|
14
|
+
import { extractPercentNumber, useDeepCompareMemo } from "../../utilities";
|
|
15
15
|
|
|
16
16
|
type SnapPosition = "top" | "middle" | "bottom";
|
|
17
17
|
|
|
@@ -145,18 +145,6 @@ function convertSnapPointsForNewImplementation(
|
|
|
145
145
|
});
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
-
function extractPercentNumber(percentString: string) {
|
|
149
|
-
const percentRegex = /(\d+)?%/;
|
|
150
|
-
const matches = percentString.match(percentRegex);
|
|
151
|
-
if (matches?.length) {
|
|
152
|
-
const percentNumber = Number(matches[1]);
|
|
153
|
-
if (!isNaN(percentNumber)) {
|
|
154
|
-
return percentNumber;
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
return undefined;
|
|
158
|
-
}
|
|
159
|
-
|
|
160
148
|
const styles = StyleSheet.create({
|
|
161
149
|
contentContainerStyle: {
|
|
162
150
|
paddingHorizontal: 16,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { FlashList } from "@shopify/flash-list";
|
|
3
|
-
import
|
|
3
|
+
import { useFlashListSplitContentContainerStyles } from "./useSplitContentContainerStyles";
|
|
4
4
|
/**
|
|
5
5
|
* A FlashList wrapper that takes a single `style` prop and internally extracts
|
|
6
6
|
* the appropriate style keys into the `contentContainerStyle`
|
|
7
7
|
*/
|
|
8
8
|
const SimpleStyleFlashList = React.forwardRef(({ style: styleProp, data, ...rest }, ref) => {
|
|
9
|
-
const { style, contentContainerStyle } =
|
|
9
|
+
const { style, contentContainerStyle } = useFlashListSplitContentContainerStyles(styleProp);
|
|
10
10
|
return (React.createElement(FlashList, { ref: ref, style: style, contentContainerStyle: contentContainerStyle, data: data, ...rest }));
|
|
11
11
|
});
|
|
12
12
|
export default SimpleStyleFlashList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleStyleFlashList.js","sourceRoot":"","sources":["SimpleStyleFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,
|
|
1
|
+
{"version":3,"file":"SimpleStyleFlashList.js","sourceRoot":"","sources":["SimpleStyleFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,uCAAuC,EAAE,MAAM,kCAAkC,CAAC;AAE3F;;;GAGG;AACH,MAAM,oBAAoB,GAAG,KAAK,CAAC,UAAU,CAC3C,CACE,EACE,KAAK,EAAE,SAAS,EAChB,IAAI,EACJ,GAAG,IAAI,EAC0C,EACnD,GAA8B,EAC9B,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,uCAAuC,CAAC,SAAS,CAAC,CAAC;IAErD,OAAO,CACL,oBAAC,SAAS,IACR,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqC,EAC5D,IAAI,EAAE,IAAI,KACN,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { FlashList } from "@shopify/flash-list";
|
|
3
3
|
import type { FlashListProps, ContentStyle } from "@shopify/flash-list";
|
|
4
|
-
import
|
|
4
|
+
import { useFlashListSplitContentContainerStyles } from "./useSplitContentContainerStyles";
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* A FlashList wrapper that takes a single `style` prop and internally extracts
|
|
@@ -17,7 +17,7 @@ const SimpleStyleFlashList = React.forwardRef(
|
|
|
17
17
|
ref: React.Ref<FlashList<any>>
|
|
18
18
|
) => {
|
|
19
19
|
const { style, contentContainerStyle } =
|
|
20
|
-
|
|
20
|
+
useFlashListSplitContentContainerStyles(styleProp);
|
|
21
21
|
|
|
22
22
|
return (
|
|
23
23
|
<FlashList
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { MasonryFlashList } from "@shopify/flash-list";
|
|
3
|
-
import
|
|
3
|
+
import { useFlashListSplitContentContainerStyles } from "./useSplitContentContainerStyles";
|
|
4
4
|
/**
|
|
5
5
|
* A MasonryFlashList wrapper that takes a single `style` prop and internally extracts
|
|
6
6
|
* the appropriate style keys into the `contentContainerStyle`
|
|
7
7
|
*/
|
|
8
8
|
const SimpleStyleMasonryFlashList = React.forwardRef(({ style: styleProp, data, ...rest }, ref) => {
|
|
9
|
-
const { style, contentContainerStyle } =
|
|
9
|
+
const { style, contentContainerStyle } = useFlashListSplitContentContainerStyles(styleProp);
|
|
10
10
|
return (React.createElement(MasonryFlashList, { ref: ref, style: style, contentContainerStyle: contentContainerStyle, data: data, ...rest }));
|
|
11
11
|
});
|
|
12
12
|
export default SimpleStyleMasonryFlashList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleStyleMasonryFlashList.js","sourceRoot":"","sources":["SimpleStyleMasonryFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAMvD,OAAO,
|
|
1
|
+
{"version":3,"file":"SimpleStyleMasonryFlashList.js","sourceRoot":"","sources":["SimpleStyleMasonryFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAMvD,OAAO,EAAE,uCAAuC,EAAE,MAAM,kCAAkC,CAAC;AAE3F;;;GAGG;AACH,MAAM,2BAA2B,GAAG,KAAK,CAAC,UAAU,CAClD,CACE,EACE,KAAK,EAAE,SAAS,EAChB,IAAI,EACJ,GAAG,IAAI,EACiD,EAC1D,GAAwC,EACxC,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,uCAAuC,CAAC,SAAS,CAAC,CAAC;IAErD,OAAO,CACL,oBAAC,gBAAgB,IACf,GAAG,EAAE,GAAU,EACf,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqC,EAC5D,IAAI,EAAE,IAAI,KACN,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
|
|
@@ -5,7 +5,7 @@ import type {
|
|
|
5
5
|
ContentStyle,
|
|
6
6
|
MasonryFlashListRef,
|
|
7
7
|
} from "@shopify/flash-list";
|
|
8
|
-
import
|
|
8
|
+
import { useFlashListSplitContentContainerStyles } from "./useSplitContentContainerStyles";
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
11
|
* A MasonryFlashList wrapper that takes a single `style` prop and internally extracts
|
|
@@ -21,7 +21,7 @@ const SimpleStyleMasonryFlashList = React.forwardRef(
|
|
|
21
21
|
ref: React.Ref<MasonryFlashListRef<any>>
|
|
22
22
|
) => {
|
|
23
23
|
const { style, contentContainerStyle } =
|
|
24
|
-
|
|
24
|
+
useFlashListSplitContentContainerStyles(styleProp);
|
|
25
25
|
|
|
26
26
|
return (
|
|
27
27
|
<MasonryFlashList
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { StyleSheet } from "react-native";
|
|
1
|
+
import { StyleSheet, Dimensions } from "react-native";
|
|
2
2
|
import { pick, omit } from "lodash";
|
|
3
|
-
import { useDeepCompareMemo } from "../../utilities";
|
|
3
|
+
import { extractPercentNumber, useDeepCompareMemo } from "../../utilities";
|
|
4
|
+
const DEVICE_WIDTH = Dimensions.get("window").width;
|
|
5
|
+
const DEVICE_HEIGHT = Dimensions.get("window").height;
|
|
4
6
|
export const contentContainerStyleNames = [
|
|
5
7
|
"padding",
|
|
6
8
|
"paddingBottom",
|
|
@@ -41,4 +43,47 @@ export default function useSplitContentContainerStyles(originalStyle) {
|
|
|
41
43
|
};
|
|
42
44
|
}, [originalStyle]);
|
|
43
45
|
}
|
|
46
|
+
export function useFlashListSplitContentContainerStyles(originalStyle) {
|
|
47
|
+
const { style, contentContainerStyle } = useSplitContentContainerStyles(originalStyle);
|
|
48
|
+
// FlashList only supports a subset of contentContainerStyles
|
|
49
|
+
// See https://shopify.github.io/flash-list/docs/usage/#contentcontainerstyle
|
|
50
|
+
const flashListContentContainerStyle = pick(contentContainerStyle, [
|
|
51
|
+
"backgroundColor",
|
|
52
|
+
"paddingTop",
|
|
53
|
+
"paddingLeft",
|
|
54
|
+
"paddingRight",
|
|
55
|
+
"paddingBottom",
|
|
56
|
+
"padding",
|
|
57
|
+
"paddingVertical",
|
|
58
|
+
"paddingHorizontal",
|
|
59
|
+
]);
|
|
60
|
+
// FlashList percentage paddings cause it to freeze and crash
|
|
61
|
+
// This converts them to numbers based on device width/height
|
|
62
|
+
for (const [key, value] of Object.entries(flashListContentContainerStyle)) {
|
|
63
|
+
if (typeof value === "string" && key.includes("padding")) {
|
|
64
|
+
const asNumber = extractPercentNumber(value);
|
|
65
|
+
if (asNumber !== undefined) {
|
|
66
|
+
switch (key) {
|
|
67
|
+
case "padding":
|
|
68
|
+
case "paddingLeft":
|
|
69
|
+
case "paddingRight":
|
|
70
|
+
case "paddingHorizontal":
|
|
71
|
+
flashListContentContainerStyle[key] =
|
|
72
|
+
DEVICE_WIDTH * (asNumber / 100);
|
|
73
|
+
break;
|
|
74
|
+
case "paddingTop":
|
|
75
|
+
case "paddingBottom":
|
|
76
|
+
case "paddingVertical":
|
|
77
|
+
flashListContentContainerStyle[key] =
|
|
78
|
+
DEVICE_HEIGHT * (asNumber / 100);
|
|
79
|
+
break;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return {
|
|
85
|
+
style,
|
|
86
|
+
contentContainerStyle: flashListContentContainerStyle,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
44
89
|
//# sourceMappingURL=useSplitContentContainerStyles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSplitContentContainerStyles.js","sourceRoot":"","sources":["useSplitContentContainerStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"useSplitContentContainerStyles.js","sourceRoot":"","sources":["useSplitContentContainerStyles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { StyleProp, ViewStyle, StyleSheet } from "react-native";
|
|
1
|
+
import { StyleProp, ViewStyle, StyleSheet, Dimensions } from "react-native";
|
|
2
2
|
import { pick, omit } from "lodash";
|
|
3
|
-
import { useDeepCompareMemo } from "../../utilities";
|
|
3
|
+
import { extractPercentNumber, useDeepCompareMemo } from "../../utilities";
|
|
4
|
+
|
|
5
|
+
const DEVICE_WIDTH = Dimensions.get("window").width;
|
|
6
|
+
const DEVICE_HEIGHT = Dimensions.get("window").height;
|
|
4
7
|
|
|
5
8
|
interface Styles {
|
|
6
9
|
style?: StyleProp<ViewStyle>;
|
|
@@ -57,3 +60,53 @@ export default function useSplitContentContainerStyles(
|
|
|
57
60
|
};
|
|
58
61
|
}, [originalStyle]);
|
|
59
62
|
}
|
|
63
|
+
|
|
64
|
+
export function useFlashListSplitContentContainerStyles(
|
|
65
|
+
originalStyle: StyleProp<ViewStyle>
|
|
66
|
+
): Styles {
|
|
67
|
+
const { style, contentContainerStyle } =
|
|
68
|
+
useSplitContentContainerStyles(originalStyle);
|
|
69
|
+
|
|
70
|
+
// FlashList only supports a subset of contentContainerStyles
|
|
71
|
+
// See https://shopify.github.io/flash-list/docs/usage/#contentcontainerstyle
|
|
72
|
+
const flashListContentContainerStyle = pick(contentContainerStyle, [
|
|
73
|
+
"backgroundColor",
|
|
74
|
+
"paddingTop",
|
|
75
|
+
"paddingLeft",
|
|
76
|
+
"paddingRight",
|
|
77
|
+
"paddingBottom",
|
|
78
|
+
"padding",
|
|
79
|
+
"paddingVertical",
|
|
80
|
+
"paddingHorizontal",
|
|
81
|
+
]) as { [key: string]: any };
|
|
82
|
+
|
|
83
|
+
// FlashList percentage paddings cause it to freeze and crash
|
|
84
|
+
// This converts them to numbers based on device width/height
|
|
85
|
+
for (const [key, value] of Object.entries(flashListContentContainerStyle)) {
|
|
86
|
+
if (typeof value === "string" && key.includes("padding")) {
|
|
87
|
+
const asNumber = extractPercentNumber(value);
|
|
88
|
+
if (asNumber !== undefined) {
|
|
89
|
+
switch (key) {
|
|
90
|
+
case "padding":
|
|
91
|
+
case "paddingLeft":
|
|
92
|
+
case "paddingRight":
|
|
93
|
+
case "paddingHorizontal":
|
|
94
|
+
flashListContentContainerStyle[key] =
|
|
95
|
+
DEVICE_WIDTH * (asNumber / 100);
|
|
96
|
+
break;
|
|
97
|
+
case "paddingTop":
|
|
98
|
+
case "paddingBottom":
|
|
99
|
+
case "paddingVertical":
|
|
100
|
+
flashListContentContainerStyle[key] =
|
|
101
|
+
DEVICE_HEIGHT * (asNumber / 100);
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return {
|
|
109
|
+
style,
|
|
110
|
+
contentContainerStyle: flashListContentContainerStyle,
|
|
111
|
+
};
|
|
112
|
+
}
|
package/src/utilities.js
CHANGED
|
@@ -209,4 +209,15 @@ export function useDeepCompareEffect(effect, deps) {
|
|
|
209
209
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
210
210
|
return React.useEffect(effect, deps === null || deps === void 0 ? void 0 : deps.map(useDeepCompareMemoize));
|
|
211
211
|
}
|
|
212
|
+
export function extractPercentNumber(percentString) {
|
|
213
|
+
const percentRegex = /(\d+)?%/;
|
|
214
|
+
const matches = percentString.match(percentRegex);
|
|
215
|
+
if (matches === null || matches === void 0 ? void 0 : matches.length) {
|
|
216
|
+
const percentNumber = Number(matches[1]);
|
|
217
|
+
if (!isNaN(percentNumber)) {
|
|
218
|
+
return percentNumber;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
return undefined;
|
|
222
|
+
}
|
|
212
223
|
//# sourceMappingURL=utilities.js.map
|
package/src/utilities.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["utilities.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["utilities.ts"],"names":[],"mappings":"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"}
|
package/src/utilities.ts
CHANGED
|
@@ -305,3 +305,15 @@ export function useDeepCompareEffect(
|
|
|
305
305
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
306
306
|
return React.useEffect(effect, deps?.map(useDeepCompareMemoize));
|
|
307
307
|
}
|
|
308
|
+
|
|
309
|
+
export function extractPercentNumber(percentString: string) {
|
|
310
|
+
const percentRegex = /(\d+)?%/;
|
|
311
|
+
const matches = percentString.match(percentRegex);
|
|
312
|
+
if (matches?.length) {
|
|
313
|
+
const percentNumber = Number(matches[1]);
|
|
314
|
+
if (!isNaN(percentNumber)) {
|
|
315
|
+
return percentNumber;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
return undefined;
|
|
319
|
+
}
|