@draftbit/core 46.10.3-877a3f.2 → 46.10.3-945068.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.10.3-877a3f.2+877a3fa",
+  "version": "46.10.3-945068.2+945068e",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -15,9 +15,9 @@
     "!**/__mocks__"
   ],
   "scripts": {
-    "prepare": "bob build",
     "clean": "rimraf lib",
-    "clean:modules": "rimraf node_modules"
+    "clean:modules": "rimraf node_modules",
+    "prepack": "bob build"
   },
   "keywords": [
     "react-native",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.10.3-877a3f.2+877a3fa",
+    "@draftbit/types": "^46.10.3-945068.2+945068e",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -75,22 +75,11 @@
     "@types/lodash.tonumber": "^4.0.6"
   },
   "react-native-builder-bob": {
-    "declarationMap": false,
     "source": "src",
     "output": "lib",
     "targets": [
-      [
-        "commonjs",
-        {
-          "sourceMaps": false
-        }
-      ],
-      [
-        "module",
-        {
-          "sourceMaps": false
-        }
-      ],
+      "commonjs",
+      "module",
       [
         "typescript",
         {
@@ -100,5 +89,9 @@
       ]
     ]
   },
-  "gitHead": "877a3fa2568c2a8c87bcac685df23e35a69f883e"
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "gitHead": "945068ed5d20c5e973ea7316ef8921c8fc682655"
 }

package/src/components/Row.js

@@ -0,0 +1,48 @@
+import * as React from "react";
+import { View, Text, Image, StyleSheet, } from "react-native";
+import { withTheme } from "../theming";
+import Config from "./Config";
+const Row = ({ titleTypeStyle, titleColor, subtitleTypeStyle, subtitleColor, title, subtitle, multilineSubtitle, image, right, style, }) => {
+    return (React.createElement(View, { style: [styles.container, { padding: 16 }, style] },
+        React.createElement(View, { style: styles.leftContainer },
+            image && (React.createElement(Image, { source: typeof image === "string" ? { uri: image } : image, style: {
+                    marginRight: 12,
+                    width: subtitle
+                        ? Config.rowMultiLineImageSize
+                        : Config.rowSingleLineImageSize,
+                    height: subtitle
+                        ? Config.rowMultiLineImageSize
+                        : Config.rowSingleLineImageSize,
+                } })),
+            React.createElement(View, { style: styles.textContainer },
+                React.createElement(Text, { style: [
+                        titleTypeStyle,
+                        {
+                            color: titleColor,
+                        },
+                    ], numberOfLines: 1 }, title),
+                subtitle ? (React.createElement(Text, { style: [
+                        subtitleTypeStyle,
+                        {
+                            color: subtitleColor,
+                            marginTop: 4,
+                        },
+                    ], numberOfLines: multilineSubtitle ? undefined : 1 }, subtitle)) : null)),
+        right && right()));
+};
+const styles = StyleSheet.create({
+    leftContainer: {
+        flexDirection: "row",
+        flex: 1,
+    },
+    container: {
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+    },
+    textContainer: {
+        flex: 1,
+        justifyContent: "center",
+    },
+});
+export default withTheme(Row);

package/src/components/Row.tsx

@@ -0,0 +1,108 @@
+import * as React from "react";
+import {
+  View,
+  Text,
+  Image,
+  ImageSourcePropType,
+  StyleSheet,
+  StyleProp,
+  TextStyle,
+  ViewStyle,
+} from "react-native";
+import { withTheme } from "../theming";
+import Config from "./Config";
+import theme from "../styles/DefaultTheme";
+
+type Props = {
+  titleTypeStyle?: StyleProp<TextStyle>;
+  titleColor?: string;
+  subtitleTypeStyle?: StyleProp<TextStyle>;
+  subtitleColor?: string;
+  title?: string;
+  subtitle?: string;
+  multilineSubtitle?: boolean;
+  image?: string | ImageSourcePropType;
+  right?: () => React.ReactNode;
+  style?: StyleProp<ViewStyle>;
+  theme: typeof theme;
+};
+
+const Row: React.FC<React.PropsWithChildren<Props>> = ({
+  titleTypeStyle,
+  titleColor,
+  subtitleTypeStyle,
+  subtitleColor,
+  title,
+  subtitle,
+  multilineSubtitle,
+  image,
+  right,
+  style,
+}) => {
+  return (
+    <View style={[styles.container, { padding: 16 }, style]}>
+      <View style={styles.leftContainer}>
+        {image && (
+          <Image
+            source={typeof image === "string" ? { uri: image } : image}
+            style={{
+              marginRight: 12,
+              width: subtitle
+                ? Config.rowMultiLineImageSize
+                : Config.rowSingleLineImageSize,
+              height: subtitle
+                ? Config.rowMultiLineImageSize
+                : Config.rowSingleLineImageSize,
+            }}
+          />
+        )}
+        <View style={styles.textContainer}>
+          <Text
+            style={[
+              titleTypeStyle,
+              {
+                color: titleColor,
+              },
+            ]}
+            numberOfLines={1}
+          >
+            {title}
+          </Text>
+          {subtitle ? (
+            <Text
+              style={[
+                subtitleTypeStyle,
+                {
+                  color: subtitleColor,
+                  marginTop: 4,
+                },
+              ]}
+              numberOfLines={multilineSubtitle ? undefined : 1}
+            >
+              {subtitle}
+            </Text>
+          ) : null}
+        </View>
+      </View>
+      {right && right()}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  leftContainer: {
+    flexDirection: "row",
+    flex: 1,
+  },
+  container: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+  },
+  textContainer: {
+    flex: 1,
+    justifyContent: "center",
+  },
+});
+
+export default withTheme(Row);

