@lookiero/checkout 0.2.23 → 0.2.24

package/dist/infrastructure/ui/components/organisms/returnQuestions/components/hostSelectReturnQuestionItem/HostSelectReturnQuestionItem.js

@@ -2,30 +2,34 @@ import { useI18nMessage } from "@lookiero/i18n-react";
 import React, { useCallback, useState } from "react";
 import { useIntl } from "react-intl";
 import { TouchableHighlight, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { RETURN_QUESTIONS_PREFIX } from "../../../../../i18n/i18n";
 import { Modal } from "../../../../../shared/components/layouts/modal/Modal";
+import { ButtonIcon } from "../../../../../shared/components/molecules/buttonIcon/ButtonIcon";
 import { InputField } from "../../../../../shared/components/molecules/inputField/InputField";
-import { theme } from "../../../../../theme/theme";
-import { useReturnQuestionFeedback } from "../../behaviors/useReturnQuestionFeedback";
-import { feedbackForReturnQuestion } from "../../util/returnQuestionFeedback";
+import { useReturnQuestionFeedback, useReturnQuestionFeedbackForId } from "../../behaviors/useReturnQuestionFeedback";
+import { deepestReturnQuestionWithFeedbackForReturnQuestion, feedbackForReturnQuestion, } from "../../util/returnQuestionFeedback";
 import { style, containerUnderlayColor } from "./HostSelectReturnQuestionItem.style";
-const { spaceXL } = theme();
 const HostSelectReturnQuestionItem = ({ returnQuestion, children, portalHostName, }) => {
-    const { bottom: safeAreaInsetBottom } = useSafeAreaInsets();
     const placeholderText = useI18nMessage({ id: returnQuestion.placeholder, prefix: RETURN_QUESTIONS_PREFIX });
     const [modalVisible, setModalVisible] = useState(false);
     const handleOnPress = useCallback(() => setModalVisible(true), []);
     const handleOnModalClose = useCallback(() => setModalVisible(false), []);
     const feedback = useReturnQuestionFeedback();
+    const { onChange } = useReturnQuestionFeedbackForId({ id: returnQuestion.id });
     const intl = useIntl();
     const translate = useCallback((returnQuestionName) => intl.formatMessage({ id: `${RETURN_QUESTIONS_PREFIX}${returnQuestionName}`, defaultMessage: returnQuestionName }), [intl]);
     const inputValue = feedbackForReturnQuestion({ feedback, returnQuestion, translate }).join(" / ");
+    const deepestReturnQuestionWithFeedback = deepestReturnQuestionWithFeedbackForReturnQuestion({
+        feedback,
+        returnQuestion,
+    });
+    const handleOnBackButtonPress = useCallback(() => deepestReturnQuestionWithFeedback &&
+        onChange({ returnQuestionId: deepestReturnQuestionWithFeedback.id, returnQuestionFeedback: undefined }), [deepestReturnQuestionWithFeedback, onChange]);
     return (React.createElement(React.Fragment, null,
         React.createElement(TouchableHighlight, { style: style.container, onPress: handleOnPress, underlayColor: containerUnderlayColor },
             React.createElement(View, { pointerEvents: "none" },
                 React.createElement(InputField, { label: placeholderText || "", value: inputValue, icon: "arrow-down", editable: false }))),
-        React.createElement(Modal, { visible: modalVisible, onClose: handleOnModalClose, portalHostName: portalHostName },
-            React.createElement(View, { style: [style.modalContent, { paddingBottom: spaceXL + safeAreaInsetBottom }] }, children))));
+        React.createElement(Modal, { visible: modalVisible, onClose: handleOnModalClose, portalHostName: portalHostName, header: deepestReturnQuestionWithFeedback && (React.createElement(ButtonIcon, { name: "arrow-left", onPress: handleOnBackButtonPress, testID: "modal-back-button" })), scroll: true },
+            React.createElement(View, { style: style.modalContent }, children))));
 };
 export { HostSelectReturnQuestionItem };

package/dist/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/HostStackReturnQuestionItem.js

@@ -1,33 +1,27 @@
 import { Text } from "@lookiero/aurora-next/build/components/primitives/Text/Text";
 import { useI18nMessage } from "@lookiero/i18n-react";
-import React, { useCallback } from "react";
+import { animated, useSpring } from "@react-spring/native";
+import React, { useCallback, useState } from "react";
+import { View } from "react-native";
 import { RETURN_QUESTIONS_PREFIX } from "../../../../../i18n/i18n";
