@draftbit/core 46.8.0 → 46.8.1-2ae5b7.2

package/lib/commonjs/components/DeckSwiper/DeckSwiper.js

@@ -17,13 +17,47 @@ const DeckSwiper = _ref => {
     verticalEnabled = true,
     horizontalEnabled = true,
     visibleCardCount = 1,
+    data,
+    keyExtractor,
+    renderItem,
     style,
     children
   } = _ref;
+  //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 lazily render. Either remove them entirley or include both");
+  }
+  if (data && renderItem && children) {
+    console.warn("'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'");
+  }
   const childrenArray = _react.default.useMemo(() => _react.default.Children.toArray(children), [children]);
 
   // an array of indices based on children count
   const cardsFillerData = _react.default.useMemo(() => Array.from(Array(childrenArray.length).keys()), [childrenArray]);
+  const cardsData = data || cardsFillerData;
+  const renderCard = (card, index) => {
+    if (renderItem) {
+      return renderItem({
+        item: card,
+        index
+      });
+    } else {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, childrenArray[index]);
+    }
+  };
+  const renderFirstCard = () => {
+    if (cardsData.length) {
+      return renderCard(cardsData[0], 0);
+    }
+    return undefined;
+  };
+  const cardKeyExtractor = card => {
+    if (keyExtractor) {
+      return keyExtractor(card);
+    } else {
+      return card === null || card === void 0 ? void 0 : card.toString();
+    }
+  };
 
   /**
    * By default react-native-deck-swiper positions everything with absolute position.
@@ -37,10 +71,10 @@ const DeckSwiper = _ref => {
 
   return /*#__PURE__*/_react.default.createElement(_reactNative.View, null, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
     style: styles.containerHeightFiller
-  }, childrenArray.length && childrenArray[0]), /*#__PURE__*/_react.default.createElement(_reactNativeDeckSwiper.default, {
-    cards: cardsFillerData,
-    renderCard: (_, i) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, childrenArray[i]),
-    keyExtractor: card => card === null || card === void 0 ? void 0 : card.toString(),
+  }, renderFirstCard()), /*#__PURE__*/_react.default.createElement(_reactNativeDeckSwiper.default, {
+    cards: cardsData,
+    renderCard: renderCard,
+    keyExtractor: cardKeyExtractor,
     containerStyle: _reactNative.StyleSheet.flatten([styles.cardsContainer, style]),
     cardStyle: styles.card,
     onSwiped: onIndexChanged,

package/lib/commonjs/constants.js

@@ -12,4 +12,4 @@ const APPROX_STATUSBAR_HEIGHT = _reactNative.Platform.select({
   android: DEFAULT_STATUSBAR_HEIGHT_EXPO,
   ios: _reactNative.Platform.Version < 11 ? DEFAULT_STATUSBAR_HEIGHT_EXPO : 0
 });
-exports.APPROX_STATUSBAR_HEIGHT = APPROX_STATUSBAR_HEIGHT;
+exports.APPROX_STATUSBAR_HEIGHT = APPROX_STATUSBAR_HEIGHT;AR_HEIGHT;

package/lib/commonjs/styles/overlay.js

@@ -15,7 +15,6 @@ function overlay(elevation) {
   let surfaceColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _DarkTheme.default.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
     return elevation.interpolate({
       inputRange,
@@ -24,7 +23,6 @@ function overlay(elevation) {
       })
     });
   }
-
   // @ts-expect-error: TS doesn't seem to refine the type correctly
   return calculateColor(surfaceColor, elevation);
 }
@@ -65,4 +63,4 @@ const elevationOverlayTransparency = {
   22: 15.72,
   23: 15.84,
   24: 16
-};
+};};

package/lib/module/components/DeckSwiper/DeckSwiper.js

@@ -10,13 +10,47 @@ const DeckSwiper = _ref => {
     verticalEnabled = true,
     horizontalEnabled = true,
     visibleCardCount = 1,
+    data,
+    keyExtractor,
+    renderItem,
     style,
     children
   } = _ref;
+  //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 lazily render. Either remove them entirley or include both");
+  }
+  if (data && renderItem && children) {
+    console.warn("'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'");
+  }
   const childrenArray = React.useMemo(() => React.Children.toArray(children), [children]);
 
   // an array of indices based on children count
   const cardsFillerData = React.useMemo(() => Array.from(Array(childrenArray.length).keys()), [childrenArray]);
