@draftbit/core 46.4.4-602cb9.2 → 46.4.4-62cd12.2

package/lib/module/mappings/StarRating.js

@@ -21,8 +21,8 @@ export const SEED_DATA = {
       handlerPropName: "onPress",
       // the change handler prop in this component
       valuePropName: "rating" // the value prop in this component
-
     }),
+
     maxStars: createStaticNumberProp({
       label: "Max stars",
       description: "The max number of stars",

package/lib/module/mappings/Text.js

@@ -191,9 +191,10 @@ export const SEED_DATA = [{
   stylesPanelSections: [StylesPanelSections.Typography, StylesPanelSections.LayoutSelectedItem, StylesPanelSections.MarginsAndPaddings, StylesPanelSections.Effects],
   layout: {
     color: "strong" // This is translated on collector script run by the extractValueAndType function
-
   },
-  props: { ...SEED_DATA_PROPS,
+
+  props: {
+    ...SEED_DATA_PROPS,
     children: {
       group: GROUPS.data,
       label: "Text",
@@ -214,7 +215,8 @@ export const SEED_DATA = [{
     color: "primary"
   },
   triggers: [Triggers.OnPress],
-  props: { ...SEED_DATA_PROPS,
+  props: {
+    ...SEED_DATA_PROPS,
     onPress: createActionProp(),
     title: createTextProp({
       label: "Title",

package/lib/module/mappings/TextArea.js

@@ -226,7 +226,8 @@ export const SEED_DATA = {
       editable: true,
       required: false
     },
-    fieldName: { ...FIELD_NAME,
+    fieldName: {
+      ...FIELD_NAME,
       defaultValue: "textInputValue",
       handlerPropName: "onChangeText"
     }

package/lib/module/mappings/TextField.js

@@ -16,7 +16,7 @@ const SEED_DATA_PROPS = {
     description: "Can automatically capitalize sentences, words, and characters (Default: none).",
     editable: true,
     required: false,
-    defaultValue: null,
+    defaultValue: "none",
     options: ["none", "sentences", "words", "characters"],
     formType: FORM_TYPES.flatArray,
     propType: PROP_TYPES.STRING
@@ -233,9 +233,7 @@ const SEED_DATA_PROPS = {
     description: "The mode of the icon to display on the left. 'inset' or 'outset'.",
     formType: FORM_TYPES.flatArray,
     propType: PROP_TYPES.STRING,
-    defaultValue: null
-    /* inset */
-    ,
+    defaultValue: null /* inset */,
     options: ["inset", "outset"],
     editable: true,
     required: true
@@ -250,7 +248,8 @@ const SEED_DATA_PROPS = {
     editable: true,
     required: false
   },
-  fieldName: { ...FIELD_NAME,
+  fieldName: {
+    ...FIELD_NAME,
     handlerPropName: "onChangeText",
     defaultValue: "textFieldValue"
   }
@@ -264,7 +263,8 @@ export const SEED_DATA = [{
   preview_image_url: "{CLOUDINARY_URL}/Textfield.png",
   supports_list_render: false,
   triggers: SEED_DATA_TRIGGERS,
-  props: { ...SEED_DATA_PROPS,
+  props: {
+    ...SEED_DATA_PROPS,
     type: {
       label: "Appearance",
       description: "Type of Datepicker",
@@ -305,7 +305,8 @@ export const SEED_DATA = [{
   preview_image_url: "{CLOUDINARY_URL}/TextArea.png",
   supports_list_render: false,
   triggers: SEED_DATA_TRIGGERS,
-  props: { ...SEED_DATA_PROPS,
+  props: {
+    ...SEED_DATA_PROPS,
     type: {
       label: "Appearance",
       description: "Type of Datepicker",

package/lib/module/mappings/TextInput.js

@@ -51,7 +51,8 @@ export const SEED_DATA_PROPS = {
     formType: FORM_TYPES.color,
     propType: PROP_TYPES.THEME
   },
-  fieldName: { ...FIELD_NAME,
+  fieldName: {
+    ...FIELD_NAME,
     defaultValue: "textInputValue",
     handlerPropName: "onChangeText"
   }
@@ -94,7 +95,7 @@ export const SEED_DATA = [{
       description: "Can automatically capitalize sentences, words, and characters (Default: none).",
       editable: true,
       required: false,
-      defaultValue: null,
+      defaultValue: "none",
       options: ["none", "sentences", "words", "characters"],
       formType: FORM_TYPES.flatArray,
       propType: PROP_TYPES.STRING

package/lib/module/styles/DarkTheme.js

@@ -4,10 +4,12 @@ import DefaultTheme from "./DefaultTheme";
 const white = "#FFF";
 const black = "#000";
 const pinkA100 = "#ff80ab";
-const DarkTheme = { ...DefaultTheme,
+const DarkTheme = {
+  ...DefaultTheme,
   dark: true,
   mode: "adaptive",
-  colors: { ...DefaultTheme.colors,
+  colors: {
+    ...DefaultTheme.colors,
     primary: "#BB86FC",
     background: "#121212",
     surface: "#121212",

package/lib/module/styles/DefaultTheme.js

@@ -28,67 +28,80 @@ const DefaultTheme = {
   },
   fonts: configureFonts(),
   typography: {
-    headline1: { ...systemWeights.regular,
+    headline1: {
+      ...systemWeights.regular,
       fontSize: 60,
       letterSpacing: 0,
       lineHeight: 71
     },
-    headline2: { ...systemWeights.regular,
+    headline2: {
+      ...systemWeights.regular,
       fontSize: 48,
       letterSpacing: 0,
       lineHeight: 58
     },
-    headline3: { ...systemWeights.regular,
+    headline3: {
+      ...systemWeights.regular,
       fontSize: 34,
       letterSpacing: 0,
       lineHeight: 40
     },
-    headline4: { ...systemWeights.regular,
+    headline4: {
+      ...systemWeights.regular,
       fontSize: 24,
       letterSpacing: 0,
       lineHeight: 34
     },
-    headline5: { ...systemWeights.regular,
+    headline5: {
+      ...systemWeights.regular,
       fontSize: 20,
       letterSpacing: 0,
       lineHeight: 26
     },
-    subtitle1: { ...systemWeights.regular,
+    subtitle1: {
+      ...systemWeights.regular,
       fontSize: 16,
       letterSpacing: 0,
       lineHeight: 26
     },
-    subtitle2: { ...systemWeights.regular,
+    subtitle2: {
+      ...systemWeights.regular,
       fontSize: 14,
       letterSpacing: 0,
       lineHeight: 22
     },
-    body1: { ...systemWeights.regular,
+    body1: {
+      ...systemWeights.regular,
       fontSize: 16,
       letterSpacing: 0,
       lineHeight: 26
     },
-    body2: { ...systemWeights.regular,
+    body2: {
+      ...systemWeights.regular,
       fontSize: 14,
       letterSpacing: 0,
       lineHeight: 22
     },
-    button: { ...systemWeights.regular,
+    button: {
+      ...systemWeights.regular,
       fontSize: 14,
       letterSpacing: 0,
       lineHeight: 16
     },
-    caption: { ...systemWeights.regular,
+    caption: {
+      ...systemWeights.regular,
       fontSize: 12,
       letterSpacing: 0,
       lineHeight: 16
     },
-    overline: { ...systemWeights.regular,
+    overline: {
+      ...systemWeights.regular,
       fontSize: 12,
       letterSpacing: 2,
       lineHeight: 16
     },
-    headline6: { ...systemWeights.regular,
+    headline6: {
+      ...systemWeights.regular,
       fontSize: 16,
       letterSpacing: 0,
       lineHeight: 24

package/lib/module/styles/fonts.js

@@ -57,7 +57,8 @@ const fontConfig = {
   }
 };
 export default function configureFonts(config) {
-  const fonts = Platform.select({ ...fontConfig,
+  const fonts = Platform.select({
+    ...fontConfig,
     ...config
   });
   return fonts;

package/lib/module/styles/overlay.js

@@ -2,31 +2,27 @@
 import color from "color";
 import { Animated } from "react-native";
 import DarkTheme from "./DarkTheme";
-
 const isAnimatedValue = it => it instanceof Animated.Value;
-
 export default function overlay(elevation) {
   let surfaceColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DarkTheme.colors.surface;
-
   if (isAnimatedValue(elevation)) {
-    const inputRange = [0, 1, 2, 3, 8, 24]; // @ts-expect-error: TS doesn't seem to refine the type correctly
+    const inputRange = [0, 1, 2, 3, 8, 24];
 
+    // @ts-expect-error: TS doesn't seem to refine the type correctly
     return elevation.interpolate({
       inputRange,
       outputRange: inputRange.map(e => {
         return calculateColor(surfaceColor, e);
       })
     });
-  } // @ts-expect-error: TS doesn't seem to refine the type correctly
-
+  }
 
+  // @ts-expect-error: TS doesn't seem to refine the type correctly
   return calculateColor(surfaceColor, elevation);
 }
-
 function calculateColor(surfaceColor) {
   let elevation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   let overlayTransparency;
-
   if (elevation >= 1 && elevation <= 24) {
     overlayTransparency = elevationOverlayTransparency[elevation];
   } else if (elevation > 24) {
@@ -34,10 +30,8 @@ function calculateColor(surfaceColor) {
   } else {
     overlayTransparency = elevationOverlayTransparency[1];
   }
-
   return color(surfaceColor).mix(color("white"), overlayTransparency * 0.01).hex();
 }
-
 const elevationOverlayTransparency = {
   1: 5,
   2: 7,

package/lib/module/styles/shadow.js

@@ -3,7 +3,6 @@ const SHADOW_COLOR = "#000";
 const SHADOW_OPACITY = 0.24;
 export default function shadow() {
   let elevation = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-
   if (elevation instanceof Animated.Value) {
     const inputRange = [0, 1, 2, 3, 8, 24];
     return {
@@ -25,25 +24,20 @@ export default function shadow() {
     if (elevation === 0) {
       return {};
     }
-
     let height, radius;
-
     switch (elevation) {
       case 1:
         height = 0.5;
         radius = 0.75;
         break;
-
       case 2:
         height = 0.75;
         radius = 1.5;
         break;
-
       default:
         height = elevation - 1;
         radius = elevation;
     }
-
     return {
       shadowColor: SHADOW_COLOR,
       shadowOffset: {

package/lib/module/utilities.js

@@ -44,6 +44,7 @@ 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
@@ -56,20 +57,16 @@ 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) {
@@ -78,6 +75,6 @@ export function getValueForRadioButton(value) {
   } else if (isNumber(value)) {
     return String(value);
   } else {
-    throw new Error("Invalid value: ".concat(value));
+    throw new Error(`Invalid value: ${value}`);
   }
 }

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

@@ -6,7 +6,8 @@ declare type Props = {
 } & TextProps;
 declare class Text extends React.Component<Props> {
     _root: any;
-    setNativeProps(args: TextProps): any;
+    state: any;
+    setNativeProps(args: TextProps): void;
     render(): JSX.Element;
 }
 export declare const BaseLink: ({ style, theme, title, ...props }: any) => JSX.Element;

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

@@ -27,6 +27,7 @@ export declare type Props = {
     }) => React.ReactNode;
 } & TextInputProps & IconSlot;
 interface State {
+    nativeProps: any;
     labeled: Animated.Value;
     focused?: boolean;
     placeholder?: string | undefined;
@@ -57,7 +58,7 @@ declare class TextField extends React.Component<Props, State> {
     /**
      * @internal
      */
-    setNativeProps(args: Props): void | undefined;
+    setNativeProps(args: Props): void;
     isFocused(): boolean | undefined;
     clear(): void | undefined;
     focus(): void | undefined;

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

@@ -5,7 +5,6 @@ export declare const SEED_DATA: {
     category: string;
     layout: null;
     triggers: string[];
-    StylesPanelSections: string[];
     props: {
         type: {
             label: string;

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

@@ -64,7 +64,7 @@ export declare const SEED_DATA: ({
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;
@@ -371,7 +371,7 @@ export declare const SEED_DATA: ({
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;

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

@@ -229,7 +229,7 @@ export declare const SEED_DATA: {
             description: string;
             editable: boolean;
             required: boolean;
-            defaultValue: null;
+            defaultValue: string;
             options: string[];
             formType: string;
             propType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.4.4-602cb9.2+602cb98",
+  "version": "46.4.4-62cd12.2+62cd129",
   "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": "^46.4.4-602cb9.2+602cb98",
+    "@draftbit/types": "^46.4.4-62cd12.2+62cd129",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -81,5 +81,5 @@
       ]
     ]
   },
-  "gitHead": "602cb98b5e2406894571b6304d46320af1770deb"
+  "gitHead": "62cd129f7beb7cfa4ddd3a333e1ace2e4c677b33"
 }

package/src/components/DatePicker/DatePicker.js

@@ -6,7 +6,6 @@ import { withTheme } from "../../theming";
 import Portal from "../Portal/Portal";
 import Touchable from "../Touchable";
 import DateTimePicker from "./DatePickerComponent";
-import { extractStyles } from "../../utilities";
 const AnimatedText = Animated.createAnimatedComponent(Text);
 const FOCUS_ANIMATION_DURATION = 150;
 const BLUR_ANIMATION_DURATION = 180;
@@ -242,12 +241,10 @@ const DatePicker = ({ Icon, style, theme: { colors, typography, roundness, disab
             },
         ],
     };
-    const { textStyles } = extractStyles(style);
     const inputStyles = [
         styles.input,
         inputStyle,
         type === "solid" ? { marginHorizontal: 12 } : {},
-        textStyles,
     ];
     // const render = (props) => <NativeTextInput {...props} />;
     return (React.createElement(View, { style: [styles.container, style] },

package/src/components/DatePicker/DatePicker.tsx

@@ -23,7 +23,6 @@ import DateTimePicker from "./DatePickerComponent";
 
 import type { Theme } from "../../styles/DefaultTheme";
 import type { IconSlot } from "../../interfaces/Icon";
-import { extractStyles } from "../../utilities";
 
 const AnimatedText = Animated.createAnimatedComponent(Text);
 
@@ -348,13 +347,10 @@ const DatePicker: React.FC<React.PropsWithChildren<Props>> = ({
     ],
   };
 
-  const { textStyles } = extractStyles(style);
-
   const inputStyles = [
     styles.input,
     inputStyle,
     type === "solid" ? { marginHorizontal: 12 } : {},
-    textStyles,
   ];
 
   // const render = (props) => <NativeTextInput {...props} />;

package/src/components/Text.js

@@ -2,13 +2,19 @@ import * as React from "react";
 import { Text as NativeText, I18nManager } from "react-native";
 import { withTheme } from "../theming";
 class Text extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            nativeProps: {},
+        };
+    }
     setNativeProps(args) {
-        return this._root && this._root.setNativeProps(args);
+        this.state.nativeProps = args || {};
     }
     render() {
         const { style, ...rest } = this.props;
         const writingDirection = I18nManager.isRTL ? "rtl" : "ltr";
-        return (React.createElement(NativeText, { ...rest, ref: (c) => {
+        return (React.createElement(NativeText, { ...rest, ...this.state.nativeProps, ref: (c) => {
                 this._root = c;
             }, style: [
                 {

package/src/components/Text.tsx

@@ -10,8 +10,12 @@ type Props = {
 class Text extends React.Component<Props> {
   _root: any;
 
+  state: any = {
+    nativeProps: {},
+  };
+
   setNativeProps(args: TextProps) {
-    return this._root && this._root.setNativeProps(args);
+    this.state.nativeProps = args || {};
   }
 
   render() {
@@ -21,6 +25,7 @@ class Text extends React.Component<Props> {
     return (
       <NativeText
         {...rest}
+        {...this.state.nativeProps}
         ref={(c) => {
           this._root = c;
         }}

package/src/components/TextField.js

@@ -10,6 +10,7 @@ class TextField extends React.Component {
     constructor() {
         super(...arguments);
         this.state = {
+            nativeProps: {},
             labeled: new Animated.Value(this.props.value || this.props.error ? 0 : 1),
             focused: false,
             placeholder: this.props.error ? this.props.placeholder : "",
@@ -121,7 +122,10 @@ class TextField extends React.Component {
      * @internal
      */
     setNativeProps(args) {
-        return this._root && this._root.setNativeProps(args);
+        this.setState((state) => ({
+            ...state,
+            nativeState: args || {},
+        }));
     }
     isFocused() {
         return this._root && this._root.isFocused();
@@ -381,6 +385,7 @@ class TextField extends React.Component {
                     underlineColorAndroid: "transparent",
                     style: inputStyles,
                     ...rest,
+                    ...this.state.nativeProps,
                     value: this.state.value,
                 })),
             rightIconName ? (React.createElement(Icon, { name: rightIconName, size: ICON_SIZE, color: colors.light, style: {

package/src/components/TextField.tsx

@@ -52,6 +52,7 @@ export type Props = {
   IconSlot;
 
 interface State {
+  nativeProps: any;
   labeled: Animated.Value;
   focused?: boolean;
   placeholder?: string | undefined;
@@ -73,6 +74,7 @@ class TextField extends React.Component<Props, State> {
   }
 
   state: State = {
+    nativeProps: {},
     labeled: new Animated.Value(this.props.value || this.props.error ? 0 : 1),
     focused: false,
     placeholder: this.props.error ? this.props.placeholder : "",
@@ -207,7 +209,10 @@ class TextField extends React.Component<Props, State> {
    * @internal
    */
   setNativeProps(args: Props) {
-    return this._root && this._root.setNativeProps(args);
+    this.setState((state) => ({
+      ...state,
+      nativeState: args || {},
+    }));
   }
 
   isFocused() {
@@ -566,6 +571,7 @@ class TextField extends React.Component<Props, State> {
             underlineColorAndroid: "transparent",
             style: inputStyles,
             ...rest,
+            ...this.state.nativeProps,
             value: this.state.value,
           })}
         </View>

package/src/mappings/DatePicker.js

@@ -1,4 +1,4 @@
-import { COMPONENT_TYPES, FORM_TYPES, PROP_TYPES, FIELD_NAME, GROUPS, Triggers, StylesPanelSections, } from "@draftbit/types";
+import { COMPONENT_TYPES, FORM_TYPES, PROP_TYPES, FIELD_NAME, GROUPS, Triggers, } from "@draftbit/types";
 const SEED_DATA_PROPS = {
     label: {
         label: "Label",
@@ -139,14 +139,6 @@ export const SEED_DATA = [
         category: COMPONENT_TYPES.input,
         layout: null,
         triggers: [Triggers.OnDateChange],
-        StylesPanelSections: [
-            StylesPanelSections.Background,
-            StylesPanelSections.Borders,
-            StylesPanelSections.MarginsAndPaddings,
-            StylesPanelSections.Position,
-            StylesPanelSections.Size,
-            StylesPanelSections.Typography,
-        ],
         props: {
             ...SEED_DATA_PROPS,
             type: {

package/src/mappings/DatePicker.ts

@@ -5,7 +5,6 @@ import {
   FIELD_NAME,
   GROUPS,
   Triggers,
-  StylesPanelSections,
 } from "@draftbit/types";
 
 const SEED_DATA_PROPS = {
@@ -151,14 +150,6 @@ export const SEED_DATA = [
     category: COMPONENT_TYPES.input,
     layout: null,
     triggers: [Triggers.OnDateChange],
-    StylesPanelSections: [
-      StylesPanelSections.Background,
-      StylesPanelSections.Borders,
-      StylesPanelSections.MarginsAndPaddings,
-      StylesPanelSections.Position,
-      StylesPanelSections.Size,
-      StylesPanelSections.Typography,
-    ],
     props: {
       ...SEED_DATA_PROPS,
       type: {

package/src/mappings/TextField.js

@@ -16,7 +16,7 @@ const SEED_DATA_PROPS = {
         description: "Can automatically capitalize sentences, words, and characters (Default: none).",
         editable: true,
         required: false,
-        defaultValue: null,
+        defaultValue: "none",
         options: ["none", "sentences", "words", "characters"],
         formType: FORM_TYPES.flatArray,
         propType: PROP_TYPES.STRING,

package/src/mappings/TextField.ts

@@ -30,7 +30,7 @@ const SEED_DATA_PROPS = {
       "Can automatically capitalize sentences, words, and characters (Default: none).",
     editable: true,
     required: false,
-    defaultValue: null,
+    defaultValue: "none",
     options: ["none", "sentences", "words", "characters"],
     formType: FORM_TYPES.flatArray,
     propType: PROP_TYPES.STRING,

package/src/mappings/TextInput.js

@@ -104,7 +104,7 @@ export const SEED_DATA = [
                 description: "Can automatically capitalize sentences, words, and characters (Default: none).",
                 editable: true,
                 required: false,
-                defaultValue: null,
+                defaultValue: "none",
                 options: ["none", "sentences", "words", "characters"],
                 formType: FORM_TYPES.flatArray,
                 propType: PROP_TYPES.STRING,