@draftbit/core 46.5.2-13b65f.2 → 46.5.2-404403.2

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

@@ -5,10 +5,10 @@ export declare const SEED_DATA: ({
     stylesPanelSections: string[];
     layout: {
         backgroundColor: string;
-        borderRadius: number;
-        fontFamily: string;
         borderWidth: number;
         textAlign: string;
+        borderRadius: number;
+        fontFamily: string;
     };
     triggers: string[];
     props: {
@@ -22,16 +22,6 @@ export declare const SEED_DATA: ({
             defaultValue: null;
             group: string;
         };
-        onLongPress: {
-            label: string;
-            description: string;
-            editable: boolean;
-            required: boolean;
-            formType: string;
-            propType: string;
-            defaultValue: null;
-            group: string;
-        };
         icon: {
             label: string;
             description: string;
@@ -63,50 +53,6 @@ export declare const SEED_DATA: ({
             propType: string;
             defaultValue: null;
         };
-        activeOpacity: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        disabledOpacity: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        delayLongPress: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        hitSlop: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
     };
 } | {
     name: string;
@@ -114,11 +60,10 @@ export declare const SEED_DATA: ({
     category: string;
     stylesPanelSections: string[];
     layout: {
-        borderRadius: number;
-        fontFamily: string;
         backgroundColor: string;
         textAlign: string;
-        borderWidth?: undefined;
+        borderRadius: number;
+        fontFamily: string;
     };
     triggers: string[];
     props: {
@@ -132,16 +77,6 @@ export declare const SEED_DATA: ({
             defaultValue: null;
             group: string;
         };
-        onLongPress: {
-            label: string;
-            description: string;
-            editable: boolean;
-            required: boolean;
-            formType: string;
-            propType: string;
-            defaultValue: null;
-            group: string;
-        };
         icon: {
             label: string;
             description: string;
@@ -173,50 +108,6 @@ export declare const SEED_DATA: ({
             propType: string;
             defaultValue: null;
         };
-        activeOpacity: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        disabledOpacity: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        delayLongPress: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
-        hitSlop: {
-            label: string;
-            description: string;
-            formType: string;
-            propType: string;
-            group: string;
-            defaultValue: null;
-            editable: boolean;
-            required: boolean;
-            step: number;
-        };
     };
 })[];
 //# sourceMappingURL=Button.d.ts.map

package/lib/typescript/src/mappings/Button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../../../../src/mappings/Button.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoErB,CAAC"}
+{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../../../../src/mappings/Button.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiErB,CAAC"}

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

@@ -0,0 +1,22 @@
+export declare const SEED_DATA: {
+    name: string;
+    tag: string;
+    description: string;
+    category: string;
+    stylesPanelSections: string[];
+    layout: {};
+    triggers: string[];
+    props: {
+        onPress: {
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            formType: string;
+            propType: string;
+            defaultValue: null;
+            group: string;
+        };
+    };
+};
+//# sourceMappingURL=Touchable.d.ts.map

package/lib/typescript/src/mappings/Touchable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Touchable.d.ts","sourceRoot":"","sources":["../../../../src/mappings/Touchable.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;CAerB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.5.2-13b65f.2+13b65fd",
+  "version": "46.5.2-404403.2+4044036",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,12 +41,12 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.5.2-13b65f.2+13b65fd",
+    "@draftbit/types": "^46.5.2-404403.2+4044036",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
-    "@react-native-community/slider": "4.2.3",
-    "@react-native-picker/picker": "2.4.2",
-    "@shopify/flash-list": "1.2.0",
+    "@react-native-community/slider": "4.2.4",
+    "@react-native-picker/picker": "2.4.8",
+    "@shopify/flash-list": "1.3.1",
     "color": "^3.1.2",
     "date-fns": "^2.16.1",
     "dateformat": "^3.0.3",
@@ -54,7 +54,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.tonumber": "^4.0.3",
     "react-native-modal-datetime-picker": "^13.0.0",
-    "react-native-svg": "12.3.0",
+    "react-native-svg": "13.4.0",
     "react-native-typography": "^1.4.1",
     "react-native-web-swiper": "^2.2.3"
   },
@@ -91,5 +91,5 @@
       ]
     ]
   },
-  "gitHead": "13b65fd21f56082a5d36ed9822aebe327cdc5143"
+  "gitHead": "40440364445de4fc6e203808d4be937966fc034a"
 }

package/src/components/Button.js

@@ -1,4 +1,4 @@
-import React, { useCallback } from "react";
+import * as React from "react";
 import { Text, Pressable, Platform, StyleSheet, ActivityIndicator, } from "react-native";
 import { withTheme } from "../theming";
 const CONSTANTS = {
@@ -7,7 +7,7 @@ const CONSTANTS = {
     padding: 8,
     icon: 24,
 };
-function Base({ Icon, icon, title, onPress, onLongPress, activeOpacity, disabledOpacity, loading, disabled, style, ...props }) {
+function Base({ Icon, icon, title, onPress, loading, disabled, style, ...props }) {
     const { color, fontFamily, fontWeight, fontSize, lineHeight, letterSpacing, textTransform, textAlign, textDecorationLine, textDecorationColor, textDecorationStyle, ...buttonStyles } = StyleSheet.flatten(style || {});
     const titleStyles = {
         color,
@@ -28,22 +28,15 @@ function Base({ Icon, icon, title, onPress, onLongPress, activeOpacity, disabled
     if (textAlign === "right") {
         buttonStyles.justifyContent = "flex-end";
     }
-    const getOpacity = useCallback((pressed) => {
-        if (disabled) {
-            return disabledOpacity;
-        }
-        else {
-            if (pressed)
-                return activeOpacity;
-            else
-                return 1;
-        }
-    }, [activeOpacity, disabled, disabledOpacity]);
-    const _style = useCallback(({ pressed }) => [
-        buttonStyles,
-        { opacity: getOpacity(pressed) },
-    ], [getOpacity, buttonStyles]);
-    return (React.createElement(Pressable, { onPress: onPress, onLongPress: onLongPress, disabled: disabled || loading, style: (styles.base, _style), ...props },
+    return (React.createElement(Pressable, { onPress: onPress, disabled: disabled || loading, style: ({ pressed }) => {
+            return [
+                styles.base,
+                {
+                    opacity: pressed || disabled ? 0.75 : 1,
+                },
+                buttonStyles,
+            ];
+        }, ...props },
         loading ? (React.createElement(ActivityIndicator, { size: "small", color: color, style: styles.loading })) : null,
         icon && !loading ? (React.createElement(Icon, { name: icon, color: color, style: styles.icon, size: CONSTANTS.icon })) : null,
         React.createElement(Text, { style: titleStyles }, title)));

package/src/components/Button.tsx

@@ -1,14 +1,11 @@
-import React, { useCallback } from "react";
+import * as React from "react";
 import {
   Text,
   Pressable,
-  PressableProps,
-  PressableStateCallbackType,
   Platform,
   StyleSheet,
-  StyleProp,
   TextStyle,
-  ViewStyle,
+  PressableProps,
   ActivityIndicator,
 } from "react-native";
 
@@ -30,12 +27,6 @@ type BaseProps = {
   loading: boolean;
   style?: TextStyle;
   onPress: () => void;
-  onLongPress?: () => void;
-  activeOpacity?: number;
-  disabledOpacity?: number;
-  delayLongPress?: number;
-  hitSlop?: number;
-  pressRetentionOffset?: number;
   icon?: string;
 } & PressableProps &
   IconSlot;
@@ -46,29 +37,16 @@ type Props = {
   loading: boolean;
   style?: TextStyle;
   onPress: () => void;
-  onLongPress?: () => void;
-  activeOpacity?: number;
-  disabledOpacity?: number;
-  delayLongPress?: number;
-  hitSlop?: number;
-  pressRetentionOffset?: number;
   icon?: string;
   theme: Theme;
 } & PressableProps &
   IconSlot;
 
-export type StyleType = (
-  state: PressableStateCallbackType
-) => StyleProp<ViewStyle>;
-
 function Base({
   Icon,
   icon,
   title,
   onPress,
-  onLongPress,
-  activeOpacity,
-  disabledOpacity,
   loading,
   disabled,
   style,
@@ -111,31 +89,19 @@ function Base({
     buttonStyles.justifyContent = "flex-end";
   }
 
-  const getOpacity = useCallback(
-    (pressed: boolean) => {
-      if (disabled) {
-        return disabledOpacity;
-      } else {
-        if (pressed) return activeOpacity;
-        else return 1;
-      }
-    },
-    [activeOpacity, disabled, disabledOpacity]
-  );
-  const _style = useCallback<StyleType>(
-    ({ pressed }) => [
-      buttonStyles as ViewStyle,
-      { opacity: getOpacity(pressed) },
-    ],
-    [getOpacity, buttonStyles]
-  );
-
   return (
     <Pressable
       onPress={onPress}
-      onLongPress={onLongPress}
       disabled={disabled || loading}
-      style={(styles.base, _style)}
+      style={({ pressed }) => {
+        return [
+          styles.base,
+          {
+            opacity: pressed || disabled ? 0.75 : 1,
+          },
+          buttonStyles,
+        ];
+      }}
       {...props}
     >
       {loading ? (

package/src/components/Checkbox/Checkbox.js

@@ -1,6 +1,7 @@
 import * as React from "react";
-import { View, StyleSheet, Pressable, } from "react-native";
+import { View, StyleSheet, } from "react-native";
 import { useTheme } from "../../theming";
+import Touchable from "../Touchable";
 import { usePrevious } from "../../hooks";
 const Checkbox = ({ Icon, status, disabled = false, onPress, onCheck, onUncheck, color, uncheckedColor, defaultValue, checkedIcon = "MaterialCommunityIcons/checkbox-marked", uncheckedIcon = "MaterialCommunityIcons/checkbox-blank-outline", size = 24, style, ...rest }) => {
     const [internalValue, setInternalValue] = React.useState(status || defaultValue || false);
@@ -32,7 +33,7 @@ const Checkbox = ({ Icon, status, disabled = false, onPress, onCheck, onUncheck,
             onUncheck === null || onUncheck === void 0 ? void 0 : onUncheck();
         }
     };
-    return (React.createElement(Pressable, { ...rest, onPress: handlePress, disabled: disabled, accessibilityState: { disabled }, accessibilityRole: "button", accessibilityLiveRegion: "polite", style: [styles.container, style, { width: size, height: size }] },
+    return (React.createElement(Touchable, { ...rest, onPress: handlePress, disabled: disabled, accessibilityState: { disabled }, accessibilityRole: "button", accessibilityLiveRegion: "polite", style: [styles.container, style, { width: size, height: size }] },
         React.createElement(Icon, { style: styles.icon, name: internalValue ? checkedIcon : uncheckedIcon, size: size, color: checkboxColor }),
         React.createElement(View, { style: [StyleSheet.absoluteFill, styles.fillContainer] },
             React.createElement(View, { style: [

package/src/components/Checkbox/Checkbox.tsx

@@ -2,14 +2,14 @@ import * as React from "react";
 import {
   View,
   StyleSheet,
+  TouchableHighlightProps,
   StyleProp,
   ViewStyle,
-  Pressable,
-  PressableProps,
 } from "react-native";
 import { useTheme } from "../../theming";
 import type { IconSlot } from "../../interfaces/Icon";
 
+import Touchable from "../Touchable";
 import { usePrevious } from "../../hooks";
 
 export interface CheckboxProps {
@@ -27,7 +27,9 @@ export interface CheckboxProps {
   style?: StyleProp<ViewStyle>;
 }
 
-const Checkbox: React.FC<CheckboxProps & PressableProps & IconSlot> = ({
+const Checkbox: React.FC<
+  CheckboxProps & TouchableHighlightProps & IconSlot
+> = ({
   Icon,
   status,
   disabled = false,
@@ -85,7 +87,7 @@ const Checkbox: React.FC<CheckboxProps & PressableProps & IconSlot> = ({
   };
 
   return (
-    <Pressable
+    <Touchable
       {...rest}
       onPress={handlePress}
       disabled={disabled}
@@ -109,7 +111,7 @@ const Checkbox: React.FC<CheckboxProps & PressableProps & IconSlot> = ({
           ]}
         />
       </View>
-    </Pressable>
+    </Touchable>
   );
 };
 

package/src/components/DeprecatedButton.js

@@ -0,0 +1,95 @@
+import * as React from "react";
+import { ActivityIndicator, View, Text, StyleSheet, } 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 }) => {
+    let backgroundColor, borderColor, textColor, borderWidth;
+    const buttonColor = colorOverride || colors.primary;
+    if (type === "solid") {
+        backgroundColor = buttonColor;
+        if (disabled) {
+            textColor = color(colors.surface).alpha(disabledOpacity).rgb().string();
+        }
+        else {
+            textColor = labelColor || colors.surface;
+        }
+    }
+    else {
+        backgroundColor = "transparent";
+        if (disabled) {
+            textColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
+        }
+        else {
+            textColor = labelColor || buttonColor;
+        }
+    }
+    if (type === "outline") {
+        if (disabled) {
+            borderColor = color(buttonColor).alpha(disabledOpacity).rgb().string();
+        }
+        else {
+            borderColor = buttonColor;
+        }
+        borderWidth = StyleSheet.hairlineWidth;
+    }
+    else {
+        borderColor = "transparent";
+        borderWidth = 0;
+    }
+    const buttonStyle = {
+        backgroundColor,
+        borderColor,
+        borderWidth,
+        borderRadius: roundness,
+    };
+    const textStyle = {
+        textAlign: "center",
+        color: textColor,
+        marginVertical: 16,
+        marginHorizontal: 16,
+    };
+    const iconStyle = [
+        styles.icon,
+        {
+            marginLeft: 16,
+            marginRight: -8,
+            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] },
+            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,
+                loading ? (React.createElement(ActivityIndicator, { size: "small", color: textColor, style: iconStyle })) : null,
+                React.createElement(Text, { numberOfLines: 1, style: [textStyle, typography.button] }, children)))));
+};
+const styles = StyleSheet.create({
+    button: {
+        minWidth: 64,
+        borderStyle: "solid",
+    },
+    content: {
+        flexDirection: "row",
+        alignItems: "center",
+        justifyContent: "center",
+    },
+    icon: {
+        width: Config.buttonIconSize,
+    },
+});
+export default withTheme(Button);