@draftbit/core 49.3.2-e6a661.2 → 49.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "49.3.2-e6a661.2+e6a661f",
+  "version": "49.4.1",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/src/index.d.ts",
@@ -41,9 +41,9 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^49.3.2-e6a661.2+e6a661f",
+    "@draftbit/types": "49.2.6",
     "@expo/vector-icons": "^13.0.0",
-    "@gorhom/bottom-sheet": "^5.0.0-alpha.4",
+    "@gorhom/bottom-sheet": "5.0.0-alpha.7",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
     "@react-native-community/slider": "4.4.2",
@@ -113,5 +113,5 @@
     ],
     "testEnvironment": "node"
   },
-  "gitHead": "e6a661f85673e4f0eaeab86f3389871a23490004"
+  "gitHead": "3610e9e734278b5fe5af227f57609cc7adc0732c"
 }

package/src/components/PinInput/PinInput.js

@@ -5,7 +5,7 @@ import { CodeField, useClearByFocusCell, } from "react-native-confirmation-code-
 import { withTheme } from "../../theming";
 import PinInputText from "./PinInputText";
 import { extractStyles } from "../../utilities";
-const PinInput = React.forwardRef(({ theme, onInputFull, cellCount = 4, clearOnCellFocus = true, blurOnFull = true, renderItem, value, onChangeText, focusedBorderColor = theme.colors.primary, focusedBackgroundColor, focusedBorderWidth, focusedTextColor, style, ...rest }, ref) => {
+const PinInput = React.forwardRef(({ theme, onInputFull, cellCount = 4, clearOnCellFocus = true, blurOnFull = true, renderItem, value, onChangeText, focusedBorderColor = theme.colors.primary, focusedBackgroundColor, focusedBorderWidth, focusedTextColor, secureTextEntry, style, ...rest }, ref) => {
     const newPinInputRef = React.useRef(null);
     // Use the provided ref or default to new ref when not provided
     const pinInputRef = ref
@@ -28,6 +28,9 @@ const PinInput = React.forwardRef(({ theme, onInputFull, cellCount = 4, clearOnC
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value, cellCount, blurOnFull, pinInputRef]);
     const renderCell = (cellValue, index, isFocused) => {
+        if (secureTextEntry && cellValue) {
+            cellValue = "•";
+        }
         const cell = (renderItem === null || renderItem === void 0 ? void 0 : renderItem({ cellValue, index, isFocused })) || (React.createElement(View, { testID: "default-code-input-cell", style: [
                 styles.cell,
                 { borderColor: theme.colors.disabled },
@@ -59,7 +62,7 @@ const PinInput = React.forwardRef(({ theme, onInputFull, cellCount = 4, clearOnC
             { height: "100%" },
             //@ts-ignore Web specific prop. Removes default blue outline that appears on the hidden TextInput
             Platform.OS === "web" ? { outlineWidth: 0 } : {},
-        ], InputComponent: TextInput, cellCount: cellCount, renderCell: ({ symbol: cellValue, index, isFocused }) => (React.createElement(React.Fragment, { key: index }, renderCell(cellValue, index, isFocused))), ...rest }));
+        ], InputComponent: TextInput, cellCount: cellCount, renderCell: ({ symbol: cellValue, index, isFocused }) => (React.createElement(React.Fragment, { key: index }, renderCell(cellValue, index, isFocused))), secureTextEntry: secureTextEntry, ...rest }));
 });
 const styles = StyleSheet.create({
     rootContainer: {

package/src/components/PinInput/PinInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"PinInput.js","sourceRoot":"","sources":["PinInput.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PinInput.js","sourceRoot":"","sources":["PinInput.tsx"],"names":[],"mappings":"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"}

package/src/components/PinInput/PinInput.tsx

@@ -53,6 +53,7 @@ const PinInput = React.forwardRef<NativeTextInput, PinInputProps>(
       focusedBackgroundColor,
       focusedBorderWidth,
       focusedTextColor,
+      secureTextEntry,
       style,
       ...rest
     },
@@ -88,6 +89,9 @@ const PinInput = React.forwardRef<NativeTextInput, PinInputProps>(
       index: number,
       isFocused: boolean
     ) => {
+      if (secureTextEntry && cellValue) {
+        cellValue = "•";
+      }
       const cell = renderItem?.({ cellValue, index, isFocused }) || (
         <View
           testID="default-code-input-cell"
@@ -147,6 +151,7 @@ const PinInput = React.forwardRef<NativeTextInput, PinInputProps>(
             {renderCell(cellValue, index, isFocused)}
           </React.Fragment>
         )}
+        secureTextEntry={secureTextEntry}
         {...rest}
       />
     );

package/src/components/SimpleStyleScrollables/SimpleStyleFlashList.js

@@ -1,13 +1,18 @@
 import React from "react";
 import { FlashList } from "@shopify/flash-list";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A FlashList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleFlashList = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
-    return (React.createElement(FlashList, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
+    return (React.createElement(FlashList, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleFlashList;
 //# sourceMappingURL=SimpleStyleFlashList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleFlashList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleFlashList.js","sourceRoot":"","sources":["SimpleStyleFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAAgB,EAC3C,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EAC0C,EAAE,EAAE;IACrD,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO,CACL,oBAAC,SAAS,IACR,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqC,KACxD,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"SimpleStyleFlashList.js","sourceRoot":"","sources":["SimpleStyleFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAAgB,EAC3C,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EAC0C,EAAE,EAAE;IACrD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO,CACL,oBAAC,SAAS,IACR,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqC,KACxD,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleFlashList.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { FlashList } from "@shopify/flash-list";
 import type { FlashListProps, ContentStyle } from "@shopify/flash-list";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A FlashList wrapper that takes a single `style` prop and internally extracts
@@ -11,11 +11,21 @@ const SimpleStyleFlashList = <T extends any>({
   style: styleProp,
   ...rest
 }: Omit<FlashListProps<T>, "contentContainerStyle">) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     <FlashList
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle as ContentStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/SimpleStyleFlatList.js

@@ -1,13 +1,18 @@
 import React from "react";
 import { FlatList } from "react-native";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A FlatList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleFlatList = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
-    return (React.createElement(FlatList, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
+    return (React.createElement(FlatList, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleFlatList;
 //# sourceMappingURL=SimpleStyleFlatList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleFlatList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleFlatList.js","sourceRoot":"","sources":["SimpleStyleFlatList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,mBAAmB,GAAG,CAAgB,EAC1C,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EACyC,EAAE,EAAE;IACpD,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO,CACL,oBAAC,QAAQ,IACP,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"SimpleStyleFlatList.js","sourceRoot":"","sources":["SimpleStyleFlatList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,mBAAmB,GAAG,CAAgB,EAC1C,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EACyC,EAAE,EAAE;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO,CACL,oBAAC,QAAQ,IACP,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleFlatList.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { FlatList } from "react-native";
 import type { FlatListProps } from "react-native";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A FlatList wrapper that takes a single `style` prop and internally extracts
@@ -11,11 +11,21 @@ const SimpleStyleFlatList = <T extends any>({
   style: styleProp,
   ...rest
 }: Omit<FlatListProps<T>, "contentContainerStyle">) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     <FlatList
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/SimpleStyleKeyboardAwareScrollView.js

@@ -1,13 +1,18 @@
 import React from "react";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A KeyboardAwareScrollView wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleKeyboardAwareScrollView = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
-    return (React.createElement(KeyboardAwareScrollView, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
+    return (React.createElement(KeyboardAwareScrollView, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleKeyboardAwareScrollView;
 //# sourceMappingURL=SimpleStyleKeyboardAwareScrollView.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleKeyboardAwareScrollView.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleKeyboardAwareScrollView.js","sourceRoot":"","sources":["SimpleStyleKeyboardAwareScrollView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,kCAAkC,GAEpC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpC,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO,CACL,oBAAC,uBAAuB,IACtB,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kCAAkC,CAAC"}
+{"version":3,"file":"SimpleStyleKeyboardAwareScrollView.js","sourceRoot":"","sources":["SimpleStyleKeyboardAwareScrollView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,kCAAkC,GAEpC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpC,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO,CACL,oBAAC,uBAAuB,IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kCAAkC,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleKeyboardAwareScrollView.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import type { KeyboardAwareScrollViewProps } from "react-native-keyboard-aware-scroll-view";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A KeyboardAwareScrollView wrapper that takes a single `style` prop and internally extracts
@@ -10,11 +10,21 @@ import splitContentContainerStyles from "./splitContentContainerStyles";
 const SimpleStyleKeyboardAwareScrollView: React.FC<
   Omit<KeyboardAwareScrollViewProps, "contentContainerStyle">
 > = ({ style: styleProp, ...rest }) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     <KeyboardAwareScrollView
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js

@@ -1,13 +1,18 @@
 import React from "react";
 import { MasonryFlashList } from "@shopify/flash-list";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A MasonryFlashList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleMasonryFlashList = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
-    return (React.createElement(MasonryFlashList, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
+    return (React.createElement(MasonryFlashList, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleMasonryFlashList;
 //# sourceMappingURL=SimpleStyleMasonryFlashList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleMasonryFlashList.js","sourceRoot":"","sources":["SimpleStyleMasonryFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAgB,EAClD,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EACiD,EAAE,EAAE;IAC5D,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO,CACL,oBAAC,gBAAgB,IACf,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqC,KACxD,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"SimpleStyleMasonryFlashList.js","sourceRoot":"","sources":["SimpleStyleMasonryFlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAgB,EAClD,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EACiD,EAAE,EAAE;IAC5D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO,CACL,oBAAC,gBAAgB,IACf,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqC,KACxD,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,2BAA2B,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleMasonryFlashList.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { MasonryFlashList } from "@shopify/flash-list";
 import type { MasonryFlashListProps, ContentStyle } from "@shopify/flash-list";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A MasonryFlashList wrapper that takes a single `style` prop and internally extracts
@@ -11,11 +11,21 @@ const SimpleStyleMasonryFlashList = <T extends any>({
   style: styleProp,
   ...rest
 }: Omit<MasonryFlashListProps<T>, "contentContainerStyle">) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     <MasonryFlashList
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle as ContentStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/SimpleStyleScrollView.js

@@ -1,13 +1,18 @@
 import React from "react";
 import { ScrollView } from "react-native";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A ScrollView wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleScrollView = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
-    return (React.createElement(ScrollView, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
+    return (React.createElement(ScrollView, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleScrollView;
 //# sourceMappingURL=SimpleStyleScrollView.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleScrollView.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleScrollView.js","sourceRoot":"","sources":["SimpleStyleScrollView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,qBAAqB,GAEvB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpC,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO,CACL,oBAAC,UAAU,IACT,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"SimpleStyleScrollView.js","sourceRoot":"","sources":["SimpleStyleScrollView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,qBAAqB,GAEvB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpC,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO,CACL,oBAAC,UAAU,IACT,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleScrollView.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { ScrollView } from "react-native";
 import type { ScrollViewProps } from "react-native";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A ScrollView wrapper that takes a single `style` prop and internally extracts
@@ -10,11 +10,21 @@ import splitContentContainerStyles from "./splitContentContainerStyles";
 const SimpleStyleScrollView: React.FC<
   Omit<ScrollViewProps, "contentContainerStyle">
 > = ({ style: styleProp, ...rest }) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     <ScrollView
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/SimpleStyleSectionList.js

@@ -1,15 +1,20 @@
 import React from "react";
 import { SectionList } from "../SectionList";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A SectionList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleSectionList = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
     return (
     //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
-    React.createElement(SectionList, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    React.createElement(SectionList, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleSectionList;
 //# sourceMappingURL=SimpleStyleSectionList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleSectionList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleSectionList.js","sourceRoot":"","sources":["SimpleStyleSectionList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,sBAAsB,GAAG,CAAmC,EAChE,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EAIR,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO;IACL,gHAAgH;IAChH,oBAAC,WAAW,IACV,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"SimpleStyleSectionList.js","sourceRoot":"","sources":["SimpleStyleSectionList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,sBAAsB,GAAG,CAAmC,EAChE,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EAIR,EAAE,EAAE;IACH,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO;IACL,gHAAgH;IAChH,oBAAC,WAAW,IACV,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleSectionList.tsx

@@ -4,7 +4,7 @@ import type {
   FlatListSectionListProps,
   FlashListSectionListProps,
 } from "../SectionList";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A SectionList wrapper that takes a single `style` prop and internally extracts
@@ -17,12 +17,22 @@ const SimpleStyleSectionList = <T extends { [key: string]: any }>({
   FlatListSectionListProps<T> | FlashListSectionListProps<T>,
   "contentContainerStyle"
 >) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
     <SectionList
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.js

@@ -1,15 +1,20 @@
 import React from "react";
 import { SwipeableList } from "../SwipeableItem";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 /**
  * A SwipeableList wrapper that takes a single `style` prop and internally extracts
  * the appropriate style keys into the `contentContainerStyle`
  */
 const SimpleStyleSwipeableList = ({ style: styleProp, ...rest }) => {
-    const { style, contentContainerStyle } = splitContentContainerStyles(styleProp);
+    const [measuredWidth, setMeasuredWidth] = React.useState();
+    const [measuredHeight, setMeasuredHeight] = React.useState();
+    const { style, contentContainerStyle } = useSplitContentContainerStyles(styleProp, measuredWidth, measuredHeight);
     return (
     //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
-    React.createElement(SwipeableList, { style: style, contentContainerStyle: contentContainerStyle, ...rest }));
+    React.createElement(SwipeableList, { onLayout: (event) => {
+            setMeasuredWidth(event.nativeEvent.layout.width);
+            setMeasuredHeight(event.nativeEvent.layout.height);
+        }, style: style, contentContainerStyle: contentContainerStyle, ...rest }));
 };
 export default SimpleStyleSwipeableList;
 //# sourceMappingURL=SimpleStyleSwipeableList.js.map

package/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleStyleSwipeableList.js","sourceRoot":"","sources":["SimpleStyleSwipeableList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAExE;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAmC,EAClE,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EAIR,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACpC,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAEzC,OAAO;IACL,gHAAgH;IAChH,oBAAC,aAAa,IACZ,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"SimpleStyleSwipeableList.js","sourceRoot":"","sources":["SimpleStyleSwipeableList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAE9E;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAmC,EAClE,KAAK,EAAE,SAAS,EAChB,GAAG,IAAI,EAIR,EAAE,EAAE;IACH,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IAErE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,8BAA8B,CACrE,SAAS,EACT,aAAa,EACb,cAAc,CACf,CAAC;IAEF,OAAO;IACL,gHAAgH;IAChH,oBAAC,aAAa,IACZ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EACZ,qBAAqB,EAAE,qBAAqB,KACxC,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}

package/src/components/SimpleStyleScrollables/SimpleStyleSwipeableList.tsx

@@ -4,7 +4,7 @@ import type {
   FlashListSwipeableListProps,
   FlatListSwipeableListProps,
 } from "../SwipeableItem";
-import splitContentContainerStyles from "./splitContentContainerStyles";
+import useSplitContentContainerStyles from "./useSplitContentContainerStyles";
 
 /**
  * A SwipeableList wrapper that takes a single `style` prop and internally extracts
@@ -17,12 +17,22 @@ const SimpleStyleSwipeableList = <T extends { [key: string]: any }>({
   FlashListSwipeableListProps<T> | FlatListSwipeableListProps<T>,
   "contentContainerStyle"
 >) => {
-  const { style, contentContainerStyle } =
-    splitContentContainerStyles(styleProp);
+  const [measuredWidth, setMeasuredWidth] = React.useState<number>();
+  const [measuredHeight, setMeasuredHeight] = React.useState<number>();
+
+  const { style, contentContainerStyle } = useSplitContentContainerStyles(
+    styleProp,
+    measuredWidth,
+    measuredHeight
+  );
 
   return (
     //@ts-ignore contentContainerStyle has different types for FlashList and FlatList implmentations and confuses TS
     <SwipeableList
+      onLayout={(event) => {
+        setMeasuredWidth(event.nativeEvent.layout.width);
+        setMeasuredHeight(event.nativeEvent.layout.height);
+      }}
       style={style}
       contentContainerStyle={contentContainerStyle}
       {...rest}

package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js

@@ -0,0 +1,43 @@
+import { StyleSheet } from "react-native";
+import { pick, omit } from "lodash";
+import { useDeepCompareMemo } from "../../utilities";
+export const contentContainerStyleNames = [
+    "padding",
+    "paddingBottom",
+    "paddingEnd",
+    "paddingHorizontal",
+    "paddingLeft",
+    "paddingRight",
+    "paddingStart",
+    "paddingTop",
+    "paddingVertical",
+    "justifyContent",
+    "alignItems",
+    "alignContent",
+    "flexDirection",
+    "flexWrap",
+];
+export default function useSplitContentContainerStyles(originalStyle, measuredWidth, measuredHeight) {
+    return useDeepCompareMemo(() => {
+        const flattenedStyle = StyleSheet.flatten(originalStyle);
+        let contentContainerStyle = pick(flattenedStyle, contentContainerStyleNames);
+        // contentContainerStyle should always at least fill the parent to ensure sizing changes reflects properly on component and children
+        if (measuredWidth) {
+            contentContainerStyle.minWidth = measuredWidth;
+        }
+        if (measuredHeight) {
+            contentContainerStyle.minHeight = measuredHeight;
+        }
+        let style = omit(flattenedStyle, contentContainerStyleNames);
+        // ScrollView's implementation defaults flexGrow to 1, which prevents the ability to set a static size or use a flex larger than 1
+        // See: https://github.com/facebook/react-native/issues/3422
+        if (style.flex === undefined) {
+            style = { flexGrow: 0, ...style };
+        }
+        else if (style.flexGrow === undefined) {
+            style = { flexGrow: style.flex, ...style };
+        }
+        return { style, contentContainerStyle };
+    }, [originalStyle, measuredWidth, measuredHeight]);
+}
+//# sourceMappingURL=useSplitContentContainerStyles.js.map

package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSplitContentContainerStyles.js","sourceRoot":"","sources":["useSplitContentContainerStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAOrD,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,SAAS;IACT,eAAe;IACf,YAAY;IACZ,mBAAmB;IACnB,aAAa;IACb,cAAc;IACd,cAAc;IACd,YAAY;IACZ,iBAAiB;IACjB,gBAAgB;IAChB,YAAY;IACZ,cAAc;IACd,eAAe;IACf,UAAU;CACX,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,8BAA8B,CACpD,aAAmC,EACnC,aAAsB,EACtB,cAAuB;IAEvB,OAAO,kBAAkB,CAAS,GAAG,EAAE;QACrC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEzD,IAAI,qBAAqB,GAAG,IAAI,CAC9B,cAAc,EACd,0BAA0B,CAC3B,CAAC;QAEF,oIAAoI;QACpI,IAAI,aAAa,EAAE;YACjB,qBAAqB,CAAC,QAAQ,GAAG,aAAa,CAAC;SAChD;QACD,IAAI,cAAc,EAAE;YAClB,qBAAqB,CAAC,SAAS,GAAG,cAAc,CAAC;SAClD;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;QAE7D,kIAAkI;QAClI,4DAA4D;QAC5D,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5B,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC;SACnC;aAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YACvC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;SAC5C;QAED,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC1C,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;AACrD,CAAC"}