@draftbit/core 43.3.1 → 43.3.4-900303.5

package/lib/typescript/src/components/Swiper/Swiper.d.ts

@@ -7,9 +7,13 @@ export interface SwiperProps {
     timeout?: number;
     prevTitle?: string;
     nextTitle?: string;
+    prevTitleColor?: string;
+    nextTitleColor?: string;
     dotsTouchable?: boolean;
+    dotColor?: string;
+    dotActiveColor?: string;
     children: React.ReactNode;
     style?: StyleProp<ViewStyle>;
 }
-declare const Swiper: ({ vertical, loop, timeout, from, prevTitle, nextTitle, dotsTouchable, children, style, }: SwiperProps) => JSX.Element;
+declare const Swiper: ({ vertical, loop, timeout, from, prevTitle, nextTitle, prevTitleColor, nextTitleColor, dotsTouchable, dotColor, dotActiveColor, children, style, }: SwiperProps) => JSX.Element;
 export default Swiper;

package/lib/typescript/src/mappings/{AccordionGroup.d.ts → Accordion.d.ts}

@@ -3,6 +3,13 @@ export declare const SEED_DATA: {
     tag: string;
     description: string;
     category: string;
+    layout: {
+        paddingTop: number;
+        paddingRight: number;
+        paddingBottom: number;
+        paddingLeft: number;
+        fontSize: number;
+    };
     props: {
         openColor: {
             group: string;

package/lib/typescript/src/mappings/Stepper.d.ts

@@ -39,5 +39,27 @@ export declare const SEED_DATA: {
             formType: string;
             propType: string;
         };
+        min: {
+            label: string;
+            description: string;
+            formType: string;
+            propType: string;
+            group: string;
+            defaultValue: null;
+            editable: boolean;
+            required: boolean;
+            step: number;
+        };
+        max: {
+            label: string;
+            description: string;
+            formType: string;
+            propType: string;
+            group: string;
+            defaultValue: null;
+            editable: boolean;
+            required: boolean;
+            step: number;
+        };
     };
 }[];

package/lib/typescript/src/mappings/Swiper.d.ts

@@ -52,6 +52,46 @@ export declare const SEED_DATA: {
         };
         prevTitle: any;
         nextTitle: any;
+        prevTitleColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
+        nextTitleColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
+        dotColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
+        dotActiveColor: {
+            group: string;
+            label: string;
+            description: string;
+            editable: boolean;
+            required: boolean;
+            defaultValue: null;
+            formType: string;
+            propType: string;
+        };
         dotsTouchable: {
             label: string;
             description: string;

package/lib/typescript/src/mappings/TextArea.d.ts

@@ -4,7 +4,16 @@ export declare const SEED_DATA: {
     description: string;
     category: string;
     layout: {
-        flex: number;
+        borderLeftWidth: number;
+        borderRightWidth: number;
+        borderTopWidth: number;
+        borderBottomWidth: number;
+        borderColor: string;
+        paddingLeft: number;
+        paddingRight: number;
+        paddingTop: number;
+        paddingBottom: number;
+        borderRadius: number;
     };
     triggers: string[];
     props: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "43.3.1",
+  "version": "43.3.4-900303.5+90030317",
   "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": "^43.3.0",
+    "@draftbit/types": "^43.3.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.1.7",
@@ -79,5 +79,5 @@
       ]
     ]
   },
-  "gitHead": "ee0080243c56a4d523028294f4c814df68c0d5fe"
+  "gitHead": "9003031730d4f6561505d6f0262e3ef2ba17224f"
 }

package/src/components/Accordion/AccordionGroup.js

@@ -2,45 +2,31 @@ import * as React from "react";
 import { View, StyleSheet, Pressable, } from "react-native";
 import Text from "../Text";
 import { withTheme } from "../../theming";
