@hero-design/rn 8.35.0-alpha.1 → 8.35.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hero-design/rn",
-  "version": "8.35.0-alpha.1",
+  "version": "8.35.0-alpha.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -21,6 +21,7 @@
   "dependencies": {
     "@emotion/native": "^11.9.3",
     "@emotion/react": "^11.9.3",
+    "@gorhom/portal": "^1.0.14",
     "@hero-design/colors": "8.34.1",
     "date-fns": "^2.16.1",
     "events": "^3.2.0",
@@ -82,6 +83,5 @@
     "rollup-plugin-flow": "^1.1.1",
     "ts-jest": "^27.0.7"
   },
-  "prettier": "prettier-config-hd",
-  "react-native": "src/index.ts"
+  "prettier": "prettier-config-hd"
 }

package/src/components/FAB/ActionGroup/index.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef, useRef } from 'react';
 import type { StyleProp, ViewStyle } from 'react-native';
-import { Animated, Modal, Platform } from 'react-native';
+import { Animated, Platform } from 'react-native';
 import type { IconName } from '../../Icon';
 import type { ActionItemProps } from './ActionItem';
 import ActionItem from './ActionItem';
@@ -14,7 +14,7 @@ import {
 
 import Box from '../../Box';
 import { FABHandles } from '../FAB';
-import { FABModal } from '../../..';
+import { Portal } from '@gorhom/portal';
 
 export type ActionGroupHandles = {
   showFAB: () => void;
@@ -32,6 +32,7 @@ export interface ActionGroupProps {
    * This function is called on pressing the FAB button.
    * */
   onPress?: () => void;
+
   /**
    * Specify if the FAB button is in active state and the action group is shown.
    * */
@@ -61,6 +62,7 @@ export interface ActionGroupProps {
    * Testing id of the component.
    */
   testID?: string;
+  portalName?: string;
 }
 
 const ActionGroup = forwardRef<ActionGroupHandles, ActionGroupProps>(
@@ -74,6 +76,7 @@ const ActionGroup = forwardRef<ActionGroupHandles, ActionGroupProps>(
       testID,
       fabTitle,
       fabIcon = 'add',
+      portalName,
     },
     ref
   ) => {
@@ -123,51 +126,45 @@ const ActionGroup = forwardRef<ActionGroupHandles, ActionGroupProps>(
         outputRange: [0, 1],
       });
 
+    const Wrapper = portalName ? Portal : React.Fragment;
     return (
-      <StyledContainer testID={testID} pointerEvents="box-none" style={style}>
-        <FABModal visible={active}>
-          <StyledContainer
-            testID={testID}
-            pointerEvents="box-none"
-            style={style}
+      <Wrapper name={portalName}>
+        <StyledContainer testID={testID} pointerEvents="box-none" style={style}>
+          <StyledBackdrop
+            pointerEvents={active ? 'auto' : 'box-none'}
+            testID="back-drop"
+            style={{ opacity: interpolatedBackdropOpacityAnimation }}
+          />
+          <StyledActionGroupContainer
+            pointerEvents={active ? 'auto' : 'none'}
+            testID="action-group"
+            style={{
+              opacity: interpolatedActionGroupOpacityAnimation,
+            }}
           >
-            <StyledBackdrop
-              pointerEvents={active ? 'auto' : 'box-none'}
-              testID="back-drop"
-              style={{
-                opacity: interpolatedBackdropOpacityAnimation,
-                backgroundColor: 'yellow',
-              }}
-            />
-            <StyledActionGroupContainer
-              pointerEvents={active ? 'auto' : 'none'}
-              testID="action-group"
-              style={{
-                opacity: interpolatedActionGroupOpacityAnimation,
-                flex: 1,
-              }}
-            >
-              {!!headerTitle && (
-                <Animated.View
-                  style={{ transform: [{ translateY: titleTranslateY }] }}
-                >
-                  <StyledHeaderText testID="header-text" level="h4">
-                    {headerTitle}
-                  </StyledHeaderText>
-                </Animated.View>
-              )}
-
-              <Box style={[style, { paddingBottom: 0 }]}>
-                {items?.map((itemProp, index) => (
-                  <ActionItem
-                    key={itemProp.key || `${itemProp.icon}_${itemProp.title}`}
-                    {...itemProp}
-                    index={active ? index : items.length - index}
-                    active={active}
-                  />
-                ))}
-              </Box>
-            </StyledActionGroupContainer>
+            {!!headerTitle && (
+              <Animated.View
+                style={{ transform: [{ translateY: titleTranslateY }] }}
+              >
+                <StyledHeaderText testID="header-text" level="h4">
+                  {headerTitle}
+                </StyledHeaderText>
+              </Animated.View>
+            )}
+
+            <Box style={[style, { paddingBottom: 0 }]}>
+              {items?.map((itemProp, index) => (
+                <ActionItem
+                  key={itemProp.key || `${itemProp.icon}_${itemProp.title}`}
+                  {...itemProp}
+                  index={active ? index : items.length - index}
+                  active={active}
+                />
+              ))}
+            </Box>
+          </StyledActionGroupContainer>
+
+          <Portal hostName="CustomPortalHost">
             <StyledFAB
               testID="fab"
               icon={fabIcon}
@@ -177,18 +174,9 @@ const ActionGroup = forwardRef<ActionGroupHandles, ActionGroupProps>(
               title={fabTitle}
               ref={fabRef}
             />
-          </StyledContainer>
-        </FABModal>
-        <StyledFAB
-          testID="fab"
-          icon={fabIcon}
-          onPress={onPress}
-          animated
-          active={active}
-          title={fabTitle}
-          ref={fabRef}
-        />
-      </StyledContainer>
+          </Portal>
+        </StyledContainer>
+      </Wrapper>
     );
   }
 );

package/src/components/FAB/FAB.tsx

@@ -163,16 +163,7 @@ const FAB = forwardRef<FABHandles, FABProps>(
     return (
       <StyledFAB
         /** Add a small timeout before executing animation to prevent flakiness */
-        onLayout={() => {
-          setTimeout(() => setCanAnimate(true), 500);
-        }}
-        ref={(ref) => {
-          if (ref) {
-            ref.measureInWindow((x, y, width, height) => {
-              console.log('measureInWindow', x, y, width, height);
-            });
-          }
-        }}
+        onLayout={() => setTimeout(() => setCanAnimate(true), 500)}
         underlayColor={theme.__hd__.fab.colors.buttonPressedBackground}
         onPress={onPress}
         style={[

package/src/components/FAB/index.tsx

@@ -1,6 +1,10 @@
 import FAB from './FAB';
 import ActionGroup from './ActionGroup';
+import { Portal, PortalHost, PortalProvider } from '@gorhom/portal';
 
 export default Object.assign(FAB, {
   ActionGroup,
+  Portal: Portal,
+  PortalHost: PortalHost,
+  Provider: PortalProvider,
 });

package/src/index.ts

@@ -12,6 +12,7 @@ import theme, {
   withTheme,
 } from './theme';
 import { scale } from './utils/scale';
+import * as Portal from '@gorhom/portal';
 
 import Accordion from './components/Accordion';
 import Alert from './components/Alert';
@@ -60,7 +61,6 @@ import Rate from './components/Rate';
 import RefreshControl from './components/RefreshControl';
 import RichTextEditor from './components/RichTextEditor';
 import PageControl from './components/PageControl';
-import FABModal from './components/FAB/ActionGroup/FABModal';
 
 export {
   theme,
@@ -124,7 +124,7 @@ export {
   Rate,
   RefreshControl,
   RichTextEditor,
-  FABModal,
+  Portal,
 };
 
 export * from './types';

package/types/index.d.ts

@@ -1,5 +1,6 @@
 import theme, { getTheme, ThemeProvider, useTheme, swagSystemPalette, swagDarkSystemPalette, workSystemPalette, jobsSystemPalette, walletSystemPalette, eBensSystemPalette, ThemeSwitcher, withTheme } from './theme';
 import { scale } from './utils/scale';
+import * as Portal from '@gorhom/portal';
 import Accordion from './components/Accordion';
 import Alert from './components/Alert';
 import Attachment from './components/Attachment';
@@ -47,6 +48,5 @@ import Rate from './components/Rate';
 import RefreshControl from './components/RefreshControl';
 import RichTextEditor from './components/RichTextEditor';
 import PageControl from './components/PageControl';
-import FABModal from './components/FAB/ActionGroup/FABModal';
-export { theme, getTheme, useTheme, scale, ThemeProvider, ThemeSwitcher, withTheme, swagSystemPalette, swagDarkSystemPalette, workSystemPalette, jobsSystemPalette, walletSystemPalette, eBensSystemPalette, Accordion, Alert, Attachment, Avatar, useAvatarColors, Badge, BottomNavigation, BottomSheet, Box, Button, Calendar, Card, Carousel, Collapse, Checkbox, ContentNavigator, DatePicker, Divider, Drawer, Empty, Error, FAB, Icon, Image, List, Modal, PinInput, Progress, PageControl, Skeleton, Slider, Spinner, Swipeable, Radio, SectionHeading, Select, Success, Switch, Tabs, Tag, TextInput, TimePicker, Toast, Toolbar, Typography, Rate, RefreshControl, RichTextEditor, FABModal, };
+export { theme, getTheme, useTheme, scale, ThemeProvider, ThemeSwitcher, withTheme, swagSystemPalette, swagDarkSystemPalette, workSystemPalette, jobsSystemPalette, walletSystemPalette, eBensSystemPalette, Accordion, Alert, Attachment, Avatar, useAvatarColors, Badge, BottomNavigation, BottomSheet, Box, Button, Calendar, Card, Carousel, Collapse, Checkbox, ContentNavigator, DatePicker, Divider, Drawer, Empty, Error, FAB, Icon, Image, List, Modal, PinInput, Progress, PageControl, Skeleton, Slider, Spinner, Swipeable, Radio, SectionHeading, Select, Success, Switch, Tabs, Tag, TextInput, TimePicker, Toast, Toolbar, Typography, Rate, RefreshControl, RichTextEditor, Portal, };
 export * from './types';

package/src/components/FAB/ActionGroup/FABModal.tsx

@@ -1,63 +0,0 @@
-import React from 'react';
-import { Dimensions, View, ViewStyle } from 'react-native';
-import { ModalHandler, showFABModal } from './ModalPresenter';
-
-const wrapperStyle: ViewStyle = {
-  width: Dimensions.get('window').width,
-  height: Dimensions.get('window').height,
-};
-
-export interface ModalProps {
-  /**
-   * Content of the modal.
-   */
-  children: React.ReactElement;
-  /**
-   * Visibility of the modal
-   */
-  visible?: boolean;
-  /**
-   * Callback when the modal is shown.
-   */
-  onShow?: () => void;
-  /**
-   * TestID of the modal.
-   */
-  testID?: string;
-}
-
-const fABModal = ({ children, onShow, testID, visible = true }: ModalProps) => {
-  const [modalHandler, setModalHandler] = React.useState<ModalHandler>();
-
-  const getModalContent = React.useCallback(
-    () => (
-      <View pointerEvents="box-none" style={wrapperStyle} testID={testID}>
-        {children}
-      </View>
-    ),
-    [visible, children, onShow, testID]
-  );
-
-  React.useEffect(() => {
-    if (visible) {
-      // Modal does not exist, create a new one
-      if (!modalHandler) {
-        const newModalHandler = showFABModal(getModalContent());
-        setModalHandler(newModalHandler);
-
-        onShow?.();
-      }
-      // Modal already exists, update it
-      else {
-        modalHandler.update(getModalContent());
-      }
-    } else {
-      modalHandler?.dismiss();
-      setModalHandler(undefined);
-    }
-  }, [getModalContent]);
-
-  return null;
-};
-
-export default fABModal;

package/src/components/FAB/ActionGroup/FABModalContentWrapper.tsx

@@ -1,31 +0,0 @@
-import React from 'react';
-import { StyleProp, View, ViewStyle } from 'react-native';
-
-type ModalContentWrapperProps = {
-  children: React.ReactElement;
-  visible?: boolean;
-  testID?: string;
-  style?: StyleProp<ViewStyle>;
-  animated?: boolean;
-  pointerEvents: 'box-none' | 'none' | 'box-only' | 'auto';
-};
-
-export type ModalContentWrapperHandler = {
-  hide: (callback?: () => void) => void;
-};
-
-const FABModalContentWrapper = ({
-  children,
-  testID,
-  pointerEvents,
-}: ModalContentWrapperProps) => {
-  return (
-    <View testID={testID} pointerEvents={pointerEvents}>
-      {children}
-    </View>
-  );
-};
-
-FABModalContentWrapper.displayName = 'FABModalContentWrapper';
-
-export default FABModalContentWrapper;

package/src/components/FAB/ActionGroup/ModalPresenter/ModalPresenter.tsx

@@ -1,133 +0,0 @@
-import React, { forwardRef, useRef } from 'react';
-import { Animated, StyleSheet, ViewProps } from 'react-native';
-import RootSiblings from 'react-native-root-siblings';
-import Box from '../../../Box';
-
-export type ModalPresenterHandles = {
-  animatedOut: (completion?: () => void) => void;
-};
-export type FABModalDismissFunc = (onDismiss?: () => void) => void;
-export type FABModalUpdateFunc = (content: React.ReactNode) => void;
-
-/**
- * Modal handler is returned by `showModal` function.
- */
-export type FABModalHandler = {
-  /**
-   * Same `dismiss` function as in `ModalContentProps`.
-   */
-  dismiss: FABModalDismissFunc;
-  /**
-   * Same `update` function as in `ModalContentProps`.
-   */
-  update: FABModalUpdateFunc;
-};
-
-const FABModalPresenter = forwardRef<ModalPresenterHandles, ViewProps>(
-  ({ style, children, ...props }, ref) => {
-    const animatedOpacity = useRef(new Animated.Value(0));
-
-    React.useEffect(() => {
-      Animated.spring(animatedOpacity.current, {
-        toValue: 1,
-        useNativeDriver: true,
-      }).start();
-    }, []);
-
-    React.useImperativeHandle(ref, () => ({
-      animatedOut: (completion?: () => void) => {
-        Animated.spring(animatedOpacity.current, {
-          toValue: 0,
-          useNativeDriver: true,
-        }).start(() => {
-          completion?.();
-        });
-      },
-    }));
-
-    return (
-      <Box style={StyleSheet.absoluteFill} pointerEvents="box-none">
-        <Animated.View
-          style={[
-            {
-              width: '100%',
-              height: '100%',
-              justifyContent: 'center',
-              alignItems: 'center',
-              opacity: animatedOpacity.current,
-            },
-            style,
-          ]}
-          {...props}
-          pointerEvents="box-none"
-        >
-          {children}
-        </Animated.View>
-      </Box>
-    );
-  }
-);
-
-/**
- * Present a modal on screen immediately.
- *
- * The new presented modal will be on top of existing modals if there are any.
- *
- * @param Content A component to be presented as a modal on screen.
- * This component will be centered horizontally and vertically on screen with
- * a semitransparent black overlay underneath.
- * @param contentProps Props for this modal component.
- * @returns A `ModalHandler` you can use to dismiss the modal.
- */
-
-export const showFABModal = (content: React.ReactNode): FABModalHandler => {
-  let ref: ModalPresenterHandles | null = null;
-  let rootSiblings: RootSiblings | null = null;
-
-  const dismiss: FABModalDismissFunc = (onDismiss) => {
-    if (rootSiblings) {
-      const cleanup = () => {
-        rootSiblings?.destroy();
-        rootSiblings = null;
-        ref = null;
-        onDismiss?.();
-      };
-
-      if (ref) {
-        ref.animatedOut(cleanup);
-      } else {
-        cleanup();
-      }
-    }
-  };
-
-  const update: FABModalUpdateFunc = (newContent) => {
-    rootSiblings?.update(
-      <FABModalPresenter
-        ref={(_ref) => {
-          ref = _ref;
-        }}
-      >
-        {newContent}
-      </FABModalPresenter>
-    );
-  };
-
-  rootSiblings = new RootSiblings(
-    (
-      <FABModalPresenter
-        ref={(_ref) => {
-          ref = _ref;
-        }}
-      >
-        {content}
-      </FABModalPresenter>
-    )
-  );
-
-  return { dismiss, update };
-};
-
-FABModalPresenter.displayName = 'FABModalPresenter';
-
-export default FABModalPresenter;

package/src/components/FAB/ActionGroup/ModalPresenter/index.tsx

@@ -1,13 +0,0 @@
-import {
-  FABModalDismissFunc,
-  FABModalHandler,
-  showFABModal,
-  ModalPresenterHandles,
-} from './ModalPresenter';
-
-export type {
-  FABModalDismissFunc as ModalDismissFunc,
-  FABModalHandler as ModalHandler,
-  ModalPresenterHandles,
-};
-export { showFABModal };