@draftbit/core 48.4.1-87073a.2 → 48.4.2-91140d.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "48.4.1-87073a.2+87073a0",
+  "version": "48.4.2-91140d.2+91140d8",
   "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": "^48.4.1-87073a.2+87073a0",
+    "@draftbit/types": "^48.4.2-91140d.2+91140d8",
     "@expo/vector-icons": "^13.0.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
@@ -100,5 +100,5 @@
     ],
     "testEnvironment": "node"
   },
-  "gitHead": "87073a0c7cf622e54f39549d291bf00acc8cb521"
+  "gitHead": "91140d874c87d209cb4f2073ddf92b7418768545"
 }

package/src/components/Layout/Center.js

@@ -1,7 +1,9 @@
 import React from "react";
 import { View, StyleSheet } from "react-native";
+import { convertBackwardCompatiblePropsToStyle } from "./LayoutCommon";
 const Center = ({ style, ...rest }) => {
-    return React.createElement(View, { ...rest, style: [styles.center, style] });
+    const backwardsCompatibleStyle = convertBackwardCompatiblePropsToStyle(rest);
+    return (React.createElement(View, { ...rest, style: [styles.center, backwardsCompatibleStyle, style] }));
 };
 const styles = StyleSheet.create({
     center: {

package/src/components/Layout/Center.js.map

@@ -1 +1 @@
-{"version":3,"file":"Center.js","sourceRoot":"","sources":["Center.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAa,UAAU,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,MAAM,GAAwB,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACzD,OAAO,oBAAC,IAAI,OAAK,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAI,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;CACF,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Center.js","sourceRoot":"","sources":["Center.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAa,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,qCAAqC,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,MAAM,GAAwB,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACzD,MAAM,wBAAwB,GAAG,qCAAqC,CAAC,IAAI,CAAC,CAAC;IAC7E,OAAO,CACL,oBAAC,IAAI,OAAK,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,EAAE,KAAK,CAAC,GAAI,CAC5E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;CACF,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}

package/src/components/Layout/Center.tsx

@@ -1,8 +1,12 @@
 import React from "react";
 import { View, ViewProps, StyleSheet } from "react-native";
+import { convertBackwardCompatiblePropsToStyle } from "./LayoutCommon";
 
 const Center: React.FC<ViewProps> = ({ style, ...rest }) => {
-  return <View {...rest} style={[styles.center, style]} />;
+  const backwardsCompatibleStyle = convertBackwardCompatiblePropsToStyle(rest);
+  return (
+    <View {...rest} style={[styles.center, backwardsCompatibleStyle, style]} />
+  );
 };
 
 const styles = StyleSheet.create({

package/src/components/Layout/Circle.js

@@ -1,8 +1,11 @@
 import React from "react";
 import { StyleSheet } from "react-native";
 import Square from "./Square";
+import { pick } from "lodash";
+import { convertBackwardCompatiblePropsToStyle } from "./LayoutCommon";
 const Circle = ({ size, style, ...rest }) => {
-    return React.createElement(Square, { ...rest, size: size, style: [style, styles.circle] });
+    const backwardsCompatibleStyle = pick(convertBackwardCompatiblePropsToStyle(rest), "backgroundColor");
+    return (React.createElement(Square, { ...rest, size: size, style: [backwardsCompatibleStyle, style, styles.circle] }));
 };
 const styles = StyleSheet.create({
     circle: {

package/src/components/Layout/Circle.js.map

@@ -1 +1 @@
-{"version":3,"file":"Circle.js","sourceRoot":"","sources":["Circle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAa,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,MAAM,MAAM,UAAU,CAAC;AAM9B,MAAM,MAAM,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACjE,OAAO,oBAAC,MAAM,OAAK,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GAAI,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,YAAY,EAAE,IAAI,EAAE,gGAAgG;KACrH;CACF,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Circle.js","sourceRoot":"","sources":["Circle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAa,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,qCAAqC,EAAE,MAAM,gBAAgB,CAAC;AAMvE,MAAM,MAAM,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACjE,MAAM,wBAAwB,GAAG,IAAI,CACnC,qCAAqC,CAAC,IAAI,CAAC,EAC3C,iBAAiB,CAClB,CAAC;IAEF,OAAO,CACL,oBAAC,MAAM,OACD,IAAI,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,CAAC,wBAAwB,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GACvD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE;QACN,YAAY,EAAE,IAAI,EAAE,gGAAgG;KACrH;CACF,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}

package/src/components/Layout/Circle.tsx

@@ -1,13 +1,26 @@
 import React from "react";
 import { ViewProps, StyleSheet } from "react-native";
 import Square from "./Square";
+import { pick } from "lodash";
+import { convertBackwardCompatiblePropsToStyle } from "./LayoutCommon";
 
 interface CircleProps extends ViewProps {
   size?: number;
 }
 
 const Circle: React.FC<CircleProps> = ({ size, style, ...rest }) => {
-  return <Square {...rest} size={size} style={[style, styles.circle]} />;
+  const backwardsCompatibleStyle = pick(
+    convertBackwardCompatiblePropsToStyle(rest),
+    "backgroundColor"
+  );
+
+  return (
+    <Square
+      {...rest}
+      size={size}
+      style={[backwardsCompatibleStyle, style, styles.circle]}
+    />
+  );
 };
 
 const styles = StyleSheet.create({

package/src/components/Layout/LayoutCommon.js

@@ -0,0 +1,8 @@
+export function convertBackwardCompatiblePropsToStyle(props) {
+    return {
+        width: props.width,
+        height: props.height,
+        backgroundColor: props.bgColor,
+    };
+}
+//# sourceMappingURL=LayoutCommon.js.map

package/src/components/Layout/LayoutCommon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LayoutCommon.js","sourceRoot":"","sources":["LayoutCommon.ts"],"names":[],"mappings":"AAgBA,MAAM,UAAU,qCAAqC,CACnD,KAA2C;IAE3C,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,eAAe,EAAE,KAAK,CAAC,OAAO;KAC/B,CAAC;AACJ,CAAC"}

package/src/components/Layout/LayoutCommon.ts

@@ -0,0 +1,25 @@
+import { ViewProps, ViewStyle } from "react-native";
+
+/**
+ * Old and deprecated layout components of the same names had props that have since been removed
+ * This maintains correct rendering when using the older/deprecated props as to not break existing usage
+ * (See: deprecared-components/Layout)
+ *
+ * These deprecated props are not exposed in the component type to discourage their usage
+ */
+
+interface BackwardsCompatibleProps {
+  width?: number;
+  height?: number;
+  bgColor?: string;
+}
+
+export function convertBackwardCompatiblePropsToStyle(
+  props: BackwardsCompatibleProps & ViewProps
+): ViewStyle {
+  return {
+    width: props.width,
+    height: props.height,
+    backgroundColor: props.bgColor,
+  };
+}

package/src/components/Layout/Square.js

@@ -1,12 +1,16 @@
 import React from "react";
 import Center from "./Center";
+import { pick } from "lodash";
+import { convertBackwardCompatiblePropsToStyle } from "./LayoutCommon";
 const Square = ({ size, style, onLayout, ...rest }) => {
     const [calculatedSize, setCalculatedSize] = React.useState(0);
+    const backwardsCompatibleStyle = pick(convertBackwardCompatiblePropsToStyle(rest), "backgroundColor");
     return (React.createElement(Center, { onLayout: (e) => {
             const layout = e.nativeEvent.layout;
             setCalculatedSize(Math.max(layout.width, layout.height));
             onLayout === null || onLayout === void 0 ? void 0 : onLayout(e);
         }, ...rest, style: [
+            backwardsCompatibleStyle,
             style,
             size != undefined ? { width: size, height: size } : {},
             calculatedSize > 0

package/src/components/Layout/Square.js.map

@@ -1 +1 @@
-{"version":3,"file":"Square.js","sourceRoot":"","sources":["Square.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,MAAM,MAAM,UAAU,CAAC;AAM9B,MAAM,MAAM,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC3E,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;YACpC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YACzD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;QAChB,CAAC,KACG,IAAI,EACR,KAAK,EAAE;YACL,KAAK;YACL,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;YACtD,cAAc,GAAG,CAAC;gBAChB,CAAC,CAAC;oBACE,KAAK,EAAE,cAAc;oBACrB,MAAM,EAAE,cAAc;iBACvB;gBACH,CAAC,CAAC,EAAE;SACP,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Square.js","sourceRoot":"","sources":["Square.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,qCAAqC,EAAE,MAAM,gBAAgB,CAAC;AAMvE,MAAM,MAAM,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC3E,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9D,MAAM,wBAAwB,GAAG,IAAI,CACnC,qCAAqC,CAAC,IAAI,CAAC,EAC3C,iBAAiB,CAClB,CAAC;IAEF,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;YACpC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YACzD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;QAChB,CAAC,KACG,IAAI,EACR,KAAK,EAAE;YACL,wBAAwB;YACxB,KAAK;YACL,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;YACtD,cAAc,GAAG,CAAC;gBAChB,CAAC,CAAC;oBACE,KAAK,EAAE,cAAc;oBACrB,MAAM,EAAE,cAAc;iBACvB;gBACH,CAAC,CAAC,EAAE;SACP,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/src/components/Layout/Square.tsx

@@ -1,6 +1,8 @@
 import React from "react";
 import { ViewProps } from "react-native";
 import Center from "./Center";
+import { pick } from "lodash";
+import { convertBackwardCompatiblePropsToStyle } from "./LayoutCommon";
 
 interface SquareProps extends ViewProps {
   size?: number;
@@ -8,6 +10,10 @@ interface SquareProps extends ViewProps {
 
 const Square: React.FC<SquareProps> = ({ size, style, onLayout, ...rest }) => {
   const [calculatedSize, setCalculatedSize] = React.useState(0);
+  const backwardsCompatibleStyle = pick(
+    convertBackwardCompatiblePropsToStyle(rest),
+    "backgroundColor"
+  );
 
   return (
     <Center
@@ -18,6 +24,7 @@ const Square: React.FC<SquareProps> = ({ size, style, onLayout, ...rest }) => {
       }}
       {...rest}
       style={[
+        backwardsCompatibleStyle,
         style,
         size != undefined ? { width: size, height: size } : {},
         calculatedSize > 0