@draftbit/core 47.0.1-cc5ccc.2 → 47.0.1-d41acb.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); }
@@ -21,13 +21,11 @@ function Base(_ref) {
     Icon,
     icon,
     title,
-    onPress,
-    onLongPress,
-    activeOpacity,
-    disabledOpacity,
     loading,
     disabled,
     style,
+    activeOpacity,
+    disabledOpacity,
     ...props
   } = _ref;
   const {
@@ -63,36 +61,26 @@ function Base(_ref) {
   if (textAlign === "right") {
     buttonStyles.justifyContent = "flex-end";
   }
-  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,
+  return /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
     disabled: disabled || loading,
-    style: (styles.base, _style)
-  }, props), loading ? /*#__PURE__*/_react.default.createElement(_reactNative.ActivityIndicator, {
+    style: _ref2 => {
+      let {
+        pressed
+      } = _ref2;
+      return [styles.base, {
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+      }, buttonStyles];
+    }
+  }, props), loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {
     size: "small",
     color: color,
     style: styles.loading
-  }) : null, icon && !loading ? /*#__PURE__*/_react.default.createElement(Icon, {
+  }) : null, icon && !loading ? /*#__PURE__*/React.createElement(Icon, {
     name: icon,
     color: color,
     style: styles.icon,
     size: CONSTANTS.icon
-  }) : null, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
+  }) : null, /*#__PURE__*/React.createElement(_reactNative.Text, {
     style: titleStyles
   }, title));
 }
@@ -102,7 +90,7 @@ const Solid = _ref3 => {
     theme,
     ...props
   } = _ref3;
