@draftbit/core 46.8.2-0a0db3.2 → 46.8.2-2fe7f4.2

package/lib/commonjs/components/TextField.js

@@ -10,6 +10,10 @@ var _theming = require("../theming");
 var _utilities = require("../utilities");
 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const AnimatedText = _reactNative.Animated.createAnimatedComponent(_reactNative.Text);
 const FOCUS_ANIMATION_DURATION = 150;
 const BLUR_ANIMATION_DURATION = 180;
@@ -17,7 +21,7 @@ const ICON_SIZE = 24;
 class TextField extends React.Component {
   constructor() {
     super(...arguments);
-    this.state = {
+    _defineProperty(this, "state", {
       nativeProps: {},
       labeled: new _reactNative.Animated.Value(this.props.value || this.props.error ? 0 : 1),
       focused: false,
@@ -26,46 +30,47 @@ class TextField extends React.Component {
         measured: false,
         width: 0
       }
-    };
-    this._timer = setTimeout(() => {}, 0);
-    this._showPlaceholder = () => {
+    });
+    _defineProperty(this, "_timer", setTimeout(() => {}, 0));
+    _defineProperty(this, "_showPlaceholder", () => {
       clearTimeout(this._timer);
+
       // Set the placeholder in a delay to offset the label animation
       // If we show it immediately, they'll overlap and look ugly
       this._timer = setTimeout(() => this.setState({
         placeholder: this.props.placeholder
       }), 50);
-    };
-    this._hidePlaceholder = () => this.setState({
-      placeholder: ""
     });
-    this._restoreLabel = () => _reactNative.Animated.timing(this.state.labeled, {
+    _defineProperty(this, "_hidePlaceholder", () => this.setState({
+      placeholder: ""
+    }));
+    _defineProperty(this, "_restoreLabel", () => _reactNative.Animated.timing(this.state.labeled, {
       toValue: 1,
       duration: FOCUS_ANIMATION_DURATION,
       useNativeDriver: true
-    }).start();
-    this._minmizeLabel = () => _reactNative.Animated.timing(this.state.labeled, {
+    }).start());
+    _defineProperty(this, "_minmizeLabel", () => _reactNative.Animated.timing(this.state.labeled, {
       toValue: 0,
       duration: BLUR_ANIMATION_DURATION,
       useNativeDriver: true
-    }).start();
-    this._handleFocus = () => {
+    }).start());
+    _defineProperty(this, "_handleFocus", () => {
       if (this.props.disabled) {
         return;
       }
       this.setState({
         focused: true
       });
-    };
-    this._handleBlur = () => {
+    });
+    _defineProperty(this, "_handleBlur", () => {
       if (this.props.disabled) {
         return;
       }
       this.setState({
         focused: false
       });
-    };
-    this._handleChangeText = value => {
+    });
+    _defineProperty(this, "_handleChangeText", value => {
       if (this.props.disabled) {
         return;
       }
@@ -80,8 +85,8 @@ class TextField extends React.Component {
         });
         this.props.onChangeText && this.props.onChangeText(value.nativeEvent.text);
       }
-    };
-    this._root = undefined;
+    });
+    _defineProperty(this, "_root", undefined);
   }
   static getDerivedStateFromProps(nextProps, prevState) {
     return {
@@ -168,9 +173,7 @@ class TextField extends React.Component {
         roundness,
         disabledOpacity
       },
-      render = props => /*#__PURE__*/React.createElement(_reactNative.TextInput, {
-        ...props
-      }),
+      render = props => /*#__PURE__*/React.createElement(_reactNative.TextInput, props),
       ...rest
     } = this.props;
     const MINIMIZED_LABEL_Y_OFFSET = -(typography.caption.lineHeight + 4);
@@ -310,10 +313,9 @@ class TextField extends React.Component {
     } = _reactNative.StyleSheet.flatten(style || {});
     return /*#__PURE__*/React.createElement(_reactNative.View, {
       style: [styles.container, styleProp]
-    }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, {
-      ...leftIconProps,
+    }, leftIconName && leftIconMode === "outset" ? /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
       style: leftIconStyle
-    }) : null, /*#__PURE__*/React.createElement(_reactNative.View, {
+    })) : null, /*#__PURE__*/React.createElement(_reactNative.View, {
       style: (0, _utilities.applyStyles)([containerStyle], {
         height: style === null || style === void 0 ? void 0 : style.height,
         backgroundColor: bgColor,
@@ -381,10 +383,9 @@ class TextField extends React.Component {
       style: {
         justifyContent: type === "solid" ? "center" : undefined
       }
-    }, /*#__PURE__*/React.createElement(Icon, {
-      ...leftIconProps,
+    }, /*#__PURE__*/React.createElement(Icon, _extends({}, leftIconProps, {
       style: leftIconStyle
-    })) : null, render({
+    }))) : null, render({
       ref: c => {
         this._root = c;
       },
@@ -422,55 +423,6 @@ class TextField extends React.Component {
 }
 var _default = (0, _theming.withTheme)(TextField);
 exports.default = _default;
-const styles = _reactNative.StyleSheet.create({
-  container: {
-    alignSelf: "stretch"
-  },
-  placeholder: {
-    position: "absolute",
-    left: 0
-  },
-  underline: {
-    position: "absolute",
-    left: 0,
-    right: 0,
-    bottom: 0,
-    height: 2
-  },
-  input: {
-    flexGrow: 1,
-    justifyContent: "center",
-    textAlignVertical: "center",
-    margin: 0,
-    textAlign: _reactNative.I18nManager.isRTL ? "right" : "left"
-  }
-});_handleFocus,
-      onBlur: this._handleBlur,
-      underlineColorAndroid: "transparent",
-      style: inputStyles,
-      ...rest,
-      ...this.state.nativeProps,
-      value: this.state.value
-    })), rightIconName ? /*#__PURE__*/React.createElement(Icon, {
-      name: rightIconName,
-      size: ICON_SIZE,
-      color: colors.light,
-      style: {
-        position: "absolute",
-        right: 16,
-        marginTop: type === "solid" ? MINIMIZED_LABEL_FONT_SIZE + 4 : 16
-      }
-    }) : null, assistiveText ? /*#__PURE__*/React.createElement(_reactNative.Text, {
-      style: [{
-        color: error ? colors.error : colors.light,
-        marginTop: 8,
-        marginLeft: assistiveTextLeftMargin
-      }]
-    }, assistiveText) : null);
-  }
-}
-var _default = (0, _theming.withTheme)(TextField);
-exports.default = _default;
 const styles = _reactNative.StyleSheet.create({
   container: {
     alignSelf: "stretch"

package/lib/commonjs/components/Touchable.js

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

package/lib/module/components/TabView/TabView.js

@@ -76,6 +76,7 @@ const TabViewComponent = _ref => {
           color
         } = _ref2;
         return route !== null && route !== void 0 && route.icon ? /*#__PURE__*/React.createElement(Icon, {
+          style: styles.icon,
           name: route.icon,
           color: color,
           size: 16
@@ -83,7 +84,8 @@ const TabViewComponent = _ref => {
       },
       style: {
         backgroundColor: tabsBackgroundColor || theme.colors.background
-      }
+      },
+      contentContainerStyle: styles.tabBarContainer
     }));
   };
 
