@draftbit/core 47.0.1-54c307.2 → 47.0.1-cc5ccc.2

package/lib/commonjs/components/Button.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ButtonSolid = exports.ButtonOutline = exports.Button = void 0;
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _theming = require("../theming");
 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); }
@@ -22,6 +22,9 @@ function Base(_ref) {
     icon,
     title,
     onPress,
+    onLongPress,
+    activeOpacity,
+    disabledOpacity,
     loading,
     disabled,
     style,
@@ -60,27 +63,36 @@ function Base(_ref) {
   if (textAlign === "right") {
     buttonStyles.justifyContent = "flex-end";
   }
-  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
+  const getOpacity = (0, _react.useCallback)(pressed => {
+    if (disabled) {
+      return disabledOpacity;
+    } else {
+      if (pressed) return activeOpacity;else return 1;
+    }
+  }, [activeOpacity, disabled, disabledOpacity]);
+  const _style = (0, _react.useCallback)(_ref2 => {
+    let {
+      pressed
+    } = _ref2;
+    return [buttonStyles, {
+      opacity: getOpacity(pressed)
+    }];
+  }, [getOpacity, buttonStyles]);
+  return /*#__PURE__*/_react.default.createElement(_reactNative.Pressable, _extends({
     onPress: onPress,
+    onLongPress: onLongPress,
     disabled: disabled || loading,
-    style: _ref2 => {
-      let {
-        pressed
-      } = _ref2;
-      return [styles.base, {
-        opacity: pressed || disabled ? 0.75 : 1
-      }, buttonStyles];
-    }
-  }, props), loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {
+    style: (styles.base, _style)
+  }, props), loading ? /*#__PURE__*/_react.default.createElement(_reactNative.ActivityIndicator, {
     size: "small",
     color: color,
     style: styles.loading
-  }) : null, icon && !loading ? /*#__PURE__*/React.createElement(Icon, {
+  }) : null, icon && !loading ? /*#__PURE__*/_react.default.createElement(Icon, {
     name: icon,
     color: color,
     style: styles.icon,
     size: CONSTANTS.icon
-  }) : null, /*#__PURE__*/React.createElement(_reactNative.Text, {
+  }) : null, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
     style: titleStyles
   }, title));
 }
@@ -90,7 +102,7 @@ const Solid = _ref3 => {
     theme,
     ...props
   } = _ref3;