-  return /*#__PURE__*/_react.default.createElement(Base, _extends({
+  return /*#__PURE__*/React.createElement(Base, _extends({
     style: [{
       color: "#FFF",
       borderRadius: theme.roundness,
@@ -120,7 +108,7 @@ const Outline = _ref4 => {
     theme,
     ...props
   } = _ref4;
-  return /*#__PURE__*/_react.default.createElement(Base, _extends({
+  return /*#__PURE__*/React.createElement(Base, _extends({
     style: [styles.outline, {
       borderRadius: theme.roundness,
       borderColor: theme.colors.primary,

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

@@ -0,0 +1,127 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var React = _interopRequireWildcard(require("react"));
+var _reactNative = require("react-native");
+var _color = _interopRequireDefault(require("color"));
+var _Config = _interopRequireDefault(require("./Config"));
+var _Elevation = _interopRequireDefault(require("./Elevation"));
+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 Button = _ref => {
+  let {
+    Icon,
+    icon,
+    disabled = false,
+    type = "solid",
+    loading = false,
+    labelColor,
+    color: colorOverride,
+    children,
+    onPress,
+    elevation = 0,
+    theme: {
+      colors,
+      disabledOpacity,
+      roundness,
+      typography
+    },
+    ...rest
+  } = _ref;
+  let backgroundColor, borderColor, textColor, borderWidth;
+  const buttonColor = colorOverride || colors.primary;
+  if (type === "solid") {
+    backgroundColor = buttonColor;
+    if (disabled) {
+      textColor = (0, _color.default)(colors.surface).alpha(disabledOpacity).rgb().string();
+    } else {
+      textColor = labelColor || colors.surface;
+    }
+  } else {
+    backgroundColor = "transparent";
+    if (disabled) {
+      textColor = (0, _color.default)(buttonColor).alpha(disabledOpacity).rgb().string();
+    } else {
+      textColor = labelColor || buttonColor;
+    }
+  }
+  if (type === "outline") {
+    if (disabled) {
+      borderColor = (0, _color.default)(buttonColor).alpha(disabledOpacity).rgb().string();
+    } else {
+      borderColor = buttonColor;
+    }
+    borderWidth = _reactNative.StyleSheet.hairlineWidth;
+  } else {
+    borderColor = "transparent";
+    borderWidth = 0;
+  }
+  const buttonStyle = {
+    backgroundColor,
+    borderColor,
+    borderWidth,
+    borderRadius: roundness
+  };
+  const textStyle = {
+    textAlign: "center",
+    color: textColor,
+    marginVertical: 16,
+    marginHorizontal: 16
+  };
+  const iconStyle = [styles.icon, {
+    marginLeft: 16,
+    marginRight: -8,
+    width: _Config.default.buttonIconSize
+  }];
+  return /*#__PURE__*/React.createElement(_Elevation.default, {
+    style: {
+      elevation,
+      alignSelf: "stretch"
+    }
+  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({}, rest, {
+    onPress: onPress,
+    accessibilityState: {
+      disabled
+    },
+    accessibilityRole: "button",
+    disabled: disabled || loading,
+    style: [styles.button, buttonStyle]
+  }), /*#__PURE__*/React.createElement(_reactNative.View, {
+    style: styles.content
+  }, icon && loading !== true ? /*#__PURE__*/React.createElement(_reactNative.View, {
+    style: iconStyle
+  }, /*#__PURE__*/React.createElement(Icon, {
+    name: icon,
+    size: _Config.default.buttonIconSize,
+    color: textColor
+  })) : null, loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {
+    size: "small",
+    color: textColor,
+    style: iconStyle
+  }) : null, /*#__PURE__*/React.createElement(_reactNative.Text, {
+    numberOfLines: 1,
+    style: [textStyle, typography.button]
+  }, children))));
+};
+const styles = _reactNative.StyleSheet.create({
+  button: {
+    minWidth: 64,
+    borderStyle: "solid"
+  },
+  content: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center"
+  },
+  icon: {
+    width: _Config.default.buttonIconSize
+  }
+});
+var _default = (0, _theming.withTheme)(Button);
+exports.default = _default;

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 _reactNative = require("react-native");
+var _Touchable = _interopRequireDefault(require("./Touchable"));
 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(_reactNative.Pressable, _extends({
+  return /*#__PURE__*/_react.default.createElement(_Touchable.default, _extends({
     disabled: !onPress,
     onPress: onPress,
     style: [style, {

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

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

package/lib/commonjs/components/Pressable.js

@@ -4,45 +4,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Pressable;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(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 _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,
-    onLongPress,
-    hitSlop,
-    delayLongPress,
     activeOpacity,
     disabledOpacity,
+    delayLongPress,
+    hitSlop,
     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
+    style: _ref2 => {
+      let {
+        pressed
+      } = _ref2;
+      return [{
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+      }, style];
+    }
   }, props), children);
 }

package/lib/commonjs/components/Touchable.js

@@ -4,45 +4,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Touchable;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(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 _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 Touchable(_ref) {
   let {
     children,
     disabled,
     onPress,
-    onLongPress,
-    hitSlop,
-    delayLongPress,
     activeOpacity,
     disabledOpacity,
+    delayLongPress,
+    hitSlop,
     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,
+    onPress: onPress,
     delayLongPress: delayLongPress ? delayLongPress : 500,
     hitSlop: hitSlop ? hitSlop : 8,
-    style: _style
+    style: _ref2 => {
+      let {
+        pressed
+      } = _ref2;
+      return [{
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+      }, style];
+    }
   }, props), children);
 }

package/lib/commonjs/components/Touchable.web.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _reactNative = require("react-native");
+var _default = _reactNative.TouchableOpacity;
+exports.default = _default;

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

@@ -20,10 +20,36 @@ const SEED_DATA_PROPS = {
   }),
   disabled: (0, _types.createDisabledProp)(),
   loading: (0, _types.createLoadingProp)(),
-  activeOpacity: (0, _types.createNumberProp)(),
-  disabledOpacity: (0, _types.createNumberProp)(),
-  delayLongPress: (0, _types.createNumberProp)(),
-  hitSlop: (0, _types.createNumberProp)()
+  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,9 +57,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: {
-    backgroundColor: "transparent",
     borderRadius: 8,
     fontFamily: "system-700",
+    backgroundColor: "transparent",
     borderWidth: 1,
     textAlign: "center"
   },

package/lib/commonjs/mappings/{Pressable.js → Touchable.js}

@@ -12,27 +12,35 @@ const SEED_DATA_PROPS = {
   props: {
     onPress: (0, _types.createActionProp)(),
     onLongPress: (0, _types.createActionProp)(),
-    activeOpacity: (0, _types.createNumberProp)({
+    activeOpacity: (0, _types.createStaticNumberProp)({
       label: "Active Opacity",
       description: "The opacity when the button is pressed.",
       defaultValue: 0.8,
-      group: _types.GROUPS.basic
+      min: 0,
+      max: 1,
+      step: 0.01,
+      precision: 2,
+      required: false
     }),
-    disabledOpacity: (0, _types.createNumberProp)({
+    disabledOpacity: (0, _types.createStaticNumberProp)({
       label: "Disabled Opacity",
       description: "The opacity when the button is disabled.",
       defaultValue: 0.8,
-      group: _types.GROUPS.basic
+      min: 0,
+      max: 1,
+      step: 0.01,
+      precision: 2,
+      required: false
     }),
-    delayLongPress: (0, _types.createNumberProp)({
+    delayLongPress: (0, _types.createStaticNumberProp)({
       label: "Delay Long Press",
       description: "Duration (in milliseconds) from onPressIn before onLongPress is called.",
-      group: _types.GROUPS.basic
+      required: false
     }),
-    hitSlop: (0, _types.createNumberProp)({
+    hitSlop: (0, _types.createStaticNumberProp)({
       label: "Hit Slop",
       description: "Sets additional distance outside of element in which a press can be detected.",
-      group: _types.GROUPS.basic
+      required: false
     })
   }
 };
@@ -40,13 +48,13 @@ const SEED_DATA = [{
   name: "Touchable",
   tag: "Touchable",
   description: "An interactive view with no styles",
-  category: _types.COMPONENT_TYPES.button,
+  category: _types.COMPONENT_TYPES.deprecated,
   ...SEED_DATA_PROPS
 }, {
   name: "Pressable",
   tag: "Pressable",
   description: "An interactive view with no styles",
-  category: _types.COMPONENT_TYPES.deprecated,
+  category: _types.COMPONENT_TYPES.button,
   ...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 React, { useCallback } from "react";
+import * as React from "react";
 import { Text, Pressable, Platform, StyleSheet, ActivityIndicator } from "react-native";
 import { withTheme } from "../theming";
 const CONSTANTS = {
@@ -13,13 +13,11 @@ function Base(_ref) {
     Icon,
     icon,
     title,
-    onPress,
-    onLongPress,
-    activeOpacity,
-    disabledOpacity,
     loading,
     disabled,
     style,
+    activeOpacity,
+    disabledOpacity,
     ...props
   } = _ref;
   const {
@@ -55,26 +53,16 @@ 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: (styles.base, _style)
+    style: _ref2 => {
+      let {
+        pressed
+      } = _ref2;
+      return [styles.base, {
+        opacity: pressed ? activeOpacity : disabled ? disabledOpacity : 1
+      }, buttonStyles];
+    }
   }, props), loading ? /*#__PURE__*/React.createElement(ActivityIndicator, {
     size: "small",
     color: color,

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