@draftbit/core 46.4.4-b53636.2 → 46.4.4-c18fe1.2

package/lib/module/styles/DefaultTheme.js

@@ -28,67 +28,80 @@ const DefaultTheme = {
   },
   fonts: configureFonts(),
   typography: {
-    headline1: { ...systemWeights.regular,
+    headline1: {
+      ...systemWeights.regular,
       fontSize: 60,
       letterSpacing: 0,
       lineHeight: 71
     },
-    headline2: { ...systemWeights.regular,
+    headline2: {
+      ...systemWeights.regular,
       fontSize: 48,
       letterSpacing: 0,
       lineHeight: 58
     },
-    headline3: { ...systemWeights.regular,
+    headline3: {
+      ...systemWeights.regular,
       fontSize: 34,
       letterSpacing: 0,
       lineHeight: 40
     },
-    headline4: { ...systemWeights.regular,
+    headline4: {
+      ...systemWeights.regular,
       fontSize: 24,
       letterSpacing: 0,
       lineHeight: 34
     },
-    headline5: { ...systemWeights.regular,
+    headline5: {
+      ...systemWeights.regular,
       fontSize: 20,
       letterSpacing: 0,
       lineHeight: 26
     },
-    subtitle1: { ...systemWeights.regular,
+    subtitle1: {
+      ...systemWeights.regular,
       fontSize: 16,
       letterSpacing: 0,
       lineHeight: 26
     },
-    subtitle2: { ...systemWeights.regular,
+    subtitle2: {
+      ...systemWeights.regular,
       fontSize: 14,
       letterSpacing: 0,
       lineHeight: 22
     },
-    body1: { ...systemWeights.regular,
+    body1: {
+      ...systemWeights.regular,
       fontSize: 16,
       letterSpacing: 0,
       lineHeight: 26
     },
-    body2: { ...systemWeights.regular,
+    body2: {
+      ...systemWeights.regular,
       fontSize: 14,
       letterSpacing: 0,
       lineHeight: 22
     },
-    button: { ...systemWeights.regular,
+    button: {
+      ...systemWeights.regular,
       fontSize: 14,
       letterSpacing: 0,
       lineHeight: 16
     },
-    caption: { ...systemWeights.regular,
+    caption: {
+      ...systemWeights.regular,
       fontSize: 12,
       letterSpacing: 0,
       lineHeight: 16
     },
-    overline: { ...systemWeights.regular,
+    overline: {
+      ...systemWeights.regular,
       fontSize: 12,
       letterSpacing: 2,
       lineHeight: 16
     },
-    headline6: { ...systemWeights.regular,
+    headline6: {
+      ...systemWeights.regular,
       fontSize: 16,
       letterSpacing: 0,
       lineHeight: 24

package/lib/module/styles/fonts.js

@@ -57,7 +57,8 @@ const fontConfig = {
   }
 };
 export default function configureFonts(config) {
-  const fonts = Platform.select({ ...fontConfig,
+  const fonts = Platform.select({
+    ...fontConfig,
     ...config
   });
   return fonts;

package/lib/module/styles/overlay.js

@@ -2,31 +2,27 @@
 import color from "color";
 import { Animated } from "react-native";
 import DarkTheme from "./DarkTheme";
-
 const isAnimatedValue = it => it instanceof Animated.Value;
-
 export default function overlay(elevation) {
   let surfaceColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DarkTheme.colors.surface;
-
   if (isAnimatedValue(elevation)) {
-    const inputRange = [0, 1, 2, 3, 8, 24]; // @ts-expect-error: TS doesn't seem to refine the type correctly
+    const inputRange = [0, 1, 2, 3, 8, 24];
 
+    // @ts-expect-error: TS doesn't seem to refine the type correctly
     return elevation.interpolate({
       inputRange,
       outputRange: inputRange.map(e => {
         return calculateColor(surfaceColor, e);
       })
     });
-  } // @ts-expect-error: TS doesn't seem to refine the type correctly
-
+  }
 
+  // @ts-expect-error: TS doesn't seem to refine the type correctly
   return calculateColor(surfaceColor, elevation);
 }
-
 function calculateColor(surfaceColor) {
   let elevation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   let overlayTransparency;
-
   if (elevation >= 1 && elevation <= 24) {
     overlayTransparency = elevationOverlayTransparency[elevation];
   } else if (elevation > 24) {
@@ -34,10 +30,8 @@ function calculateColor(surfaceColor) {
   } else {
     overlayTransparency = elevationOverlayTransparency[1];
   }
-
   return color(surfaceColor).mix(color("white"), overlayTransparency * 0.01).hex();
 }
-
 const elevationOverlayTransparency = {
   1: 5,
   2: 7,

package/lib/module/styles/shadow.js

@@ -3,7 +3,6 @@ const SHADOW_COLOR = "#000";
 const SHADOW_OPACITY = 0.24;
 export default function shadow() {
   let elevation = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-
   if (elevation instanceof Animated.Value) {
     const inputRange = [0, 1, 2, 3, 8, 24];
     return {
@@ -25,25 +24,20 @@ export default function shadow() {
     if (elevation === 0) {
       return {};
     }
-
     let height, radius;
-
     switch (elevation) {
       case 1:
         height = 0.5;
         radius = 0.75;
         break;
-
       case 2:
         height = 0.75;
         radius = 1.5;
         break;
-
       default:
         height = elevation - 1;
         radius = elevation;
     }
-
     return {
       shadowColor: SHADOW_COLOR,
       shadowOffset: {

package/lib/module/utilities.js

@@ -44,6 +44,7 @@ export function extractBorderAndMarginStyles(style, additionalBorderStyles, addi
     marginStyles
   };
 }
+
 /**
  * Merges a style object on top of another style object. In React Native,
  * keys with undefined values in a style object will still override styles
@@ -56,20 +57,16 @@ export function extractBorderAndMarginStyles(style, additionalBorderStyles, addi
  * `const mergedStyles = StyleSheet.compose({ color: "red" }, { color: undefined })`
  * `const mergedStyles = StyleSheet.flatten([{ color: "red" }, { color: undefined }])`
  */
-
 export function applyStyles(baseStyles, stylesToApply) {
   if (!stylesToApply) {
     return;
   }
-
   const flattenedStyles = StyleSheet.flatten(baseStyles);
-
   for (const [key, value] of Object.entries(stylesToApply)) {
     if (value != null) {
       flattenedStyles[key] = value;
     }
   }
-
   return flattenedStyles;
 }
 export function getValueForRadioButton(value) {
@@ -78,6 +75,6 @@ export function getValueForRadioButton(value) {
   } else if (isNumber(value)) {
     return String(value);
   } else {
-    throw new Error("Invalid value: ".concat(value));
+    throw new Error(`Invalid value: ${value}`);
   }
 }

package/lib/typescript/src/components/BottomSheet/BottomSheet.native.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { BottomSheetProps } from "./types";
+declare const BottomSheetComponent: React.FC<BottomSheetProps>;
+export default BottomSheetComponent;

package/lib/typescript/src/components/BottomSheet/BottomSheet.web.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { BottomSheetProps } from "./types";
+declare const BottomSheetComponent: React.FC<BottomSheetProps>;
+export default BottomSheetComponent;

package/lib/typescript/src/components/BottomSheet/index.d.ts

@@ -0,0 +1 @@
+export { default as BottomSheet } from "./BottomSheet";

package/lib/typescript/src/components/BottomSheet/types.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { StyleProp, ViewStyle, TextStyle } from "react-native";
+export interface BottomSheetProps {
+    style: StyleProp<ViewStyle | TextStyle>;
+    children: React.ReactNode;
+    step: number;
+    isOpen?: Boolean;
+}

package/lib/typescript/src/components/Text.d.ts

@@ -6,7 +6,8 @@ declare type Props = {
 } & TextProps;
 declare class Text extends React.Component<Props> {
     _root: any;
-    setNativeProps(args: TextProps): any;
+    state: any;
+    setNativeProps(args: TextProps): void;
     render(): JSX.Element;
 }
 export declare const BaseLink: ({ style, theme, title, ...props }: any) => JSX.Element;

package/lib/typescript/src/components/TextField.d.ts

@@ -27,6 +27,7 @@ export declare type Props = {
     }) => React.ReactNode;
 } & TextInputProps & IconSlot;
 interface State {
+    nativeProps: any;
     labeled: Animated.Value;
     focused?: boolean;
     placeholder?: string | undefined;
@@ -57,7 +58,7 @@ declare class TextField extends React.Component<Props, State> {
     /**
      * @internal
      */
-    setNativeProps(args: Props): void | undefined;
+    setNativeProps(args: Props): void;
     isFocused(): boolean | undefined;
     clear(): void | undefined;
     focus(): void | undefined;

package/lib/typescript/src/index.d.ts

@@ -29,6 +29,7 @@ export { default as Touchable } from "./components/Touchable";
 export { AccordionGroup, AccordionItem } from "./components/Accordion";
 export { ActionSheet, ActionSheetItem, ActionSheetCancel, } from "./components/ActionSheet";
 export { Swiper, SwiperItem } from "./components/Swiper";
+export { BottomSheet } from "./components/BottomSheet";
 export { Center, Circle, Square, Row, Stack, Spacer, } from "./components/Layout";
 export { RadioButton, RadioButtonGroup, RadioButtonRow, RadioButtonFieldGroup, } from "./components/RadioButton/index";
 export { default as CardBlock } from "./components/CardBlock";

package/lib/typescript/src/mappings/AudioPlayer.d.ts

@@ -3,17 +3,7 @@ export declare const SEED_DATA: {
     tag: string;
     description: string;
     category: string;
-    stylesPanelSections: string[];
-    layout: {
-        backgroundColor: string;
-        paddingLeft: number;
-        paddingRight: number;
-        paddingTop: number;
-        paddingBottom: number;
-        borderRadius: number;
-        flexDirection: string;
-        alignItems: string;
-    };
+    layout: {};
     props: {
         source: {
             group: string;
@@ -25,56 +15,5 @@ export declare const SEED_DATA: {
             formType: string;
             propType: string;
         };
-        sliderColor: {
-            group: string;
-            label: string;
-            description: string;
-            editable: boolean;
-            required: boolean;
-            defaultValue: null;
-            formType: string;
-            propType: string;
-        };
-        completedTrackColor: {
-            group: string;
-            label: string;
-            description: string;
-            editable: boolean;
-            required: boolean;
-            defaultValue: null;
-            formType: string;
-            propType: string;
-        };
-        remainingTrackColor: {
-            group: string;
-            label: string;
-            description: string;
-            editable: boolean;
-            required: boolean;
-            defaultValue: null;
-            formType: string;
-            propType: string;
-        };
-        trackThumbSize: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        playIconColor: {
-            group: string;
-            label: string;
-            description: string;
-            editable: boolean;
-            required: boolean;
-            defaultValue: null;
-            formType: string;
-            propType: string;
-        };
     };
 };

package/lib/typescript/src/mappings/BottomSheet.d.ts

@@ -0,0 +1,19 @@
+export declare const SEED_DATA: {
+    name: string;
+    tag: string;
+    category: string;
+    stylesPanelSections: string[];
+    props: {
+        step: {
+            label: string;
+            description: string;
+            formType: string;
+            propType: string;
+            group: string;
+            defaultValue: null;
+            editable: boolean;
+            required: boolean;
+            step: number;
+        };
+    };
+};

package/lib/typescript/src/mappings/TextField.d.ts

@@ -64,7 +64,7 @@ export declare const SEED_DATA: ({
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;
@@ -371,7 +371,7 @@ export declare const SEED_DATA: ({
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;

package/lib/typescript/src/mappings/TextInput.d.ts

@@ -229,7 +229,7 @@ export declare const SEED_DATA: {
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.4.4-b53636.2+b536363",
+  "version": "46.4.4-c18fe1.2+c18fe15",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,7 +41,8 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.4.4-b53636.2+b536363",
+    "@draftbit/types": "^46.4.4-c18fe1.2+c18fe15",
+    "@gorhom/bottom-sheet": "4.4.5",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -54,6 +55,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.tonumber": "^4.0.3",
     "react-native-modal-datetime-picker": "^13.0.0",
+    "react-native-scroll-bottom-sheet": "0.7.0",
     "react-native-svg": "12.3.0",
     "react-native-typography": "^1.4.1",
     "react-native-web-swiper": "^2.2.3"
@@ -81,5 +83,5 @@
       ]
     ]
   },
-  "gitHead": "b536363885da285bd8327c5c4cb51fd9e03bdf78"
+  "gitHead": "c18fe15af829dd9dbc224859aeda8cc5bda518dc"
 }

package/src/components/BottomSheet/BottomSheet.native.js

@@ -0,0 +1,37 @@
+import React, { useCallback, useMemo, useRef } from "react";
+import { View, StyleSheet } from "react-native";
+import BottomSheet, { BottomSheetView } from "@gorhom/bottom-sheet";
+import { extractStyles } from "../../utilities";
+const BottomSheetComponent = ({ style, children, step, }) => {
+    const bottomSheetRef = useRef(null);
+    const { viewStyles } = extractStyles(style);
+    // variables
+    const snapPoints = useMemo(() => ["25%", "50%", "90%"], []);
+    // callbacks
+    const handleSheetChanges = useCallback((index) => {
+        console.log("handleSheetChanges", index);
+    }, []);
+    React.useEffect(() => {
+        var _a;
+        if (step === -1) {
+            (_a = bottomSheetRef === null || bottomSheetRef === void 0 ? void 0 : bottomSheetRef.current) === null || _a === void 0 ? void 0 : _a.close();
+        }
+    }, [step]);
+    return (React.createElement(View, { style: [
+            containerStyle.container,
+            viewStyles,
+            { backgroundColor: step !== -1 ? "grey" : "transparent" },
+        ] },
+        React.createElement(BottomSheet, { ref: bottomSheetRef, index: step, snapPoints: snapPoints, onChange: handleSheetChanges },
+            React.createElement(BottomSheetView, null, children))));
+};
+export default BottomSheetComponent;
+const containerStyle = StyleSheet.create({
+    container: {
+        flex: 1,
+    },
+    contentContainer: {
+        flex: 1,
+        alignItems: "center",
+    },
+});

package/src/components/BottomSheet/BottomSheet.native.tsx

@@ -0,0 +1,60 @@
+import React, { useCallback, useMemo, useRef } from "react";
+import { View, StyleSheet } from "react-native";
+import BottomSheet, { BottomSheetView } from "@gorhom/bottom-sheet";
+
+import { extractStyles } from "../../utilities";
+import { BottomSheetProps } from "./types";
+
+const BottomSheetComponent: React.FC<BottomSheetProps> = ({
+  style,
+  children,
+  step,
+}) => {
+  const bottomSheetRef = useRef<BottomSheet>(null);
+  const { viewStyles } = extractStyles(style);
+
+  // variables
+  const snapPoints = useMemo(() => ["25%", "50%", "90%"], []);
+
+  // callbacks
+  const handleSheetChanges = useCallback((index: number) => {
+    console.log("handleSheetChanges", index);
+  }, []);
+
+  React.useEffect(() => {
+    if (step === -1) {
+      bottomSheetRef?.current?.close();
+    }
+  }, [step]);
+
+  return (
+    <View
+      style={[
+        containerStyle.container,
+        viewStyles,
+        { backgroundColor: step !== -1 ? "grey" : "transparent" },
+      ]}
+    >
+      <BottomSheet
+        ref={bottomSheetRef}
+        index={step}
+        snapPoints={snapPoints}
+        onChange={handleSheetChanges}
+      >
+        <BottomSheetView>{children}</BottomSheetView>
+      </BottomSheet>
+    </View>
+  );
+};
+
+export default BottomSheetComponent;
+
+const containerStyle = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  contentContainer: {
+    flex: 1,
+    alignItems: "center",
+  },
+});

package/src/components/BottomSheet/BottomSheet.web.js

@@ -0,0 +1,56 @@
+import React from "react";
+import { StyleSheet, View, Dimensions } from "react-native";
+import ScrollBottomSheet from "react-native-scroll-bottom-sheet";
+import { extractStyles } from "../../utilities";
+const windowHeight = Dimensions.get("window").height;
+const BottomSheetComponent = ({ style, children, step, }) => {
+    const { viewStyles } = extractStyles(style);
+    const bottomSheetRef = React.useRef();
+    const webStep = React.useMemo(() => step + 1, [step]);
+    const snapPoints = React.useMemo(() => ["25%", "50%", windowHeight - 200], []);
+    React.useEffect(() => {
+        var _a;
+        (_a = bottomSheetRef === null || bottomSheetRef === void 0 ? void 0 : bottomSheetRef.current) === null || _a === void 0 ? void 0 : _a.snapTo(snapPoints.length - webStep);
+        // bottomSheetRef.current.snapTo(step);
+    }, [webStep, step, snapPoints]);
+    if (step === -1) {
+        return React.createElement(React.Fragment, null);
+    }
+    return (React.createElement(View, { style: styles.container },
+        React.createElement(ScrollBottomSheet, { ref: bottomSheetRef, componentType: "ScrollView", snapPoints: snapPoints, initialSnapIndex: 0, renderHandle: () => (React.createElement(View, { style: styles.header },
+                React.createElement(View, { style: styles.panelHandle }))), contentContainerStyle: styles.contentContainerStyle },
+            React.createElement(View, { style: {
+                    ...styles.container,
+                    ...viewStyles,
+                    backgroundColor: webStep !== -1 ? "grey" : "transparent",
+                } }, children))));
+};
+export default BottomSheetComponent;
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+    },
+    contentContainerStyle: {
+        padding: 16,
+    },
+    header: {
+        alignItems: "center",
+        backgroundColor: "white",
+        paddingVertical: 20,
+        borderTopLeftRadius: 20,
+        borderTopRightRadius: 20,
+    },
+    panelHandle: {
+        width: 40,
+        height: 2,
+        backgroundColor: "rgba(0,0,0,0.3)",
+        borderRadius: 4,
+    },
+    item: {
+        padding: 20,
+        justifyContent: "center",
+        backgroundColor: "white",
+        alignItems: "center",
+        marginVertical: 10,
+    },
+});