-import { ButtonIcon } from "../../../../../shared/components/molecules/buttonIcon/ButtonIcon";
 import ReturnQuestion from "../../ReturnQuestion";
 import { useReturnQuestionFeedbackForId } from "../../behaviors/useReturnQuestionFeedback";
 import { style } from "./HostStackReturnQuestionItem.style";
 const HostStackReturnQuestionItem = ({ returnQuestion, children, portalHostName, }) => {
     const titleText = useI18nMessage({ id: returnQuestion.name, prefix: RETURN_QUESTIONS_PREFIX });
-    const { feedback, onChange } = useReturnQuestionFeedbackForId({ id: returnQuestion.id });
+    const { feedback } = useReturnQuestionFeedbackForId({ id: returnQuestion.id });
     const feedbackReturnQuestion = feedback
         ? returnQuestion.children?.find((returnQuestion) => returnQuestion.id === feedback)
         : undefined;
     const feedbackText = useI18nMessage({ id: feedbackReturnQuestion?.name, prefix: RETURN_QUESTIONS_PREFIX });
-    const handleOnBackButtonPress = useCallback(() => {
-        onChange({ returnQuestionId: returnQuestion.id, returnQuestionFeedback: undefined });
-    }, [onChange, returnQuestion.id]);
-    const questionTitle = titleText && (React.createElement(Text, { level: 2, style: style.title }, titleText));
-    if (feedbackReturnQuestion) {
-        return (React.createElement(React.Fragment, null,
-            React.createElement(ButtonIcon, { name: "arrow-left", style: { icon: style.backButton }, onPress: handleOnBackButtonPress }),
-            questionTitle,
-            React.createElement(Text, { level: 3, style: style.feedback }, feedbackText),
-            feedbackReturnQuestion.children?.map((childReturnQuestion) => (React.createElement(ReturnQuestion, { key: childReturnQuestion.id, returnQuestion: childReturnQuestion, returnQuestionParentId: feedbackReturnQuestion.id, portalHostName: portalHostName })))));
-    }
-    else {
-        return (React.createElement(React.Fragment, null,
-            questionTitle,
-            children));
-    }
+    const [stackHeight, setStackHeight] = useState();
+    const handleOnLayout = useCallback(({ nativeEvent: { layout: { height }, }, }) => setStackHeight(height), []);
+    const stackSyle = useSpring({ height: stackHeight });
+    return (React.createElement(animated.View, { style: stackSyle },
+        React.createElement(View, { onLayout: handleOnLayout },
+            titleText && (React.createElement(Text, { level: 2, style: style.title }, titleText)),
+            feedbackReturnQuestion ? (React.createElement(React.Fragment, null,
+                React.createElement(Text, { level: 3, style: style.feedback }, feedbackText),
+                feedbackReturnQuestion.children?.map((childReturnQuestion) => (React.createElement(ReturnQuestion, { key: childReturnQuestion.id, returnQuestion: childReturnQuestion, returnQuestionParentId: feedbackReturnQuestion.id, portalHostName: portalHostName }))))) : (children))));
 };
 export { HostStackReturnQuestionItem };

package/dist/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/HostStackReturnQuestionItem.style.d.ts

