@draftbit/core 50.2.3-9ed7ea.2 → 50.2.3-ad4d9d.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/commonjs/components/BottomSheet/BottomSheet.js +1 -1
- package/lib/typescript/src/components/BottomSheet/BottomSheet.d.ts +2 -0
- package/lib/typescript/src/components/BottomSheet/BottomSheet.js +3 -5
- package/lib/typescript/src/components/BottomSheet/BottomSheet.js.map +1 -1
- package/lib/typescript/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/components/BottomSheet/BottomSheet.js +3 -5
- package/src/components/BottomSheet/BottomSheet.js.map +1 -1
- package/src/components/BottomSheet/BottomSheet.tsx +7 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@draftbit/core",
|
|
3
|
-
"version": "50.2.3-
|
|
3
|
+
"version": "50.2.3-ad4d9d.2+ad4d9d7",
|
|
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": "^50.2.3-
|
|
44
|
+
"@draftbit/theme": "^50.2.3-ad4d9d.2+ad4d9d7",
|
|
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": "ad4d9d7257b66d68d5eb9935dacc377d71095c08"
|
|
122
122
|
}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { StyleSheet, Dimensions, } from "react-native";
|
|
3
3
|
import BottomSheetComponent, { BottomSheetScrollView, } from "@gorhom/bottom-sheet";
|
|
4
|
-
import { useTheme } from "@draftbit/theme";
|
|
5
4
|
import { useDeepCompareMemo } from "../../utilities";
|
|
6
5
|
const windowHeight = Dimensions.get("window").height;
|
|
7
6
|
// Clarification:
|
|
8
7
|
// Input of snap points is sorted top -> bottom where each value represents distance from top
|
|
9
8
|
// Implementation using `@gorhom/bottom-sheet` is sorted bottom -> top where each value represents distance from bottom
|
|
10
|
-
const BottomSheet = React.forwardRef(({ snapPoints: snapPointsProp, topSnapPosition = "10%", middleSnapPosition = "50%", bottomSnapPosition = "80%", initialSnapIndex, initialSnapPosition = "bottom", showHandle = true, handleColor, topBorderRadius = 20, borderWidth = 1, borderColor, onSettle, style, children, ...rest }, ref) => {
|
|
11
|
-
const theme = useTheme();
|
|
9
|
+
const BottomSheet = React.forwardRef(({ theme, snapPoints: snapPointsProp, topSnapPosition = "10%", middleSnapPosition = "50%", bottomSnapPosition = "80%", initialSnapIndex, initialSnapPosition = "bottom", showHandle = true, handleColor = theme.colors.border.brand, topBorderRadius = 20, borderWidth = 1, borderColor = theme.colors.border.brand, onSettle, style, children, ...rest }, ref) => {
|
|
12
10
|
const backgroundColor = (style === null || style === void 0 ? void 0 : style.backgroundColor) || theme.colors.background.brand;
|
|
13
11
|
const snapPoints = snapPointsProp !== null && snapPointsProp !== void 0 ? snapPointsProp : [
|
|
14
12
|
topSnapPosition,
|
|
@@ -29,14 +27,14 @@ const BottomSheet = React.forwardRef(({ snapPoints: snapPointsProp, topSnapPosit
|
|
|
29
27
|
return (React.createElement(BottomSheetComponent, { ref: ref, snapPoints: mappedSnapPoints, index: initialSnapIndex !== undefined
|
|
30
28
|
? mappedSnapPoints.length - initialSnapIndex - 1
|
|
31
29
|
: getSnapIndexFromPosition(initialSnapPosition), handleIndicatorStyle: [
|
|
32
|
-
{ backgroundColor: handleColor
|
|
30
|
+
{ backgroundColor: handleColor },
|
|
33
31
|
!showHandle ? { display: "none" } : {},
|
|
34
32
|
], backgroundStyle: {
|
|
35
33
|
backgroundColor,
|
|
36
34
|
borderTopLeftRadius: topBorderRadius,
|
|
37
35
|
borderTopRightRadius: topBorderRadius,
|
|
38
36
|
borderWidth,
|
|
39
|
-
borderColor
|
|
37
|
+
borderColor,
|
|
40
38
|
}, onChange: (index) => onSettle === null || onSettle === void 0 ? void 0 : onSettle(mappedSnapPoints.length - index - 1) },
|
|
41
39
|
React.createElement(BottomSheetScrollView, { contentContainerStyle: [styles.contentContainerStyle, style], ...rest }, children)));
|
|
42
40
|
});
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"BottomSheet.js","sourceRoot":"","sources":["BottomSheet.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
import BottomSheetComponent, {
|
|
11
11
|
BottomSheetScrollView,
|
|
12
12
|
} from "@gorhom/bottom-sheet";
|
|
13
|
-
import {
|
|
13
|
+
import type { ReadTheme } from "@draftbit/theme";
|
|
14
14
|
import { useDeepCompareMemo } from "../../utilities";
|
|
15
15
|
|
|
16
16
|
type SnapPosition = "top" | "middle" | "bottom";
|
|
@@ -37,6 +37,7 @@ export interface BottomSheetProps extends ScrollViewProps {
|
|
|
37
37
|
borderColor?: string;
|
|
38
38
|
onSettle?: (index: number) => void;
|
|
39
39
|
style?: StyleProp<ViewStyle>;
|
|
40
|
+
theme: ReadTheme;
|
|
40
41
|
}
|
|
41
42
|
|
|
42
43
|
// Clarification:
|
|
@@ -45,6 +46,7 @@ export interface BottomSheetProps extends ScrollViewProps {
|
|
|
45
46
|
const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
|
|
46
47
|
(
|
|
47
48
|
{
|
|
49
|
+
theme,
|
|
48
50
|
snapPoints: snapPointsProp,
|
|
49
51
|
topSnapPosition = "10%",
|
|
50
52
|
middleSnapPosition = "50%",
|
|
@@ -52,10 +54,10 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
|
|
|
52
54
|
initialSnapIndex,
|
|
53
55
|
initialSnapPosition = "bottom",
|
|
54
56
|
showHandle = true,
|
|
55
|
-
handleColor,
|
|
57
|
+
handleColor = theme.colors.border.brand,
|
|
56
58
|
topBorderRadius = 20,
|
|
57
59
|
borderWidth = 1,
|
|
58
|
-
borderColor,
|
|
60
|
+
borderColor = theme.colors.border.brand,
|
|
59
61
|
onSettle,
|
|
60
62
|
style,
|
|
61
63
|
children,
|
|
@@ -63,7 +65,6 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
|
|
|
63
65
|
},
|
|
64
66
|
ref
|
|
65
67
|
) => {
|
|
66
|
-
const theme = useTheme();
|
|
67
68
|
const backgroundColor =
|
|
68
69
|
(style as ViewStyle)?.backgroundColor || theme.colors.background.brand;
|
|
69
70
|
|
|
@@ -99,7 +100,7 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
|
|
|
99
100
|
: getSnapIndexFromPosition(initialSnapPosition)
|
|
100
101
|
}
|
|
101
102
|
handleIndicatorStyle={[
|
|
102
|
-
{ backgroundColor: handleColor
|
|
103
|
+
{ backgroundColor: handleColor },
|
|
103
104
|
!showHandle ? { display: "none" } : {},
|
|
104
105
|
]}
|
|
105
106
|
backgroundStyle={{
|
|
@@ -107,7 +108,7 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
|
|
|
107
108
|
borderTopLeftRadius: topBorderRadius,
|
|
108
109
|
borderTopRightRadius: topBorderRadius,
|
|
109
110
|
borderWidth,
|
|
110
|
-
borderColor
|
|
111
|
+
borderColor,
|
|
111
112
|
}}
|
|
112
113
|
onChange={(index) => onSettle?.(mappedSnapPoints.length - index - 1)}
|
|
113
114
|
>
|