@draftbit/core 47.0.1-ad0ed2.2 → 47.0.1-b3708e.2

package/src/components/Checkbox/CheckboxRow.tsx

@@ -6,7 +6,6 @@ import {
   TextStyle,
   View,
   Platform,
-  Pressable,
 } from "react-native";
 import { isString } from "lodash";
 
@@ -14,6 +13,7 @@ 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 (
-    <Pressable
+    <Touchable
       onPress={handlePress}
       style={[viewStyles, styles.mainParent, { flexDirection: direction }]}
       disabled={disabled}
@@ -130,7 +130,7 @@ const CheckboxRow: React.FC<CheckboxRowProps & IconSlot> = ({
         uncheckedIcon={uncheckedIcon}
         size={size}
       />
-    </Pressable>
+    </Touchable>
   );
 };
 

package/src/components/DeprecatedButton.js

@@ -1,10 +1,11 @@
 import * as React from "react";
-import { ActivityIndicator, View, Text, StyleSheet, Pressable, } from "react-native";
+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, theme: { colors, disabledOpacity, roundness, typography }, ...rest }) => {
+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") {
@@ -58,8 +59,19 @@ const Button = ({ Icon, icon, disabled = false, type = "solid", loading = false,
             width: Config.buttonIconSize,
         },
     ];
-    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] },
+    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,

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;
-} & PressableProps &
+} & TouchableHighlightProps &
   IconSlot;
 
 const Button: React.FC<React.PropsWithChildren<Props>> = ({
@@ -77,6 +77,7 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
   children,
   onPress,
   elevation = 0,
+  style,
   theme: { colors, disabledOpacity, roundness, typography },
   ...rest
 }) => {
@@ -136,15 +137,38 @@ 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" }}>
-      <Pressable
+    <Elevation style={{ elevation, alignSelf: "stretch", ...margins }}>
+      <Touchable
         {...rest}
         onPress={onPress}
         accessibilityState={{ disabled }}
         accessibilityRole="button"
         disabled={disabled || loading}
-        style={[styles.button, buttonStyle]}
+        style={[styles.button, buttonStyle, innerStyles]}
       >
         <View style={styles.content}>
           {icon && loading !== true ? (
@@ -167,7 +191,7 @@ const Button: React.FC<React.PropsWithChildren<Props>> = ({
             {children}
           </Text>
         </View>
-      </Pressable>
+      </Touchable>
     </Elevation>
   );
 };

package/src/components/DeprecatedFAB.js

@@ -1,8 +1,9 @@
 import * as React from "react";
-import { ActivityIndicator, View, StyleSheet, Pressable, } from "react-native";
+import { ActivityIndicator, View, StyleSheet, } 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 }) => {
@@ -82,7 +83,7 @@ const FAB = ({ Icon, icon, disabled = false, type = "solid", loading = false, co
         });
     }
     return (React.createElement(Elevation, { style: [{ elevation }, style] },
-        React.createElement(Pressable, { ...rest, onPress: onPress, accessibilityState: { disabled }, accessibilityRole: "button", disabled: disabled || loading, style: buttonStyles },
+        React.createElement(Touchable, { ...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>;
-} & PressableProps &
+} & TouchableHighlightProps &
   IconSlot;
 
 const FAB: React.FC<React.PropsWithChildren<Props>> = ({
@@ -169,7 +169,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
 
   return (
     <Elevation style={[{ elevation }, style]}>
-      <Pressable
+      <Touchable
         {...rest}
         onPress={onPress}
         accessibilityState={{ disabled }}
@@ -200,7 +200,7 @@ const FAB: React.FC<React.PropsWithChildren<Props>> = ({
             </Text>
           ) : null}
         </View>
-      </Pressable>
+      </Touchable>
     </Elevation>
   );
 };

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, activeOpacity, disabledOpacity, delayLongPress, hitSlop, style, ...props }) {
-    return (React.createElement(Pressable, { disabled: disabled, onPress: onPress, delayLongPress: delayLongPress ? delayLongPress : 500, hitSlop: hitSlop ? hitSlop : 8, style: ({ pressed }) => {
+export default function Touchable({ children, disabled, onPress, style, ...props }) {
+    return (React.createElement(Pressable, { onPress: onPress, disabled: disabled, hitSlop: 8, style: ({ pressed }) => {
             return [
                 {
-                    opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1,
+                    opacity: pressed || disabled ? 0.75 : 1,
                 },
                 style,
             ];

package/src/components/Touchable.tsx

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

package/src/mappings/Button.js

@@ -1,4 +1,4 @@
-import { COMPONENT_TYPES, createIconProp, createTextProp, createDisabledProp, createLoadingProp, createActionProp, Triggers, StylesPanelSections, createStaticNumberProp, } from "@draftbit/types";
+import { COMPONENT_TYPES, createIconProp, createTextProp, createDisabledProp, createLoadingProp, createActionProp, Triggers, StylesPanelSections, } from "@draftbit/types";
 const SEED_DATA_TRIGGERS = [Triggers.OnPress];
 const SEED_DATA_PROPS = {
     onPress: createActionProp(),
@@ -13,26 +13,11 @@ const SEED_DATA_PROPS = {
     }),
     disabled: createDisabledProp(),
     loading: createLoadingProp(),
-    activeOpacity: createStaticNumberProp({
-        label: "Active Opacity",
-        description: "Opacity of the button when active.",
-        required: false,
-    }),
-    disabledOpacity: createStaticNumberProp({
-        label: "Disabled Opacity",
-        description: "Opacity of the button when disabled.",
-        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,
-    }),
+};
+const LAYOUT = {
+    backgroundColor: "transparent",
+    borderRadius: 8,
+    fontFamily: "system-700",
 };
 export const SEED_DATA = [
     {
@@ -49,8 +34,7 @@ export const SEED_DATA = [
             StylesPanelSections.Effects,
         ],
         layout: {
-            borderRadius: 8,
-            fontFamily: "system-700",
+            ...LAYOUT,
             backgroundColor: "transparent",
             borderWidth: 1,
             textAlign: "center",
@@ -72,8 +56,7 @@ export const SEED_DATA = [
             StylesPanelSections.Effects,
         ],
         layout: {
-            borderRadius: 8,
-            fontFamily: "system-700",
+            ...LAYOUT,
             backgroundColor: "primary",
             textAlign: "center",
         },
@@ -94,8 +77,7 @@ export const SEED_DATA = [
             StylesPanelSections.Effects,
         ],
         layout: {
-            borderRadius: 8,
-            fontFamily: "system-700",
+            ...LAYOUT,
             backgroundColor: "primary",
             textAlign: "center",
         },

package/src/mappings/Button.ts

@@ -7,7 +7,6 @@ import {
   createActionProp,
   Triggers,
   StylesPanelSections,
-  createStaticNumberProp,
 } from "@draftbit/types";
 
 const SEED_DATA_TRIGGERS = [Triggers.OnPress];
@@ -24,28 +23,12 @@ const SEED_DATA_PROPS = {
   }),
   disabled: createDisabledProp(),
   loading: createLoadingProp(),
-  activeOpacity: createStaticNumberProp({
-    label: "Active Opacity",
-    description: "Opacity of the button when active.",
-    required: false,
-  }),
-  disabledOpacity: createStaticNumberProp({
-    label: "Disabled Opacity",
-    description: "Opacity of the button when disabled.",
-    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,
-  }),
+};
+
+const LAYOUT = {
+  backgroundColor: "transparent",
+  borderRadius: 8,
+  fontFamily: "system-700",
 };
 
 export const SEED_DATA = [
@@ -63,8 +46,7 @@ export const SEED_DATA = [
       StylesPanelSections.Effects,
     ],
     layout: {
-      borderRadius: 8,
-      fontFamily: "system-700",
+      ...LAYOUT,
       backgroundColor: "transparent",
       borderWidth: 1,
       textAlign: "center",
@@ -86,8 +68,7 @@ export const SEED_DATA = [
       StylesPanelSections.Effects,
     ],
     layout: {
-      borderRadius: 8,
-      fontFamily: "system-700",
+      ...LAYOUT,
       backgroundColor: "primary",
       textAlign: "center",
     },
@@ -108,8 +89,7 @@ export const SEED_DATA = [
       StylesPanelSections.Effects,
     ],
     layout: {
-      borderRadius: 8,
-      fontFamily: "system-700",
+      ...LAYOUT,
       backgroundColor: "primary",
       textAlign: "center",
     },

package/src/mappings/FlashList.js

@@ -1,33 +1,79 @@
-import { COMPONENT_TYPES, createNumColumnsType, createStaticBoolProp, createNumberProp, CONTAINER_COMPONENT_STYLES_SECTIONS, GROUPS, } from "@draftbit/types";
-export const SEED_DATA = {
-    name: "FlashList",
-    tag: "FlashList",
-    description: "Flashlist by Shopify",
-    packageName: "@shopify/flash-list",
-    category: COMPONENT_TYPES.data,
-    stylesPanelSections: CONTAINER_COMPONENT_STYLES_SECTIONS,
-    layout: {
-        flex: 1,
+import { COMPONENT_TYPES, createNumColumnsType, createStaticBoolProp, createNumberProp, CONTAINER_COMPONENT_STYLES_SECTIONS, GROUPS, Triggers, createActionProp, createStaticNumberProp, } from "@draftbit/types";
+export const SEED_DATA = [
+    {
+        name: "Masonry List",
+        tag: "MasonryFlashList",
+        description: "Masonry Flashlist by Shopify",
+        packageName: "@shopify/flash-list",
+        category: COMPONENT_TYPES.data,
+        stylesPanelSections: CONTAINER_COMPONENT_STYLES_SECTIONS,
+        layout: {
+            flex: 1,
+        },
+        triggers: [Triggers.OnRefresh, Triggers.OnEndReached],
+        props: {
+            onRefresh: createActionProp(),
+            onEndReached: createActionProp(),
+            numColumns: createNumColumnsType({
+                editable: true,
+            }),
+            estimatedItemSize: createNumberProp({
+                group: GROUPS.basic,
+                label: "Est. Item Size",
+                description: "Approximate size of the items before rendering.",
+                defaultValue: 50,
+                step: 1,
+                precision: 0,
+            }),
+            optimizeItemArrangement: createStaticBoolProp({
+                label: "Optimize Item Arrangement",
+                description: "If enabled, MasonryFlashList will try to reduce difference in column height by modifying item order. If true, specifying overrideItemLayout is required. Default value is false.",
+            }),
+            onEndReachedThreshold: createStaticNumberProp({
+                label: "End Reached Threshold",
+                description: "How far from the end (in units of visible length of the list) the bottom edge of the list must be from the end of the content to trigger the onEndReached callback. Thus a value of 0.5 will trigger onEndReached when the end of the content is within half the visible length of the list.",
+                defaultValue: 0.5,
+            }),
+        },
     },
-    props: {
-        estimatedItemSize: createNumberProp({
-            group: GROUPS.basic,
-            label: "Est. Item Size",
-            description: "Approximate size of the items before rendering.",
-            defaultValue: 50,
-            step: 1,
-            precision: 0,
-        }),
-        horizontal: createStaticBoolProp({
-            label: "Horizontal",
-            description: "Render list horizontally",
-        }),
-        inverted: createStaticBoolProp({
-            label: "Inverted",
-            description: "If true, reverses the direction.",
-        }),
-        numColumns: createNumColumnsType({
-            editable: true,
-        }),
+    {
+        name: "FlashList",
+        tag: "FlashList",
+        description: "Flashlist by Shopify",
+        packageName: "@shopify/flash-list",
+        category: COMPONENT_TYPES.data,
+        stylesPanelSections: CONTAINER_COMPONENT_STYLES_SECTIONS,
+        layout: {
+            flex: 1,
+        },
+        triggers: [Triggers.OnRefresh, Triggers.OnEndReached],
+        props: {
+            onRefresh: createActionProp(),
+            onEndReached: createActionProp(),
+            estimatedItemSize: createNumberProp({
+                group: GROUPS.basic,
+                label: "Est. Item Size",
+                description: "Approximate size of the items before rendering.",
+                defaultValue: 50,
+                step: 1,
+                precision: 0,
+            }),
+            horizontal: createStaticBoolProp({
+                label: "Horizontal",
+                description: "Render list horizontally",
+            }),
+            inverted: createStaticBoolProp({
+                label: "Inverted",
+                description: "If true, reverses the direction.",
+            }),
+            numColumns: createNumColumnsType({
+                editable: true,
+            }),
+            onEndReachedThreshold: createStaticNumberProp({
+                label: "End Reached Threshold",
+                description: "How far from the end (in units of visible length of the list) the bottom edge of the list must be from the end of the content to trigger the onEndReached callback. Thus a value of 0.5 will trigger onEndReached when the end of the content is within half the visible length of the list.",
+                defaultValue: 0.5,
+            }),
+        },
     },
-};
+];