@@ -1,10 +1,4 @@
 declare const style: {
-    backButton: {
-        position: "absolute";
-        top: number;
-        left: number;
-        zIndex: number;
-    };
     title: {
         marginVertical: number;
         textAlign: "center";

package/dist/infrastructure/ui/components/organisms/returnQuestions/components/hostStackReturnQuestionItem/HostStackReturnQuestionItem.style.js

@@ -1,16 +1,7 @@
 import { StyleSheet } from "react-native";
 import { theme } from "../../../../../theme/theme";
-const { colorGrayscaleL, spaceS, spaceM, spaceL, iconSize } = theme();
-const headerPadding = spaceM;
-const buttonIconPadding = spaceS;
-const backButtonTop = (iconSize + headerPadding + buttonIconPadding * 2) * -1;
+const { colorGrayscaleL, spaceM, spaceL } = theme();
 const style = StyleSheet.create({
-    backButton: {
-        position: "absolute",
-        top: backButtonTop,
-        left: spaceM,
-        zIndex: 20,
-    },
     title: {
         marginVertical: spaceL,
         textAlign: "center",

package/dist/infrastructure/ui/components/organisms/returnQuestions/util/returnQuestionFeedback.d.ts

@@ -10,4 +10,13 @@ interface RecursiveFeedbackForReturnQuestionFunction {
     (args: RecursiveFeedbackForReturnQuestionFunctionArgs): string[];
 }
 declare const feedbackForReturnQuestion: RecursiveFeedbackForReturnQuestionFunction;
-export { feedbackForReturnQuestion };
+interface RecursiveDeepestReturnQuestionWithFeedbackFunctionArgs {
+    readonly feedback: FeedbackProjection | undefined;
+    readonly returnQuestion: ReturnQuestionProjection;
+    readonly deepestReturnQuestion?: ReturnQuestionProjection;
+}
+interface RecursiveDeepestReturnQuestionWithFeedbackFunction {
+    (args: RecursiveDeepestReturnQuestionWithFeedbackFunctionArgs): ReturnQuestionProjection | undefined;
+}
+declare const deepestReturnQuestionWithFeedbackForReturnQuestion: RecursiveDeepestReturnQuestionWithFeedbackFunction;
+export { feedbackForReturnQuestion, deepestReturnQuestionWithFeedbackForReturnQuestion };

package/dist/infrastructure/ui/components/organisms/returnQuestions/util/returnQuestionFeedback.js

@@ -7,25 +7,52 @@ const feedbackForReturnQuestion = ({ feedback, returnQuestion, translate, acc =
     const returnQuestionId = Object.keys(feedback).find((id) => id === returnQuestion.id);
     if (returnQuestionId) {
         const returnQuestionFeedback = feedback[returnQuestionId];
-        if (returnQuestionFeedback !== undefined) {
-            if (isUuid(returnQuestionFeedback)) {
-                const feebackReturnQuestionChild = returnQuestion.children?.find((childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback);
-                if (feebackReturnQuestionChild) {
-                    return [
-                        ...acc,
-                        translate(feebackReturnQuestionChild?.name),
-                        ...feedbackForReturnQuestion({ feedback, returnQuestion: feebackReturnQuestionChild, translate, acc }),
-                    ];
-                }
-                return acc;
+        if (isUuid(returnQuestionFeedback)) {
+            const feebackReturnQuestionChild = returnQuestion.children?.find((childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback);
+            if (feebackReturnQuestionChild) {
+                return [
+                    ...acc,
+                    translate(feebackReturnQuestionChild?.name),
+                    ...feedbackForReturnQuestion({ feedback, returnQuestion: feebackReturnQuestionChild, translate, acc }),
+                ];
             }
-            return [...acc, returnQuestionFeedback];
+            return acc;
         }
-        return acc;
+        return [...acc, returnQuestionFeedback];
     }
     return (returnQuestion.children?.reduce((acc, childReturnQuestion) => [
         ...acc,
         ...feedbackForReturnQuestion({ feedback, returnQuestion: childReturnQuestion, translate, acc }),
     ], []) || []);
 };
-export { feedbackForReturnQuestion };
+const deepestReturnQuestionWithFeedbackForReturnQuestion = ({ feedback, returnQuestion, deepestReturnQuestion, }) => {
+    if (!feedback) {
+        return;
+    }
+    const returnQuestionId = Object.keys(feedback).find((id) => id === returnQuestion.id);
+    if (returnQuestionId) {
+        const returnQuestionFeedback = feedback[returnQuestionId];
+        if (isUuid(returnQuestionFeedback)) {
+            const feebackReturnQuestionChild = returnQuestion.children?.find((childReturnQuestion) => childReturnQuestion.id === returnQuestionFeedback);
+            if (feebackReturnQuestionChild) {
+                return deepestReturnQuestionWithFeedbackForReturnQuestion({
+                    feedback,
+                    returnQuestion: feebackReturnQuestionChild,
+                    deepestReturnQuestion: returnQuestion,
+                });
+            }
+            return returnQuestion;
+        }
+        return returnQuestion;
+    }
+    const feebackReturnQuestionChild = returnQuestion.children?.find((childReturnQuestion) => Object.keys(feedback).find((id) => id === childReturnQuestion.id));
+    if (feebackReturnQuestionChild) {
+        return deepestReturnQuestionWithFeedbackForReturnQuestion({
+            feedback,
+            returnQuestion: feebackReturnQuestionChild,
+            deepestReturnQuestion: feebackReturnQuestionChild,
+        });
+    }
+    return deepestReturnQuestion;
+};
+export { feedbackForReturnQuestion, deepestReturnQuestionWithFeedbackForReturnQuestion };

package/dist/infrastructure/ui/shared/components/layouts/modal/Modal.d.ts

@@ -9,6 +9,7 @@ interface ModalProps {
     readonly onClose?: () => void;
     readonly header?: ReactNode;
     readonly portalHostName?: string;
+    readonly scroll?: boolean;
     readonly size?: Partial<Record<ScreenSize, ColumnSize>>;
     readonly style?: Partial<Record<ModalStyle, ViewProps>>;
 }

package/dist/infrastructure/ui/shared/components/layouts/modal/Modal.js

@@ -1,14 +1,14 @@
 import { Portal } from "@gorhom/portal";
 import { animated, useTransition } from "@react-spring/native";
-import React, { useCallback, useState } from "react";
-import { Dimensions, Platform, TouchableWithoutFeedback, View } from "react-native";
+import React, { useCallback, useMemo, useState } from "react";
+import { Dimensions, Platform, ScrollView, TouchableWithoutFeedback, View, } from "react-native";
 import { SafeAreaView, useSafeAreaInsets } from "react-native-safe-area-context";
 import { useScreenSize } from "../../../hooks/useScreenSize";
 import { ButtonIcon } from "../../molecules/buttonIcon/ButtonIcon";
 import { Row } from "../row/Row";
 import { style } from "./Modal.style";
 const TRANSITION_MODAL_SCALE = 0.9;
-const Modal = ({ children, visible, header, portalHostName, onClose, size = { M: "2/3", L: "1/3" }, style: customStyle, }) => {
+const Modal = ({ children, visible, header, portalHostName, onClose, size = { M: "2/3", L: "1/3" }, style: customStyle, scroll = false, }) => {
     const { height: screenHeight } = Dimensions.get("screen");
     const { top: safeAreaInsetTop, bottom: safeAreaInsetBottom } = useSafeAreaInsets();
     const screenSizeWithoutInsets = screenHeight - safeAreaInsetTop;
@@ -37,6 +37,7 @@ const Modal = ({ children, visible, header, portalHostName, onClose, size = { M:
             : { modalOpacity: 0, overlayOpacity: 0, modalTranslateY: 0, modalScale: TRANSITION_MODAL_SCALE },
         unique: true,
     });
+    const ModalContentView = useMemo(() => (scroll ? ScrollView : View), [scroll]);
     return (React.createElement(Portal, { hostName: portalHostName }, transitions(({ modalOpacity, overlayOpacity, modalTranslateY, modalScale }, item) => item && (React.createElement(View, { style: style.container, pointerEvents: visible ? "auto" : "none", testID: "modal" },
         React.createElement(TouchableWithoutFeedback, { onPress: visible ? onClose : undefined },
             React.createElement(animated.View, { style: [style.overlay, { opacity: overlayOpacity }, customStyle?.overlay] })),
@@ -54,7 +55,8 @@ const Modal = ({ children, visible, header, portalHostName, onClose, size = { M:
                     ], onLayout: handleOnModalLayout, pointerEvents: visible ? "auto" : "none" },
                     (header || onClose) && (React.createElement(View, { style: [style.header, customStyle?.header] },
                         React.createElement(View, null, header),
-                        onClose && (React.createElement(ButtonIcon, { style: { button: [style.closeButton, customStyle?.closeButton] }, name: "close", onPress: onClose })))),
-                    children))))))));
+                        onClose && (React.createElement(ButtonIcon, { style: { button: customStyle?.closeButton }, name: "close", onPress: onClose })))),
+                    React.createElement(ModalContentView, null,
+                        React.createElement(View, { style: { paddingBottom: safeAreaInsetBottom } }, children))))))))));
 };
 export { Modal };

