@draftbit/core 46.4.4-cbd3a5.2 → 46.4.4-d5b88a.2

package/lib/module/utilities.js

@@ -44,7 +44,6 @@ export function extractBorderAndMarginStyles(style, additionalBorderStyles, addi
     marginStyles
   };
 }
-
 /**
  * Merges a style object on top of another style object. In React Native,
  * keys with undefined values in a style object will still override styles
@@ -57,16 +56,20 @@ export function extractBorderAndMarginStyles(style, additionalBorderStyles, addi
  * `const mergedStyles = StyleSheet.compose({ color: "red" }, { color: undefined })`
  * `const mergedStyles = StyleSheet.flatten([{ color: "red" }, { color: undefined }])`
  */
+
 export function applyStyles(baseStyles, stylesToApply) {
   if (!stylesToApply) {
     return;
   }
+
   const flattenedStyles = StyleSheet.flatten(baseStyles);
+
   for (const [key, value] of Object.entries(stylesToApply)) {
     if (value != null) {
       flattenedStyles[key] = value;
     }
   }
+
   return flattenedStyles;
 }
 export function getValueForRadioButton(value) {
@@ -75,6 +78,6 @@ export function getValueForRadioButton(value) {
   } else if (isNumber(value)) {
     return String(value);
   } else {
-    throw new Error(`Invalid value: ${value}`);
+    throw new Error("Invalid value: ".concat(value));
   }
 }

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

@@ -7,8 +7,7 @@ declare type Props = {
     max: number;
     value?: number;
     defaultValue?: number;
-    style?: StyleProp<ViewStyle>;
-    typeStyle?: StyleProp<TextStyle>;
+    style?: StyleProp<ViewStyle | TextStyle>;
     iconSize: number;
     iconColor?: string;
     onChange?: (value: number) => void;

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

@@ -0,0 +1,49 @@
+export declare const SEED_DATA: ({
+    category: string;
+    doc_link: string;
+    code_link: string;
+    stylesPanelSections: string[];
+    layout: {
+        margin: number;
+    };
+    triggers: string[];
+    name: string;
+    tag: string;
+} | {
+    props: {
+        href: any;
+        target: {
+            group: string;
+            label: string;
+            description: string;
+            formType: string;
+            defaultValue: string;
+            options: string[];
+        };
+    };
+    category: string;
+    doc_link: string;
+    code_link: string;
+    stylesPanelSections: string[];
+    layout: {
+        margin: number;
+    };
+    triggers: string[];
+    name: string;
+    tag: string;
+} | {
+    props: {
+        href?: undefined;
+        target?: undefined;
+    };
+    category: string;
+    doc_link: string;
+    code_link: string;
+    stylesPanelSections: string[];
+    layout: {
+        margin: number;
+    };
+    triggers: string[];
+    name: string;
+    tag: string;
+})[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.4.4-cbd3a5.2+cbd3a50",
+  "version": "46.4.4-d5b88a.2+d5b88a7",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,7 +41,8 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^46.4.4-cbd3a5.2+cbd3a50",
+    "@draftbit/types": "^46.4.4-d5b88a.2+d5b88a7",
+    "@expo/html-elements": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -81,5 +82,5 @@
       ]
     ]
   },
-  "gitHead": "cbd3a509f711ccc53f3b9c4f8f6e3e6c0e957c5f"
+  "gitHead": "d5b88a73c85fdcb68bf75b649c2b36373b9673ae"
 }

package/src/components/Picker/Picker.js

@@ -194,7 +194,6 @@ const Picker = ({ error, options = [], onValueChange, defaultValue, Icon, style,
                     React.createElement(NativePicker, { style: styles.iosNativePicker, selectedValue: internalValue, onValueChange: handleValueChange }, pickerOptions.map((option) => (React.createElement(NativePicker.Item, { label: option.label, value: option.value, key: option.value })))))))) : null,
         !isIos && pickerVisible ? (React.createElement(NativePicker, { enabled: pickerVisible, selectedValue: internalValue, onValueChange: handleValueChange, style: styles.nonIosPicker, ref: androidPickerRef, onBlur: () => setPickerVisible(false) }, pickerOptions.map((option) => (React.createElement(NativePicker.Item, { label: option.label, value: option.value, key: option.value }))))) : null));
 };
-export default withTheme(Picker);
 const styles = StyleSheet.create({
     marginsContainer: {
         alignSelf: "stretch",
@@ -265,3 +264,4 @@ const styles = StyleSheet.create({
         maxHeight: deviceHeight,
     },
 });
+export default withTheme(Picker);

package/src/components/Picker/Picker.tsx

@@ -406,8 +406,6 @@ const Picker: React.FC<PickerProps> = ({
   );
 };
 
-export default withTheme(Picker);
-
 const styles = StyleSheet.create({
   marginsContainer: {
     alignSelf: "stretch",
@@ -478,3 +476,5 @@ const styles = StyleSheet.create({
     maxHeight: deviceHeight,
   },
 });
+
+export default withTheme(Picker);

package/src/components/Stepper.js

@@ -3,7 +3,9 @@ import { View, Text } from "react-native";
 import { isNumber } from "lodash";
 import { withTheme } from "../theming";
 import IconButton from "./IconButton";
-const Stepper = ({ min = -Infinity, max = Infinity, value: valueProp, defaultValue, style, typeStyle, iconSize = 24, iconColor, onChange, theme: { colors, typography }, Icon, }) => {
+import { extractStyles } from "../utilities";
+const Stepper = ({ min = -Infinity, max = Infinity, value: valueProp, defaultValue, style, iconSize = 24, iconColor, onChange, theme: { colors, typography }, Icon, }) => {
+    const { viewStyles, textStyles } = extractStyles(style);
     const [value, setValue] = useState(defaultValue !== null && defaultValue !== void 0 ? defaultValue : 0);
     const isValidValue = (valueArg) => valueArg >= min && valueArg <= max;
     const handlePlusOrMinus = (type) => {
@@ -22,7 +24,7 @@ const Stepper = ({ min = -Infinity, max = Infinity, value: valueProp, defaultVal
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [valueProp]);
-    return (React.createElement(View, { style: [{ flexDirection: "row" }, style] },
+    return (React.createElement(View, { style: [{ flexDirection: "row" }, viewStyles] },
         React.createElement(IconButton, { Icon: Icon, icon: "MaterialIcons/remove", onPress: () => handlePlusOrMinus("minus"), size: iconSize, color: iconColor, disabled: value === min, style: { opacity: value === min ? 0.5 : 1 } }),
         React.createElement(Text, { style: [
                 typography.body1,
@@ -32,7 +34,7 @@ const Stepper = ({ min = -Infinity, max = Infinity, value: valueProp, defaultVal
                     color: colors.medium,
                     marginHorizontal: 8,
                 },
-                typeStyle,
+                textStyles,
             ] }, value),
         React.createElement(IconButton, { Icon: Icon, icon: "MaterialIcons/add", onPress: () => handlePlusOrMinus("plus"), size: iconSize, color: iconColor, disabled: value === max, style: { opacity: value === max ? 0.5 : 1 } })));
 };

package/src/components/Stepper.tsx

@@ -6,14 +6,14 @@ import { withTheme } from "../theming";
 import type { Theme } from "../styles/DefaultTheme";
 import type { IconSlot } from "../interfaces/Icon";
 import IconButton from "./IconButton";
+import { extractStyles } from "../utilities";
 
 type Props = {
   min: number;
   max: number;
   value?: number;
   defaultValue?: number;
-  style?: StyleProp<ViewStyle>;
-  typeStyle?: StyleProp<TextStyle>;
+  style?: StyleProp<ViewStyle | TextStyle>;
   iconSize: number;
   iconColor?: string;
   onChange?: (value: number) => void;
@@ -26,13 +26,13 @@ const Stepper: FC<Props> = ({
   value: valueProp,
   defaultValue,
   style,
-  typeStyle,
   iconSize = 24,
   iconColor,
   onChange,
   theme: { colors, typography },
   Icon,
 }) => {
+  const { viewStyles, textStyles } = extractStyles(style);
   const [value, setValue] = useState(defaultValue ?? 0);
 
   const isValidValue = (valueArg: number) => valueArg >= min && valueArg <= max;
@@ -59,7 +59,7 @@ const Stepper: FC<Props> = ({
   }, [valueProp]);
 
   return (
-    <View style={[{ flexDirection: "row" }, style]}>
+    <View style={[{ flexDirection: "row" }, viewStyles]}>
       <IconButton
         Icon={Icon}
         icon="MaterialIcons/remove"
@@ -79,7 +79,7 @@ const Stepper: FC<Props> = ({
             color: colors.medium,
             marginHorizontal: 8,
           },
-          typeStyle,
+          textStyles,
         ]}
       >
         {value}

package/src/mappings/HtmlElements.js

@@ -0,0 +1,141 @@
+import { COMPONENT_TYPES, createTextProp, FORM_TYPES, GROUPS, StylesPanelSections, Triggers, } from "@draftbit/types";
+const SEED_DATA_TRIGGERS = [Triggers.OnValueChange];
+const ELEMENT_PROPS = {
+    category: COMPONENT_TYPES.deprecated,
+    doc_link: "https://www.npmjs.com/package/@expo/html-elements",
+    code_link: "https://github.com/expo/expo/tree/master/packages/html-elements",
+    stylesPanelSections: [
+        StylesPanelSections.Typography,
+        StylesPanelSections.LayoutSelectedItem,
+        StylesPanelSections.MarginsAndPaddings,
+        StylesPanelSections.Effects,
+    ],
+    layout: {
+        margin: 0,
+    },
+    triggers: SEED_DATA_TRIGGERS,
+};
+const HEADING_PROPS = {
+    ...ELEMENT_PROPS,
+};
+export const SEED_DATA = [
+    {
+        name: "H1",
+        tag: "H1",
+        ...HEADING_PROPS,
+    },
+    {
+        name: "H2",
+        tag: "H2",
+        ...HEADING_PROPS,
+    },
+    {
+        name: "H3",
+        tag: "H3",
+        ...HEADING_PROPS,
+    },
+    {
+        name: "H4",
+        tag: "H4",
+        ...HEADING_PROPS,
+    },
+    {
+        name: "H5",
+        tag: "H5",
+        ...HEADING_PROPS,
+    },
+    {
+        name: "H6",
+        tag: "H6",
+        ...HEADING_PROPS,
+    },
+    {
+        name: "Anchor",
+        tag: "A",
+        ...ELEMENT_PROPS,
+        props: {
+            href: createTextProp({
+                label: "href",
+                description: "Specify the URL",
+                defaultValue: "",
+            }),
+            target: {
+                group: GROUPS.basic,
+                label: "target",
+                description: "decide where link should open",
+                formType: FORM_TYPES.flatArray,
+                defaultValue: "_blank",
+                options: ["_blank", "_self", "_parent", "_top"],
+            },
+        },
+    },
+    {
+        name: "Paragraph",
+        tag: "P",
+        ...ELEMENT_PROPS,
+        props: {
+        // NOTE - Keeping the props commented until we figure out a way to use this props from draftbit side.
+        // strong: createBoolProp({
+        //     label: "Strong",
+        //     description: "Strong",
+        // }),
+        // strike: createBoolProp({
+        //     label: "Strike",
+        //     description: "Strike through",
+        // }),
+        // italic: createBoolProp({
+        //     label: "Italic",
+        //     description: "Italic Fonts",
+        // }),
+        // bold: createBoolProp({
+        //     label: "Bold",
+        //     description: "Bold",
+        // }),
+        },
+    },
+    {
+        name: "Code",
+        tag: "Code",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "Pre",
+        tag: "Pre",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "Mark",
+        tag: "Mark",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "BR",
+        tag: "BR",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "BlockQuote",
+        tag: "BlockQuote",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "Time",
+        tag: "Time",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "UL",
+        tag: "UL",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "LI",
+        tag: "LI",
+        ...ELEMENT_PROPS,
+    },
+    {
+        name: "HR",
+        tag: "HR",
+        ...ELEMENT_PROPS,
+    },
+];

package/src/mappings/HtmlElements.ts

@@ -0,0 +1,151 @@
+import {
+  COMPONENT_TYPES,
+  createTextProp,
+  FORM_TYPES,
+  GROUPS,
+  StylesPanelSections,
+  Triggers,
+} from "@draftbit/types";
+const SEED_DATA_TRIGGERS = [Triggers.OnValueChange];
+
+const ELEMENT_PROPS = {
+  category: COMPONENT_TYPES.deprecated,
+  doc_link: "https://www.npmjs.com/package/@expo/html-elements",
+  code_link: "https://github.com/expo/expo/tree/master/packages/html-elements",
+  stylesPanelSections: [
+    StylesPanelSections.Typography,
+    StylesPanelSections.LayoutSelectedItem,
+    StylesPanelSections.MarginsAndPaddings,
+    StylesPanelSections.Effects,
+  ],
+  layout: {
+    margin: 0,
+  },
+  triggers: SEED_DATA_TRIGGERS,
+};
+
+const HEADING_PROPS = {
+  ...ELEMENT_PROPS,
+};
+
+export const SEED_DATA = [
+  {
+    name: "H1",
+    tag: "H1",
+    ...HEADING_PROPS,
+  },
+  {
+    name: "H2",
+    tag: "H2",
+    ...HEADING_PROPS,
+  },
+  {
+    name: "H3",
+    tag: "H3",
+    ...HEADING_PROPS,
+  },
+  {
+    name: "H4",
+    tag: "H4",
+    ...HEADING_PROPS,
+  },
+  {
+    name: "H5",
+    tag: "H5",
+    ...HEADING_PROPS,
+  },
+  {
+    name: "H6",
+    tag: "H6",
+    ...HEADING_PROPS,
+  },
+  {
+    name: "Anchor",
+    tag: "A",
+    ...ELEMENT_PROPS,
+    props: {
+      href: createTextProp({
+        label: "href",
+        description: "Specify the URL",
+        defaultValue: "",
+      }),
+      target: {
+        group: GROUPS.basic,
+        label: "target",
+        description: "decide where link should open",
+        formType: FORM_TYPES.flatArray,
+        defaultValue: "_blank",
+        options: ["_blank", "_self", "_parent", "_top"],
+      },
+    },
+  },
+  {
+    name: "Paragraph",
+    tag: "P",
+    ...ELEMENT_PROPS,
+    props: {
+      // NOTE - Keeping the props commented until we figure out a way to use this props from draftbit side.
+      // strong: createBoolProp({
+      //     label: "Strong",
+      //     description: "Strong",
+      // }),
+      // strike: createBoolProp({
+      //     label: "Strike",
+      //     description: "Strike through",
+      // }),
+      // italic: createBoolProp({
+      //     label: "Italic",
+      //     description: "Italic Fonts",
+      // }),
+      // bold: createBoolProp({
+      //     label: "Bold",
+      //     description: "Bold",
+      // }),
+    },
+  },
+  {
+    name: "Code",
+    tag: "Code",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "Pre",
+    tag: "Pre",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "Mark",
+    tag: "Mark",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "BR",
+    tag: "BR",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "BlockQuote",
+    tag: "BlockQuote",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "Time",
+    tag: "Time",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "UL",
+    tag: "UL",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "LI",
+    tag: "LI",
+    ...ELEMENT_PROPS,
+  },
+  {
+    name: "HR",
+    tag: "HR",
+    ...ELEMENT_PROPS,
+  },
+];

package/src/mappings/Stepper.js

@@ -1,11 +1,14 @@
-import { COMPONENT_TYPES, createIconSizeProp, createColorProp, createFieldNameProp, createStaticNumberProp, Triggers, BLOCK_STYLES_SECTIONS, } from "@draftbit/types";
+import { COMPONENT_TYPES, createIconSizeProp, createColorProp, createFieldNameProp, createStaticNumberProp, Triggers, BLOCK_STYLES_SECTIONS, StylesPanelSections, } from "@draftbit/types";
 export const SEED_DATA = [
     {
         name: "Stepper",
         tag: "Stepper",
         description: "A component used to control the quantity of something",
         category: COMPONENT_TYPES.control,
-        stylesPanelSections: BLOCK_STYLES_SECTIONS,
+        stylesPanelSections: [
+            StylesPanelSections.Typography,
+            ...BLOCK_STYLES_SECTIONS,
+        ],
         layout: {},
         triggers: [Triggers.OnChange],
         props: {

package/src/mappings/Stepper.ts

@@ -6,6 +6,7 @@ import {
   createStaticNumberProp,
   Triggers,
   BLOCK_STYLES_SECTIONS,
+  StylesPanelSections,
 } from "@draftbit/types";
 
 export const SEED_DATA = [
@@ -14,7 +15,10 @@ export const SEED_DATA = [
     tag: "Stepper",
     description: "A component used to control the quantity of something",
     category: COMPONENT_TYPES.control,
-    stylesPanelSections: BLOCK_STYLES_SECTIONS,
+    stylesPanelSections: [
+      StylesPanelSections.Typography,
+      ...BLOCK_STYLES_SECTIONS,
+    ],
     layout: {},
     triggers: [Triggers.OnChange],
     props: {