package/src/components/RowBodyIcon.js

@@ -0,0 +1,8 @@
+import * as React from "react";
+import { withTheme } from "../theming";
+import Row from "./Row";
+import Config from "./Config";
+const RowBodyIcon = ({ Icon, title, subtitle, icon, style, theme: { colors, typography }, }) => {
+    return (React.createElement(Row, { titleTypeStyle: typography.body1, titleColor: colors.medium, subtitleTypeStyle: typography.subtitle2, subtitleColor: colors.light, title: title, subtitle: subtitle, right: () => (React.createElement(Icon, { name: icon, size: Config.rowSingleLineIconSize, color: colors.light, style: { marginLeft: 16 } })), style: style }));
+};
+export default withTheme(RowBodyIcon);

package/src/components/RowBodyIcon.tsx

@@ -0,0 +1,47 @@
+import * as React from "react";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
+import type { IconSlot } from "../interfaces/Icon";
+
+import Row from "./Row";
+import Config from "./Config";
+import { StyleProp, ViewStyle } from "react-native";
+
+type Props = {
+  title?: string;
+  subtitle?: string;
+  icon: string;
+  style?: StyleProp<ViewStyle>;
+  theme: Theme;
+} & IconSlot;
+
+const RowBodyIcon: React.FC<React.PropsWithChildren<Props>> = ({
+  Icon,
+  title,
+  subtitle,
+  icon,
+  style,
+  theme: { colors, typography },
+}) => {
+  return (
+    <Row
+      titleTypeStyle={typography.body1}
+      titleColor={colors.medium}
+      subtitleTypeStyle={typography.subtitle2}
+      subtitleColor={colors.light}
+      title={title}
+      subtitle={subtitle}
+      right={() => (
+        <Icon
+          name={icon}
+          size={Config.rowSingleLineIconSize}
+          color={colors.light}
+          style={{ marginLeft: 16 }}
+        />
+      )}
+      style={style}
+    />
+  );
+};
+
+export default withTheme(RowBodyIcon);

package/src/components/RowHeadlineImageCaption.js

@@ -0,0 +1,12 @@
+import * as React from "react";
+import { Text } from "react-native";
+import { withTheme } from "../theming";
+import Row from "./Row";
+const RowHeadlineImageCaption = ({ title, subtitle, caption, image, style, theme: { colors, typography }, }) => {
+    return (React.createElement(Row, { titleTypeStyle: typography.headline6, titleColor: colors.strong, subtitleTypeStyle: typography.body2, subtitleColor: colors.medium, title: title, subtitle: subtitle, image: image, right: () => (React.createElement(Text, { style: {
+                ...typography.caption,
+                color: colors.strong,
+                marginLeft: 16,
+            } }, caption)), style: style }));
+};
+export default withTheme(RowHeadlineImageCaption);

package/src/components/RowHeadlineImageCaption.tsx

