@draftbit/core 47.0.1-ed6e56.2 → 47.1.1-1883fa.2

package/src/components/Checkbox/CheckboxRow.js

@@ -1,10 +1,9 @@
 import * as React from "react";
-import { StyleSheet, View, Platform, } from "react-native";
+import { StyleSheet, View, Platform, Pressable, } from "react-native";
 import { isString } from "lodash";
 import { extractStyles } from "../../utilities";
 import { usePrevious } from "../../hooks";
 import Text from "../Text";
-import Touchable from "../Touchable";
 import Checkbox from "./Checkbox";
 export var Direction;
 (function (Direction) {
@@ -46,7 +45,7 @@ const CheckboxRow = ({ label = "Label", labelStyle, labelContainerStyle, checkbo
         }
     };
     const { textStyles, viewStyles } = extractStyles(style);
-    return (React.createElement(Touchable, { onPress: handlePress, style: [viewStyles, styles.mainParent, { flexDirection: direction }], disabled: disabled, ...rest },
+    return (React.createElement(Pressable, { onPress: handlePress, style: [viewStyles, styles.mainParent, { flexDirection: direction }], disabled: disabled, ...rest },
         React.createElement(View, { style: [
                 styles.label,
                 {

package/src/components/Checkbox/CheckboxRow.tsx

@@ -6,6 +6,7 @@ import {
   TextStyle,
   View,
   Platform,
+  Pressable,
 } from "react-native";
 import { isString } from "lodash";
 
@@ -13,7 +14,6 @@ import type { IconSlot } from "../../interfaces/Icon";
 import { extractStyles } from "../../utilities";
 import { usePrevious } from "../../hooks";
 import Text from "../Text";
-import Touchable from "../Touchable";
 import Checkbox, { CheckboxProps } from "./Checkbox";
 
 export enum Direction {
@@ -100,7 +100,7 @@ const CheckboxRow: React.FC<CheckboxRowProps & IconSlot> = ({
   const { textStyles, viewStyles } = extractStyles(style);
 
   return (
-    <Touchable
+    <Pressable
       onPress={handlePress}
       style={[viewStyles, styles.mainParent, { flexDirection: direction }]}
       disabled={disabled}
@@ -130,7 +130,7 @@ const CheckboxRow: React.FC<CheckboxRowProps & IconSlot> = ({
         uncheckedIcon={uncheckedIcon}
         size={size}
       />
-    </Touchable>
+    </Pressable>
   );
 };
 

package/src/components/DatePicker/DatePicker.js

@@ -333,7 +333,7 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
                             paddingRight: insets.right,
                         },
                     ] },
-                    React.createElement(DateTimePicker, { value: getValidDate(), mode: mode, displayMode: "default", isVisible: pickerVisible, toggleVisibility: toggleVisibility, onChange: (_event, data) => {
+                    React.createElement(DateTimePicker, { value: getValidDate(), mode: mode, isVisible: pickerVisible, toggleVisibility: toggleVisibility, onChange: (_event, data) => {
                             toggleVisibility();
                             setValue(data);
                             onDateChange(data);

package/src/components/DatePicker/DatePicker.tsx

@@ -515,7 +515,6 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
               <DateTimePicker
                 value={getValidDate()}
                 mode={mode}
-                displayMode="default"
                 isVisible={pickerVisible}
                 toggleVisibility={toggleVisibility}
                 onChange={(_event: any, data: any) => {

package/src/components/DatePicker/DatePickerComponent.js

@@ -1,11 +1,13 @@
 import React from "react";
+import { Platform } from "react-native";
+import DateTimePicker from "@react-native-community/datetimepicker";
 import DateTimePickerModal from "react-native-modal-datetime-picker";
-const DatePickerComponent = ({ value, onChange, displayMode = "default", mode, toggleVisibility, }) => {
-    return (React.createElement(DateTimePickerModal, { date: value, mode: mode, isVisible: true, display: displayMode, onCancel: () => {
+const DatePickerComponent = ({ value, onChange, mode, toggleVisibility, }) => {
+    return Platform.OS === "ios" || Platform.OS === "android" ? (React.createElement(DateTimePickerModal, { date: value, mode: mode, isVisible: true, display: Platform.OS === "ios" ? "spinner" : "default", onCancel: () => {
             console.log("Picker cancelled before selecting anything.");
             toggleVisibility();
         }, onConfirm: (data) => {
             onChange(null, data);
-        } }));
+        } })) : (React.createElement(DateTimePicker, { value: value, mode: mode, onChange: onChange, display: "default" }));
 };
 export default DatePickerComponent;

package/src/components/DatePicker/DatePickerComponent.tsx

@@ -1,20 +1,21 @@
 import React from "react";
+import { Platform } from "react-native";
+import DateTimePicker from "@react-native-community/datetimepicker";
 import DateTimePickerModal from "react-native-modal-datetime-picker";
 import { DatePickerComponentProps as Props } from "./DatePickerComponentType";
 
 const DatePickerComponent: React.FC<React.PropsWithChildren<Props>> = ({
   value,
   onChange,
-  displayMode = "default",
   mode,
   toggleVisibility,
 }) => {
-  return (
+  return Platform.OS === "ios" || Platform.OS === "android" ? (
     <DateTimePickerModal
       date={value}
       mode={mode}
       isVisible={true}
-      display={displayMode}
+      display={Platform.OS === "ios" ? "spinner" : "default"}
       onCancel={() => {
         console.log("Picker cancelled before selecting anything.");
         toggleVisibility();
@@ -23,6 +24,13 @@ const DatePickerComponent: React.FC<React.PropsWithChildren<Props>> = ({
         onChange(null, data);
       }}
     />
+  ) : (
+    <DateTimePicker
+      value={value}
+      mode={mode}
+      onChange={onChange}
+      display={"default"}
+    />
   );
 };
 

package/src/components/DatePicker/DatePickerComponent.web.js

@@ -25,6 +25,6 @@ const DatePickerComponent = ({ value, onChange, mode, toggleVisibility, isVisibl
             React.createElement(Picker, { value: value, open: isVisible, onChange: (d) => {
                     toggleVisibility();
                     onChange(null, d);
-                }, onClose: () => toggleVisibility(), TextFieldComponent: () => null }))));
+                }, onClose: () => toggleVisibility(), variant: "dialog", TextFieldComponent: () => null }))));
 };
 export default withTheme(DatePickerComponent);

package/src/components/DatePicker/DatePickerComponent.web.tsx

@@ -48,6 +48,7 @@ const DatePickerComponent: React.FC<Props & { theme: typeof Theme }> = ({
             onChange(null, d);
           }}
           onClose={() => toggleVisibility()}
+          variant="dialog"
           TextFieldComponent={() => null}
         />
       </ThemeProvider>

package/src/components/DatePicker/DatePickerComponentType.ts

@@ -6,14 +6,5 @@ export interface DatePickerComponentProps {
   mode: "date" | "time" | "datetime";
   toggleVisibility: () => void;
   isVisible?: boolean;
-  displayMode?:
-    | "default"
-    | "compact"
-    | "inline"
-    | "spinner"
-    | "clock"
-    | "calendar"
-    | undefined;
-  variant?: "dialog" | "inline" | undefined;
   theme?: typeof theme;
 }

package/src/components/DeprecatedButton.js

@@ -1,11 +1,10 @@
 import * as React from "react";
-import { ActivityIndicator, View, Text, StyleSheet, } from "react-native";
+import { ActivityIndicator, View, Text, StyleSheet, Pressable, } from "react-native";
 import color from "color";
 import Config from "./Config";
-import Touchable from "./Touchable";
 import Elevation from "./Elevation";
 import { withTheme } from "../theming";
-const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, style, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
+const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false, labelColor, color: colorOverride, children, onPress, elevation = 0, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
     let backgroundColor, borderColor, textColor, borderWidth;
     const buttonColor = colorOverride || colors.primary;
     if (type === "solid") {
@@ -59,19 +58,8 @@ const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false,
             width: Config.buttonIconSize,
         },
     ];
-    const { margin, marginEnd, marginTop, marginLeft, marginRight, marginBottom, marginHorizontal, marginVertical, ...innerStyles } = StyleSheet.flatten(style || {});
-    const margins = {
-        margin,
-        marginEnd,
-        marginTop,
-        marginLeft,
-        marginRight,
-        marginBottom,
-        marginHorizontal,
-        marginVertical,
-    };
-    return (React.createElement(Elevation, { style: { elevation, alignSelf: "stretch", ...margins } },
-        React.createElement(Touchable, { ...rest, onPress: onPress, accessibilityState: { disabled }, accessibilityRole: "button", disabled: disabled || loading, style: [styles.button, buttonStyle, innerStyles] },
+    return (React.createElement(Elevation, { style: { elevation, alignSelf: "stretch" } },
+        React.createElement(Pressable, { ...rest, onPress: onPress, accessibilityState: { disabled }, accessibilityRole: "button", disabled: disabled || loading, style: [styles.button, buttonStyle] },
             React.createElement(View, { style: styles.content },
                 icon && loading !== true ? (React.createElement(View, { style: iconStyle },
                     React.createElement(Icon, { name: icon, size: Config.buttonIconSize, color: textColor }))) : null,

package/src/components/DeprecatedButton.tsx

@@ -4,14 +4,14 @@ import {
   View,
   Text,
   StyleSheet,
-  TouchableHighlightProps,
   StyleProp,
   ViewStyle,
   TextStyle,
+  Pressable,
+  PressableProps,
 } from "react-native";
 import color from "color";
 import Config from "./Config";
-import Touchable from "./Touchable";
 import Elevation from "./Elevation";
 import { withTheme } from "../theming";
 
@@ -63,7 +63,7 @@ type Props = {
   elevation?: number;
   style?: StyleProp<ViewStyle>;
   theme: Theme;
-} & TouchableHighlightProps &
+} & PressableProps &
   IconSlot;
 
 const Button: React.FC<React.PropsWithChildren<Props>> = ({
@@ -77,7 +77,6 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
   children,
   onPress,
   elevation = 0,
-  style,
   theme: { colors, disabledOpacity, roundness, typography },
   ...rest
 }) => {
@@ -137,38 +136,15 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
     },
   ];
 
-  const {
-    margin,
-    marginEnd,
-    marginTop,
-    marginLeft,
-    marginRight,
-    marginBottom,
-    marginHorizontal,
-    marginVertical,
-    ...innerStyles
-  } = StyleSheet.flatten(style || {});
-
-  const margins = {
-    margin,
-    marginEnd,
-    marginTop,
-    marginLeft,
-    marginRight,
-    marginBottom,
-    marginHorizontal,
-    marginVertical,
-  };
-
   return (
-    <Elevation style={{ elevation, alignSelf: "stretch", ...margins }}>
-      <Touchable
+    <Elevation style={{ elevation, alignSelf: "stretch" }}>
+      <Pressable
         {...rest}
         onPress={onPress}
         accessibilityState={{ disabled }}
         accessibilityRole="button"
         disabled={disabled || loading}
-        style={[styles.button, buttonStyle, innerStyles]}
+        style={[styles.button, buttonStyle]}
       >
         <View style={styles.content}>
           {icon && loading !== true ? (
@@ -191,7 +167,7 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
             {children}
           </Text>
         </View>
-      </Touchable>
+      </Pressable>
     </Elevation>
   );
 };

package/src/components/DeprecatedFAB.js

@@ -1,9 +1,8 @@
 import * as React from "react";
-import { ActivityIndicator, View, StyleSheet, } from "react-native";
+import { ActivityIndicator, View, StyleSheet, Pressable, } from "react-native";
 import color from "color";
 import Config from "./Config";
 import Text from "./Text";
-import Touchable from "./Touchable";
 import Elevation from "./Elevation";
 import { withTheme } from "../theming";
 const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, color: colorOverride, label, onPress, elevation = 0, style, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
@@ -83,7 +82,7 @@ const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, co
         });
     }
     return (React.createElement(Elevation, { style: [{ elevation }, style] },
-        React.createElement(Touchable, { ...rest, onPress: onPress, accessibilityState: { disabled }, accessibilityRole: "button", disabled: disabled || loading, style: buttonStyles },
+        React.createElement(Pressable, { ...rest, onPress: onPress, accessibilityState: { disabled }, accessibilityRole: "button", disabled: disabled || loading, style: buttonStyles },
             React.createElement(View, { style: styles.content },
                 icon && loading !== true ? (React.createElement(View, { style: iconStyle },
                     React.createElement(Icon, { name: icon, size: Config.buttonIconSize, color: textColor }))) : null,

package/src/components/DeprecatedFAB.tsx

@@ -3,15 +3,15 @@ import {
   ActivityIndicator,
   View,
   StyleSheet,
-  TouchableHighlightProps,
   StyleProp,
   ViewStyle,
   TextStyle,
+  Pressable,
+  PressableProps,
 } from "react-native";
 import color from "color";
 import Config from "./Config";
 import Text from "./Text";
-import Touchable from "./Touchable";
 import Elevation from "./Elevation";
 import { withTheme } from "../theming";
 
@@ -65,7 +65,7 @@ type Props = {
   elevation?: number;
   theme: Theme;
   style?: StyleProp<ViewStyle>;
-} & TouchableHighlightProps &
+} & PressableProps &
   IconSlot;
 
 const FAB: React.FC<React.PropsWithChildren<Props>> = ({
@@ -169,7 +169,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
 
   return (
     <Elevation style={[{ elevation }, style]}>
-      <Touchable
+      <Pressable
         {...rest}
         onPress={onPress}
         accessibilityState={{ disabled }}
@@ -200,7 +200,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
             </Text>
           ) : null}
         </View>
-      </Touchable>
+      </Pressable>
     </Elevation>
   );
 };

package/src/components/Pressable.js

@@ -0,0 +1,12 @@
+import React from "react";
+import { Pressable as NativePressable, } from "react-native";
+export default function Pressable({ children, disabled, onPress, activeOpacity, disabledOpacity, delayLongPress, hitSlop, style, ...props }) {
+    return (React.createElement(NativePressable, { onPress: onPress, disabled: disabled, delayLongPress: delayLongPress ? delayLongPress : 500, hitSlop: hitSlop ? hitSlop : 8, style: ({ pressed }) => {
+            return [
+                {
+                    opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1,
+                },
+                style,
+            ];
+        }, ...props }, children));
+}

package/src/components/Pressable.tsx

@@ -0,0 +1,44 @@
+import React from "react";
+import {
+  Pressable as NativePressable,
+  PressableProps,
+  ViewStyle,
+} from "react-native";
+
+type Props = {
+  style?: ViewStyle;
+  activeOpacity?: number;
+  disabledOpacity?: number;
+} & PressableProps;
+
+export default function Pressable({
+  children,
+  disabled,
+  onPress,
+  activeOpacity,
+  disabledOpacity,
+  delayLongPress,
+  hitSlop,
+  style,
+  ...props
+}: Props) {
+  return (
+    <NativePressable
+      onPress={onPress}
+      disabled={disabled}
+      delayLongPress={delayLongPress ? delayLongPress : 500}
+      hitSlop={hitSlop ? hitSlop : 8}
+      style={({ pressed }) => {
+        return [
+          {
+            opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1,
+          },
+          style,
+        ];
+      }}
+      {...props}
+    >
+      {children}
+    </NativePressable>
+  );
+}

package/src/components/Swiper/Swiper.js

@@ -1,8 +1,8 @@
 import React from "react";
 import { View } from "react-native";
 import SwiperComponent from "react-native-web-swiper";
-const Swiper = ({ vertical = false, loop = false, timeout = 0, from = 0, prevTitle = "", nextTitle = "", prevTitleColor, nextTitleColor, dotsTouchable = true, dotColor, dotActiveColor, data, keyExtractor, renderItem, children, style, }) => (React.createElement(View, { style: style },
-    React.createElement(SwiperComponent, { from: from, loop: loop, timeout: timeout, vertical: vertical, controlsProps: {
+const Swiper = ({ vertical = false, loop = false, timeout = 0, from = 0, prevTitle = "", nextTitle = "", prevTitleColor, nextTitleColor, dotsTouchable = true, dotColor, dotActiveColor, data, keyExtractor, renderItem, children, onIndexChanged, style, }) => (React.createElement(View, { style: style },
+    React.createElement(SwiperComponent, { from: from, loop: loop, timeout: timeout, vertical: vertical, onIndexChanged: onIndexChanged, controlsProps: {
             prevTitle,
             nextTitle,
             prevTitleStyle: { color: prevTitleColor },

package/src/components/Swiper/Swiper.tsx

@@ -19,6 +19,7 @@ export interface SwiperProps<T> {
   keyExtractor: (item: T, index: number) => string;
   renderItem?: ({ item, index }: { item: T; index: number }) => JSX.Element;
   style?: StyleProp<ViewStyle>;
+  onIndexChanged?: (index: number) => void;
 }
 
 const Swiper = ({
@@ -37,6 +38,7 @@ const Swiper = ({
   keyExtractor,
   renderItem,
   children,
+  onIndexChanged,
   style,
 }: SwiperProps<any>) => (
   <View style={style}>
@@ -46,6 +48,7 @@ const Swiper = ({
       loop={loop}
       timeout={timeout}
       vertical={vertical}
+      onIndexChanged={onIndexChanged}
       controlsProps={{
         prevTitle,
         nextTitle,

package/src/components/Touchable.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { Pressable } from "react-native";
-export default function Touchable({ children, disabled, onPress, style, ...props }) {
-    return (React.createElement(Pressable, { onPress: onPress, disabled: disabled, hitSlop: 8, style: ({ pressed }) => {
+export default function Touchable({ children, disabled, onPress, activeOpacity, disabledOpacity, delayLongPress, hitSlop, style, ...props }) {
+    return (React.createElement(Pressable, { disabled: disabled, onPress: onPress, delayLongPress: delayLongPress ? delayLongPress : 500, hitSlop: hitSlop ? hitSlop : 8, style: ({ pressed }) => {
             return [
                 {
-                    opacity: pressed || disabled ? 0.75 : 1,
+                    opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1,
                 },
                 style,
             ];

package/src/components/Touchable.tsx

@@ -1,29 +1,33 @@
 import React from "react";
-import { Pressable, ViewStyle, PressableProps } from "react-native";
+import { Pressable, PressableProps, ViewStyle } from "react-native";
 
 type Props = {
-  disabled?: boolean;
-  children: React.ReactNode;
   style?: ViewStyle;
-  onPress?: () => void;
+  activeOpacity?: number;
+  disabledOpacity?: number;
 } & PressableProps;
 
 export default function Touchable({
   children,
   disabled,
   onPress,
+  activeOpacity,
+  disabledOpacity,
+  delayLongPress,
+  hitSlop,
   style,
   ...props
 }: Props) {
   return (
     <Pressable
-      onPress={onPress}
       disabled={disabled}
-      hitSlop={8}
+      onPress={onPress}
+      delayLongPress={delayLongPress ? delayLongPress : 500}
+      hitSlop={hitSlop ? hitSlop : 8}
       style={({ pressed }) => {
         return [
           {
-            opacity: pressed || disabled ? 0.75 : 1,
+            opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1,
           },
           style,
         ];

package/src/index.js

@@ -26,6 +26,7 @@ export { default as Switch, SwitchRow } from "./components/Switch";
 export { default as TextField } from "./components/TextField";
 export { default as ToggleButton } from "./components/ToggleButton";
 export { default as Touchable } from "./components/Touchable";
+export { default as Pressable } from "./components/Pressable";
 export { AccordionGroup, AccordionItem } from "./components/Accordion";
 export { ActionSheet, ActionSheetItem, ActionSheetCancel, } from "./components/ActionSheet";
 export { Swiper, SwiperItem } from "./components/Swiper";

package/src/index.tsx

@@ -27,6 +27,7 @@ export { default as Switch, SwitchRow } from "./components/Switch";
 export { default as TextField } from "./components/TextField";
 export { default as ToggleButton } from "./components/ToggleButton";
 export { default as Touchable } from "./components/Touchable";
+export { default as Pressable } from "./components/Pressable";
 export { AccordionGroup, AccordionItem } from "./components/Accordion";
 export {
   ActionSheet,

package/src/mappings/Button.js

@@ -1,7 +1,8 @@
-import { COMPONENT_TYPES, createIconProp, createTextProp, createDisabledProp, createLoadingProp, createActionProp, Triggers, StylesPanelSections, } from "@draftbit/types";
-const SEED_DATA_TRIGGERS = [Triggers.OnPress];
+import { COMPONENT_TYPES, createIconProp, createTextProp, createDisabledProp, createLoadingProp, createActionProp, Triggers, StylesPanelSections, createStaticNumberProp, } from "@draftbit/types";
+const SEED_DATA_TRIGGERS = [Triggers.OnPress, Triggers.OnLongPress];
 const SEED_DATA_PROPS = {
     onPress: createActionProp(),
+    onLongPress: createActionProp(),
     icon: createIconProp({
         defaultValue: null,
         required: false,
@@ -13,11 +14,36 @@ const SEED_DATA_PROPS = {
     }),
     disabled: createDisabledProp(),
     loading: createLoadingProp(),
-};
-const LAYOUT = {
-    backgroundColor: "transparent",
-    borderRadius: 8,
-    fontFamily: "system-700",
+    activeOpacity: createStaticNumberProp({
+        label: "Active Opacity",
+        description: "Opacity of the button when active.",
+        defaultValue: 0.8,
+        min: 0,
+        max: 1,
+        step: 0.01,
+        precision: 2,
+        required: false,
+    }),
+    disabledOpacity: createStaticNumberProp({
+        label: "Disabled Opacity",
+        description: "Opacity of the button when disabled.",
+        defaultValue: 0.8,
+        min: 0,
+        max: 1,
+        step: 0.01,
+        precision: 2,
+        required: false,
+    }),
+    delayLongPress: createStaticNumberProp({
+        label: "Delay Long Press",
+        description: "Duration (in milliseconds) from onPressIn before onLongPress is called.",
+        required: false,
+    }),
+    hitSlop: createStaticNumberProp({
+        label: "Hit Slop",
+        description: "Sets additional distance outside of element in which a press can be detected",
+        required: false,
+    }),
 };
 export const SEED_DATA = [
     {
@@ -34,7 +60,8 @@ export const SEED_DATA = [
             StylesPanelSections.Effects,
         ],
         layout: {
-            ...LAYOUT,
+            borderRadius: 8,
+            fontFamily: "system-700",
             backgroundColor: "transparent",
             borderWidth: 1,
             textAlign: "center",
@@ -56,7 +83,8 @@ export const SEED_DATA = [
             StylesPanelSections.Effects,
         ],
         layout: {
-            ...LAYOUT,
+            borderRadius: 8,
+            fontFamily: "system-700",
             backgroundColor: "primary",
             textAlign: "center",
         },
@@ -77,7 +105,8 @@ export const SEED_DATA = [
             StylesPanelSections.Effects,
         ],
         layout: {
-            ...LAYOUT,
+            borderRadius: 8,
+            fontFamily: "system-700",
             backgroundColor: "primary",
             textAlign: "center",
         },