bootstrap-rn 0.3.6 → 0.4.1

package/src/components/helpers/Overlay.tsx

@@ -1,79 +1,92 @@
-import React, { useRef, ReactNode } from 'react';
-import { Platform, StatusBar, ViewStyle } from 'react-native';
-import { useOverlayPosition } from '@react-native-aria/overlays';
-import type { ViewRef } from '../View';
-import type { Placement, PlacementAxis } from '../../types';
-
-type OverlayReturnType = {
-  placement: PlacementAxis;
-  rendered?: boolean;
-  overlayProps: {
-    style: ViewStyle;
-  };
-  arrowProps: {
-    style: ViewStyle;
-  };
-};
-
-interface OverlayProps {
-  children: (
-    overlay: OverlayReturnType,
-    overlayRef: React.RefObject<ViewRef>,
-  ) => ReactNode;
-  placement: Placement;
-  targetRef: React.RefObject<ViewRef>;
-  offset?: number;
-  arrowOffset?: number;
-  visible: boolean;
-}
-
-const Overlay = ({
-  children,
-  targetRef,
-  placement,
-  offset,
-  arrowOffset = 0,
-  visible,
-}: OverlayProps) => {
-  const overlayRef = useRef(null);
-
-  const overlay = useOverlayPosition({
-    placement,
-    targetRef,
-    overlayRef,
-    offset,
-    isOpen: visible,
-  });
-
-  // Remove unnecessary arrow styles and adjust arrow offset.
-  if (placement === 'top' || placement === 'bottom') {
-    // @ts-expect-error workaround for correct positioning
-    delete overlay.arrowProps.style.top;
-    if (typeof overlay.arrowProps.style.left === 'number') {
-      overlay.arrowProps.style.left -= arrowOffset;
-    }
-  }
-  if (placement === 'left' || placement === 'right') {
-    // @ts-expect-error workaround for correct positioning
-    delete overlay.arrowProps.style.left;
-    if (typeof overlay.arrowProps.style.top === 'number') {
-      overlay.arrowProps.style.top -= arrowOffset;
-    }
-  }
-
-  // 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;
-    }
-  }
-
-  return children(overlay, overlayRef);
-};
-
-Overlay.displayName = 'Overlay';
-
-export default Overlay;
+import React, { useRef, ReactNode } from 'react';
+import { Platform, StatusBar, ViewStyle } from 'react-native';
+import { useOverlayPosition } from '@react-native-aria/overlays';
+import type { ViewRef } from '../View';
+import type { Placement, PlacementAxis } from '../../types';
+
+type OverlayReturnType = {
+  placement: PlacementAxis;
+  rendered?: boolean;
+  overlayProps: {
+    style: ViewStyle;
+  };
+  arrowProps: {
+    style: ViewStyle;
+  };
+};
+
+interface OverlayProps {
+  children: (
+    overlay: OverlayReturnType,
+    overlayRef: React.RefObject<ViewRef | null>,
+  ) => ReactNode;
+  placement: Placement;
+  targetRef: React.RefObject<ViewRef | null>;
+  offset?: number;
+  arrowOffset?: number;
+  visible: boolean;
+}
+
+function Overlay({
+  children,
+  targetRef,
+  placement,
+  offset,
+  arrowOffset = 0,
+  visible,
+}: OverlayProps) {
+  const overlayRef = useRef(null);
+
+  const overlay = useOverlayPosition({
+    placement,
+    targetRef,
+    overlayRef,
+    offset,
+    isOpen: visible,
+  });
+
+  // Remove unnecessary arrow styles and adjust arrow offset.
+  if (placement === 'top' || placement === 'bottom') {
+    // @ts-expect-error workaround for correct positioning
+    delete overlay.arrowProps.style.top;
+    if (typeof overlay.arrowProps.style.left === 'number') {
+      overlay.arrowProps.style.left -= arrowOffset;
+    }
+  }
+  if (placement === 'left' || placement === 'right') {
+    // @ts-expect-error workaround for correct positioning
+    delete overlay.arrowProps.style.left;
+    if (typeof overlay.arrowProps.style.top === 'number') {
+      overlay.arrowProps.style.top -= arrowOffset;
+    }
+  }
+
+  // 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
+  // https://github.com/facebook/react-native/issues/47080
+  if (
+    Platform.OS === 'android' &&
+    Platform.constants.Version >= 35 &&
+    StatusBar.currentHeight
+  ) {
+    if (typeof overlay.overlayProps.style.bottom === 'number') {
+      // Assuming height of bottom bar is 22
+      overlay.overlayProps.style.bottom -= StatusBar.currentHeight + 22;
+    }
+  }
+
+  return children(overlay, overlayRef);
+}
+
+Overlay.displayName = 'Overlay';
+
+export default Overlay;

