bootstrap-rn 0.4.3 → 0.4.5

package/src/components/forms/internals/PickerWeb.tsx

@@ -1,78 +1,85 @@
-import React, { useMemo, forwardRef } from 'react';
-import {
-  // @ts-expect-error web only import
-  Picker as BasePicker,
-  StyleSheet as StyleUtils,
-  TextStyle,
-} from 'react-native';
-import useBackground from '../../../hooks/useBackground';
-import PickerWebContext from './PickerWebContext';
-import type { PickerProps } from '../Picker';
-import type { PressableRef } from '../../Pressable';
-
-interface PickerWebProps extends PickerProps {
-  style: TextStyle[];
-}
-
-const PLACEHOLDER = '__PLACEHOLDER__';
-
-const getOptionStyle = (style: TextStyle[], showPlaceholder: boolean) => {
-  if (!showPlaceholder) {
-    return null;
-  }
-
-  const flattenedStyle = StyleUtils.flatten(style);
-
-  return flattenedStyle.color || null;
-};
-
-const PickerWeb = forwardRef<PressableRef, PickerWebProps>((props, ref) => {
-  const {
-    children,
-    selectedValue,
-    onValueChange = () => {},
-    onFocus = () => {},
-    onBlur = () => {},
-    placeholder,
-    placeholderTextColor,
-    disabled,
-    style,
-    ...elementProps
-  } = props;
-
-  const background = useBackground(style);
-
-  const showPlaceholder = selectedValue === undefined || selectedValue === null;
-
-  const contextValue = useMemo(
-    () => ({
-      optionColor: getOptionStyle(background.style, showPlaceholder),
-    }),
-    [background, showPlaceholder],
-  );
-
-  return (
-    <BasePicker
-      {...elementProps}
-      ref={ref}
-      selectedValue={showPlaceholder ? PLACEHOLDER : selectedValue}
-      onValueChange={onValueChange}
-      onFocus={onFocus}
-      onBlur={onBlur}
-      disabled={disabled}
-      style={[
-        background.style,
-        showPlaceholder && { color: placeholderTextColor },
-      ]}
-    >
-      <option value={PLACEHOLDER} disabled hidden>
-        {placeholder}
-      </option>
-      <PickerWebContext.Provider value={contextValue}>
-        {children}
-      </PickerWebContext.Provider>
-    </BasePicker>
-  );
-});
-
-export default PickerWeb;
+import React, { useMemo, forwardRef } from 'react';
+import {
+  // @ts-expect-error web only import
+  Picker as BasePicker,
+  StyleSheet as StyleUtils,
+  TextStyle,
+} from 'react-native';
+import useBackground from '../../../hooks/useBackground';
+import PickerWebContext from './PickerWebContext';
+import type { PickerProps } from '../Picker';
+import type { PressableRef } from '../../Pressable';
+
+interface PickerWebProps extends PickerProps {
+  style: TextStyle[];
+}
+
+const PLACEHOLDER = '__PLACEHOLDER__';
+
+const getOptionStyle = (
+  style: ReturnType<typeof useBackground>['style'],
+  showPlaceholder: boolean,
+) => {
+  if (!showPlaceholder) {
+    return null;
+  }
+
+  const flattenedStyle = StyleUtils.flatten(style);
+
+  if ('color' in flattenedStyle && flattenedStyle.color !== undefined) {
+    return flattenedStyle.color;
+  }
+
+  return null;
+};
+
+const PickerWeb = forwardRef<PressableRef, PickerWebProps>((props, ref) => {
+  const {
+    children,
+    selectedValue,
+    onValueChange = () => {},
+    onFocus = () => {},
+    onBlur = () => {},
+    placeholder,
+    placeholderTextColor,
+    disabled,
+    style,
+    ...elementProps
+  } = props;
+
+  const background = useBackground(style);
+
+  const showPlaceholder = selectedValue === undefined || selectedValue === null;
+
+  const contextValue = useMemo(
+    () => ({
+      optionColor: getOptionStyle(background.style, showPlaceholder),
+    }),
+    [background, showPlaceholder],
+  );
+
+  return (
+    <BasePicker
+      {...elementProps}
+      ref={ref}
+      selectedValue={showPlaceholder ? PLACEHOLDER : selectedValue}
+      onValueChange={onValueChange}
+      onFocus={onFocus}
+      onBlur={onBlur}
+      disabled={disabled}
+      style={[
+        background.style,
+        showPlaceholder && { color: placeholderTextColor },
+      ]}
+    >
+      <option value={PLACEHOLDER} disabled hidden>
+        {placeholder}
+      </option>
+      <PickerWebContext.Provider value={contextValue}>
+        {children}
+      </PickerWebContext.Provider>
+    </BasePicker>
+  );
+});
+
+export default PickerWeb;

package/src/components/helpers/Overlay.tsx

@@ -61,17 +61,7 @@ function Overlay({
     }
   }
 
-  // Adjust top value by status bar height on Android
-  if (Platform.OS === 'android' && StatusBar.currentHeight) {
-    if (typeof overlay.overlayProps.style.top === 'number') {
-      overlay.overlayProps.style.top -= StatusBar.currentHeight;
-    }
-    if (typeof overlay.arrowProps.style.top === 'number') {
-      overlay.arrowProps.style.top -= StatusBar.currentHeight;
-    }
-  }
-
-  // Workaround for different calculation of height in Android 15
+  // Android 15 (edge-to-edge support) adjustments
   // https://github.com/facebook/react-native/issues/47080
   if (
     Platform.OS === 'android' &&
@@ -79,8 +69,7 @@ function Overlay({
     StatusBar.currentHeight
   ) {
     if (typeof overlay.overlayProps.style.bottom === 'number') {
-      // Assuming height of bottom bar is 22
-      overlay.overlayProps.style.bottom -= StatusBar.currentHeight + 22;
+      overlay.overlayProps.style.bottom -= StatusBar.currentHeight;
     }
   }