@@ -0,0 +1,49 @@
+import * as React from "react";
+import { Text, ImageSourcePropType, StyleProp, ViewStyle } from "react-native";
+import { withTheme } from "../theming";
+import Row from "./Row";
+import theme from "../styles/DefaultTheme";
+
+type Props = {
+  title?: string;
+  subtitle?: string;
+  caption?: string;
+  image: string | ImageSourcePropType;
+  style?: StyleProp<ViewStyle>;
+  theme: typeof theme;
+};
+
+const RowHeadlineImageCaption: React.FC<React.PropsWithChildren<Props>> = ({
+  title,
+  subtitle,
+  caption,
+  image,
+  style,
+  theme: { colors, typography },
+}) => {
+  return (
+    <Row
+      titleTypeStyle={typography.headline6}
+      titleColor={colors.strong}
+      subtitleTypeStyle={typography.body2}
+      subtitleColor={colors.medium}
+      title={title}
+      subtitle={subtitle}
+      image={image}
+      right={() => (
+        <Text
+          style={{
+            ...typography.caption,
+            color: colors.strong,
+            marginLeft: 16,
+          }}
+        >
+          {caption}
+        </Text>
+      )}
+      style={style}
+    />
+  );
+};
+
+export default withTheme(RowHeadlineImageCaption);

package/src/components/RowHeadlineImageIcon.js

@@ -0,0 +1,14 @@
+import * as React from "react";
+import { withTheme } from "../theming";
+import Row from "./Row";
+import Config from "./Config";
+const RowHeadlineImageIcon = ({ Icon, icon, title, image, subtitle, multilineSubtitle = false, style, theme: { colors, typography }, }) => {
+    return (React.createElement(Row, { titleTypeStyle: typography.headline6, titleColor: colors.strong, subtitleTypeStyle: typography.body2, subtitleColor: colors.medium, title: title, subtitle: subtitle, multilineSubtitle: multilineSubtitle, image: image, right: () => (React.createElement(Icon, { name: icon, size: multilineSubtitle
+                ? Config.rowMultiLineIconSize
+                : Config.rowSingleLineIconSize, color: colors.light, style: {
+                marginLeft: 16,
+                alignSelf: multilineSubtitle ? "flex-start" : "center",
+                marginTop: multilineSubtitle ? 4 : 0,
+            } })), style: style }));
+};
+export default withTheme(RowHeadlineImageIcon);

package/src/components/RowHeadlineImageIcon.tsx

@@ -0,0 +1,61 @@
+import * as React from "react";
+import { withTheme } from "../theming";
+import type { Theme } from "../styles/DefaultTheme";
+import type { IconSlot } from "../interfaces/Icon";
+
+import Row from "./Row";
+import Config from "./Config";
+import { ImageSourcePropType, StyleProp, ViewStyle } from "react-native";
+
+type Props = {
+  title?: string;
+  image: string | ImageSourcePropType;
+  subtitle?: string;
+  multilineSubtitle?: boolean;
+  icon: string;
+  style?: StyleProp<ViewStyle>;
+  theme: Theme;
+} & IconSlot;
+
+const RowHeadlineImageIcon: React.FC<React.PropsWithChildren<Props>> = ({
+  Icon,
+  icon,
+  title,
+  image,
+  subtitle,
+  multilineSubtitle = false,
+  style,
+  theme: { colors, typography },
+}) => {
+  return (
+    <Row
+      titleTypeStyle={typography.headline6}
+      titleColor={colors.strong}
+      subtitleTypeStyle={typography.body2}
+      subtitleColor={colors.medium}
+      title={title}
+      subtitle={subtitle}
+      multilineSubtitle={multilineSubtitle}
+      image={image}
+      right={() => (
+        <Icon
+          name={icon}
+          size={
+            multilineSubtitle
+              ? Config.rowMultiLineIconSize
+              : Config.rowSingleLineIconSize
+          }
+          color={colors.light}
+          style={{
+            marginLeft: 16,
+            alignSelf: multilineSubtitle ? "flex-start" : "center",
+            marginTop: multilineSubtitle ? 4 : 0,
+          }}
+        />
+      )}
+      style={style}
+    />
+  );
+};
+
+export default withTheme(RowHeadlineImageIcon);

package/src/components/Table/Table.js

