@draftbit/core 47.0.1-9fd6f2.2 → 47.0.1-c14479.2

package/lib/commonjs/components/Button.js

@@ -21,10 +21,11 @@ function Base(_ref) {
     Icon,
     icon,
     title,
-    onPress,
     loading,
     disabled,
     style,
+    activeOpacity,
+    disabledOpacity,
     ...props
   } = _ref;
   const {
@@ -61,14 +62,13 @@ 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 || disabled ? 0.75 : 1
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
       }, buttonStyles];
     }
   }, props), loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {

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

@@ -7,9 +7,7 @@ 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); }
@@ -60,7 +58,7 @@ const Checkbox = _ref => {
       onUncheck === null || onUncheck === void 0 ? void 0 : onUncheck();
     }
   };
-  return /*#__PURE__*/React.createElement(_Touchable.default, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
     onPress: handlePress,
     disabled: disabled,
     accessibilityState: {

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

@@ -9,7 +9,6 @@ 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); }
@@ -73,7 +72,7 @@ const CheckboxGroupRow = _ref => {
     textStyles,
     viewStyles
   } = (0, _utilities.extractStyles)(style);
-  return /*#__PURE__*/React.createElement(_Touchable.default, _extends({
+  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
     onPress: handlePress,
     style: [styles.mainParent, {
       flexDirection: direction

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

@@ -10,7 +10,6 @@ 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); }
@@ -83,7 +82,7 @@ const CheckboxRow = _ref => {
     textStyles,
     viewStyles
   } = (0, _utilities.extractStyles)(style);
-  return /*#__PURE__*/React.createElement(_Touchable.default, _extends({
+  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
     onPress: handlePress,
     style: [viewStyles, styles.mainParent, {
       flexDirection: direction

package/lib/commonjs/components/DeprecatedButton.js

@@ -8,7 +8,6 @@ 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 }; }
@@ -27,7 +26,6 @@ const Button = _ref => {
     children,
     onPress,
     elevation = 0,
-    style,
     theme: {
       colors,
       disabledOpacity,
@@ -81,41 +79,19 @@ 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",
-      ...margins
+      alignSelf: "stretch"
     }
-  }, /*#__PURE__*/React.createElement(_Touchable.default, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled
     },
     accessibilityRole: "button",
     disabled: disabled || loading,
-    style: [styles.button, buttonStyle, innerStyles]
+    style: [styles.button, buttonStyle]
   }), /*#__PURE__*/React.createElement(_reactNative.View, {
     style: styles.content
   }, icon && loading !== true ? /*#__PURE__*/React.createElement(_reactNative.View, {

package/lib/commonjs/components/DeprecatedFAB.js

@@ -9,7 +9,6 @@ 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 }; }
@@ -107,7 +106,7 @@ const FAB = _ref => {
     style: [{
       elevation
     }, style]
-  }, /*#__PURE__*/React.createElement(_Touchable.default, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled

package/lib/commonjs/components/Pressable.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Pressable;
+var _react = _interopRequireDefault(require("react"));
+var _reactNative = require("react-native");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
+function Pressable(_ref) {
+  let {
+    children,
+    disabled,
+    onPress,
+    activeOpacity,
+    disabledOpacity,
+    delayLongPress,
+    hitSlop,
+    style,
+    ...props
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(_reactNative.Pressable, _extends({
+    onPress: onPress,
+    disabled: disabled,
+    delayLongPress: delayLongPress ? delayLongPress : 500,
+    hitSlop: hitSlop ? hitSlop : 8,
+    style: _ref2 => {
+      let {
+        pressed
+      } = _ref2;
+      return [{
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+      }, style];
+    }
+  }, props), children);
+}

package/lib/commonjs/components/Touchable.js

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

package/lib/commonjs/index.js

@@ -225,6 +225,12 @@ Object.defineProperty(exports, "Picker", {
     return _Picker.default;
   }
 });
+Object.defineProperty(exports, "Pressable", {
+  enumerable: true,
+  get: function () {
+    return _Pressable.default;
+  }
+});
 Object.defineProperty(exports, "ProgressBar", {
   enumerable: true,
   get: function () {
@@ -438,6 +444,7 @@ var _Switch = _interopRequireWildcard(require("./components/Switch"));
 var _TextField = _interopRequireDefault(require("./components/TextField"));
 var _ToggleButton = _interopRequireDefault(require("./components/ToggleButton"));
 var _Touchable = _interopRequireDefault(require("./components/Touchable"));
+var _Pressable = _interopRequireDefault(require("./components/Pressable"));
 var _Accordion = require("./components/Accordion");
 var _ActionSheet = require("./components/ActionSheet");
 var _Swiper = require("./components/Swiper");

package/lib/commonjs/mappings/Button.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SEED_DATA = void 0;
 var _types = require("@draftbit/types");
-const SEED_DATA_TRIGGERS = [_types.Triggers.OnPress];
+const SEED_DATA_TRIGGERS = [_types.Triggers.OnPress, _types.Triggers.OnLongPress];
 const SEED_DATA_PROPS = {
   onPress: (0, _types.createActionProp)(),
+  onLongPress: (0, _types.createActionProp)(),
   icon: (0, _types.createIconProp)({
     defaultValue: null,
     required: false
@@ -18,12 +19,37 @@ const SEED_DATA_PROPS = {
     defaultValue: "Get Started"
   }),
   disabled: (0, _types.createDisabledProp)(),
-  loading: (0, _types.createLoadingProp)()
-};
-const LAYOUT = {
-  backgroundColor: "transparent",
-  borderRadius: 8,
-  fontFamily: "system-700"
+  loading: (0, _types.createLoadingProp)(),
+  activeOpacity: (0, _types.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: (0, _types.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: (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
+  })
 };
 const SEED_DATA = [{
   name: "Button Outline",
@@ -31,7 +57,8 @@ 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: {
-    ...LAYOUT,
+    borderRadius: 8,
+    fontFamily: "system-700",
     backgroundColor: "transparent",
     borderWidth: 1,
     textAlign: "center"
@@ -44,7 +71,8 @@ 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: {
-    ...LAYOUT,
+    borderRadius: 8,
+    fontFamily: "system-700",
     backgroundColor: "primary",
     textAlign: "center"
   },
@@ -56,7 +84,8 @@ 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: {
-    ...LAYOUT,
+    borderRadius: 8,
+    fontFamily: "system-700",
     backgroundColor: "primary",
     textAlign: "center"
   },

package/lib/commonjs/mappings/Touchable.js

@@ -5,16 +5,56 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SEED_DATA = void 0;
 var _types = require("@draftbit/types");
-const SEED_DATA = {
-  name: "Touchable",
-  tag: "Touchable",
-  description: "Simple button with no styles",
-  category: _types.COMPONENT_TYPES.button,
+const SEED_DATA_PROPS = {
   stylesPanelSections: [_types.StylesPanelSections.Size, _types.StylesPanelSections.Margins, _types.StylesPanelSections.Borders],
   layout: {},
-  triggers: [_types.Triggers.OnPress],
+  triggers: [_types.Triggers.OnPress, _types.Triggers.OnLongPress],
   props: {
-    onPress: (0, _types.createActionProp)()
+    onPress: (0, _types.createActionProp)(),
+    onLongPress: (0, _types.createActionProp)(),
+    activeOpacity: (0, _types.createStaticNumberProp)({
+      label: "Active Opacity",
+      description: "The opacity when the button is pressed.",
+      defaultValue: 0.8,
+      min: 0,
+      max: 1,
+      step: 0.01,
+      precision: 2,
+      required: false
+    }),
+    disabledOpacity: (0, _types.createStaticNumberProp)({
+      label: "Disabled Opacity",
+      description: "The opacity when the button is disabled.",
+      defaultValue: 0.8,
+      min: 0,
+      max: 1,
+      step: 0.01,
+      precision: 2,
+      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
+    })
   }
 };
+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/Button.js

@@ -13,10 +13,11 @@ function Base(_ref) {
     Icon,
     icon,
     title,
-    onPress,
     loading,
     disabled,
     style,
+    activeOpacity,
+    disabledOpacity,
     ...props
   } = _ref;
   const {
@@ -53,14 +54,13 @@ 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 || disabled ? 0.75 : 1
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
       }, buttonStyles];
     }
   }, props), loading ? /*#__PURE__*/React.createElement(ActivityIndicator, {

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

@@ -1,8 +1,7 @@
 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 } from "react-native";
+import { View, StyleSheet, Pressable } from "react-native";
 import { useTheme } from "../../theming";
-import Touchable from "../Touchable";
 import { usePrevious } from "../../hooks";
 const Checkbox = _ref => {
   let {
@@ -51,7 +50,7 @@ const Checkbox = _ref => {
       onUncheck === null || onUncheck === void 0 ? void 0 : onUncheck();
     }
   };
-  return /*#__PURE__*/React.createElement(Touchable, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(Pressable, _extends({}, rest, {
     onPress: handlePress,
     disabled: disabled,
     accessibilityState: {

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

@@ -1,11 +1,10 @@
 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 } from "react-native";
+import { StyleSheet, View, Platform, Pressable } 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) {
@@ -64,7 +63,7 @@ const CheckboxGroupRow = _ref => {
     textStyles,
     viewStyles
   } = extractStyles(style);
-  return /*#__PURE__*/React.createElement(Touchable, _extends({
+  return /*#__PURE__*/React.createElement(Pressable, _extends({
     onPress: handlePress,
     style: [styles.mainParent, {
       flexDirection: direction

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

@@ -1,11 +1,10 @@
 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 } 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 let Direction;
 (function (Direction) {
@@ -73,7 +72,7 @@ const CheckboxRow = _ref => {
     textStyles,
     viewStyles
   } = extractStyles(style);
-  return /*#__PURE__*/React.createElement(Touchable, _extends({
+  return /*#__PURE__*/React.createElement(Pressable, _extends({
     onPress: handlePress,
     style: [viewStyles, styles.mainParent, {
       flexDirection: direction

package/lib/module/components/DeprecatedButton.js

@@ -1,9 +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 { 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 = _ref => {
@@ -18,7 +17,6 @@ const Button = _ref => {
     children,
     onPress,
     elevation = 0,
-    style,
     theme: {
       colors,
       disabledOpacity,
@@ -72,41 +70,19 @@ 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",
-      ...margins
+      alignSelf: "stretch"
     }
-  }, /*#__PURE__*/React.createElement(Touchable, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(Pressable, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled
     },
     accessibilityRole: "button",
     disabled: disabled || loading,
-    style: [styles.button, buttonStyle, innerStyles]
+    style: [styles.button, buttonStyle]
   }), /*#__PURE__*/React.createElement(View, {
     style: styles.content
   }, icon && loading !== true ? /*#__PURE__*/React.createElement(View, {

package/lib/module/components/DeprecatedFAB.js

@@ -1,10 +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, 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 = _ref => {
@@ -98,7 +97,7 @@ const FAB = _ref => {
     style: [{
       elevation
     }, style]
-  }, /*#__PURE__*/React.createElement(Touchable, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(Pressable, _extends({}, rest, {
     onPress: onPress,
     accessibilityState: {
       disabled

package/lib/module/components/Pressable.js

@@ -0,0 +1,30 @@
+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 React from "react";
+import { Pressable as NativePressable } from "react-native";
+export default function Pressable(_ref) {
+  let {
+    children,
+    disabled,
+    onPress,
+    activeOpacity,
+    disabledOpacity,
+    delayLongPress,
+    hitSlop,
+    style,
+    ...props
+  } = _ref;
+  return /*#__PURE__*/React.createElement(NativePressable, _extends({
+    onPress: onPress,
+    disabled: disabled,
+    delayLongPress: delayLongPress ? delayLongPress : 500,
+    hitSlop: hitSlop ? hitSlop : 8,
+    style: _ref2 => {
+      let {
+        pressed
+      } = _ref2;
+      return [{
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+      }, style];
+    }
+  }, props), children);
+}

package/lib/module/components/Touchable.js

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

package/lib/module/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";