@draftbit/core 49.4.2-183f10.2 → 49.4.2-6b199f.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "49.4.2-183f10.2+183f102",
+  "version": "49.4.2-6b199f.2+6b199f8",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/src/index.d.ts",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^49.4.2-183f10.2+183f102",
+    "@draftbit/types": "^49.4.2-6b199f.2+6b199f8",
     "@expo/vector-icons": "^13.0.0",
     "@gorhom/bottom-sheet": "5.0.0-alpha.7",
     "@material-ui/core": "^4.11.0",
@@ -113,5 +113,5 @@
     ],
     "testEnvironment": "node"
   },
-  "gitHead": "183f1027182789e12e8d1a404315979809e85134"
+  "gitHead": "6b199f88af4f4dd56e502670478c8e12922e00b8"
 }

package/src/components/Markdown.js

@@ -1,11 +1,24 @@
 import * as React from "react";
 import { StyleSheet } from "react-native";
 import MarkdownComponent from "react-native-markdown-display";
-const Markdown = ({ children, style, }) => {
+const childToString = (child) => {
+    if (typeof child === "undefined" ||
+        child === null ||
+        typeof child === "boolean") {
+        return "";
+    }
+    if (JSON.stringify(child) === "{}") {
+        return "";
+    }
+    return child.toString();
+};
+const Markdown = ({ children: childrenProp, style, }) => {
+    const children = React.Children.toArray(childrenProp);
+    const text = children.map(childToString).join("");
     return (
     //'body' style applies to all markdown components
     //@ts-ignore TS does not like the type of this named style for some reason
-    React.createElement(MarkdownComponent, { style: { body: StyleSheet.flatten(style) } }, children));
+    React.createElement(MarkdownComponent, { style: { body: StyleSheet.flatten(style) } }, text));
 };
 export default Markdown;
 //# sourceMappingURL=Markdown.js.map

