react-native-ui-lib 8.1.8-snapshot.7635 → 8.1.8-snapshot.7643

package/src/components/loaderScreen/index.d.ts

@@ -3,7 +3,7 @@ import { LoaderScreenProps } from './types';
 export { LoaderScreenProps };
 declare const _default: React.ForwardRefExoticComponent<import("react-native").ActivityIndicatorProps & {
     loaderColor?: string | undefined;
-    customLoader?: string | number | React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
+    customLoader?: React.ReactChild | undefined;
     backgroundColor?: string | undefined;
     message?: string | undefined;
     messageStyle?: import("react-native").TextStyle | undefined;

package/src/components/loaderScreen/types.d.ts

@@ -8,7 +8,7 @@ export type LoaderScreenProps = ActivityIndicatorProps & {
     /**
      * Custom loader
      */
-    customLoader?: React.ReactElement<any> | number | string;
+    customLoader?: React.ReactChild;
     /**
      * Color of the loader background (only when passing 'overlay')
      */

package/src/components/maskedInput/index.d.ts

@@ -1,22 +1,5 @@
-import React, { type JSX } from 'react';
-import { TextInputProps, StyleProp, ViewStyle } from 'react-native';
-export interface MaskedInputProps extends Omit<TextInputProps, 'value'> {
-    /**
-     * Initial value to pass to masked input
-     */
-    initialValue?: string;
-    /**
-     * callback for rendering the custom input out of the value returns from the actual input
-     */
-    renderMaskedText?: (value?: string) => JSX.Element | undefined;
-    /**
-     * Custom formatter for the input value
-     */
-    formatter?: (value?: string) => string | undefined;
-    /**
-     * container style for the masked input container
-     */
-    containerStyle?: StyleProp<ViewStyle>;
-}
-declare const _default: React.ForwardRefExoticComponent<MaskedInputProps & React.RefAttributes<any>>;
+import React from 'react';
+import { MaskedInputProps } from './new';
+export { MaskedInputProps };
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/src/components/maskedInput/index.js

@@ -1,85 +1,23 @@
-import _isFunction from "lodash/isFunction";
-import _identity from "lodash/identity";
-import React, { useCallback, useEffect, useRef, useState, useImperativeHandle, forwardRef } from 'react';
-import { StyleSheet, Keyboard, TextInput } from 'react-native';
-import View from "../view";
-import Text from "../text";
-import TouchableOpacity from "../touchableOpacity";
-/**
- * @description: Mask Input to create custom looking inputs with custom formats
- * @gif: https://camo.githubusercontent.com/61eedb65e968845d5eac713dcd21a69691571fb1/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f4b5a5a7446666f486f454b334b2f67697068792e676966
- * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/MaskedInputScreen.tsx
- */
-function MaskedInput(props, ref) {
+import React, { forwardRef, useEffect } from 'react';
+// @ts-expect-error
+import MaskedInputOld from "./old";
+import MaskedInputNew, { MaskedInputProps } from "./new";
+import { LogService } from "../../services";
+function MaskedInputMigrator(props, refToForward) {
   const {
-    initialValue,
-    formatter = _identity,
-    containerStyle,
-    renderMaskedText,
-    onChangeText,
+    migrate,
     ...others
   } = props;
-  const [value, setValue] = useState(initialValue);
-  const inputRef = useRef(undefined);
-  const keyboardDidHideListener = useRef(undefined);
-  useImperativeHandle(ref, () => {
-    return {
-      isFocused: () => inputRef.current?.isFocused(),
-      focus,
-      blur: () => inputRef.current?.blur(),
-      clear: () => {
-        inputRef.current?.clear();
-        setValue('');
-        // NOTE: This fixes an RN issue - when triggering imperative clear method, it doesn't call onChangeText
-        onChangeText?.('');
-      }
-    };
-  });
   useEffect(() => {
-    if (initialValue !== value) {
-      setValue(initialValue);
+    if (!migrate) {
+      LogService.warn(`UILib MaskedInput implementation has been updated and now requires manual migration. To proceed, pass the "migrate" prop and check if the functionality works as expected.`);
     }
-  }, [initialValue]);
-  useEffect(() => {
-    keyboardDidHideListener.current = Keyboard.addListener('keyboardDidHide', () => {
-      if (inputRef.current?.isFocused()) {
-        inputRef.current?.blur();
-      }
-    });
-    return () => keyboardDidHideListener.current.remove();
-  }, []);
-  const _onChangeText = useCallback(value => {
-    const formattedValue = formatter(value) ?? '';
-    setValue(formattedValue);
-    onChangeText?.(formattedValue);
-  }, [onChangeText, formatter]);
-  const focus = useCallback(() => {
-    inputRef.current?.focus();
   }, []);
-  const _renderMaskedText = () => {
-    if (_isFunction(renderMaskedText)) {
-      return renderMaskedText(value);
-    }
-    return <Text>{value}</Text>;
-  };
-  return <TouchableOpacity style={containerStyle} activeOpacity={1} onPress={focus}>
-      <TextInput {...others} value={value}
-    // @ts-expect-error
-    ref={inputRef} style={styles.hiddenInput} enableErrors={false} hideUnderline placeholder="" caretHidden multiline={false} onChangeText={_onChangeText} />
-      <View style={styles.maskedInputWrapper}>{_renderMaskedText()}</View>
-    </TouchableOpacity>;
-}
-const styles = StyleSheet.create({
-  hiddenInput: {
-    ...StyleSheet.absoluteFillObject,
-    zIndex: 1,
-    color: 'transparent',
-    backgroundColor: 'transparent',
-    height: undefined
-  },
-  maskedInputWrapper: {
-    zIndex: 0
+  if (migrate) {
+    return <MaskedInputNew {...others} ref={refToForward} />;
+  } else {
+    return <MaskedInputOld {...others} ref={refToForward} />;
   }
-});
-MaskedInput.displayName = 'MaskedInput';
-export default forwardRef(MaskedInput);
+}
+export { MaskedInputProps };
+export default forwardRef(MaskedInputMigrator);

package/src/components/maskedInput/maskedInput.api.json

@@ -44,6 +44,7 @@
     "  return (",
     "    <div>",
     "      <MaskedInput",
+    "        migrate",
     "        renderMaskedText={renderTimeText}",
     "        formatter={formatter}",
     "        keyboardType={'numeric'}",

package/src/components/maskedInput/new.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+import { TextInputProps, StyleProp, ViewStyle } from 'react-native';
+export interface MaskedInputProps extends Omit<TextInputProps, 'value'> {
+    /**
+     * Initial value to pass to masked input
+     */
+    initialValue?: string;
+    /**
+     * callback for rendering the custom input out of the value returns from the actual input
+     */
+    renderMaskedText?: (value?: string) => JSX.Element | undefined;
+    /**
+     * Custom formatter for the input value
+     */
+    formatter?: (value?: string) => string | undefined;
+    /**
+     * container style for the masked input container
+     */
+    containerStyle?: StyleProp<ViewStyle>;
+}
+declare const _default: React.ForwardRefExoticComponent<MaskedInputProps & React.RefAttributes<any>>;
+export default _default;

package/src/components/maskedInput/new.js

@@ -0,0 +1,85 @@
+import _isFunction from "lodash/isFunction";
+import _identity from "lodash/identity";
+import React, { useCallback, useEffect, useRef, useState, useImperativeHandle, forwardRef } from 'react';
+import { StyleSheet, Keyboard, TextInput } from 'react-native';
+import View from "../view";
+import Text from "../text";
+import TouchableOpacity from "../touchableOpacity";
+/**
+ * @description: Mask Input to create custom looking inputs with custom formats
+ * @gif: https://camo.githubusercontent.com/61eedb65e968845d5eac713dcd21a69691571fb1/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f4b5a5a7446666f486f454b334b2f67697068792e676966
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/MaskedInputScreen.tsx
+ */
+function MaskedInput(props, ref) {
+  const {
+    initialValue,
+    formatter = _identity,
+    containerStyle,
+    renderMaskedText,
+    onChangeText,
+    ...others
+  } = props;
+  const [value, setValue] = useState(initialValue);
+  const inputRef = useRef();
+  const keyboardDidHideListener = useRef();
+  useImperativeHandle(ref, () => {
+    return {
+      isFocused: () => inputRef.current?.isFocused(),
+      focus,
+      blur: () => inputRef.current?.blur(),
+      clear: () => {
+        inputRef.current?.clear();
+        setValue('');
+        // NOTE: This fixes an RN issue - when triggering imperative clear method, it doesn't call onChangeText
+        onChangeText?.('');
+      }
+    };
+  });
+  useEffect(() => {
+    if (initialValue !== value) {
+      setValue(initialValue);
+    }
+  }, [initialValue]);
+  useEffect(() => {
+    keyboardDidHideListener.current = Keyboard.addListener('keyboardDidHide', () => {
+      if (inputRef.current?.isFocused()) {
+        inputRef.current?.blur();
+      }
+    });
+    return () => keyboardDidHideListener.current.remove();
+  }, []);
+  const _onChangeText = useCallback(value => {
+    const formattedValue = formatter(value) ?? '';
+    setValue(formattedValue);
+    onChangeText?.(formattedValue);
+  }, [onChangeText, formatter]);
+  const focus = useCallback(() => {
+    inputRef.current?.focus();
+  }, []);
+  const _renderMaskedText = () => {
+    if (_isFunction(renderMaskedText)) {
+      return renderMaskedText(value);
+    }
+    return <Text>{value}</Text>;
+  };
+  return <TouchableOpacity style={containerStyle} activeOpacity={1} onPress={focus}>
+      <TextInput {...others} value={value}
+    // @ts-expect-error
+    ref={inputRef} style={styles.hiddenInput} enableErrors={false} hideUnderline placeholder="" caretHidden multiline={false} onChangeText={_onChangeText} />
+      <View style={styles.maskedInputWrapper}>{_renderMaskedText()}</View>
+    </TouchableOpacity>;
+}
+const styles = StyleSheet.create({
+  hiddenInput: {
+    ...StyleSheet.absoluteFillObject,
+    zIndex: 1,
+    color: 'transparent',
+    backgroundColor: 'transparent',
+    height: undefined
+  },
+  maskedInputWrapper: {
+    zIndex: 0
+  }
+});
+MaskedInput.displayName = 'MaskedInput';
+export default forwardRef(MaskedInput);

package/src/components/maskedInput/old.js

@@ -0,0 +1,95 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React from 'react';
+import {StyleSheet, Keyboard} from 'react-native';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
+import BaseInput from '../baseInput';
+import TextField from '../textFieldOld';
+import View from '../view';
+import Text from '../text';
+import TouchableOpacity from '../touchableOpacity';
+
+/**
+ * @description: Mask Input to create custom looking inputs with custom formats
+ * @gif: https://camo.githubusercontent.com/61eedb65e968845d5eac713dcd21a69691571fb1/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f4b5a5a7446666f486f454b334b2f67697068792e676966
+ * @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/MaskedInputScreen.tsx
+ */
+export default class MaskedInput extends BaseInput {
+  static displayName = 'MaskedInput';
+  static propTypes = {
+    ...TextField.propTypes,
+    /**
+     * callback for rendering the custom input out of the value returns from the actual input
+     */
+    renderMaskedText: PropTypes.elementType.isRequired,
+    /**
+     * container style for the masked input container
+     */
+    containerStyle: ViewPropTypes.style
+  };
+
+  componentDidMount() {
+    this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
+      if (_.invoke(this, 'isFocused')) {
+        _.invoke(this, 'blur');
+      }
+    });
+  }
+
+  componentWillUnmount() {
+    this.keyboardDidHideListener.remove();
+  }
+
+  clear() {
+    this.setState({value: ''});
+    this.input.clear();
+  }
+
+  renderMaskedText() {
+    const {renderMaskedText} = this.props;
+    const {value} = this.state;
+
+    if (_.isFunction(renderMaskedText)) {
+      return renderMaskedText(value);
+    }
+    return <Text>{value}</Text>;
+  }
+
+  render() {
+    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+    const {containerStyle, style} = this.props;
+
+    return (
+      <TouchableOpacity style={containerStyle} activeOpacity={1} onPress={() => this.input.focus()}>
+        <TextField
+          ref={r => (this.input = r)}
+          containerStyle={styles.hiddenInputContainer}
+          style={styles.hiddenInput}
+          enableErrors={false}
+          hideUnderline
+          placeholder=""
+          {...this.props}
+          caretHidden
+          multiline={false}
+          onChangeText={this.onChangeText}
+        />
+        <View style={styles.maskedInputWrapper}>{this.renderMaskedText()}</View>
+      </TouchableOpacity>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  hiddenInputContainer: {
+    ...StyleSheet.absoluteFillObject,
+    zIndex: 1
+  },
+  hiddenInput: {
+    color: 'transparent',
+    backgroundColor: 'transparent',
+    height: undefined
+  },
+  maskedInputWrapper: {
+    zIndex: 0
+  }
+});

package/src/components/modal/index.d.ts

@@ -1,4 +1,4 @@
-import React, { Component, type JSX } from 'react';
+import React, { Component } from 'react';
 import { ModalProps as RNModalProps, GestureResponderEvent, KeyboardAvoidingViewProps } from 'react-native';
 import TopBar, { ModalTopBarProps } from './TopBar';
 export { ModalTopBarProps };
@@ -57,8 +57,8 @@ declare class Modal extends Component<ModalProps> {
     static displayName: string;
     static TopBar: typeof TopBar;
     constructor(props: ModalProps);
-    renderTouchableOverlay(): JSX.Element | undefined;
-    render(): JSX.Element;
+    renderTouchableOverlay(): React.JSX.Element | undefined;
+    render(): React.JSX.Element;
 }
 declare const _default: React.ForwardRefExoticComponent<ModalProps & React.RefAttributes<any>> & typeof Modal;
 export default _default;

package/src/components/numberInput/index.js

@@ -3,7 +3,7 @@ import React, { useMemo, useCallback, useState, useRef } from 'react';
 import { StyleSheet } from 'react-native';
 import { useDidUpdate, useThemeProps } from "../../hooks";
 import { Colors } from "../../style";
-import MaskedInput from "../maskedInput";
+import MaskedInput from "../maskedInput/new";
 import TextField from "../textField";
 import View from "../view";
 import Text from "../text";
@@ -29,7 +29,7 @@ function NumberInput(props, ref) {
   const [options, setOptions] = useState(generateOptions(locale, fractionDigits));
   const initialNumber = getInitialNumber(propsInitialNumber, options);
   const [data, setData] = useState(parseInput(`${initialNumber}`, options, propsInitialNumber));
-  const textField = useRef(undefined);
+  const textField = useRef();
   const [isFocused, setIsFocused] = useState(textFieldProps?.autoFocus ?? false);
   useDidUpdate(() => {
     setOptions(generateOptions(locale, fractionDigits));

package/src/components/overlay/index.d.ts

@@ -28,7 +28,7 @@ export type OverlayTypes = Pick<ImageProps, 'borderRadius'> & {
     /**
      * Custom overlay content to be rendered on top of the image
      */
-    customContent?: React.ReactElement<any> | React.ReactElement<any>[];
+    customContent?: React.ReactElement | React.ReactElement[];
 };
 /**
  * @description: Overlay view with types (default, top, bottom, solid)

package/src/components/picker/PickerDialog.android.js

@@ -1,5 +1,7 @@
 import React, {Component} from 'react';
 import {StyleSheet} from 'react-native';
+import {TextPropTypes} from 'deprecated-react-native-prop-types';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 
 import Dialog from '../dialog';
@@ -9,6 +11,19 @@ import {Colors, BorderRadiuses} from '../../style';
 
 class PickerDialog extends Component {
   static displayName = 'PickerDialog';
+  static propTypes = {
+    onDone: PropTypes.func,
+    onCancel: PropTypes.func,
+    children: PropTypes.array,
+    /**
+     * select label style
+     */
+    selectLabelStyle: TextPropTypes.style,
+    /**
+     * cancel label style
+     */
+    cancelLabelStyle: TextPropTypes.style
+  };
 
   state = {};
 

package/src/components/picker/PickerDialog.js

@@ -1,5 +1,6 @@
 import React, {Component} from 'react';
 import {StyleSheet} from 'react-native';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 
 import Dialog from '../dialog';
@@ -9,6 +10,12 @@ import {Colors} from '../../style';
 
 class PickerDialog extends Component {
   static displayName = 'PickerDialog';
+  static propTypes = {
+    onDone: PropTypes.func,
+    onCancel: PropTypes.func,
+    topBarProps: PropTypes.object,
+    children: PropTypes.array
+  };
 
   state = {};
 

package/src/components/picker/helpers/useImperativePickerHandle.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ExpandableOverlayMethods } from '../../../incubator/expandableOverlay';
 import { TextFieldMethods } from '../../textField';
-declare const useImperativePickerHandle: (ref: React.Ref<any>, expandableRef: React.MutableRefObject<ExpandableOverlayMethods | null>) => React.RefObject<TextFieldMethods | undefined>;
+declare const useImperativePickerHandle: (ref: React.Ref<any>, expandableRef: React.MutableRefObject<ExpandableOverlayMethods | null>) => React.MutableRefObject<TextFieldMethods | undefined>;
 export default useImperativePickerHandle;

package/src/components/picker/helpers/useImperativePickerHandle.js

@@ -1,6 +1,6 @@
 import { useImperativeHandle, useRef } from 'react';
 const useImperativePickerHandle = (ref, expandableRef) => {
-  const pickerRef = useRef(undefined);
+  const pickerRef = useRef();
   useImperativeHandle(ref, () => {
     const {
       isFocused,

package/src/components/picker/types.d.ts

@@ -1,4 +1,4 @@
-import { PropsWithChildren, ReactNode, type JSX } from 'react';
+import { PropsWithChildren, ReactNode } from 'react';
 import { FlatListProps, StyleProp, ViewStyle, TextStyle } from 'react-native';
 import { ExpandableOverlayProps, ExpandableOverlayMethods } from '../../incubator/expandableOverlay';
 import { ModalTopBarProps } from '../modal/TopBar';
@@ -19,7 +19,7 @@ export type PickerSingleValue = string | number;
 export type PickerMultiValue = PickerSingleValue[];
 export type PickerValue = PickerSingleValue | PickerMultiValue | undefined;
 type PickerFilteredItems = ReactNode | Pick<PickerItemProps, 'label' | 'value' | 'disabled'>[] | undefined;
-type RenderPickerOverloads<ValueType> = ValueType extends PickerValue ? (value?: ValueType, label?: string) => React.ReactElement<any> : never;
+type RenderPickerOverloads<ValueType> = ValueType extends PickerValue ? (value?: ValueType, label?: string) => React.ReactElement : never;
 type RenderPicker = RenderPickerOverloads<PickerValue>;
 export type RenderCustomModalProps = {
     visible: boolean;
@@ -55,7 +55,7 @@ type PickerPropsDeprecation = {
     renderCustomDialogHeader?: (callbacks: {
         onDone?: () => void;
         onCancel?: () => void;
-    }) => React.ReactElement<any>;
+    }) => React.ReactElement;
     /**
      * @deprecated
      * Render custom picker input (the value will be passed)
@@ -69,7 +69,7 @@ type PickerPropsDeprecation = {
      * Render custom picker overlay (e.g ({visible, children, toggleModal}) => {...})
      * instead use renderOverlay
      */
-    renderCustomModal?: (modalProps: RenderCustomModalProps) => React.ReactElement<any>;
+    renderCustomModal?: (modalProps: RenderCustomModalProps) => React.ReactElement;
     /**
      * @deprecated
      * Pass props to the picker modal
@@ -97,7 +97,7 @@ type PickerSearchProps = {
     /**
      * Render custom search input (only when passing showSearch)
      */
-    renderCustomSearch?: (props: PickerItemsListProps) => React.ReactElement<any>;
+    renderCustomSearch?: (props: PickerItemsListProps) => React.ReactElement;
 };
 type PickerListProps = PickerSearchProps & {
     /**
@@ -106,7 +106,7 @@ type PickerListProps = PickerSearchProps & {
     renderHeader?: (callbacks: {
         onDone?: () => void;
         onCancel?: () => void;
-    }) => React.ReactElement<any>;
+    }) => React.ReactElement;
     /**
      * Pass props to the list component that wraps the picker items (allows to control FlatList behavior)
      */
@@ -128,7 +128,7 @@ type PickerExpandableOverlayProps = {
     /**
      * Render custom picker overlay (e.g ({visible, children, toggleModal}) => {...})
      */
-    renderOverlay?: (modalProps: RenderCustomModalProps) => React.ReactElement<any>;
+    renderOverlay?: (modalProps: RenderCustomModalProps) => React.ReactElement;
     /**
      * Add blur effect to picker modal (iOS only)
      */
@@ -213,11 +213,11 @@ export type PickerBaseProps = Omit<TextFieldProps, 'value' | 'onChange'> & Picke
     renderItem?: (value: PickerValue, itemProps: PickerItemProps & {
         isSelected: boolean;
         isItemDisabled: boolean;
-    }, label?: string) => React.ReactElement<any>;
+    }, label?: string) => React.ReactElement;
     /**
      * Render custom top element
      */
-    renderCustomTopElement?: (value?: PickerValue) => React.ReactElement<any>;
+    renderCustomTopElement?: (value?: PickerValue) => React.ReactElement;
     /**
      * Selection status bar props
      */

package/src/components/progressBar/index.d.ts

@@ -1,4 +1,4 @@
-import React, { PureComponent, type JSX } from 'react';
+import React, { PureComponent } from 'react';
 import { Animated, StyleProp, ViewStyle, LayoutChangeEvent } from 'react-native';
 /**
  * @description: Progress bar
@@ -15,8 +15,17 @@ interface Props {
     fullWidth?: boolean;
     /**
      * Override container style
+     * @deprecated Use containerStyle instead
      */
     style?: StyleProp<ViewStyle>;
+    /**
+     * Override container style
+     */
+    containerStyle?: StyleProp<ViewStyle>;
+    /**
+     * Override progress style
+     */
+    progressStyle?: StyleProp<ViewStyle>;
     /**
      * Progress color
      */
@@ -58,7 +67,7 @@ declare class ProgressBar extends PureComponent<Props, State> {
         borderTopRightRadius: number;
     };
     renderCustomElement(): React.FunctionComponentElement<any> | undefined;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export { ProgressBar };
 declare const _default: React.ForwardRefExoticComponent<Props & React.RefAttributes<any>> & typeof ProgressBar;

package/src/components/progressBar/index.js

@@ -105,7 +105,9 @@ class ProgressBar extends PureComponent {
   render() {
     const {
       style,
-      testID
+      containerStyle,
+      testID,
+      progressStyle
     } = this.props;
     const {
       containerWidth = 0
@@ -115,12 +117,13 @@ class ProgressBar extends PureComponent {
       inputRange: [0, 100],
       outputRange
     });
-    return <View onLayout={this.getContainerWidth} style={[styles.container, this.getContainerStyle(), style]} {...this.getAccessibilityProps()} testID={testID}>
-        {!!containerWidth && <Animated.View style={[styles.progress, this.getProgressStyle(), {
-        transform: [{
-          translateX: newProgress
-        }]
-      }]}>
+    const animatedStyle = {
+      transform: [{
+        translateX: newProgress
+      }]
+    };
+    return <View onLayout={this.getContainerWidth} style={[styles.container, this.getContainerStyle(), style, containerStyle]} {...this.getAccessibilityProps()} testID={testID}>
+        {!!containerWidth && <Animated.View style={[styles.progress, this.getProgressStyle(), progressStyle, animatedStyle]}>
             {this.renderCustomElement()}
           </Animated.View>}
       </View>;

package/src/components/progressBar/progressBar.api.json

@@ -16,10 +16,15 @@
       "description": "FullWidth Ui preset"
     },
     {
-      "name": "style",
+      "name": "containerStyle",
       "type": "ViewStyle",
       "description": "Override container style"
     },
+    {
+      "name": "progressStyle",
+      "type": "ViewStyle",
+      "description": "Override progress style"
+    },
     {
       "name": "progressColor",
       "type": "string",

package/src/components/scrollBar/index.d.ts

@@ -1,19 +1,12 @@
 import React, { Component } from 'react';
-import { Animated, FlatListProps, ScrollViewProps, ImageSourcePropType, NativeSyntheticEvent, NativeScrollEvent, LayoutChangeEvent } from 'react-native';
+import { Animated, FlatListProps, ImageSourcePropType, NativeSyntheticEvent, NativeScrollEvent, LayoutChangeEvent } from 'react-native';
 import { ForwardRefInjectedProps } from '../../commons/new';
 import { ComponentStatics } from '../../typings/common';
-export type ListProps = (FlatListProps<any> & {
+export interface ScrollBarProps extends FlatListProps<any> {
     /**
      * Whether to use a FlatList. NOTE: you must pass 'data' and 'renderItem' props as well
      */
-    useList: true;
-}) | (ScrollViewProps & {
-    /**
-     * Whether to use a ScrollView. NOTE: you must pass 'contentContainerStyle' prop as well
-     */
-    useList?: false;
-});
-export type ScrollBarProps = ListProps & {
+    useList?: boolean;
     /**
      * The element to use as a container, instead of a View
      */
@@ -51,7 +44,7 @@ export type ScrollBarProps = ListProps & {
      * The index to currently focus on
      */
     focusIndex?: number;
-};
+}
 type Props = ScrollBarProps & ForwardRefInjectedProps;
 type State = {
     gradientOpacity: Animated.Value;