@@ -108,6 +110,14 @@ const TabViewComponent = _ref => {
 const styles = StyleSheet.create({
   tabView: {
     flex: 1
+  },
+  //Prevent height of bar from filling container
+  tabBarContainer: {
+    flex: undefined
+  },
+  icon: {
+    width: 16,
+    height: 16
   }
 });
 export default withTheme(TabViewComponent);

package/lib/typescript/src/components/TabView/TabView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TabView.d.ts","sourceRoot":"","sources":["../../../../../src/components/TabView/TabView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAc,MAAM,cAAc,CAAC;AAWhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAMvD,aAAK,cAAc,GAAG,KAAK,GAAG,QAAQ,CAAC;AACvC,aAAK,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AAEvD,aAAK,YAAY,GAAG;IAClB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,KAAK,EAAE,KAAK,CAAC;CACd,GAAG,QAAQ,CAAC;;;;AAiHb,wBAA2C"}
+{"version":3,"file":"TabView.d.ts","sourceRoot":"","sources":["../../../../../src/components/TabView/TabView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAc,MAAM,cAAc,CAAC;AAWhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAMvD,aAAK,cAAc,GAAG,KAAK,GAAG,QAAQ,CAAC;AACvC,aAAK,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AAEvD,aAAK,YAAY,GAAG;IAClB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,KAAK,EAAE,KAAK,CAAC;CACd,GAAG,QAAQ,CAAC;;;;AA2Hb,wBAA2C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.8.2-0a0db3.2+0a0db3b",
+  "version": "46.8.2-2fe7f4.2+2fe7f49",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.8.2-0a0db3.2+0a0db3b",
+    "@draftbit/types": "^46.8.2-2fe7f4.2+2fe7f49",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -94,5 +94,5 @@
       ]
     ]
   },
-  "gitHead": "0a0db3be11947a0ea8b922d741a9c2604a0e6748"
+  "gitHead": "2fe7f498ea206b3d2f0103d25975d06e235a7fec"
 }

package/src/components/TabView/TabView.js

@@ -42,9 +42,9 @@ const TabViewComponent = ({ Icon, onIndexChanged, onEndReached, tabBarPosition,
     const renderTabBar = (props) => {
         return (React.createElement(TabBar, { ...props, activeColor: activeColor || theme.colors.primary, inactiveColor: inactiveColor || theme.colors.divider, pressColor: pressColor || theme.colors.primary, scrollEnabled: scrollEnabled, indicatorStyle: {
                 backgroundColor: indicatorColor || theme.colors.primary,
-            }, labelStyle: textStyles, renderIcon: ({ route, color }) => (route === null || route === void 0 ? void 0 : route.icon) ? (React.createElement(Icon, { name: route.icon, color: color, size: 16 })) : null, style: {
+            }, labelStyle: textStyles, renderIcon: ({ route, color }) => (route === null || route === void 0 ? void 0 : route.icon) ? (React.createElement(Icon, { style: styles.icon, name: route.icon, color: color, size: 16 })) : null, style: {
                 backgroundColor: tabsBackgroundColor || theme.colors.background,
-            } }));
+            }, contentContainerStyle: styles.tabBarContainer }));
     };
     //Cannot render TabView without at least one tab
     if (!routes.length) {
@@ -54,5 +54,8 @@ const TabViewComponent = ({ Icon, onIndexChanged, onEndReached, tabBarPosition,
 };
 const styles = StyleSheet.create({
     tabView: { flex: 1 },
+    //Prevent height of bar from filling container
+    tabBarContainer: { flex: undefined },
+    icon: { width: 16, height: 16 },
 });
 export default withTheme(TabViewComponent);

package/src/components/TabView/TabView.tsx

@@ -115,12 +115,18 @@ const TabViewComponent: React.FC<React.PropsWithChildren<TabViewProps>> = ({
         labelStyle={textStyles}
         renderIcon={({ route, color }) =>
           route?.icon ? (
-            <Icon name={route.icon} color={color} size={16} />
+            <Icon
+              style={styles.icon}
+              name={route.icon}
+              color={color}
+              size={16}
+            />
           ) : null
         }
         style={{
           backgroundColor: tabsBackgroundColor || theme.colors.background,
         }}
+        contentContainerStyle={styles.tabBarContainer}
       />
     );
   };
@@ -146,6 +152,10 @@ const TabViewComponent: React.FC<React.PropsWithChildren<TabViewProps>> = ({
 
 const styles = StyleSheet.create({
   tabView: { flex: 1 },
+
+  //Prevent height of bar from filling container
+  tabBarContainer: { flex: undefined },
+  icon: { width: 16, height: 16 },
 });
 
 export default withTheme(TabViewComponent);