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

package/lib/commonjs/components/AvatarEdit.js

@@ -12,7 +12,6 @@ var _theming = require("../theming");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const AvatarEdit = _ref => {
   let {
     Icon,
@@ -32,9 +31,10 @@ const AvatarEdit = _ref => {
     width: size,
     height: size
   };
-  return /*#__PURE__*/React.createElement(_reactNative.View, _extends({
-    style: [style, dimensions]
-  }, rest), /*#__PURE__*/React.createElement(_Touchable.default, {
+  return /*#__PURE__*/React.createElement(_reactNative.View, {
+    style: [style, dimensions],
+    ...rest
+  }, /*#__PURE__*/React.createElement(_Touchable.default, {
     onPress: onPress
   }, /*#__PURE__*/React.createElement(_CircleImage.default, {
     source: image,
@@ -56,4 +56,15 @@ const AvatarEdit = _ref => {
   }))));
 };
 var _default = (0, _theming.withTheme)(AvatarEdit);
+exports.default = _default;r: colorStyles.editBackgroundColor,
+      borderRadius: size * (3 / 16),
+      padding: size * (3 / 32)
+    }
+  }, /*#__PURE__*/React.createElement(Icon, {
+    name: "MaterialIcons/edit",
+    color: colorStyles.editIconColor,
+    size: size * (3 / 16)
+  }))));
+};
+var _default = (0, _theming.withTheme)(AvatarEdit);
 exports.default = _default;

package/lib/commonjs/components/Button.js

@@ -21,11 +21,10 @@ function Base(_ref) {
     Icon,
     icon,
     title,
+    onPress,
     loading,
     disabled,
     style,
-    activeOpacity,
-    disabledOpacity,
     ...props
   } = _ref;
   const {
@@ -62,13 +61,14 @@ function Base(_ref) {
     buttonStyles.justifyContent = "flex-end";
   }
   return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
+    onPress: onPress,
     disabled: disabled || loading,
     style: _ref2 => {
       let {
         pressed
       } = _ref2;
       return [styles.base, {
-        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+        opacity: pressed || disabled ? 0.75 : 1
       }, buttonStyles];
     }
   }, props), loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {

package/lib/commonjs/components/Checkbox/Checkbox.js

@@ -7,7 +7,9 @@ exports.default = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _theming = require("../../theming");
+var _Touchable = _interopRequireDefault(require("../Touchable"));
 var _hooks = require("../../hooks");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -58,7 +60,7 @@ const Checkbox = _ref => {
       onUncheck === null || onUncheck === void 0 ? void 0 : onUncheck();
     }
   };