+import { extractStyles } from "../../utilities";
 const AccordionGroup = ({ Icon, openColor, closedColor, caretColor, icon, iconSize = 24, style, label, children, expanded: expandedProp, theme, }) => {
     const [expanded, setExpanded] = React.useState(expandedProp || false);
     const handlePressAction = () => {
-        if (expandedProp === undefined) {
-            setExpanded(!expanded);
-        }
+        setExpanded(!expanded);
     };
     const expandedInternal = expandedProp !== undefined ? expandedProp : expanded;
     const expandedColor = openColor || theme.colors.primary;
     const collapsedColor = closedColor || theme.colors.primary;
     const labelColor = expanded ? expandedColor : collapsedColor;
+    const { textStyles, viewStyles } = extractStyles(style);
     return (React.createElement(React.Fragment, null,
-        React.createElement(Pressable, { style: [style], onPress: handlePressAction, accessibilityRole: "button" },
-            React.createElement(View, { style: styles.row },
-                icon ? (React.createElement(Icon, { name: icon, size: iconSize, color: labelColor, style: styles.icon })) : null,
-                React.createElement(View, { style: [styles.item, styles.content] },
-                    React.createElement(Text, { selectable: false, style: [
-                            styles.label,
-                            {
-                                color: labelColor,
-                            },
-                            style,
-                        ] }, label)),
-                React.createElement(View, { style: [styles.item] },
-                    React.createElement(Icon, { name: expanded
-                            ? "MaterialIcons/keyboard-arrow-up"
-                            : "MaterialIcons/keyboard-arrow-down", color: caretColor, size: 24 })))),
-        expandedInternal
-            ? React.Children.map(children, (child) => {
-                if (React.isValidElement(child) &&
-                    !child.props.left &&
-                    !child.props.right) {
-                    return React.cloneElement(child, {
-                        style: child.props.style,
-                    });
-                }
-                return child;
-            })
-            : null));
+        React.createElement(Pressable, { style: [styles.row, viewStyles], onPress: handlePressAction, accessibilityRole: "button" },
+            icon ? React.createElement(Icon, { name: icon, size: iconSize, color: labelColor }) : null,
+            React.createElement(View, { style: styles.content },
+                React.createElement(Text, { selectable: false, style: [
+                        {
+                            color: labelColor,
+                        },
+                        textStyles,
+                    ] }, label)),
+            React.createElement(Icon, { name: expanded
+                    ? "MaterialIcons/keyboard-arrow-up"
+                    : "MaterialIcons/keyboard-arrow-down", color: caretColor, size: 24 })),
+        expandedInternal ? children : null));
 };
 const styles = StyleSheet.create({
     row: {
@@ -50,9 +36,6 @@ const styles = StyleSheet.create({
     label: {
         fontSize: 16,
     },
-    item: {
-        margin: 8,
-    },
     content: {
         flex: 1,
         justifyContent: "center",

package/src/components/Accordion/AccordionGroup.tsx

@@ -10,6 +10,7 @@ import Text from "../Text";
 import { withTheme } from "../../theming";
 import type { IconSlot } from "../../interfaces/Icon";
 import type { Theme } from "../../styles/DefaultTheme";
+import { extractStyles } from "../../utilities";
 
 type Props = {
   openColor: string;
@@ -42,9 +43,7 @@ const AccordionGroup = ({
   );
 
   const handlePressAction = () => {
-    if (expandedProp === undefined) {
-      setExpanded(!expanded);
-    }
+    setExpanded(!expanded);
   };
 
   const expandedInternal = expandedProp !== undefined ? expandedProp : expanded;
@@ -54,64 +53,40 @@ const AccordionGroup = ({
 
   const labelColor = expanded ? expandedColor : collapsedColor;
 
+  const { textStyles, viewStyles } = extractStyles(style);
+
   return (
     <>
       <Pressable
-        style={[style]}
+        style={[styles.row, viewStyles]}
         onPress={handlePressAction}
         accessibilityRole="button"
       >
-        <View style={styles.row}>
-          {icon ? (
-            <Icon
-              name={icon}
-              size={iconSize}
-              color={labelColor}
-              style={styles.icon}
-            />
-          ) : null}
-          <View style={[styles.item, styles.content]}>
-            <Text
-              selectable={false}
-              style={[
-                styles.label,
-                {
-                  color: labelColor,
-                },
-                style,
-              ]}
-            >
-              {label}
-            </Text>
-          </View>
-          <View style={[styles.item]}>
-            <Icon
-              name={
-                expanded
-                  ? "MaterialIcons/keyboard-arrow-up"
-                  : "MaterialIcons/keyboard-arrow-down"
-              }
-              color={caretColor}
-              size={24}
-            />
-          </View>
+        {icon ? <Icon name={icon} size={iconSize} color={labelColor} /> : null}
+        <View style={styles.content}>
+          <Text
+            selectable={false}
+            style={[
+              {
+                color: labelColor,
+              },
+              textStyles,
+            ]}
+          >
+            {label}
+          </Text>
         </View>
+        <Icon
+          name={
+            expanded
+              ? "MaterialIcons/keyboard-arrow-up"
+              : "MaterialIcons/keyboard-arrow-down"
+          }
+          color={caretColor}
+          size={24}
+        />
       </Pressable>
-      {expandedInternal
-        ? React.Children.map(children, (child) => {
-            if (
-              React.isValidElement(child) &&
-              !child.props.left &&
-              !child.props.right
-            ) {
-              return React.cloneElement(child, {
-                style: child.props.style,
-              });
-            }
-
-            return child;
-          })
-        : null}
+      {expandedInternal ? children : null}
     </>
   );
 };
@@ -124,9 +99,6 @@ const styles = StyleSheet.create({
   label: {
     fontSize: 16,
   },
-  item: {
-    margin: 8,
-  },
   content: {
     flex: 1,
     justifyContent: "center",

package/src/components/FAB.js

@@ -28,7 +28,7 @@ const FAB = ({ onPress, disabled, loading, iconName = "MaterialIcons/add", style
                     },
                 ];
             }, ...props },
-            React.createElement(View, null, loading ? (React.createElement(ActivityIndicator, { size: "small", color: color })) : (React.createElement(Icon, { name: iconName, size: 28, color: color }))))));
+            React.createElement(View, null, loading ? (React.createElement(ActivityIndicator, { style: size > 50 ? { marginTop: 2, marginLeft: 2 } : undefined, size: size <= 50 ? "small" : "large", color: color })) : (React.createElement(Icon, { name: iconName, size: size, color: color }))))));
 };
 const styles = StyleSheet.create({
     button: {

package/src/components/FAB.tsx

@@ -77,9 +77,13 @@ const FAB: React.FC<Props> = ({
       >
         <View>
           {loading ? (
-            <ActivityIndicator size="small" color={color} />
+            <ActivityIndicator
+              style={size > 50 ? { marginTop: 2, marginLeft: 2 } : undefined}
+              size={size <= 50 ? "small" : "large"}
+              color={color}
+            />
           ) : (
-            <Icon name={iconName} size={28} color={color} />
+            <Icon name={iconName} size={size} color={color} />
           )}
         </View>
       </Pressable>

package/src/components/Stepper.js

@@ -2,40 +2,42 @@ import * as React from "react";
 import { View, Text } from "react-native";
 import { withTheme } from "../theming";
 import IconButton from "./IconButton";
-const Stepper = ({ Icon, value, style, onChange, defaultValue, theme: { colors, typography, roundness }, iconSize = 24, iconColor = colors.strong, borderRadius = roundness, typeStyle, }) => {
+import isNumber from "lodash.isnumber";
+const Stepper = ({ Icon, value, min, max, style, onChange, defaultValue, theme: { colors, typography, roundness }, iconSize = 24, iconColor = colors.strong, borderRadius = roundness, typeStyle, }) => {
     const [stateValue, setStateValue] = React.useState(value || defaultValue || 0);
     React.useEffect(() => {
-        if (value != null) {
-            setStateValue(value);
+        if (value || value === 0) {
+            onChange && onChange(stateValue);
         }
-    }, [value]);
+    }, [onChange, stateValue, value]);
     React.useEffect(() => {
-        if (defaultValue != null) {
-            setStateValue(defaultValue);
-        }
-    }, [defaultValue]);
-    const handleMinus = () => {
-        if (value || value === 0) {
-            onChange && onChange(value - 1);
+        let newValue = value || defaultValue || 0;
+        if (isNumber(max) && newValue > max) {
+            newValue = max;
         }
-        else {
-            setStateValue(stateValue - 1);
+        if (isNumber(min) && newValue < min) {
+            newValue = min;
         }
-    };
-    const handlePlus = () => {
-        if (value || value === 0) {
-            onChange && onChange(value + 1);
+        setStateValue(newValue);
+    }, [defaultValue, value, min, max]);
+    const handleMinus = React.useCallback(() => {
+        if (isNumber(min) && value === min) {
+            return;
         }
-        else {
-            setStateValue(stateValue + 1);
+        setStateValue(stateValue - 1);
+    }, [min, stateValue, value]);
+    const handlePlus = React.useCallback(() => {
+        if (isNumber(max) && value === max) {
+            return;
         }
-    };
+        setStateValue(stateValue + 1);
+    }, [max, stateValue, value]);
     return (React.createElement(View, { style: [
             { flexDirection: "row" },
             style,
             borderRadius ? { borderRadius } : {},
         ] },
-        React.createElement(IconButton, { Icon: Icon, icon: "MaterialIcons/remove", onPress: handleMinus, size: iconSize, color: iconColor, disabled: value ? value === 0 : stateValue === 0 }),
+        React.createElement(IconButton, { Icon: Icon, icon: "MaterialIcons/remove", onPress: handleMinus, size: iconSize, color: iconColor, disabled: stateValue === 0 }),
         React.createElement(Text, { style: [
                 typography.body1,
                 {

package/src/components/Stepper.tsx

@@ -5,9 +5,12 @@ import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 
 import IconButton from "./IconButton";
+import isNumber from "lodash.isnumber";
 
 type Props = {
   value?: number;
+  min?: number;
+  max?: number;
   theme: Theme;
   style?: StyleProp<ViewStyle>;
   onChange?: (value: number) => void;
@@ -21,6 +24,8 @@ type Props = {
 const Stepper: React.FC<Props> = ({
   Icon,
   value,
+  min,
+  max,
   style,
   onChange,
   defaultValue,
@@ -35,32 +40,35 @@ const Stepper: React.FC<Props> = ({
   );
 
   React.useEffect(() => {
-    if (value != null) {
-      setStateValue(value);
+    if (value || value === 0) {
+      onChange && onChange(stateValue);
     }
-  }, [value]);
+  }, [onChange, stateValue, value]);
 
   React.useEffect(() => {
-    if (defaultValue != null) {
-      setStateValue(defaultValue);
+    let newValue = value || defaultValue || 0;
+    if (isNumber(max) && newValue > max) {
+      newValue = max;
+    }
+    if (isNumber(min) && newValue < min) {
+      newValue = min;
     }
-  }, [defaultValue]);
+    setStateValue(newValue);
+  }, [defaultValue, value, min, max]);
 
-  const handleMinus = () => {
-    if (value || value === 0) {
-      onChange && onChange(value - 1);
-    } else {
-      setStateValue(stateValue - 1);
+  const handleMinus = React.useCallback(() => {
+    if (isNumber(min) && value === min) {
+      return;
     }
-  };
+    setStateValue(stateValue - 1);
+  }, [min, stateValue, value]);
 
-  const handlePlus = () => {
-    if (value || value === 0) {
-      onChange && onChange(value + 1);
-    } else {
-      setStateValue(stateValue + 1);
+  const handlePlus = React.useCallback(() => {
+    if (isNumber(max) && value === max) {
+      return;
     }
-  };
+    setStateValue(stateValue + 1);
+  }, [max, stateValue, value]);
 
   return (
     <View
@@ -76,7 +84,7 @@ const Stepper: React.FC<Props> = ({
         onPress={handleMinus}
         size={iconSize}
         color={iconColor}
-        disabled={value ? value === 0 : stateValue === 0}
+        disabled={stateValue === 0}
       />
       <Text
         style={[

package/src/components/Swiper/Swiper.js

@@ -1,10 +1,18 @@
 import React from "react";
 import { View } from "react-native";
 import SwiperComponent from "react-native-web-swiper";
-const Swiper = ({ vertical = false, loop = false, timeout = 0, from = 0, prevTitle = "", nextTitle = "", dotsTouchable = true, children, style, }) => (React.createElement(View, { style: style },
+const Swiper = ({ vertical = false, loop = false, timeout = 0, from = 0, prevTitle = "", nextTitle = "", prevTitleColor, nextTitleColor, dotsTouchable = true, dotColor, dotActiveColor, children, style, }) => (React.createElement(View, { style: style },
     React.createElement(SwiperComponent, { from: from, loop: loop, timeout: timeout, vertical: vertical, controlsProps: {
             prevTitle,
             nextTitle,
+            prevTitleStyle: { color: prevTitleColor },
+            nextTitleStyle: { color: nextTitleColor },
             dotsTouchable,
+            ...(dotColor
+                ? { dotProps: { badgeStyle: { backgroundColor: dotColor } } }
+                : {}),
+            ...(dotActiveColor
+                ? { dotActiveStyle: { backgroundColor: dotActiveColor } }
+                : {}),
         } }, children)));
 export default Swiper;

package/src/components/Swiper/Swiper.tsx

@@ -9,7 +9,11 @@ export interface SwiperProps {
   timeout?: number;
   prevTitle?: string;
   nextTitle?: string;
+  prevTitleColor?: string;
+  nextTitleColor?: string;
   dotsTouchable?: boolean;
+  dotColor?: string;
+  dotActiveColor?: string;
   children: React.ReactNode;
   style?: StyleProp<ViewStyle>;
 }
@@ -21,7 +25,11 @@ const Swiper = ({
   from = 0,
   prevTitle = "",
   nextTitle = "",
+  prevTitleColor,
+  nextTitleColor,
   dotsTouchable = true,
+  dotColor,
+  dotActiveColor,
   children,
   style,
 }: SwiperProps) => (
@@ -34,7 +42,15 @@ const Swiper = ({
       controlsProps={{
         prevTitle,
         nextTitle,
+        prevTitleStyle: { color: prevTitleColor },
+        nextTitleStyle: { color: nextTitleColor },
         dotsTouchable,
+        ...(dotColor
+          ? { dotProps: { badgeStyle: { backgroundColor: dotColor } } }
+          : {}),
+        ...(dotActiveColor
+          ? { dotActiveStyle: { backgroundColor: dotActiveColor } }
+          : {}),
       }}
     >
       {children}

package/src/mappings/{AccordionGroup.js → Accordion.js}

@@ -1,9 +1,16 @@
 import { COMPONENT_TYPES, createNumberProp, createIconProp, createTextProp, createStaticBoolProp, createColorProp, } from "@draftbit/types";
 export const SEED_DATA = {
-    name: "Accordion Group",
+    name: "Accordion",
     tag: "AccordionGroup",
     description: "An expandable container containing components",
     category: COMPONENT_TYPES.container,
+    layout: {
+        paddingTop: 8,
+        paddingRight: 8,
+        paddingBottom: 8,
+        paddingLeft: 8,
+        fontSize: 16,
+    },
     props: {
         openColor: createColorProp({
             label: "Open text color",

package/src/mappings/{AccordionGroup.ts → Accordion.ts}

@@ -8,10 +8,17 @@ import {
 } from "@draftbit/types";
 
 export const SEED_DATA = {
-  name: "Accordion Group",
+  name: "Accordion",
   tag: "AccordionGroup",
   description: "An expandable container containing components",
   category: COMPONENT_TYPES.container,
+  layout: {
+    paddingTop: 8,
+    paddingRight: 8,
+    paddingBottom: 8,
+    paddingLeft: 8,
+    fontSize: 16,
+  },
   props: {
     openColor: createColorProp({
       label: "Open text color",

package/src/mappings/AccordionItem.js

@@ -3,7 +3,7 @@ export const SEED_DATA = {
     name: "Accordion Item",
     tag: "AccordionItem",
     description: "Item to be used in Accordion",
-    category: COMPONENT_TYPES.button,
+    category: COMPONENT_TYPES.deprecated,
     props: {
         icon: createIconProp(),
         label: createTextProp({

package/src/mappings/AccordionItem.ts

@@ -9,7 +9,7 @@ export const SEED_DATA = {
   name: "Accordion Item",
   tag: "AccordionItem",
   description: "Item to be used in Accordion",
-  category: COMPONENT_TYPES.button,
+  category: COMPONENT_TYPES.deprecated,
   props: {
     icon: createIconProp(),
     label: createTextProp({

package/src/mappings/Stepper.js

@@ -1,4 +1,4 @@
-import { COMPONENT_TYPES, createIconSizeProp, createColorProp, createFieldNameProp, Triggers, } from "@draftbit/types";
+import { COMPONENT_TYPES, createIconSizeProp, createColorProp, createFieldNameProp, createStaticNumberProp, Triggers, } from "@draftbit/types";
 export const SEED_DATA = [
     {
         name: "Stepper",
@@ -15,6 +15,15 @@ export const SEED_DATA = [
             }),
             iconSize: createIconSizeProp({ defaultValue: 24 }),
             iconColor: createColorProp({ defaultValue: "strong" }),
+            min: createStaticNumberProp({
+                label: "Minimum",
+                description: "Minimum Number",
+                defaultValue: 0,
+            }),
+            max: createStaticNumberProp({
+                label: "Maximum",
+                description: "Maximum Number",
+            }),
         },
     },
 ];