package/src/components/modal/Modal.tsx

@@ -1,234 +1,234 @@
-import React, { useRef } from 'react';
-import { Modal as BaseModal, SafeAreaView } from 'react-native';
-import { OverlayProvider } from '@react-native-aria/overlays';
-import StyleSheet from '../../style/StyleSheet';
-import { getStyles } from '../../utils';
-import css from '../../style/css';
-import ScrollView, { ScrollViewRef, ScrollViewProps } from '../ScrollView';
-import View, { ViewRef } from '../View';
-import BackdropHandler from '../helpers/BackdropHandler';
-import useModal from './useModal';
-import ModalContext from './ModalContext';
-import ModalHeader from './ModalHeader';
-import ModalTitle from './ModalTitle';
-import ModalBody from './ModalBody';
-import ModalFooter from './ModalFooter';
-import { ExtendedTextStyle, ExtendedViewStyle, StyleProp } from '../../types';
-
-export interface ModalProps extends ScrollViewProps {
-  visible: boolean;
-  size?: 'sm' | 'lg' | 'xl';
-  backdrop?: boolean | 'static';
-  scrollable?: boolean;
-  centered?: boolean;
-  onToggle: () => void;
-  dialogStyle?: StyleProp<ExtendedViewStyle>;
-  contentStyle?: StyleProp<ExtendedViewStyle>;
-  dialogTextStyle?: StyleProp<ExtendedTextStyle>;
-  contentTextStyle?: StyleProp<ExtendedTextStyle>;
-}
-
-type JustifyContentValue =
-  | 'flex-start'
-  | 'flex-end'
-  | 'center'
-  | 'space-between'
-  | 'space-around'
-  | 'space-evenly';
-
-const styles = StyleSheet.create({
-  '.modal': css`
-    position: absolute; // fixed;
-    top: 0;
-    left: 0;
-    z-index: $zindex-modal;
-    // display: none;
-    width: 100%;
-    height: 100%;
-    // overflow-x: hidden;
-    // overflow-y: auto;
-    // Prevent Chrome on Windows from adding a focus outline. For details, see
-    // https://github.com/twbs/bootstrap/pull/10951.
-    @include platform(web) {
-      outline-width: 0; // outline: 0;
-    }
-    // We deliberately don't use "-webkit-overflow-scrolling: touch;" due to a
-    // gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342
-    // See also https://github.com/twbs/bootstrap/issues/17695
-  `,
-  '.modal-dialog': css`
-    position: relative;
-    width: auto;
-    margin: $modal-dialog-margin;
-    // allow clicks to pass through for custom click handling to close modal
-    pointer-events: auto; // pointer-events: none;
-
-    @include media-breakpoint-up(sm) {
-      width: 100%; // added for bootstrap-rn
-      max-width: $modal-md;
-      margin: $modal-dialog-margin-y-sm-up auto;
-    }
-  `,
-  '.modal-dialog-scrollable': css`
-    flex-shrink: 1; // added for bootstrap-rn
-    // height: calc(100% - var(--#{$prefix}modal-margin) * 2);
-  `,
-  '.modal-dialog-scrollable .modal-content': css`
-    max-height: 100%;
-    overflow: hidden;
-  `,
-  '.modal-dialog-centered': css`
-    display: flex;
-    // align-items: center;
-    // min-height: calc(100% - var(--#{$prefix}modal-margin) * 2);
-  `,
-  '.modal-content': css`
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    width: 100%; // Ensure ".modal-content" extends the full width of the parent ".modal-dialog"
-    // counteract the pointer-events: none; in the .modal-dialog
-    pointer-events: auto;
-    background-color: $modal-content-bg;
-    // background-clip: padding-box;
-    border: $modal-content-border-width solid $modal-content-border-color;
-    border-radius: $modal-content-border-radius;
-    // @include box-shadow($modal-content-box-shadow-xs);
-    // Remove focus outline from opened modal
-    // outline: 0;
-
-    @include media-breakpoint-up(sm) {
-      // @include box-shadow($modal-content-box-shadow-sm-up);
-    }
-  `,
-  '.modal-content --text': css`
-    color: $modal-content-color;
-  `,
-  '.modal-backdrop': css`
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: $zindex-modal-backdrop;
-    width: 100%;
-    height: 100%;
-    background-color: $modal-backdrop-bg;
-    opacity: $modal-backdrop-opacity;
-  `,
-  '.modal-sm': css`
-    @include media-breakpoint-up(sm) {
-      max-width: $modal-sm;
-    }
-  `,
-  '.modal-lg': css`
-    @include media-breakpoint-up(lg) {
-      max-width: $modal-lg;
-    }
-  `,
-  '.modal-xl': css`
-    @include media-breakpoint-up(lg) {
-      max-width: $modal-lg;
-    }
-    @include media-breakpoint-up(xl) {
-      max-width: $modal-xl;
-    }
-  `,
-});
-
-const Modal = React.forwardRef<ViewRef | ScrollViewRef, ModalProps>(
-  (props, ref) => {
-    const {
-      children,
-      visible,
-      size,
-      backdrop = true,
-      scrollable = false,
-      centered = false,
-      onToggle: handleToggle,
-      style,
-      contentContainerStyle,
-      dialogStyle,
-      contentStyle,
-      textStyle,
-      dialogTextStyle,
-      contentTextStyle,
-      ...elementProps
-    } = props;
-
-    const dialogRef = useRef(null);
-
-    const modal = useModal(visible, scrollable);
-
-    const backdropClasses = getStyles(styles, ['.modal-backdrop']);
-    const classes = getStyles(styles, ['.modal']);
-    const dialogClasses = getStyles(styles, [
-      '.modal-dialog',
-      size === 'sm' && '.modal-sm',
-      size === 'lg' && '.modal-lg',
-      size === 'xl' && '.modal-xl',
-      scrollable && '.modal-dialog-scrollable',
-      centered && '.modal-dialog-centered',
-    ]);
-    const contentClasses = getStyles(styles, [
-      '.modal-content',
-      scrollable && '.modal-dialog-scrollable .modal-content',
-    ]);
-    const contentTextClasses = getStyles(styles, ['.modal-content --text']);
-
-    // If scrollable we use a ScrollView in ModalBody, so we can use a View here.
-    const FlexView = scrollable ? View : ScrollView;
-
-    const centeredStyle = centered && {
-      justifyContent: 'center' as JustifyContentValue,
-    };
-
-    return (
-      <BaseModal transparent visible={visible} onRequestClose={handleToggle}>
-        {backdrop && <View style={backdropClasses} />}
-        <FlexView
-          {...elementProps}
-          // @ts-expect-error Type of ref depends on component.
-          ref={ref}
-          style={[classes, scrollable && centeredStyle, style]}
-          textStyle={textStyle}
-          contentContainerStyle={
-            scrollable
-              ? undefined
-              : [{ flexGrow: 1 }, centeredStyle, contentContainerStyle]
-          }
-        >
-          <BackdropHandler
-            dialogRef={dialogRef}
-            onClose={handleToggle}
-            backdrop={backdrop}
-          />
-          <SafeAreaView style={{ flexShrink: 1 }}>
-            <View
-              ref={dialogRef}
-              style={[dialogClasses, dialogStyle]}
-              textStyle={dialogTextStyle}
-            >
-              <View
-                style={[contentClasses, contentStyle]}
-                textStyle={[contentTextClasses, contentTextStyle]}
-              >
-                <ModalContext.Provider value={modal}>
-                  <OverlayProvider>{children}</OverlayProvider>
-                </ModalContext.Provider>
-              </View>
-            </View>
-          </SafeAreaView>
-        </FlexView>
-      </BaseModal>
-    );
-  },
-);
-
-Modal.displayName = 'Modal';
-
-export default Object.assign(Modal, {
-  Context: ModalContext,
-  Header: ModalHeader,
-  Title: ModalTitle,
-  Body: ModalBody,
-  Footer: ModalFooter,
-});
+import React, { useRef } from 'react';
+import { Modal as BaseModal, SafeAreaView } from 'react-native';
+import { OverlayProvider } from '@react-native-aria/overlays';
+import StyleSheet from '../../style/StyleSheet';
+import { getStyles } from '../../utils';
+import css from '../../style/css';
+import ScrollView, { ScrollViewRef, ScrollViewProps } from '../ScrollView';
+import View, { ViewRef } from '../View';
+import BackdropHandler from '../helpers/BackdropHandler';
+import useModal from './useModal';
+import ModalContext from './ModalContext';
+import ModalHeader from './ModalHeader';
+import ModalTitle from './ModalTitle';
+import ModalBody from './ModalBody';
+import ModalFooter from './ModalFooter';
+import { ExtendedTextStyle, ExtendedViewStyle, StyleProp } from '../../types';
+
+export interface ModalProps extends ScrollViewProps {
+  visible: boolean;
+  size?: 'sm' | 'lg' | 'xl';
+  backdrop?: boolean | 'static';
+  scrollable?: boolean;
+  centered?: boolean;
+  onToggle: () => void;
+  dialogStyle?: StyleProp<ExtendedViewStyle>;
+  contentStyle?: StyleProp<ExtendedViewStyle>;
+  dialogTextStyle?: StyleProp<ExtendedTextStyle>;
+  contentTextStyle?: StyleProp<ExtendedTextStyle>;
+}
+
+type JustifyContentValue =
+  | 'flex-start'
+  | 'flex-end'
+  | 'center'
+  | 'space-between'
+  | 'space-around'
+  | 'space-evenly';
+
+const styles = StyleSheet.create({
+  '.modal': css`
+    position: absolute; // fixed;
+    top: 0;
+    left: 0;
+    z-index: $zindex-modal;
+    // display: none;
+    width: 100%;
+    height: 100%;
+    // overflow-x: hidden;
+    // overflow-y: auto;
+    // Prevent Chrome on Windows from adding a focus outline. For details, see
+    // https://github.com/twbs/bootstrap/pull/10951.
+    @include platform(web) {
+      outline-width: 0; // outline: 0;
+    }
+    // We deliberately don't use "-webkit-overflow-scrolling: touch;" due to a
+    // gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342
+    // See also https://github.com/twbs/bootstrap/issues/17695
+  `,
+  '.modal-dialog': css`
+    position: relative;
+    width: auto;
+    margin: $modal-dialog-margin;
+    // allow clicks to pass through for custom click handling to close modal
+    pointer-events: auto; // pointer-events: none;
+
+    @include media-breakpoint-up(sm) {
+      width: 100%; // added for bootstrap-rn
+      max-width: $modal-md;
+      margin: $modal-dialog-margin-y-sm-up auto;
+    }
+  `,
+  '.modal-dialog-scrollable': css`
+    flex-shrink: 1; // added for bootstrap-rn
+    // height: calc(100% - var(--#{$prefix}modal-margin) * 2);
+  `,
+  '.modal-dialog-scrollable .modal-content': css`
+    max-height: 100%;
+    overflow: hidden;
+  `,
+  '.modal-dialog-centered': css`
+    display: flex;
+    // align-items: center;
+    // min-height: calc(100% - var(--#{$prefix}modal-margin) * 2);
+  `,
+  '.modal-content': css`
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    width: 100%; // Ensure ".modal-content" extends the full width of the parent ".modal-dialog"
+    // counteract the pointer-events: none; in the .modal-dialog
+    pointer-events: auto;
+    background-color: $modal-content-bg;
+    // background-clip: padding-box;
+    border: $modal-content-border-width solid $modal-content-border-color;
+    border-radius: $modal-content-border-radius;
+    // @include box-shadow($modal-content-box-shadow-xs);
+    // Remove focus outline from opened modal
+    // outline: 0;
+
+    @include media-breakpoint-up(sm) {
+      // @include box-shadow($modal-content-box-shadow-sm-up);
+    }
+  `,
+  '.modal-content --text': css`
+    color: $modal-content-color;
+  `,
+  '.modal-backdrop': css`
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: $zindex-modal-backdrop;
+    width: 100%;
+    height: 100%;
+    background-color: $modal-backdrop-bg;
+    opacity: $modal-backdrop-opacity;
+  `,
+  '.modal-sm': css`
+    @include media-breakpoint-up(sm) {
+      max-width: $modal-sm;
+    }
+  `,
+  '.modal-lg': css`
+    @include media-breakpoint-up(lg) {
+      max-width: $modal-lg;
+    }
+  `,
+  '.modal-xl': css`
+    @include media-breakpoint-up(lg) {
+      max-width: $modal-lg;
+    }
+    @include media-breakpoint-up(xl) {
+      max-width: $modal-xl;
+    }
+  `,
+});
+
+const Modal = React.forwardRef<ViewRef | ScrollViewRef, ModalProps>(
+  (props, ref) => {
+    const {
+      children,
+      visible,
+      size,
+      backdrop = true,
+      scrollable = false,
+      centered = false,
+      onToggle: handleToggle,
+      style,
+      contentContainerStyle,
+      dialogStyle,
+      contentStyle,
+      textStyle,
+      dialogTextStyle,
+      contentTextStyle,
+      ...elementProps
+    } = props;
+
+    const dialogRef = useRef(null);
+
+    const modal = useModal(visible, scrollable);
+
+    const backdropClasses = getStyles(styles, ['.modal-backdrop']);
+    const classes = getStyles(styles, ['.modal']);
+    const dialogClasses = getStyles(styles, [
+      '.modal-dialog',
+      size === 'sm' && '.modal-sm',
+      size === 'lg' && '.modal-lg',
+      size === 'xl' && '.modal-xl',
+      scrollable && '.modal-dialog-scrollable',
+      centered && '.modal-dialog-centered',
+    ]);
+    const contentClasses = getStyles(styles, [
+      '.modal-content',
+      scrollable && '.modal-dialog-scrollable .modal-content',
+    ]);
+    const contentTextClasses = getStyles(styles, ['.modal-content --text']);
+
+    // If scrollable we use a ScrollView in ModalBody, so we can use a View here.
+    const FlexView = scrollable ? View : ScrollView;
+
+    const centeredStyle = centered && {
+      justifyContent: 'center' as JustifyContentValue,
+    };
+
+    return (
+      <BaseModal transparent visible={visible} onRequestClose={handleToggle}>
+        {backdrop && <View style={backdropClasses} />}
+        <FlexView
+          {...elementProps}
+          // @ts-expect-error Type of ref depends on component.
+          ref={ref}
+          style={[classes, scrollable && centeredStyle, style]}
+          textStyle={textStyle}
+          contentContainerStyle={
+            scrollable
+              ? undefined
+              : [{ flexGrow: 1 }, centeredStyle, contentContainerStyle]
+          }
+        >
+          <BackdropHandler
+            dialogRef={dialogRef}
+            onClose={handleToggle}
+            backdrop={backdrop}
+          />
+          <SafeAreaView style={{ flexShrink: 1 }}>
+            <View
+              ref={dialogRef}
+              style={[dialogClasses, dialogStyle]}
+              textStyle={dialogTextStyle}
+            >
+              <View
+                style={[contentClasses, contentStyle]}
+                textStyle={[contentTextClasses, contentTextStyle]}
+              >
+                <ModalContext.Provider value={modal}>
+                  <OverlayProvider>{children}</OverlayProvider>
+                </ModalContext.Provider>
+              </View>
+            </View>
+          </SafeAreaView>
+        </FlexView>
+      </BaseModal>
+    );
+  },
+);
+
+Modal.displayName = 'Modal';
+
+export default Object.assign(Modal, {
+  Context: ModalContext,
+  Header: ModalHeader,
+  Title: ModalTitle,
+  Body: ModalBody,
+  Footer: ModalFooter,
+});