@draftbit/core 43.4.5-958f08.1 → 43.4.5-d442fc.1

package/src/components/RadioButton/RadioButtonRow.js

@@ -5,7 +5,7 @@ import Text from "../Text";
 import { useRadioButtonGroupContext } from "./context";
 import { Direction as GroupDirection } from "./context";
 import Touchable from "../Touchable";
-import { extractStyles, getRealValue } from "../../utilities";
+import { extractStyles } from "../../utilities";
 export var Direction;
 (function (Direction) {
     Direction["Row"] = "row";
@@ -22,25 +22,19 @@ const getRadioButtonAlignment = (parentDirection, direction) => {
         return "flex-end";
     }
 };
-const renderLabel = (label, labelStyle, textStyle) => {
-    if (typeof label === "string") {
-        return React.createElement(Text, { style: [labelStyle, textStyle] }, label);
+const renderLabel = (value, labelStyle, textStyle) => {
+    if (typeof value === "string") {
+        return React.createElement(Text, { style: [labelStyle, textStyle] }, value);
     }
     else {
-        return React.createElement(React.Fragment, null, label);
+        return React.createElement(React.Fragment, null, value);
     }
 };
-const RadioButtonRow = ({ Icon, label, value, color, unselectedColor, onPress, labelContainerStyle, labelStyle, radioButtonStyle, direction = Direction.Row, selected, disabled, style, ...rest }) => {
+const RadioButtonRow = ({ Icon, label, value, color, unselectedColor, onPress = () => { }, labelContainerStyle, labelStyle, radioButtonStyle, direction = Direction.Row, selected, disabled, style, ...rest }) => {
     const { value: contextValue, onValueChange, direction: parentDirection, } = useRadioButtonGroupContext();
-    const realValue = getRealValue(value);
-    const realContextValue = getRealValue(contextValue);
-    const isSelected = selected ??
-        (realContextValue && realValue && realContextValue === realValue);
     const handlePress = () => {
-        if (realValue) {
-            onPress?.(realValue);
-            onValueChange?.(realValue);
-        }
+        onPress(value);
+        onValueChange && onValueChange(value);
     };
     const { textStyles, viewStyles } = extractStyles(style);
     return (React.createElement(Touchable, { onPress: handlePress, style: [styles.mainParent, { flexDirection: direction }, viewStyles], disabled: disabled, ...rest },
@@ -55,7 +49,7 @@ const RadioButtonRow = ({ Icon, label, value, color, unselectedColor, onPress, l
                 flex: 1,
                 alignItems: getRadioButtonAlignment(parentDirection, direction),
             } },
-            React.createElement(RadioButton, { Icon: Icon, selected: isSelected ? true : false, value: realValue, color: color, unselectedColor: unselectedColor, style: radioButtonStyle }))));
+            React.createElement(RadioButton, { Icon: Icon, selected: selected || (contextValue != null && contextValue === value), color: color, unselectedColor: unselectedColor, onPress: handlePress, style: radioButtonStyle }))));
 };
 const styles = StyleSheet.create({
     mainParent: {

package/src/components/RadioButton/RadioButtonRow.tsx

@@ -13,7 +13,7 @@ import { useRadioButtonGroupContext } from "./context";
 import type { IconSlot } from "../../interfaces/Icon";
 import { Direction as GroupDirection } from "./context";
 import Touchable from "../Touchable";
-import { extractStyles, getRealValue } from "../../utilities";
+import { extractStyles } from "../../utilities";
 
 export enum Direction {
   Row = "row",
@@ -22,7 +22,7 @@ export enum Direction {
 
 export interface RadioButtonRowProps extends Omit<RadioButtonProps, "onPress"> {
   label: string | React.ReactNode;
-  value: string; // A string (or number that will be parsed String(number)) that this radio button row represents when selected
+  value: string; // A string that this radio button row represents when selected
   color?: string;
   unselectedColor?: string;
   labelContainerStyle: StyleProp<ViewStyle>;
@@ -46,14 +46,14 @@ const getRadioButtonAlignment = (
 };
 
 const renderLabel = (
-  label: string | React.ReactNode,
+  value: string | React.ReactNode,
   labelStyle: StyleProp<TextStyle>,
   textStyle: StyleProp<TextStyle>
 ) => {
-  if (typeof label === "string") {
-    return <Text style={[labelStyle, textStyle]}>{label}</Text>;
+  if (typeof value === "string") {
+    return <Text style={[labelStyle, textStyle]}>{value}</Text>;
   } else {
-    return <>{label}</>;
+    return <>{value}</>;
   }
 };
 
@@ -63,7 +63,7 @@ const RadioButtonRow: React.FC<RadioButtonRowProps & IconSlot> = ({
   value,
   color,
   unselectedColor,
-  onPress,
+  onPress = () => {},
   labelContainerStyle,
   labelStyle,
   radioButtonStyle,
@@ -79,17 +79,9 @@ const RadioButtonRow: React.FC<RadioButtonRowProps & IconSlot> = ({
     direction: parentDirection,
   } = useRadioButtonGroupContext();
 
-  const realValue = getRealValue(value);
-  const realContextValue = getRealValue(contextValue);
-  const isSelected =
-    selected ??
-    (realContextValue && realValue && realContextValue === realValue);
-
   const handlePress = () => {
-    if (realValue) {
-      onPress?.(realValue);
-      onValueChange?.(realValue);
-    }
+    onPress(value);
+    onValueChange && onValueChange(value);
   };
 
   const { textStyles, viewStyles } = extractStyles(style);
@@ -120,10 +112,12 @@ const RadioButtonRow: React.FC<RadioButtonRowProps & IconSlot> = ({
       >
         <RadioButton
           Icon={Icon}
-          selected={isSelected ? true : false}
-          value={realValue}
+          selected={
+            selected || (contextValue != null && contextValue === value)
+          }
           color={color}
           unselectedColor={unselectedColor}
+          onPress={handlePress}
           style={radioButtonStyle}
         />
       </View>

package/src/components/TabView/TabView.js

@@ -0,0 +1,33 @@
+import * as React from "react";
+import { TabView, TabBar, SceneMap } from "react-native-tab-view";
+// import { withTheme } from "../../theming";
+import TabViewItem from "./TabViewItem";
+const TabViewComponent = ({ Icon, tabBarPosition, keyboardDismissMode, swipeEnabled, scrollEnabled, activeColor, inactiveColor, pressColor, indicatorColor, style, children, }) => {
+    const [index, setIndex] = React.useState(0);
+    const [routes, setRoutes] = React.useState([]);
+    const [tabScenes, setTabScenes] = React.useState({});
+    React.useEffect(() => {
+        const newRoutes = [];
+        const scenes = {};
+        React.Children.toArray(children)
+            .filter((child) => child.type === TabViewItem)
+            .forEach((child) => {
+            if (child?.props?.id) {
+                newRoutes.push({
+                    key: child?.props?.id,
+                    ...child?.props,
+                });
+                scenes[child?.props?.id] = () => child;
+            }
+        });
+        setRoutes(newRoutes);
+        setTabScenes(scenes);
+    }, [children]);
+    const indexChangeHandler = (i) => setIndex(i);
+    const renderTabBar = (props) => {
+        console.log(props);
+        return (React.createElement(TabBar, { ...props, activeColor: activeColor, inactiveColor: inactiveColor, pressColor: pressColor, scrollEnabled: scrollEnabled, indicatorStyle: { backgroundColor: indicatorColor }, renderIcon: ({ route, color }) => route?.icon ? (React.createElement(Icon, { name: route.icon, color: color, size: 36 })) : null, style: style }));
+    };
+    return (React.createElement(TabView, { navigationState: { index, routes }, renderScene: SceneMap(tabScenes), renderTabBar: renderTabBar, onIndexChange: indexChangeHandler, tabBarPosition: tabBarPosition, keyboardDismissMode: keyboardDismissMode, swipeEnabled: swipeEnabled }));
+};
+export default TabViewComponent;

package/src/components/TabView/TabView.tsx

@@ -0,0 +1,97 @@
+import * as React from "react";
+import { StyleProp, TextStyle, ViewStyle } from "react-native";
+import { TabView, TabBar, SceneMap } from "react-native-tab-view";
+
+// import { withTheme } from "../../theming";
+import TabViewItem from "./TabViewItem";
+import type { IconSlot } from "../../interfaces/Icon";
+
+type TabBarPosition = "top" | "bottom";
+type KeyboardDismissMode = "none" | "auto" | "on-drag";
+
+type TabViewProps = {
+  tabBarPosition?: TabBarPosition;
+  keyboardDismissMode?: KeyboardDismissMode;
+  swipeEnabled?: boolean;
+  scrollEnabled?: boolean;
+  activeColor?: string;
+  inactiveColor?: string;
+  pressColor?: string;
+  indicatorColor?: string;
+  style?: StyleProp<TextStyle | ViewStyle>;
+  children: React.ReactNode;
+} & IconSlot;
+
+const TabViewComponent = ({
+  Icon,
+  tabBarPosition,
+  keyboardDismissMode,
+  swipeEnabled,
+  scrollEnabled,
+  activeColor,
+  inactiveColor,
+  pressColor,
+  indicatorColor,
+  style,
+  children,
+}: TabViewProps) => {
+  const [index, setIndex] = React.useState(0);
+  const [routes, setRoutes] = React.useState([]);
+  const [tabScenes, setTabScenes] = React.useState({});
+
+  React.useEffect(() => {
+    const newRoutes: any = [];
+    const scenes: any = {};
+
+    React.Children.toArray(children)
+      .filter((child: any) => child.type === TabViewItem)
+      .forEach((child: any) => {
+        if (child?.props?.id) {
+          newRoutes.push({
+            key: child?.props?.id,
+            ...child?.props,
+          });
+          scenes[child?.props?.id] = () => child;
+        }
+      });
+
+    setRoutes(newRoutes);
+    setTabScenes(scenes);
+  }, [children]);
+
+  const indexChangeHandler = (i: any) => setIndex(i);
+
+  const renderTabBar = (props: any) => {
+    console.log(props);
+    return (
+      <TabBar
+        {...props}
+        activeColor={activeColor}
+        inactiveColor={inactiveColor}
+        pressColor={pressColor}
+        scrollEnabled={scrollEnabled}
+        indicatorStyle={{ backgroundColor: indicatorColor }}
+        renderIcon={({ route, color }) =>
+          route?.icon ? (
+            <Icon name={route.icon} color={color} size={36} />
+          ) : null
+        }
+        style={style}
+      />
+    );
+  };
+
+  return (
+    <TabView
+      navigationState={{ index, routes }}
+      renderScene={SceneMap(tabScenes)}
+      renderTabBar={renderTabBar}
+      onIndexChange={indexChangeHandler}
+      tabBarPosition={tabBarPosition}
+      keyboardDismissMode={keyboardDismissMode}
+      swipeEnabled={swipeEnabled}
+    />
+  );
+};
+
+export default TabViewComponent;

package/src/components/TabView/TabViewItem.js

@@ -0,0 +1,5 @@
+const TabViewItem = ({ title, id, icon, children, accessibilityLabel, }) => {
+    console.log({ title, id, icon, accessibilityLabel });
+    return children;
+};
+export default TabViewItem;

package/src/components/TabView/TabViewItem.tsx

@@ -0,0 +1,21 @@
+import React from "react";
+interface TabViewItemProps {
+  title: string;
+  id: string;
+  icon: string;
+  accessibilityLabel: string;
+  children: React.ReactNode;
+}
+
+const TabViewItem = ({
+  title,
+  id,
+  icon,
+  children,
+  accessibilityLabel,
+}: TabViewItemProps) => {
+  console.log({ title, id, icon, accessibilityLabel });
+  return children;
+};
+
+export default TabViewItem;

package/src/components/TabView/index.js

@@ -0,0 +1,2 @@
+export { default as TabView } from "./TabView";
+export { default as TabViewItem } from "./TabViewItem";

package/src/components/TabView/index.ts

@@ -0,0 +1,2 @@
+export { default as TabView } from "./TabView";
+export { default as TabViewItem } from "./TabViewItem";

package/src/index.js

@@ -27,6 +27,7 @@ export { default as Touchable } from "./components/Touchable";
 export { AccordionGroup, AccordionItem } from "./components/Accordion";
 export { ActionSheet, ActionSheetItem, ActionSheetCancel, } from "./components/ActionSheet";
 export { Swiper, SwiperItem } from "./components/Swiper";
+export { TabView, TabViewItem } from "./components/TabView";
 export { Center, Circle, Square, Row, Stack, Spacer, } from "./components/Layout";
 export { RadioButton, RadioButtonGroup, RadioButtonRow, RadioButtonFieldGroup, } from "./components/RadioButton/index";
 /* Deprecated: Fix or Delete!  */

package/src/index.tsx

@@ -32,6 +32,7 @@ export {
   ActionSheetCancel,
 } from "./components/ActionSheet";
 export { Swiper, SwiperItem } from "./components/Swiper";
+export { TabView, TabViewItem } from "./components/TabView";
 
 export {
   Center,

package/src/mappings/TabView.js

@@ -0,0 +1,73 @@
+import { COMPONENT_TYPES, createTextProp, createTextEnumProp, createBoolProp, createColorProp, } from "@draftbit/types";
+export const SEED_DATA = [
+    {
+        name: "TabView",
+        tag: "TabView",
+        category: COMPONENT_TYPES.container,
+        layout: {},
+        props: {
+            tabBarPosition: createTextEnumProp({
+                label: "Tab Bar Position",
+                description: "Tab Bar Position",
+                options: ["top", "bottom"],
+                defaultValue: "top",
+            }),
+            keyboardDismissMode: createTextEnumProp({
+                label: "Keyboard Dismiss Mode",
+                description: "Keyboard Dismiss Mode",
+                options: ["auto", "on-drag", "none"],
+                defaultValue: "auto",
+            }),
+            swipeEnabled: createBoolProp({
+                label: "Swipe Enabled",
+                description: "Swipe Enabled",
+                defaultValue: true,
+            }),
+            scrollEnabled: createBoolProp({
+                label: "Scroll Enabled",
+                description: "Scroll Enabled",
+                defaultValue: true,
+            }),
+            activeColor: createColorProp({
+                label: "Active Color",
+                description: "Active Color",
+                defaultValue: "primary",
+            }),
+            inactiveColor: createColorProp({
+                label: "Inactive Color",
+                description: "Inactive Color",
+                defaultValue: null,
+            }),
+            pressColor: createColorProp({
+                label: "Press Color",
+                description: "Press Color",
+                defaultValue: null,
+            }),
+            indicatorColor: createColorProp({
+                label: "Indicator Color",
+                description: "Indicator Color",
+                defaultValue: null,
+            }),
+        },
+    },
+    {
+        name: "TabViewItem",
+        tag: "TabViewItem",
+        category: COMPONENT_TYPES.container,
+        layout: {},
+        props: {
+            title: createTextProp({
+                label: "Title",
+                description: "Tab Title",
+            }),
+            id: createTextProp({
+                label: "Id",
+                description: "Tab Id",
+            }),
+            accessibilityLabel: createTextProp({
+                label: "Accessibility Label",
+                description: "Accessibility Label",
+            }),
+        },
+    },
+];

package/src/mappings/TabView.ts

@@ -0,0 +1,80 @@
+import {
+  COMPONENT_TYPES,
+  createTextProp,
+  createTextEnumProp,
+  createBoolProp,
+  createColorProp,
+} from "@draftbit/types";
+
+export const SEED_DATA = [
+  {
+    name: "TabView",
+    tag: "TabView",
+    category: COMPONENT_TYPES.container,
+    layout: {},
+    props: {
+      tabBarPosition: createTextEnumProp({
+        label: "Tab Bar Position",
+        description: "Tab Bar Position",
+        options: ["top", "bottom"],
+        defaultValue: "top",
+      }),
+      keyboardDismissMode: createTextEnumProp({
+        label: "Keyboard Dismiss Mode",
+        description: "Keyboard Dismiss Mode",
+        options: ["auto", "on-drag", "none"],
+        defaultValue: "auto",
+      }),
+      swipeEnabled: createBoolProp({
+        label: "Swipe Enabled",
+        description: "Swipe Enabled",
+        defaultValue: true,
+      }),
+      scrollEnabled: createBoolProp({
+        label: "Scroll Enabled",
+        description: "Scroll Enabled",
+        defaultValue: true,
+      }),
+      activeColor: createColorProp({
+        label: "Active Color",
+        description: "Active Color",
+        defaultValue: "primary",
+      }),
+      inactiveColor: createColorProp({
+        label: "Inactive Color",
+        description: "Inactive Color",
+        defaultValue: null,
+      }),
+      pressColor: createColorProp({
+        label: "Press Color",
+        description: "Press Color",
+        defaultValue: null,
+      }),
+      indicatorColor: createColorProp({
+        label: "Indicator Color",
+        description: "Indicator Color",
+        defaultValue: null,
+      }),
+    },
+  },
+  {
+    name: "TabViewItem",
+    tag: "TabViewItem",
+    category: COMPONENT_TYPES.container,
+    layout: {},
+    props: {
+      title: createTextProp({
+        label: "Title",
+        description: "Tab Title",
+      }),
+      id: createTextProp({
+        label: "Id",
+        description: "Tab Id",
+      }),
+      accessibilityLabel: createTextProp({
+        label: "Accessibility Label",
+        description: "Accessibility Label",
+      }),
+    },
+  },
+];

package/src/utilities.js

@@ -40,15 +40,3 @@ export function applyStyles(baseStyles, stylesToApply) {
     }
     return flattenedStyles;
 }
-export function getRealValue(value) {
-    // console.log("getRealValue typeof", typeof value);
-    // console.log("getRealValue value", value);
-    switch (typeof value) {
-        case "string":
-            return value;
-        case "number":
-            return String(value);
-        default:
-            return undefined;
-    }
-}

package/src/utilities.ts

@@ -63,16 +63,3 @@ export function applyStyles(
 
   return flattenedStyles;
 }
-
-export function getRealValue(value: any) {
-  // console.log("getRealValue typeof", typeof value);
-  // console.log("getRealValue value", value);
-  switch (typeof value) {
-    case "string":
-      return value;
-    case "number":
-      return String(value);
-    default:
-      return undefined;
-  }
-}