package/src/components/Markdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"Markdown.js","sourceRoot":"","sources":["Markdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAM9D,MAAM,QAAQ,GAAqD,CAAC,EAClE,QAAQ,EACR,KAAK,GACN,EAAE,EAAE;IACH,OAAO;IACL,iDAAiD;IACjD,0EAA0E;IAC1E,oBAAC,iBAAiB,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAC1D,QAAQ,CACS,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Markdown.js","sourceRoot":"","sources":["Markdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAM9D,MAAM,aAAa,GAAG,CAAC,KAAuB,EAAU,EAAE;IACxD,IACE,OAAO,KAAK,KAAK,WAAW;QAC5B,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,KAAK,SAAS,EAC1B;QACA,OAAO,EAAE,CAAC;KACX;IAED,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;QAClC,OAAO,EAAE,CAAC;KACX;IAED,OAAQ,KAAyB,CAAC,QAAQ,EAAE,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAqD,CAAC,EAClE,QAAQ,EAAE,YAAY,EACtB,KAAK,GACN,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAElD,OAAO;IACL,iDAAiD;IACjD,0EAA0E;IAC1E,oBAAC,iBAAiB,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAC1D,IAAI,CACa,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/src/components/Markdown.tsx

@@ -6,15 +6,34 @@ type MarkdownProps = {
   style?: StyleProp<ViewStyle>;
 };
 
+const childToString = (child?: React.ReactNode): string => {
+  if (
+    typeof child === "undefined" ||
+    child === null ||
+    typeof child === "boolean"
+  ) {
+    return "";
+  }
+
+  if (JSON.stringify(child) === "{}") {
+    return "";
+  }
+
+  return (child as number | string).toString();
+};
+
 const Markdown: React.FC<React.PropsWithChildren<MarkdownProps>> = ({
-  children,
+  children: childrenProp,
   style,
 }) => {
+  const children = React.Children.toArray(childrenProp);
+  const text = children.map(childToString).join("");
+
   return (
     //'body' style applies to all markdown components
     //@ts-ignore TS does not like the type of this named style for some reason
     <MarkdownComponent style={{ body: StyleSheet.flatten(style) }}>
-      {children}
+      {text}
     </MarkdownComponent>
   );
 };

package/src/components/TextInput.js

@@ -1,14 +1,14 @@
 import React from "react";
 import { TextInput as NativeTextInput, Platform, } from "react-native";
 import { useDebounce, useOnUpdate } from "../hooks";
-const TextInput = React.forwardRef(({ onChangeTextDelayed, changeTextDelay = 500, webShowOutline = true, style, disabled, value, ...rest }, ref) => {
+const TextInput = React.forwardRef(({ onChangeTextDelayed, changeTextDelay = 500, webShowOutline = true, style, disabled = false, editable = true, value, ...rest }, ref) => {
     const delayedValue = useDebounce(value, changeTextDelay);
     useOnUpdate(() => {
         if (delayedValue !== undefined) {
             onChangeTextDelayed === null || onChangeTextDelayed === void 0 ? void 0 : onChangeTextDelayed(delayedValue);
         }
     }, [delayedValue]);
-    return (React.createElement(NativeTextInput, { testID: "native-text-input", ref: ref, value: value, editable: !disabled, style: [
+    return (React.createElement(NativeTextInput, { testID: "native-text-input", ref: ref, value: value, editable: !disabled && editable, style: [
             //@ts-ignore Web specific prop. Removes default blue outline that appears on the hidden TextInput
             Platform.OS === "web" && !webShowOutline ? { outlineWidth: 0 } : {},
             style,

package/src/components/TextInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextInput.js","sourceRoot":"","sources":["TextInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,SAAS,IAAI,eAAe,EAE5B,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AASpD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAChC,CACE,EACE,mBAAmB,EACnB,eAAe,GAAG,GAAG,EACrB,cAAc,GAAG,IAAI,EACrB,KAAK,EACL,QAAQ,EACR,KAAK,EACL,GAAG,IAAI,EACR,EACD,GAAG,EACH,EAAE;IACF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAEzD,WAAW,CAAC,GAAG,EAAE;QACf,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,YAAY,CAAC,CAAC;SACrC;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,CACL,oBAAC,eAAe,IACd,MAAM,EAAC,mBAAmB,EAC1B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,QAAQ,EACnB,KAAK,EAAE;YACL,iGAAiG;YACjG,QAAQ,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACnE,KAAK;SACN,KACG,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"TextInput.js","sourceRoot":"","sources":["TextInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,SAAS,IAAI,eAAe,EAE5B,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AASpD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAChC,CACE,EACE,mBAAmB,EACnB,eAAe,GAAG,GAAG,EACrB,cAAc,GAAG,IAAI,EACrB,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,IAAI,EACf,KAAK,EACL,GAAG,IAAI,EACR,EACD,GAAG,EACH,EAAE;IACF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAEzD,WAAW,CAAC,GAAG,EAAE;QACf,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,YAAY,CAAC,CAAC;SACrC;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,CACL,oBAAC,eAAe,IACd,MAAM,EAAC,mBAAmB,EAC1B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,QAAQ,IAAI,QAAQ,EAC/B,KAAK,EAAE;YACL,iGAAiG;YACjG,QAAQ,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACnE,KAAK;SACN,KACG,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/src/components/TextInput.tsx

@@ -20,7 +20,8 @@ const TextInput = React.forwardRef<NativeTextInput, TextInputProps>(
       changeTextDelay = 500,
       webShowOutline = true,
       style,
-      disabled,
+      disabled = false,
+      editable = true,
       value,
       ...rest
     },
@@ -39,7 +40,7 @@ const TextInput = React.forwardRef<NativeTextInput, TextInputProps>(
         testID="native-text-input"
         ref={ref}
         value={value}
-        editable={!disabled}
+        editable={!disabled && editable}
         style={[
           //@ts-ignore Web specific prop. Removes default blue outline that appears on the hidden TextInput
           Platform.OS === "web" && !webShowOutline ? { outlineWidth: 0 } : {},