+  const cardsData = data || cardsFillerData;
+  const renderCard = (card, index) => {
+    if (renderItem) {
+      return renderItem({
+        item: card,
+        index
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, childrenArray[index]);
+    }
+  };
+  const renderFirstCard = () => {
+    if (cardsData.length) {
+      return renderCard(cardsData[0], 0);
+    }
+    return undefined;
+  };
+  const cardKeyExtractor = card => {
+    if (keyExtractor) {
+      return keyExtractor(card);
+    } else {
+      return card === null || card === void 0 ? void 0 : card.toString();
+    }
+  };
 
   /**
    * By default react-native-deck-swiper positions everything with absolute position.
@@ -30,10 +64,10 @@ const DeckSwiper = _ref => {
 
   return /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(View, {
     style: styles.containerHeightFiller
-  }, childrenArray.length && childrenArray[0]), /*#__PURE__*/React.createElement(DeckSwiperComponent, {
-    cards: cardsFillerData,
-    renderCard: (_, i) => /*#__PURE__*/React.createElement(React.Fragment, null, childrenArray[i]),
-    keyExtractor: card => card === null || card === void 0 ? void 0 : card.toString(),
+  }, renderFirstCard()), /*#__PURE__*/React.createElement(DeckSwiperComponent, {
+    cards: cardsData,
+    renderCard: renderCard,
+    keyExtractor: cardKeyExtractor,
     containerStyle: StyleSheet.flatten([styles.cardsContainer, style]),
     cardStyle: styles.card,
     onSwiped: onIndexChanged,

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

@@ -1,6 +1,6 @@
 import React from "react";
 import { StyleProp, ViewStyle } from "react-native";
-export interface DeckSwiperProps {
+export interface DeckSwiperProps<T> {
     onIndexChanged?: (index: number) => void;
     onEndReached?: () => void;
     startCardIndex?: number;
@@ -8,8 +8,14 @@ export interface DeckSwiperProps {
     verticalEnabled?: boolean;
     horizontalEnabled?: boolean;
     visibleCardCount?: number;
+    data?: Array<T>;
+    keyExtractor?: (item: T) => string;
+    renderItem?: ({ item, index }: {
+        item: T;
+        index: number;
+    }) => JSX.Element;
     style?: StyleProp<ViewStyle>;
 }
-declare const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>>;
+declare const DeckSwiper: <T extends object>({ onIndexChanged, onEndReached, startCardIndex, infiniteSwiping, verticalEnabled, horizontalEnabled, visibleCardCount, data, keyExtractor, renderItem, style, children, }: React.PropsWithChildren<DeckSwiperProps<T>>) => JSX.Element;
 export default DeckSwiper;
 //# sourceMappingURL=DeckSwiper.d.ts.map

package/lib/typescript/src/components/DeckSwiper/DeckSwiper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeckSwiper.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,cAAc,CAAC;AAGtE,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,CA6DlE,CAAC;AAiBF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"DeckSwiper.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,cAAc,CAAC;AAGtE,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAChB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC;IACnC,UAAU,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,QAAA,MAAM,UAAU,2PAoGf,CAAC;AAiBF,eAAe,UAAU,CAAC"}

package/lib/typescript/src/components/DeckSwiper/DeckSwiperCard.d.ts

@@ -3,11 +3,10 @@ import { StyleProp, ViewStyle } from "react-native";
 import type { Theme } from "../../styles/DefaultTheme";
 export interface DeckSwiperCardProps {
     style?: StyleProp<ViewStyle>;
-    children: React.ReactNode;
     theme: Theme;
 }
-declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<DeckSwiperCardProps, "theme"> & {
+declare const _default: React.ComponentType<import("@draftbit/react-theme-provider").$Without<React.PropsWithChildren<DeckSwiperCardProps>, "theme"> & {
     theme?: import("@draftbit/react-theme-provider").$DeepPartial<any> | undefined;
-}> & import("@draftbit/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<DeckSwiperCardProps> & React.FC<DeckSwiperCardProps>, {}>;
+}> & import("@draftbit/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<React.PropsWithChildren<DeckSwiperCardProps>> & React.FC<React.PropsWithChildren<DeckSwiperCardProps>>, {}>;
 export default _default;
 //# sourceMappingURL=DeckSwiperCard.d.ts.map

package/lib/typescript/src/components/DeckSwiper/DeckSwiperCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeckSwiperCard.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiperCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAoB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAGvD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;CACd;;;;AA+BD,wBAAyC"}
+{"version":3,"file":"DeckSwiperCard.d.ts","sourceRoot":"","sources":["../../../../../src/components/DeckSwiper/DeckSwiperCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAoB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAGvD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,KAAK,EAAE,KAAK,CAAC;CACd;;;;AA6BD,wBAAyC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "46.8.0",
+  "version": "46.8.1-2ae5b7.2+2ae5b77",
   "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.8.0",
+    "@draftbit/types": "^46.8.1-2ae5b7.2+2ae5b77",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.2.3",
@@ -92,5 +92,5 @@
       ]
     ]
   },
-  "gitHead": "c39b951332cf49ab0c1a244b1939f60f241f3ffa"
+  "gitHead": "2ae5b7790dbc8b74522107d35a88801b9c7a5c89"
 }

package/src/components/DeckSwiper/DeckSwiper.js

@@ -1,10 +1,40 @@
 import React from "react";
 import { StyleSheet, View } from "react-native";
 import DeckSwiperComponent from "react-native-deck-swiper";
-const DeckSwiper = ({ onIndexChanged, onEndReached, startCardIndex = 0, infiniteSwiping = false, verticalEnabled = true, horizontalEnabled = true, visibleCardCount = 1, style, children, }) => {
+const DeckSwiper = ({ onIndexChanged, onEndReached, startCardIndex = 0, infiniteSwiping = false, verticalEnabled = true, horizontalEnabled = true, visibleCardCount = 1, data, keyExtractor, renderItem, style, children, }) => {
+    //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 lazily render. Either remove them entirley or include both");
+    }
+    if (data && renderItem && children) {
+        console.warn("'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'");
+    }
     const childrenArray = React.useMemo(() => React.Children.toArray(children), [children]);
     // an array of indices based on children count
     const cardsFillerData = React.useMemo(() => Array.from(Array(childrenArray.length).keys()), [childrenArray]);
+    const cardsData = data || cardsFillerData;
+    const renderCard = (card, index) => {
+        if (renderItem) {
+            return renderItem({ item: card, index });
+        }
+        else {
+            return React.createElement(React.Fragment, null, childrenArray[index]);
+        }
+    };
+    const renderFirstCard = () => {
+        if (cardsData.length) {
+            return renderCard(cardsData[0], 0);
+        }
+        return undefined;
+    };
+    const cardKeyExtractor = (card) => {
+        if (keyExtractor) {
+            return keyExtractor(card);
+        }
+        else {
+            return card === null || card === void 0 ? void 0 : card.toString();
+        }
+    };
     /**
      * By default react-native-deck-swiper positions everything with absolute position.
      * To overcome this, it is wrapped in a View to be able to add the component in any layout structure.
@@ -15,8 +45,8 @@ const DeckSwiper = ({ onIndexChanged, onEndReached, startCardIndex = 0, infinite
      * This effectivley makes the default height of the container be the height of the first card.
      */
     return (React.createElement(View, null,
-        React.createElement(View, { style: styles.containerHeightFiller }, childrenArray.length && childrenArray[0]),
-        React.createElement(DeckSwiperComponent, { cards: cardsFillerData, renderCard: (_, i) => React.createElement(React.Fragment, null, childrenArray[i]), keyExtractor: (card) => card === null || card === void 0 ? void 0 : card.toString(), containerStyle: StyleSheet.flatten([styles.cardsContainer, style]), cardStyle: styles.card, onSwiped: onIndexChanged, onSwipedAll: onEndReached, cardIndex: startCardIndex, infinite: infiniteSwiping, verticalSwipe: verticalEnabled, horizontalSwipe: horizontalEnabled, showSecondCard: visibleCardCount > 1, stackSize: visibleCardCount, backgroundColor: "transparent", cardVerticalMargin: 0, cardHorizontalMargin: 0 })));
+        React.createElement(View, { style: styles.containerHeightFiller }, renderFirstCard()),
+        React.createElement(DeckSwiperComponent, { cards: cardsData, renderCard: renderCard, keyExtractor: cardKeyExtractor, containerStyle: StyleSheet.flatten([styles.cardsContainer, style]), cardStyle: styles.card, onSwiped: onIndexChanged, onSwipedAll: onEndReached, cardIndex: startCardIndex, infinite: infiniteSwiping, verticalSwipe: verticalEnabled, horizontalSwipe: horizontalEnabled, showSecondCard: visibleCardCount > 1, stackSize: visibleCardCount, backgroundColor: "transparent", cardVerticalMargin: 0, cardHorizontalMargin: 0 })));
 };
 const styles = StyleSheet.create({
     cardsContainer: {

package/src/components/DeckSwiper/DeckSwiper.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { StyleProp, ViewStyle, StyleSheet, View } from "react-native";
 import DeckSwiperComponent from "react-native-deck-swiper";
 
-export interface DeckSwiperProps {
+export interface DeckSwiperProps<T> {
   onIndexChanged?: (index: number) => void;
   onEndReached?: () => void;
   startCardIndex?: number;
@@ -10,10 +10,13 @@ export interface DeckSwiperProps {
   verticalEnabled?: boolean;
   horizontalEnabled?: boolean;
   visibleCardCount?: number;
+  data?: Array<T>;
+  keyExtractor?: (item: T) => string;
+  renderItem?: ({ item, index }: { item: T; index: number }) => JSX.Element;
   style?: StyleProp<ViewStyle>;
 }
 
-const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>> = ({
+const DeckSwiper = <T extends object>({
   onIndexChanged,
   onEndReached,
   startCardIndex = 0,
@@ -21,9 +24,25 @@ const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>> = ({
   verticalEnabled = true,
   horizontalEnabled = true,
   visibleCardCount = 1,
+  data,
+  keyExtractor,
+  renderItem,
   style,
   children,
-}) => {
+}: React.PropsWithChildren<DeckSwiperProps<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 lazily render. Either remove them entirley or include both"
+    );
+  }
+
+  if (data && renderItem && children) {
+    console.warn(
+      "'children' of DeckSwiper ignored due to usage of 'data' and 'renderItem'"
+    );
+  }
+
   const childrenArray = React.useMemo(
     () => React.Children.toArray(children),
     [children]
@@ -35,6 +54,31 @@ const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>> = ({
     [childrenArray]
   );
 
+  const cardsData = data || cardsFillerData;
+
+  const renderCard = (card: any, index: number): JSX.Element => {
+    if (renderItem) {
+      return renderItem({ item: card, index });
+    } else {
+      return <>{childrenArray[index]}</>;
+    }
+  };
+
+  const renderFirstCard = (): JSX.Element | undefined => {
+    if (cardsData.length) {
+      return renderCard(cardsData[0], 0);
+    }
+    return undefined;
+  };
+
+  const cardKeyExtractor = (card: any) => {
+    if (keyExtractor) {
+      return keyExtractor(card);
+    } else {
+      return card?.toString();
+    }
+  };
+
   /**
    * By default react-native-deck-swiper positions everything with absolute position.
    * To overcome this, it is wrapped in a View to be able to add the component in any layout structure.
@@ -47,13 +91,11 @@ const DeckSwiper: React.FC<React.PropsWithChildren<DeckSwiperProps>> = ({
 
   return (
     <View>
-      <View style={styles.containerHeightFiller}>
-        {childrenArray.length && childrenArray[0]}
-      </View>
+      <View style={styles.containerHeightFiller}>{renderFirstCard()}</View>
       <DeckSwiperComponent
-        cards={cardsFillerData}
-        renderCard={(_, i) => <>{childrenArray[i]}</>}
-        keyExtractor={(card) => card?.toString()}
+        cards={cardsData as any[]}
+        renderCard={renderCard}
+        keyExtractor={cardKeyExtractor}
         containerStyle={
           StyleSheet.flatten([styles.cardsContainer, style]) as
             | object

package/src/components/DeckSwiper/DeckSwiperCard.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { View, StyleSheet } from "react-native";
 import { withTheme } from "../../theming";
-const DeckSwiperCard = ({ style, children, theme, }) => (React.createElement(View, { style: [
+const DeckSwiperCard = ({ style, children, theme }) => (React.createElement(View, { style: [
         styles.card,
         {
             backgroundColor: theme.colors.background,

package/src/components/DeckSwiper/DeckSwiperCard.tsx

@@ -5,15 +5,12 @@ import { withTheme } from "../../theming";
 
 export interface DeckSwiperCardProps {
   style?: StyleProp<ViewStyle>;
-  children: React.ReactNode;
   theme: Theme;
 }
 
-const DeckSwiperCard: React.FC<DeckSwiperCardProps> = ({
-  style,
-  children,
-  theme,
-}) => (
+const DeckSwiperCard: React.FC<
+  React.PropsWithChildren<DeckSwiperCardProps>
+> = ({ style, children, theme }) => (
   <View
     style={[
       styles.card,