package/dist/infrastructure/ui/shared/components/layouts/modal/Modal.style.d.ts

@@ -42,8 +42,5 @@ declare const style: {
         padding: number;
         flexDirection: "row";
     };
-    closeButton: {
-        alignSelf: "flex-end";
-    };
 };
 export { style };

package/dist/infrastructure/ui/shared/components/layouts/modal/Modal.style.js

@@ -55,8 +55,5 @@ const style = StyleSheet.create({
         padding: spaceM,
         flexDirection: "row",
     },
-    closeButton: {
-        alignSelf: "flex-end",
-    },
 });
 export { style };

package/dist/infrastructure/ui/shared/components/molecules/buttonIcon/ButtonIcon.d.ts

@@ -1,14 +1,16 @@
 import { FC } from "react";
-import { StyleProp, ViewStyle } from "react-native";
+import { StyleProp, TouchableHighlightProps, ViewStyle } from "react-native";
 import { IconName, IconStyle } from "../../atoms/icon/Icon";
 interface ButtonIconStyle {
     readonly button: StyleProp<ViewStyle>;
     readonly icon: IconStyle;
 }
-interface ButtonIconProps {
+interface ButtonIconBaseProps {
     readonly name: IconName;
+    readonly testID?: string;
     readonly style?: Partial<ButtonIconStyle>;
-    readonly onPress: () => void;
+}
+interface ButtonIconProps extends Omit<TouchableHighlightProps, keyof ButtonIconBaseProps>, ButtonIconBaseProps {
 }
 declare const ButtonIcon: FC<ButtonIconProps>;
 export { ButtonIcon };

package/dist/infrastructure/ui/shared/components/molecules/buttonIcon/ButtonIcon.js

@@ -2,6 +2,6 @@ import React from "react";
 import { TouchableHighlight } from "react-native";
 import { Icon } from "../../atoms/icon/Icon";
 import { buttonIconUnderlayColor, style } from "./ButtonIcon.style";
-const ButtonIcon = ({ name, style: customStyle, onPress }) => (React.createElement(TouchableHighlight, { style: [style.buttonIcon, customStyle?.button], onPress: onPress, underlayColor: buttonIconUnderlayColor, testID: "button-icon" },
+const ButtonIcon = ({ name, style: customStyle, testID = "button-icon", onPress, ...restProps }) => (React.createElement(TouchableHighlight, { style: [style.buttonIcon, customStyle?.button], onPress: onPress, underlayColor: buttonIconUnderlayColor, testID: testID, ...restProps },
     React.createElement(Icon, { name: name, style: customStyle?.icon })));
 export { ButtonIcon };

package/dist/infrastructure/ui/views/item/components/returnQuestionsForm/ReturnQuestionsForm.js

@@ -1,7 +1,6 @@
 import { PortalHost } from "@gorhom/portal";
 import React from "react";
-import { ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { View } from "react-native";
 import { ReturnQuestionType, } from "../../../../../../projection/returnQuestion/returnQuestion";
 import { ReturnQuestions } from "../../../../components/organisms/returnQuestions/ReturnQuestions";
 import { ReturnQuestionFeedbackProvider } from "../../../../components/organisms/returnQuestions/behaviors/useReturnQuestionFeedback";
@@ -12,9 +11,7 @@ import { HostStackReturnQuestionItem } from "../../../../components/organisms/re
 import { OptionReturnQuestionItem } from "../../../../components/organisms/returnQuestions/components/optionReturnQuestionItem/OptionReturnQuestionItem";
 import { TextareaReturnQuestionItem } from "../../../../components/organisms/returnQuestions/components/textareaReturnQuestionItem/TextareaReturnQuestionItem";
 import { Modal } from "../../../../shared/components/layouts/modal/Modal";
-import { theme } from "../../../../theme/theme";
 import { style } from "./ReturnQuestionsForm.style";
-const { spaceXL } = theme();
 const RETURN_QUESTION_FORM_PORTAL_HOST_NAME = "return-question-form-portal";
 const returnQuestionItems = {
     [ReturnQuestionType.HOST_DEFAULT]: HostDefaultReturnQuestionItem,
@@ -24,14 +21,10 @@ const returnQuestionItems = {
     [ReturnQuestionType.TEXTAREA]: TextareaReturnQuestionItem,
     [ReturnQuestionType.OPTION]: OptionReturnQuestionItem,
 };
-const ReturnQuestionsForm = ({ feedback, returnQuestions, onClose, visible }) => {
-    const { bottom: safeAreaInsetBottom } = useSafeAreaInsets();
-    return (React.createElement(ReturnQuestionFeedbackProvider, { feedback: feedback },
-        React.createElement(ReturnQuestionItemProvider, { returnQuestionItems: returnQuestionItems },
-            React.createElement(PortalHost, { name: RETURN_QUESTION_FORM_PORTAL_HOST_NAME }),
-            React.createElement(Modal, { visible: visible, onClose: onClose, portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME },
-                React.createElement(ScrollView, null,
-                    React.createElement(View, { style: [style.returnQuestionsContainer, { paddingBottom: spaceXL + safeAreaInsetBottom }] },
-                        React.createElement(ReturnQuestions, { returnQuestions: returnQuestions, portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME })))))));
-};
+const ReturnQuestionsForm = ({ feedback, returnQuestions, onClose, visible }) => (React.createElement(ReturnQuestionFeedbackProvider, { feedback: feedback },
+    React.createElement(ReturnQuestionItemProvider, { returnQuestionItems: returnQuestionItems },
+        React.createElement(PortalHost, { name: RETURN_QUESTION_FORM_PORTAL_HOST_NAME }),
+        React.createElement(Modal, { visible: visible, onClose: onClose, portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME, scroll: true },
+            React.createElement(View, { style: style.returnQuestionsContainer },
+                React.createElement(ReturnQuestions, { returnQuestions: returnQuestions, portalHostName: RETURN_QUESTION_FORM_PORTAL_HOST_NAME }))))));
 export { ReturnQuestionsForm };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [