@draftbit/core 46.10.2-b59d51.2 → 46.10.2-f194c1.2

package/lib/commonjs/components/FAB.js

@@ -9,6 +9,7 @@ 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); }
 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 FAB = _ref => {
   let {
     onPress,
@@ -32,7 +33,7 @@ const FAB = _ref => {
       borderRadius: size / 2,
       overflow: "hidden"
     }, style]
-  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, {
+  }, /*#__PURE__*/React.createElement(_reactNative.Pressable, _extends({
     onPress: onPress,
     disabled: loading || disabled,
     android_ripple: {
@@ -50,9 +51,8 @@ const FAB = _ref => {
         borderRadius: size / 2,
         backgroundColor
       }];
-    },
-    ...props
-  }, /*#__PURE__*/React.createElement(_reactNative.View, null, loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {
+    }
+  }, props), /*#__PURE__*/React.createElement(_reactNative.View, null, loading ? /*#__PURE__*/React.createElement(_reactNative.ActivityIndicator, {
     style: size > 50 ? {
       marginTop: 2,
       marginLeft: 2
@@ -79,18 +79,4 @@ const styles = _reactNative.StyleSheet.create({
   }
 });
 var _default = (0, _theming.withTheme)(FAB);
-exports.default = _default; styles = _reactNative.StyleSheet.create({
-  button: {
-    backgroundColor: "#5a45ff",
-    justifyContent: "center",
-    alignItems: "center",
-    ..._reactNative.Platform.select({
-      web: {
-        cursor: "pointer",
-        userSelect: "none"
-      }
-    })
-  }
-});
-var _default = (0, _theming.withTheme)(FAB);
 exports.default = _default;

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

@@ -58,7 +58,7 @@ const Picker = _ref => {
     defaultValue,
     Icon,
     style,
-    placeholder,
+    placeholder = "Select an option",
     value,
     disabled = false,
     assistiveText,
@@ -99,7 +99,14 @@ const Picker = _ref => {
       _reactNative.Keyboard.dismiss();
     }
   }, [pickerVisible, autoDismissKeyboard]);
-  const pickerOptions = normalizeOptions(options);
+  const normalizedOptions = normalizeOptions(options);
+
+  //Underlying Picker component defaults selection to first element when value is not provided (or undefined)
+  //Placholder must be the 1st option in order to allow selection of the 'actual' 1st option
+  const pickerOptions = placeholder ? [{
+    label: placeholder,
+    value: placeholder
+  }, ...normalizedOptions] : normalizedOptions;
   const {
     viewStyles,
     textStyles
@@ -199,9 +206,12 @@ const Picker = _ref => {
     } : {})
   };
   const handleValueChange = (newValue, itemIndex) => {
-    if (newValue !== "") {
+    if (newValue !== "" && newValue !== placeholder) {
       onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
       setInternalValue(newValue);
+    } else if (newValue === placeholder) {
+      onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange("", 0);
+      setInternalValue(undefined);
     }
   };
   return (

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

@@ -49,7 +49,7 @@ const Picker = _ref => {
     defaultValue,
     Icon,
     style,
-    placeholder,
+    placeholder = "Select an option",
     value,
     disabled = false,
     assistiveText,
@@ -90,7 +90,14 @@ const Picker = _ref => {
       Keyboard.dismiss();
     }
   }, [pickerVisible, autoDismissKeyboard]);
-  const pickerOptions = normalizeOptions(options);
+  const normalizedOptions = normalizeOptions(options);
+
+  //Underlying Picker component defaults selection to first element when value is not provided (or undefined)
+  //Placholder must be the 1st option in order to allow selection of the 'actual' 1st option
+  const pickerOptions = placeholder ? [{
+    label: placeholder,
+    value: placeholder
+  }, ...normalizedOptions] : normalizedOptions;
   const {
     viewStyles,
     textStyles
@@ -190,9 +197,12 @@ const Picker = _ref => {
     } : {})
   };
   const handleValueChange = (newValue, itemIndex) => {
-    if (newValue !== "") {
+    if (newValue !== "" && newValue !== placeholder) {
       onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
       setInternalValue(newValue);
+    } else if (newValue === placeholder) {
+      onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange("", 0);
+      setInternalValue(undefined);
     }
   };
   return (

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

@@ -1 +1 @@
-{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../../../../src/components/Picker/Picker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAKL,SAAS,EACT,SAAS,EAGV,MAAM,cAAc,CAAC;AAStB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAQtD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC;IACnC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;;;;AAyaF,wBAAiC"}
+{"version":3,"file":"Picker.d.ts","sourceRoot":"","sources":["../../../../../src/components/Picker/Picker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAKL,SAAS,EACT,SAAS,EAGV,MAAM,cAAc,CAAC;AAStB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAQtD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC;IACnC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;;;;AAkbF,wBAAiC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.10.2-b59d51.2+b59d512",
+  "version": "46.10.2-f194c1.2+f194c16",
   "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.10.2-b59d51.2+b59d512",
+    "@draftbit/types": "^46.10.2-f194c1.2+f194c16",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -100,5 +100,5 @@
       ]
     ]
   },
-  "gitHead": "b59d512ac6d80b7afb4a89df601d77b5887b5218"
+  "gitHead": "f194c16dea96d8bb44c344af38b9bf75f1da664f"
 }

package/src/components/Picker/Picker.js

@@ -38,7 +38,7 @@ const disabledColor = "rgb(240, 240, 240)";
 const errorColor = "rgba(255, 69, 100, 1)";
 //Empty string for 'value' is treated as a non-value
 //reason: Draftbit uses empty string as initial value for string state*/
-const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style, placeholder, value, disabled = false, assistiveText, label, iconColor = unstyledColor, iconSize = 24, leftIconMode = "inset", leftIconName, placeholderTextColor = unstyledColor, rightIconName, type = "solid", autoDismissKeyboard = true, }) => {
+const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style, placeholder = "Select an option", value, disabled = false, assistiveText, label, iconColor = unstyledColor, iconSize = 24, leftIconMode = "inset", leftIconName, placeholderTextColor = unstyledColor, rightIconName, type = "solid", autoDismissKeyboard = true, }) => {
     var _a, _b;
     const androidPickerRef = React.useRef(undefined);
     const [internalValue, setInternalValue] = React.useState(value || defaultValue);
@@ -67,7 +67,12 @@ const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style,
             Keyboard.dismiss();
         }
     }, [pickerVisible, autoDismissKeyboard]);
-    const pickerOptions = normalizeOptions(options);
+    const normalizedOptions = normalizeOptions(options);
+    //Underlying Picker component defaults selection to first element when value is not provided (or undefined)
+    //Placholder must be the 1st option in order to allow selection of the 'actual' 1st option
+    const pickerOptions = placeholder
+        ? [{ label: placeholder, value: placeholder }, ...normalizedOptions]
+        : normalizedOptions;
     const { viewStyles, textStyles } = extractStyles(style);
     const additionalBorderStyles = ["backgroundColor"];
     const additionalMarginStyles = [
@@ -162,10 +167,14 @@ const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style,
         ...(disabled ? { color: unstyledColor } : {}),
     };
     const handleValueChange = (newValue, itemIndex) => {
-        if (newValue !== "") {
+        if (newValue !== "" && newValue !== placeholder) {
             onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(newValue, itemIndex);
             setInternalValue(newValue);
         }
+        else if (newValue === placeholder) {
+            onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange("", 0);
+            setInternalValue(undefined);
+        }
     };
     return (
     /* marginsContainer */

package/src/components/Picker/Picker.tsx

@@ -101,7 +101,7 @@ const Picker: React.FC<PickerProps> = ({
   defaultValue,
   Icon,
   style,
-  placeholder,
+  placeholder = "Select an option",
   value,
   disabled = false,
   assistiveText,
@@ -151,7 +151,13 @@ const Picker: React.FC<PickerProps> = ({
     }
   }, [pickerVisible, autoDismissKeyboard]);
 
-  const pickerOptions = normalizeOptions(options);
+  const normalizedOptions = normalizeOptions(options);
+
+  //Underlying Picker component defaults selection to first element when value is not provided (or undefined)
+  //Placholder must be the 1st option in order to allow selection of the 'actual' 1st option
+  const pickerOptions = placeholder
+    ? [{ label: placeholder, value: placeholder }, ...normalizedOptions]
+    : normalizedOptions;
 
   const { viewStyles, textStyles } = extractStyles(style);
 
@@ -302,9 +308,12 @@ const Picker: React.FC<PickerProps> = ({
   };
 
   const handleValueChange = (newValue: string, itemIndex: number) => {
-    if (newValue !== "") {
+    if (newValue !== "" && newValue !== placeholder) {
       onValueChange?.(newValue, itemIndex);
       setInternalValue(newValue);
+    } else if (newValue === placeholder) {
+      onValueChange?.("", 0);
+      setInternalValue(undefined);
     }
   };