@@ -0,0 +1,93 @@
+import React from "react";
+import { ScrollView, View, StyleSheet, } from "react-native";
+import { withTheme } from "../../theming";
+import { generateBorderStyles, TableStyleContext, } from "./TableCommon";
+const Table = ({ theme, borderWidth = 1, borderColor = theme.colors.divider, borderStyle = "solid", drawTopBorder = true, drawBottomBorder = false, drawStartBorder = false, drawEndBorder = false, cellVerticalPadding = 10, cellHorizontalPadding = 10, data, keyExtractor, renderItem, children: childrenProp, style, ...rest }) => {
+    //Both 'renderItem' and 'data' are optional to allow direct children. But if one is included, both need to be included
+    if ((data && !renderItem) || (renderItem && !data)) {
+        throw new Error("'renderItem' and 'data' need to both be provided to render from 'data'. Either remove them entirley or include both");
+    }
+    if (data && renderItem && childrenProp) {
+        console.warn("'children' of Table ignored due to usage of 'data' and 'renderItem'");
+    }
+    const isTableHeader = React.useCallback((object) => {
+        return object.isTableHeader;
+    }, []);
+    const isRenderItem = data && renderItem;
+    //Uses 'renderItem' and 'data' to create an array of children
+    const dataAsChildren = React.useMemo(() => {
+        if (!isRenderItem)
+            return [];
+        return data.map((item, index) => {
+            const component = renderItem({ item, index });
+            if (!component) {
+                return null;
+            }
+            const key = keyExtractor ? keyExtractor(item, index) : index.toString();
+            return React.cloneElement(component, {
+                key,
+            });
+        });
+    }, [data, renderItem, keyExtractor, isRenderItem]);
+    const children = isRenderItem
+        ? dataAsChildren
+        : React.Children.toArray(childrenProp);
+    const validChildren = React.useMemo(() => children.filter((item) => React.isValidElement(item)), [children]);
+    const childrenWithoutHeader = React.useMemo(() => {
+        const flattenedWithoutNestedHeaders = validChildren.map((item) => {
+            const nestedChildren = React.Children.toArray(item.props.children);
+            //Header can be nested in React.Fragment when in renderItem
+            const nestedHeaders = nestedChildren.filter((child) => isTableHeader(child.props));
+            if (nestedHeaders === null || nestedHeaders === void 0 ? void 0 : nestedHeaders.length) {
+                //New element excluding header children
+                return React.cloneElement(item, {
+                    children: nestedChildren.filter((child) => !isTableHeader(child.props)),
+                });
+            }
+            return item;
+        });
+        return flattenedWithoutNestedHeaders.filter((item) => !isTableHeader(item.props));
+    }, [validChildren, isTableHeader]);
+    const header = React.useMemo(() => {
+        const flattenedPossibleHeaders = validChildren.map((item) => {
+            const nestedChildren = React.Children.toArray(item.props.children);
+            //Header can be nested in React.Fragment when in renderItem
+            const nestedHeaders = nestedChildren.filter((child) => isTableHeader(child.props));
+            if (nestedHeaders === null || nestedHeaders === void 0 ? void 0 : nestedHeaders.length) {
+                return nestedHeaders[0];
+            }
+            return item;
+        });
+        const allHeaders = flattenedPossibleHeaders.filter((item) => isTableHeader(item.props));
+        if (allHeaders.length) {
+            return allHeaders[0]; //Only 1 header taken
+        }
+        return null;
+    }, [validChildren, isTableHeader]);
+    const contextValue = {
+        borderColor,
+        borderStyle,
+        borderWidth,
+        cellHorizontalPadding,
+        cellVerticalPadding,
+    };
+    const borderViewStyle = generateBorderStyles({
+        borderColor,
+        borderWidth,
+        borderStyle,
+        drawTopBorder,
+        drawBottomBorder,
+        drawStartBorder,
+        drawEndBorder,
+    });
+    return (React.createElement(TableStyleContext.Provider, { value: contextValue },
+        React.createElement(View, { style: [styles.container, borderViewStyle, style] },
+            React.createElement(React.Fragment, null, header),
+            React.createElement(ScrollView, { ...rest }, childrenWithoutHeader))));
+};
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+    },
+});
+export default withTheme(Table);

package/src/components/Table/Table.tsx