-  return /*#__PURE__*/React.createElement(Base, _extends({
+  return /*#__PURE__*/_react.default.createElement(Base, _extends({
     style: [{
       color: "#FFF",
       borderRadius: theme.roundness,
@@ -108,7 +120,7 @@ const Outline = _ref4 => {
     theme,
     ...props
   } = _ref4;
-  return /*#__PURE__*/React.createElement(Base, _extends({
+  return /*#__PURE__*/_react.default.createElement(Base, _extends({
     style: [styles.outline, {
       borderRadius: theme.roundness,
       borderColor: theme.colors.primary,

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/DatePicker/DatePicker.js

@@ -328,7 +328,7 @@ const DatePicker = _ref => {
     onFocus: _handleFocus,
     onBlur: _handleBlur,
     underlineColorAndroid: "transparent",
-    style: [inputStyles, textStyles, viewStyles]
+    style: [inputStyles, textStyles]
   }, props))), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
     name: rightIconName,
     size: ICON_SIZE,

package/lib/commonjs/components/DeprecatedCardWrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _theming = require("../theming");
-var _Touchable = _interopRequireDefault(require("./Touchable"));
+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); }
 const getWidth = numColumns => {
@@ -28,7 +28,7 @@ const Card = _ref => {
     ...rest
   } = _ref;
   const width = getWidth(numColumns);
-  return /*#__PURE__*/_react.default.createElement(_Touchable.default, _extends({
+  return /*#__PURE__*/_react.default.createElement(_reactNative.Pressable, _extends({
     disabled: !onPress,
     onPress: onPress,
     style: [style, {

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/Picker/Picker.js

@@ -11,8 +11,7 @@ var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
 var _picker = require("@react-native-picker/picker");
 var _theming = require("../../theming");
 var _Portal = _interopRequireDefault(require("../Portal/Portal"));
-var _DeprecatedButton = _interopRequireDefault(require("../DeprecatedButton"));
-var _Touchable = _interopRequireDefault(require("../Touchable"));
+var _Button = require("../Button");
 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); }
@@ -207,7 +206,7 @@ const Picker = _ref => {
     /* marginsContainer */
     React.createElement(_reactNative.View, {
       style: [styles.marginsContainer, marginStyles]
-    }, /*#__PURE__*/React.createElement(_Touchable.default, {
+    }, /*#__PURE__*/React.createElement(_reactNative.Pressable, {
       disabled: disabled,
       onPress: togglePickerVisible,
       style: styles.touchableContainer
@@ -226,7 +225,7 @@ const Picker = _ref => {
       }]
     }, /*#__PURE__*/React.createElement(_reactNativeSafeAreaContext.SafeAreaView, {
       style: styles.iosSafeArea
-    }, /*#__PURE__*/React.createElement(_DeprecatedButton.default, {
+    }, /*#__PURE__*/React.createElement(_Button.Button, {
       Icon: Icon,
       type: "text",
       onPress: togglePickerVisible,

package/lib/commonjs/components/Picker/PickerComponent.ios.js

@@ -11,7 +11,7 @@ var _lodash = _interopRequireDefault(require("lodash.omit"));
 var _picker = require("@react-native-picker/picker");
 var _theming = require("../../theming");
 var _Portal = _interopRequireDefault(require("../Portal/Portal"));
-var _DeprecatedButton = _interopRequireDefault(require("../DeprecatedButton"));
+var _Button = require("../Button");
 var _TextField = _interopRequireDefault(require("../TextField"));
 var _Touchable = _interopRequireDefault(require("../Touchable"));
 var _utilities = require("../../utilities");
@@ -99,7 +99,7 @@ const Picker = _ref => {
     }]
   }, /*#__PURE__*/React.createElement(_reactNativeSafeAreaContext.SafeAreaView, {
     style: styles.pickerContainer
-  }, /*#__PURE__*/React.createElement(_DeprecatedButton.default, {
+  }, /*#__PURE__*/React.createElement(_Button.Button, {
     Icon: Icon,
     type: "text",
     onPress: toggleVisibility,

package/lib/commonjs/components/Pressable.js

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

package/lib/commonjs/components/Touchable.js

@@ -4,29 +4,45 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Touchable;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
-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); }
 function Touchable(_ref) {
   let {
     children,
     disabled,
     onPress,
+    onLongPress,
+    hitSlop,
+    delayLongPress,
+    activeOpacity,
+    disabledOpacity,
     style,
     ...props
   } = _ref;
+  const getOpacity = (0, _react.useCallback)(pressed => {
+    if (disabled) {
+      return disabledOpacity;
+    } else {
+      if (pressed) return activeOpacity;else return 1;
+    }
+  }, [activeOpacity, disabled, disabledOpacity]);
+  const _style = (0, _react.useCallback)(_ref2 => {
+    let {
+      pressed
+    } = _ref2;
+    return [style, {
+      opacity: getOpacity(pressed)
+    }];
+  }, [getOpacity, style]);
   return /*#__PURE__*/_react.default.createElement(_reactNative.Pressable, _extends({
     onPress: onPress,
+    onLongPress: onLongPress,
     disabled: disabled,
-    hitSlop: 8,
-    style: _ref2 => {
-      let {
-        pressed
-      } = _ref2;
-      return [{
-        opacity: pressed || disabled ? 0.75 : 1
-      }, style];
-    }
+    delayLongPress: delayLongPress ? delayLongPress : 500,
+    hitSlop: hitSlop ? hitSlop : 8,
+    style: _style
   }, props), children);
 }

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,11 @@ 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.createNumberProp)(),
+  disabledOpacity: (0, _types.createNumberProp)(),
+  delayLongPress: (0, _types.createNumberProp)(),
+  hitSlop: (0, _types.createNumberProp)()
 };
 const SEED_DATA = [{
   name: "Button Outline",
@@ -31,8 +31,9 @@ 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,
     backgroundColor: "transparent",
+    borderRadius: 8,
+    fontFamily: "system-700",
     borderWidth: 1,
     textAlign: "center"
   },
@@ -44,7 +45,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 +58,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/Pressable.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SEED_DATA = void 0;
+var _types = require("@draftbit/types");
+const SEED_DATA_PROPS = {
+  stylesPanelSections: [_types.StylesPanelSections.Size, _types.StylesPanelSections.Margins, _types.StylesPanelSections.Borders],
+  layout: {},
+  triggers: [_types.Triggers.OnPress, _types.Triggers.OnLongPress],
+  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
+    })
+  }
+};
+const SEED_DATA = [{
+  name: "Touchable",
+  tag: "Touchable",
+  description: "An interactive view with no styles",
+  category: _types.COMPONENT_TYPES.button,
+  ...SEED_DATA_PROPS
+}, {
+  name: "Pressable",
+  tag: "Pressable",
+  description: "An interactive view with no styles",
+  category: _types.COMPONENT_TYPES.deprecated,
+  ...SEED_DATA_PROPS
+}];
+exports.SEED_DATA = SEED_DATA;

package/lib/module/components/Button.js

@@ -1,5 +1,5 @@
 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 React, { useCallback } from "react";
 import { Text, Pressable, Platform, StyleSheet, ActivityIndicator } from "react-native";
 import { withTheme } from "../theming";
 const CONSTANTS = {
@@ -14,6 +14,9 @@ function Base(_ref) {
     icon,
     title,
     onPress,
+    onLongPress,
+    activeOpacity,
+    disabledOpacity,
     loading,
     disabled,
     style,
@@ -52,17 +55,26 @@ function Base(_ref) {
   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(_ref2 => {
+    let {
+      pressed
+    } = _ref2;
+    return [buttonStyles, {
+      opacity: getOpacity(pressed)
+    }];
+  }, [getOpacity, buttonStyles]);
   return /*#__PURE__*/React.createElement(Pressable, _extends({
     onPress: onPress,
+    onLongPress: onLongPress,
     disabled: disabled || loading,
-    style: _ref2 => {
-      let {
-        pressed
-      } = _ref2;
-      return [styles.base, {
-        opacity: pressed || disabled ? 0.75 : 1
-      }, buttonStyles];
-    }
+    style: (styles.base, _style)
   }, props), loading ? /*#__PURE__*/React.createElement(ActivityIndicator, {
     size: "small",
     color: color,

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/DatePicker/DatePicker.js

@@ -319,7 +319,7 @@ const DatePicker = _ref => {
     onFocus: _handleFocus,
     onBlur: _handleBlur,
     underlineColorAndroid: "transparent",
-    style: [inputStyles, textStyles, viewStyles]
+    style: [inputStyles, textStyles]
   }, props))), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
     name: rightIconName,
     size: ICON_SIZE,

package/lib/module/components/DeprecatedCardWrapper.js

@@ -1,7 +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 React from "react";
 import { withTheme } from "../theming";
-import Touchable from "./Touchable";
+import { Pressable } from "react-native";
 const getWidth = numColumns => {
   switch (numColumns) {
     case 1:
@@ -21,7 +21,7 @@ const Card = _ref => {
     ...rest
   } = _ref;
   const width = getWidth(numColumns);
-  return /*#__PURE__*/React.createElement(Touchable, _extends({
+  return /*#__PURE__*/React.createElement(Pressable, _extends({
     disabled: !onPress,
     onPress: onPress,
     style: [style, {

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/Picker/Picker.js

@@ -1,12 +1,11 @@
 import * as React from "react";
-import { View, StyleSheet, Text, Platform, Dimensions } from "react-native";
+import { View, StyleSheet, Text, Platform, Dimensions, Pressable } from "react-native";
 import { omit, pickBy, identity, isObject } from "lodash";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { Picker as NativePicker } from "@react-native-picker/picker";
 import { withTheme } from "../../theming";
 import Portal from "../Portal/Portal";
-import Button from "../DeprecatedButton";
-import Touchable from "../Touchable";
+import { Button } from "../Button";
 import { extractStyles, extractBorderAndMarginStyles, borderStyleNames, marginStyleNames } from "../../utilities";
 function normalizeOptions(options) {
   if (options.length === 0) {
@@ -198,7 +197,7 @@ const Picker = _ref => {
     /* marginsContainer */
     React.createElement(View, {
       style: [styles.marginsContainer, marginStyles]
-    }, /*#__PURE__*/React.createElement(Touchable, {
+    }, /*#__PURE__*/React.createElement(Pressable, {
       disabled: disabled,
       onPress: togglePickerVisible,
       style: styles.touchableContainer

package/lib/module/components/Picker/PickerComponent.ios.js

@@ -6,7 +6,7 @@ import omit from "lodash.omit";
 import { Picker as NativePicker } from "@react-native-picker/picker";
 import { withTheme } from "../../theming";
 import Portal from "../Portal/Portal";
-import Button from "../DeprecatedButton";
+import { Button } from "../Button";
 import TextField from "../TextField";
 import Touchable from "../Touchable";
 import { extractStyles } from "../../utilities";

package/lib/module/components/Pressable.js

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