-  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(_Touchable.default, _extends({}, rest, {
     onPress: handlePress,
     disabled: disabled,
     accessibilityState: {

package/lib/commonjs/components/Checkbox/CheckboxGroupRow.js

@@ -9,6 +9,7 @@ var _reactNative = require("react-native");
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
 var _Text = _interopRequireDefault(require("../Text"));
 var _context = require("./context");
+var _Touchable = _interopRequireDefault(require("../Touchable"));
 var _utilities = require("../../utilities");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -72,7 +73,7 @@ const CheckboxGroupRow = _ref => {
     textStyles,
     viewStyles
   } = (0, _utilities.extractStyles)(style);
-  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
+  return /*#__PURE__*/React.createElement(_Touchable.default, _extends({
     onPress: handlePress,
     style: [styles.mainParent, {
       flexDirection: direction

package/lib/commonjs/components/Checkbox/CheckboxRow.js

@@ -10,6 +10,7 @@ var _lodash = require("lodash");
 var _utilities = require("../../utilities");
 var _hooks = require("../../hooks");
 var _Text = _interopRequireDefault(require("../Text"));
+var _Touchable = _interopRequireDefault(require("../Touchable"));
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -82,7 +83,7 @@ const CheckboxRow = _ref => {
     textStyles,
     viewStyles
   } = (0, _utilities.extractStyles)(style);
-  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
+  return /*#__PURE__*/React.createElement(_Touchable.default, _extends({
     onPress: handlePress,
     style: [viewStyles, styles.mainParent, {
       flexDirection: direction

package/lib/commonjs/components/DeprecatedButton.js

@@ -8,6 +8,7 @@ var React = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _color = _interopRequireDefault(require("color"));
 var _Config = _interopRequireDefault(require("./Config"));
+var _Touchable = _interopRequireDefault(require("./Touchable"));
 var _Elevation = _interopRequireDefault(require("./Elevation"));
 var _theming = require("../theming");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26,6 +27,7 @@ const Button = _ref => {
     children,
     onPress,
     elevation = 0,
+    style,
     theme: {
       colors,
       disabledOpacity,
@@ -79,19 +81,41 @@ const Button = _ref => {
     marginRight: -8,
     width: _Config.default.buttonIconSize
   }];
+  const {
+    margin,
+    marginEnd,
+    marginTop,
+    marginLeft,
+    marginRight,
+    marginBottom,
+    marginHorizontal,
+    marginVertical,
+    ...innerStyles
+  } = _reactNative.StyleSheet.flatten(style || {});
+  const margins = {
+    margin,
+    marginEnd,
+    marginTop,
+    marginLeft,
+    marginRight,
+    marginBottom,
+    marginHorizontal,
+    marginVertical
+  };
   return /*#__PURE__*/React.createElement(_Elevation.default, {
     style: {
       elevation,
-      alignSelf: "stretch"
+      alignSelf: "stretch",
+      ...margins
     }
-  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(_Touchable.default, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled
     },
     accessibilityRole: "button",
     disabled: disabled || loading,
-    style: [styles.button, buttonStyle]
+    style: [styles.button, buttonStyle, innerStyles]
   }), /*#__PURE__*/React.createElement(_reactNative.View, {
     style: styles.content
   }, icon && loading !== true ? /*#__PURE__*/React.createElement(_reactNative.View, {

package/lib/commonjs/components/DeprecatedFAB.js

@@ -9,6 +9,7 @@ var _reactNative = require("react-native");
 var _color = _interopRequireDefault(require("color"));
 var _Config = _interopRequireDefault(require("./Config"));
 var _Text = _interopRequireDefault(require("./Text"));
+var _Touchable = _interopRequireDefault(require("./Touchable"));
 var _Elevation = _interopRequireDefault(require("./Elevation"));
 var _theming = require("../theming");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -106,7 +107,7 @@ const FAB = _ref => {
     style: [{
       elevation
     }, style]
-  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(_Touchable.default, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled

package/lib/commonjs/components/Swiper/Swiper.js

@@ -25,6 +25,7 @@ const Swiper = _ref => {
     keyExtractor,
     renderItem,
     children,
+    onIndexChanged,
     style
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
@@ -34,6 +35,7 @@ const Swiper = _ref => {
     loop: loop,
     timeout: timeout,
     vertical: vertical,
+    onIndexChanged: onIndexChanged,
     controlsProps: {
       prevTitle,
       nextTitle,

package/lib/commonjs/components/Touchable.js

@@ -13,24 +13,19 @@ function Touchable(_ref) {
     children,
     disabled,
     onPress,
-    activeOpacity,
-    disabledOpacity,
-    delayLongPress,
-    hitSlop,
     style,
     ...props
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_reactNative.Pressable, _extends({
-    disabled: disabled,
     onPress: onPress,
-    delayLongPress: delayLongPress ? delayLongPress : 500,
-    hitSlop: hitSlop ? hitSlop : 8,
+    disabled: disabled,
+    hitSlop: 8,
     style: _ref2 => {
       let {
         pressed
       } = _ref2;
       return [{
-        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+        opacity: pressed || disabled ? 0.75 : 1
       }, style];
     }
   }, props), children);

package/lib/commonjs/mappings/Button.js

@@ -18,27 +18,12 @@ const SEED_DATA_PROPS = {
     defaultValue: "Get Started"
   }),
   disabled: (0, _types.createDisabledProp)(),
-  loading: (0, _types.createLoadingProp)(),
-  activeOpacity: (0, _types.createStaticNumberProp)({
-    label: "Active Opacity",
-    description: "Opacity of the button when active.",
-    required: false
-  }),
-  disabledOpacity: (0, _types.createStaticNumberProp)({
-    label: "Disabled Opacity",
-    description: "Opacity of the button when disabled.",
-    required: false
-  }),
-  delayLongPress: (0, _types.createStaticNumberProp)({
-    label: "Delay Long Press",
-    description: "Duration (in milliseconds) from onPressIn before onLongPress is called.",
-    required: false
-  }),
-  hitSlop: (0, _types.createStaticNumberProp)({
-    label: "Hit Slop",
-    description: "Sets additional distance outside of element in which a press can be detected",
-    required: false
-  })
+  loading: (0, _types.createLoadingProp)()
+};
+const LAYOUT = {
+  backgroundColor: "transparent",
+  borderRadius: 8,
+  fontFamily: "system-700"
 };
 const SEED_DATA = [{
   name: "Button Outline",
@@ -46,8 +31,7 @@ const SEED_DATA = [{
   category: _types.COMPONENT_TYPES.deprecated,
   stylesPanelSections: [_types.StylesPanelSections.Typography, _types.StylesPanelSections.Background, _types.StylesPanelSections.Borders, _types.StylesPanelSections.Size, _types.StylesPanelSections.MarginsAndPaddings, _types.StylesPanelSections.Position, _types.StylesPanelSections.Effects],
   layout: {
-    borderRadius: 8,
-    fontFamily: "system-700",
+    ...LAYOUT,
     backgroundColor: "transparent",
     borderWidth: 1,
     textAlign: "center"
@@ -60,8 +44,7 @@ const SEED_DATA = [{
   category: _types.COMPONENT_TYPES.deprecated,
   stylesPanelSections: [_types.StylesPanelSections.Typography, _types.StylesPanelSections.Background, _types.StylesPanelSections.Borders, _types.StylesPanelSections.Size, _types.StylesPanelSections.MarginsAndPaddings, _types.StylesPanelSections.Position, _types.StylesPanelSections.Effects],
   layout: {
-    borderRadius: 8,
-    fontFamily: "system-700",
+    ...LAYOUT,
     backgroundColor: "primary",
     textAlign: "center"
   },
@@ -73,8 +56,7 @@ const SEED_DATA = [{
   category: _types.COMPONENT_TYPES.button,
   stylesPanelSections: [_types.StylesPanelSections.Typography, _types.StylesPanelSections.Background, _types.StylesPanelSections.Borders, _types.StylesPanelSections.Size, _types.StylesPanelSections.MarginsAndPaddings, _types.StylesPanelSections.Position, _types.StylesPanelSections.Effects],
   layout: {
-    borderRadius: 8,
-    fontFamily: "system-700",
+    ...LAYOUT,
     backgroundColor: "primary",
     textAlign: "center"
   },

package/lib/commonjs/mappings/FlashList.js

@@ -5,7 +5,42 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SEED_DATA = void 0;
 var _types = require("@draftbit/types");
-const SEED_DATA = {
+const SEED_DATA = [{
+  name: "Masonry List",
+  tag: "MasonryFlashList",
+  description: "Masonry Flashlist by Shopify",
+  packageName: "@shopify/flash-list",
+  category: _types.COMPONENT_TYPES.data,
+  stylesPanelSections: _types.CONTAINER_COMPONENT_STYLES_SECTIONS,
+  layout: {
+    flex: 1
+  },
+  triggers: [_types.Triggers.OnRefresh, _types.Triggers.OnEndReached],
+  props: {
+    onRefresh: (0, _types.createActionProp)(),
+    onEndReached: (0, _types.createActionProp)(),
+    numColumns: (0, _types.createNumColumnsType)({
+      editable: true
+    }),
+    estimatedItemSize: (0, _types.createNumberProp)({
+      group: _types.GROUPS.basic,
+      label: "Est. Item Size",
+      description: "Approximate size of the items before rendering.",
+      defaultValue: 50,
+      step: 1,
+      precision: 0
+    }),
+    optimizeItemArrangement: (0, _types.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: (0, _types.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
+    })
+  }
+}, {
   name: "FlashList",
   tag: "FlashList",
   description: "Flashlist by Shopify",
@@ -15,7 +50,10 @@ const SEED_DATA = {
   layout: {
     flex: 1
   },
+  triggers: [_types.Triggers.OnRefresh, _types.Triggers.OnEndReached],
   props: {
+    onRefresh: (0, _types.createActionProp)(),
+    onEndReached: (0, _types.createActionProp)(),
     estimatedItemSize: (0, _types.createNumberProp)({
       group: _types.GROUPS.basic,
       label: "Est. Item Size",
@@ -34,7 +72,12 @@ const SEED_DATA = {
     }),
     numColumns: (0, _types.createNumColumnsType)({
       editable: true
+    }),
+    onEndReachedThreshold: (0, _types.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
     })
   }
-};
+}];
 exports.SEED_DATA = SEED_DATA;

package/lib/commonjs/mappings/FlatList.js

@@ -14,7 +14,10 @@ const SEED_DATA = {
   layout: {
     flex: 1
   },
+  triggers: [_types.Triggers.OnRefresh, _types.Triggers.OnEndReached],
   props: {
+    onRefresh: (0, _types.createActionProp)(),
+    onEndReached: (0, _types.createActionProp)(),
     horizontal: (0, _types.createStaticBoolProp)({
       label: "Horizontal",
       description: "Render list horizontally"
@@ -25,6 +28,15 @@ const SEED_DATA = {
     }),
     numColumns: (0, _types.createNumColumnsType)({
       editable: true
+    }),
+    initialNumToRender: (0, _types.createStaticBoolProp)({
+      label: "Initial Num To Render",
+      descriprion: "How many items to render in the initial batch"
+    }),
+    onEndReachedThreshold: (0, _types.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
     })
   }
 };

package/lib/commonjs/mappings/Swiper.js

@@ -14,7 +14,9 @@ const SEED_DATA = {
     height: 300,
     width: "100%"
   },
+  triggers: [_types.Triggers.OnIndexChanged],
   props: {
+    onIndexChanged: (0, _types.createActionProp)(),
     from: (0, _types.createNumberProp)({
       group: _types.GROUPS.basic,
       label: "Initial Slide"

package/lib/commonjs/mappings/Touchable.js

@@ -5,48 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SEED_DATA = void 0;
 var _types = require("@draftbit/types");
-const SEED_DATA_PROPS = {
+const SEED_DATA = {
+  name: "Touchable",
+  tag: "Touchable",
+  description: "Simple button with no styles",
+  category: _types.COMPONENT_TYPES.button,
   stylesPanelSections: [_types.StylesPanelSections.Size, _types.StylesPanelSections.Margins, _types.StylesPanelSections.Borders],
   layout: {},
-  triggers: [_types.Triggers.OnPress, _types.Triggers.OnLongPress],
+  triggers: [_types.Triggers.OnPress],
   props: {
-    onPress: (0, _types.createActionProp)(),
-    onLongPress: (0, _types.createActionProp)(),
-    activeOpacity: (0, _types.createNumberProp)({
-      label: "Active Opacity",
-      description: "The opacity when the button is pressed.",
-      defaultValue: 0.8,
-      group: _types.GROUPS.basic
-    }),
-    disabledOpacity: (0, _types.createNumberProp)({
-      label: "Disabled Opacity",
-      description: "The opacity when the button is disabled.",
-      defaultValue: 0.8,
-      group: _types.GROUPS.basic
-    }),
-    delayLongPress: (0, _types.createNumberProp)({
-      label: "Delay Long Press",
-      description: "Duration (in milliseconds) from onPressIn before onLongPress is called.",
-      group: _types.GROUPS.basic
-    }),
-    hitSlop: (0, _types.createNumberProp)({
-      label: "Hit Slop",
-      description: "Sets additional distance outside of element in which a press can be detected.",
-      group: _types.GROUPS.basic
-    })
+    onPress: (0, _types.createActionProp)()
   }
 };
-const SEED_DATA = [{
-  name: "Touchable",
-  tag: "Touchable",
-  description: "An interactive view with no styles",
-  category: _types.COMPONENT_TYPES.deprecated,
-  ...SEED_DATA_PROPS
-}, {
-  name: "Pressable",
-  tag: "Pressable",
-  description: "An interactive view with no styles",
-  category: _types.COMPONENT_TYPES.button,
-  ...SEED_DATA_PROPS
-}];
 exports.SEED_DATA = SEED_DATA;

package/lib/module/components/AnimatedCircularProgress.js

@@ -1,4 +1,3 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import * as React from "react";
 import { Animated, Easing } from "react-native";
 import CircularProgress from "./CircularProgress";
@@ -46,6 +45,19 @@ const AnimatedCircularProgress = _ref => {
   React.useEffect(() => {
     animate();
   }, [fill, animate]);
+  return /*#__PURE__*/React.createElement(AnimatedProgress, {
+    ...other,
+    style: other.style,
+    childrenContainerStyle: other.childrenContainerStyle,
+    fill: fillAnimation,
+    tintColor: animateColor()
+  });
+};
+export default AnimatedCircularProgress;imation;
+  };
+  React.useEffect(() => {
+    animate();
+  }, [fill, animate]);
   return /*#__PURE__*/React.createElement(AnimatedProgress, _extends({}, other, {
     style: other.style,
     childrenContainerStyle: other.childrenContainerStyle,

package/lib/module/components/Button.js

@@ -13,11 +13,10 @@ function Base(_ref) {
     Icon,
     icon,
     title,
+    onPress,
     loading,
     disabled,
     style,
-    activeOpacity,
-    disabledOpacity,
     ...props
   } = _ref;
   const {
@@ -54,13 +53,14 @@ function Base(_ref) {
     buttonStyles.justifyContent = "flex-end";
   }
   return /*#__PURE__*/React.createElement(Pressable, _extends({
+    onPress: onPress,
     disabled: disabled || loading,
     style: _ref2 => {
       let {
         pressed
       } = _ref2;
       return [styles.base, {
-        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+        opacity: pressed || disabled ? 0.75 : 1
       }, buttonStyles];
     }
   }, props), loading ? /*#__PURE__*/React.createElement(ActivityIndicator, {

package/lib/module/components/Checkbox/Checkbox.js

@@ -1,7 +1,8 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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 = _ref => {
   let {
@@ -50,7 +51,7 @@ const Checkbox = _ref => {
       onUncheck === null || onUncheck === void 0 ? void 0 : onUncheck();
     }
   };
-  return /*#__PURE__*/React.createElement(Pressable, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(Touchable, _extends({}, rest, {
     onPress: handlePress,
     disabled: disabled,
     accessibilityState: {

package/lib/module/components/Checkbox/CheckboxGroupRow.js

@@ -1,10 +1,11 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import * as React from "react";
-import { StyleSheet, View, Platform, Pressable } from "react-native";
+import { StyleSheet, View, Platform } from "react-native";
 import Checkbox from "./Checkbox";
 import Text from "../Text";
 import { useCheckboxGroupContext } from "./context";
 import { Direction as GroupDirection } from "./context";
+import Touchable from "../Touchable";
 import { extractStyles } from "../../utilities";
 export let Direction;
 (function (Direction) {
@@ -63,7 +64,7 @@ const CheckboxGroupRow = _ref => {
     textStyles,
     viewStyles
   } = extractStyles(style);
-  return /*#__PURE__*/React.createElement(Pressable, _extends({
+  return /*#__PURE__*/React.createElement(Touchable, _extends({
     onPress: handlePress,
     style: [styles.mainParent, {
       flexDirection: direction

package/lib/module/components/Checkbox/CheckboxRow.js

@@ -1,10 +1,11 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import * as React from "react";
-import { StyleSheet, View, Platform, Pressable } from "react-native";
+import { StyleSheet, View, Platform } 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 let Direction;
 (function (Direction) {
@@ -72,7 +73,7 @@ const CheckboxRow = _ref => {
     textStyles,
     viewStyles
   } = extractStyles(style);
-  return /*#__PURE__*/React.createElement(Pressable, _extends({
+  return /*#__PURE__*/React.createElement(Touchable, _extends({
     onPress: handlePress,
     style: [viewStyles, styles.mainParent, {
       flexDirection: direction

package/lib/module/components/DeprecatedButton.js

@@ -1,8 +1,9 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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 = _ref => {
@@ -17,6 +18,7 @@ const Button = _ref => {
     children,
     onPress,
     elevation = 0,
+    style,
     theme: {
       colors,
       disabledOpacity,
@@ -70,19 +72,41 @@ const Button = _ref => {
     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 /*#__PURE__*/React.createElement(Elevation, {
     style: {
       elevation,
-      alignSelf: "stretch"
+      alignSelf: "stretch",
+      ...margins
     }
-  }, /*#__PURE__*/React.createElement(Pressable, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(Touchable, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled
     },
     accessibilityRole: "button",
     disabled: disabled || loading,
-    style: [styles.button, buttonStyle]
+    style: [styles.button, buttonStyle, innerStyles]
   }), /*#__PURE__*/React.createElement(View, {
     style: styles.content
   }, icon && loading !== true ? /*#__PURE__*/React.createElement(View, {