@@ -0,0 +1,176 @@
+import React from "react";
+import {
+  ScrollView,
+  StyleProp,
+  ViewStyle,
+  View,
+  StyleSheet,
+  ScrollViewProps,
+} from "react-native";
+import { Theme } from "../../styles/DefaultTheme";
+import { withTheme } from "../../theming";
+import {
+  generateBorderStyles,
+  TableProps,
+  TableStyleContext,
+  TableStyleProps,
+} from "./TableCommon";
+
+export interface Props<T> extends TableProps, ScrollViewProps {
+  data?: Array<T>;
+  keyExtractor?: (item: T, index: number) => string;
+  renderItem?: ({ item, index }: { item: T; index: number }) => JSX.Element;
+  style?: StyleProp<ViewStyle>;
+  theme: Theme;
+}
+
+const Table = <T extends object>({
+  theme,
+  borderWidth = 1,
+  borderColor = theme.colors.divider,
+  borderStyle = "solid",
+  drawTopBorder = true,
+  drawBottomBorder = false,
+  drawStartBorder = false,
+  drawEndBorder = false,
+  cellVerticalPadding = 10,
+  cellHorizontalPadding = 10,
+  data,
+  keyExtractor,
+  renderItem,
+  children: childrenProp,
+  style,
+  ...rest
+}: React.PropsWithChildren<Props<T>>) => {
+  //Both 'renderItem' and 'data' are optional to allow direct children. But if one is included, both need to be included
+  if ((data && !renderItem) || (renderItem && !data)) {
+    throw new Error(
+      "'renderItem' and 'data' need to both be provided to render from 'data'. Either remove them entirley or include both"
+    );
+  }
+
+  if (data && renderItem && childrenProp) {
+    console.warn(
+      "'children' of Table ignored due to usage of 'data' and 'renderItem'"
+    );
+  }
+
+  const isTableHeader = React.useCallback((object: any): boolean => {
+    return object.isTableHeader;
+  }, []);
+
+  const isRenderItem = data && renderItem;
+
+  //Uses 'renderItem' and 'data' to create an array of children
+  const dataAsChildren = React.useMemo(() => {
+    if (!isRenderItem) return [];
+
+    return data.map((item, index) => {
+      const component = renderItem({ item, index });
+
+      if (!component) {
+        return null;
+      }
+
+      const key = keyExtractor ? keyExtractor(item, index) : index.toString();
+      return React.cloneElement(component, {
+        key,
+      });
+    });
+  }, [data, renderItem, keyExtractor, isRenderItem]);
+
+  const children = isRenderItem
+    ? dataAsChildren
+    : React.Children.toArray(childrenProp);
+
+  const validChildren = React.useMemo(
+    () =>
+      (children as any[]).filter((item) =>
+        React.isValidElement(item)
+      ) as React.ReactElement[],
+    [children]
+  );
+
+  const childrenWithoutHeader = React.useMemo(() => {
+    const flattenedWithoutNestedHeaders = validChildren.map((item) => {
+      const nestedChildren = React.Children.toArray(
+        item.props.children
+      ) as any[];
+      //Header can be nested in React.Fragment when in renderItem
+      const nestedHeaders = nestedChildren.filter((child: any) =>
+        isTableHeader(child.props)
+      );
+      if (nestedHeaders?.length) {
+        //New element excluding header children
+        return React.cloneElement(item, {
+          children: nestedChildren.filter(
+            (child: any) => !isTableHeader(child.props)
+          ),
+        });
+      }
+      return item;
+    });
+
+    return flattenedWithoutNestedHeaders.filter(
+      (item) => !isTableHeader(item.props)
+    );
+  }, [validChildren, isTableHeader]);
+
+  const header = React.useMemo(() => {
+    const flattenedPossibleHeaders = validChildren.map((item) => {
+      const nestedChildren = React.Children.toArray(
+        item.props.children
+      ) as any[];
+      //Header can be nested in React.Fragment when in renderItem
+      const nestedHeaders = nestedChildren.filter((child: any) =>
+        isTableHeader(child.props)
+      );
+      if (nestedHeaders?.length) {
+        return nestedHeaders[0];
+      }
+      return item;
+    });
+    const allHeaders = flattenedPossibleHeaders.filter((item) =>
+      isTableHeader(item.props)
+    );
+    if (allHeaders.length) {
+      return allHeaders[0]; //Only 1 header taken
+    }
+    return null;
+  }, [validChildren, isTableHeader]);
+
+  const contextValue: TableStyleProps = {
+    borderColor,
+    borderStyle,
+    borderWidth,
+    cellHorizontalPadding,
+    cellVerticalPadding,
+  };
+
+  const borderViewStyle = generateBorderStyles({
+    borderColor,
+    borderWidth,
+    borderStyle,
+    drawTopBorder,
+    drawBottomBorder,
+    drawStartBorder,
+    drawEndBorder,
+  });
+
+  return (
+    <TableStyleContext.Provider value={contextValue}>
+      <View style={[styles.container, borderViewStyle, style]}>
+        <>{header}</>
+        <ScrollView {...rest}>{childrenWithoutHeader}</ScrollView>
+      </View>
+    </TableStyleContext.Provider>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+});
+
+export default withTheme(Table);