@draftbit/core 46.4.4-602cb9.2 → 46.4.4-618dac.2

package/lib/module/components/Text.js

@@ -11,10 +11,14 @@ class Text extends React.Component {
     super(...arguments);
 
     _defineProperty(this, "_root", void 0);
+
+    _defineProperty(this, "state", {
+      nativeProps: {}
+    });
   }
 
   setNativeProps(args) {
-    return this._root && this._root.setNativeProps(args);
+    this.state.nativeProps = args || {};
   }
 
   render() {
@@ -23,7 +27,7 @@ class Text extends React.Component {
       ...rest
     } = this.props;
     const writingDirection = I18nManager.isRTL ? "rtl" : "ltr";
-    return /*#__PURE__*/React.createElement(NativeText, _extends({}, rest, {
+    return /*#__PURE__*/React.createElement(NativeText, _extends({}, rest, this.state.nativeProps, {
       ref: c => {
         this._root = c;
       },

package/lib/module/components/TextField.js

@@ -16,6 +16,7 @@ class TextField extends React.Component {
     super(...arguments);
 
     _defineProperty(this, "state", {
+      nativeProps: {},
       labeled: new Animated.Value(this.props.value || this.props.error ? 0 : 1),
       focused: false,
       placeholder: this.props.error ? this.props.placeholder : "",
@@ -146,7 +147,9 @@ class TextField extends React.Component {
    * @internal
    */
   setNativeProps(args) {
-    return this._root && this._root.setNativeProps(args);
+    this.setState(state => ({ ...state,
+      nativeState: args || {}
+    }));
   }
 
   isFocused() {
@@ -426,6 +429,7 @@ class TextField extends React.Component {
       underlineColorAndroid: "transparent",
       style: inputStyles,
       ...rest,
+      ...this.state.nativeProps,
       value: this.state.value
     })), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
       name: rightIconName,

package/lib/module/index.js

@@ -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";
 /* Deprecated: Fix or Delete!  */

package/lib/module/mappings/BottomSheet.js

@@ -0,0 +1,13 @@
+import { COMPONENT_TYPES, createNumberProp, StylesPanelSections } from "@draftbit/types";
+export const SEED_DATA = {
+  name: "Bottom Sheet",
+  tag: "BottomSheet",
+  category: COMPONENT_TYPES.container,
+  stylesPanelSections: [StylesPanelSections.Background, StylesPanelSections.Borders, StylesPanelSections.Size, StylesPanelSections.MarginsAndPaddings, StylesPanelSections.Position, StylesPanelSections.Effects],
+  props: {
+    step: createNumberProp({
+      label: "Step",
+      description: "Step can be -1, 0, 1, or 2."
+    })
+  }
+};

package/lib/module/mappings/DatePicker.js

@@ -1,4 +1,4 @@
-import { COMPONENT_TYPES, FORM_TYPES, PROP_TYPES, FIELD_NAME, GROUPS, Triggers, StylesPanelSections } from "@draftbit/types";
+import { COMPONENT_TYPES, FORM_TYPES, PROP_TYPES, FIELD_NAME, GROUPS, Triggers } from "@draftbit/types";
 const SEED_DATA_PROPS = {
   label: {
     label: "Label",
@@ -137,7 +137,6 @@ export const SEED_DATA = [{
   category: COMPONENT_TYPES.input,
   layout: null,
   triggers: [Triggers.OnDateChange],
-  StylesPanelSections: [StylesPanelSections.Background, StylesPanelSections.Borders, StylesPanelSections.MarginsAndPaddings, StylesPanelSections.Position, StylesPanelSections.Size, StylesPanelSections.Typography],
   props: { ...SEED_DATA_PROPS,
     type: {
       label: "Appearance",

package/lib/module/mappings/TextField.js

@@ -16,7 +16,7 @@ const SEED_DATA_PROPS = {
     description: "Can automatically capitalize sentences, words, and characters (Default: none).",
     editable: true,
     required: false,
-    defaultValue: null,
+    defaultValue: "none",
     options: ["none", "sentences", "words", "characters"],
     formType: FORM_TYPES.flatArray,
     propType: PROP_TYPES.STRING

package/lib/module/mappings/TextInput.js

@@ -94,7 +94,7 @@ export const SEED_DATA = [{
       description: "Can automatically capitalize sentences, words, and characters (Default: none).",
       editable: true,
       required: false,
-      defaultValue: null,
+      defaultValue: "none",
       options: ["none", "sentences", "words", "characters"],
       formType: FORM_TYPES.flatArray,
       propType: PROP_TYPES.STRING

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/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/DatePicker.d.ts

@@ -5,7 +5,6 @@ export declare const SEED_DATA: {
     category: string;
     layout: null;
     triggers: string[];
-    StylesPanelSections: string[];
     props: {
         type: {
             label: string;

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-602cb9.2+602cb98",
+  "version": "46.4.4-618dac.2+618dac9",
   "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-602cb9.2+602cb98",
+    "@draftbit/types": "^46.4.4-618dac.2+618dac9",
+    "@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": "602cb98b5e2406894571b6304d46320af1770deb"
+  "gitHead": "618dac9ee8e7861d982d4e91880448d415fc6d76"
 }

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,
+    },
+});

package/src/components/BottomSheet/BottomSheet.web.tsx

@@ -0,0 +1,90 @@
+import React from "react";
+import { StyleSheet, View, Dimensions } from "react-native";
+import ScrollBottomSheet from "react-native-scroll-bottom-sheet";
+
+import { extractStyles } from "../../utilities";
+import { BottomSheetProps } from "./types";
+
+const windowHeight = Dimensions.get("window").height;
+
+const BottomSheetComponent: React.FC<BottomSheetProps> = ({
+  style,
+  children,
+  step,
+}) => {
+  const { viewStyles } = extractStyles(style);
+  const bottomSheetRef = React.useRef<any>();
+
+  const webStep = React.useMemo(() => step + 1, [step]);
+  const snapPoints = React.useMemo(
+    () => ["25%", "50%", windowHeight - 200],
+    []
+  );
+
+  React.useEffect(() => {
+    bottomSheetRef?.current?.snapTo(snapPoints.length - webStep);
+    // bottomSheetRef.current.snapTo(step);
+  }, [webStep, step, snapPoints]);
+
+  if (step === -1) {
+    return <></>;
+  }
+
+  return (
+    <View style={styles.container}>
+      <ScrollBottomSheet
+        ref={bottomSheetRef}
+        componentType="ScrollView"
+        snapPoints={snapPoints}
+        initialSnapIndex={0}
+        renderHandle={() => (
+          <View style={styles.header}>
+            <View style={styles.panelHandle} />
+          </View>
+        )}
+        contentContainerStyle={styles.contentContainerStyle}
+      >
+        <View
+          style={{
+            ...styles.container,
+            ...viewStyles,
+            backgroundColor: webStep !== -1 ? "grey" : "transparent",
+          }}
+        >
+          {children}
+        </View>
+      </ScrollBottomSheet>
+    </View>
+  );
+};
+
+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,
+  },
+});

package/src/components/BottomSheet/index.js

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

package/src/components/BottomSheet/index.tsx

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

package/src/components/BottomSheet/types.js

@@ -0,0 +1 @@
+export {};

package/src/components/BottomSheet/types.tsx

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

package/src/components/DatePicker/DatePicker.js

@@ -6,7 +6,6 @@ import { withTheme } from "../../theming";
 import Portal from "../Portal/Portal";
 import Touchable from "../Touchable";
 import DateTimePicker from "./DatePickerComponent";
-import { extractStyles } from "../../utilities";
 const AnimatedText = Animated.createAnimatedComponent(Text);
 const FOCUS_ANIMATION_DURATION = 150;
 const BLUR_ANIMATION_DURATION = 180;
@@ -242,12 +241,10 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
             },
         ],
     };
-    const { textStyles } = extractStyles(style);
     const inputStyles = [
         styles.input,
         inputStyle,
         type === "solid" ? { marginHorizontal: 12 } : {},
-        textStyles,
     ];
     // const render = (props) => <NativeTextInput {...props} />;
     return (React.createElement(View, { style: [styles.container, style] },

package/src/components/DatePicker/DatePicker.tsx

@@ -23,7 +23,6 @@ import DateTimePicker from "./DatePickerComponent";
 
 import type { Theme } from "../../styles/DefaultTheme";
 import type { IconSlot } from "../../interfaces/Icon";
-import { extractStyles } from "../../utilities";
 
 const AnimatedText = Animated.createAnimatedComponent(Text);
 
@@ -348,13 +347,10 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     ],
   };
 
-  const { textStyles } = extractStyles(style);
-
   const inputStyles = [
     styles.input,
     inputStyle,
     type === "solid" ? { marginHorizontal: 12 } : {},
-    textStyles,
   ];
 
   // const render = (props) => <NativeTextInput {...props} />;

package/src/components/Text.js

@@ -2,13 +2,19 @@ import * as React from "react";
 import { Text as NativeText, I18nManager } from "react-native";
 import { withTheme } from "../theming";
 class Text extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            nativeProps: {},
+        };
+    }
     setNativeProps(args) {
-        return this._root && this._root.setNativeProps(args);
+        this.state.nativeProps = args || {};
     }
     render() {
         const { style, ...rest } = this.props;
         const writingDirection = I18nManager.isRTL ? "rtl" : "ltr";
-        return (React.createElement(NativeText, { ...rest, ref: (c) => {
+        return (React.createElement(NativeText, { ...rest, ...this.state.nativeProps, ref: (c) => {
                 this._root = c;
             }, style: [
                 {

package/src/components/Text.tsx

@@ -10,8 +10,12 @@ type Props = {
 class Text extends React.Component<Props> {
   _root: any;
 
+  state: any = {
+    nativeProps: {},
+  };
+
   setNativeProps(args: TextProps) {
-    return this._root && this._root.setNativeProps(args);
+    this.state.nativeProps = args || {};
   }
 
   render() {
@@ -21,6 +25,7 @@ class Text extends React.Component<Props> {
     return (
       <NativeText
         {...rest}
+        {...this.state.nativeProps}
         ref={(c) => {
           this._root = c;
         }}

package/src/components/TextField.js

@@ -10,6 +10,7 @@ class TextField extends React.Component {
     constructor() {
         super(...arguments);
         this.state = {
+            nativeProps: {},
             labeled: new Animated.Value(this.props.value || this.props.error ? 0 : 1),
             focused: false,
             placeholder: this.props.error ? this.props.placeholder : "",
@@ -121,7 +122,10 @@ class TextField extends React.Component {
      * @internal
      */
     setNativeProps(args) {
-        return this._root && this._root.setNativeProps(args);
+        this.setState((state) => ({
+            ...state,
+            nativeState: args || {},
+        }));
     }
     isFocused() {
         return this._root && this._root.isFocused();
@@ -381,6 +385,7 @@ class TextField extends React.Component {
                     underlineColorAndroid: "transparent",
                     style: inputStyles,
                     ...rest,
+                    ...this.state.nativeProps,
                     value: this.state.value,
                 })),
             rightIconName ? (React.createElement(Icon, { name: rightIconName, size: ICON_SIZE, color: colors.light, style: {