@lookiero/checkout 1.0.0 → 1.1.0

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

@@ -1,5 +1,5 @@
 import { useI18nMessage, useIntl } from "@lookiero/i18n-react";
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { TouchableHighlight, View } from "react-native";
 import { Modal } from "../../../../../../../shared/ui/components/layouts/modal/Modal";
 import { ButtonIcon } from "../../../../../../../shared/ui/components/molecules/buttonIcon/ButtonIcon";
@@ -17,12 +17,18 @@ const HostSelectReturnQuestionItem = ({ returnQuestion, children, portalHostName
     const intl = useIntl();
     const translate = useCallback((returnQuestionName) => intl.formatMessage({ id: returnQuestionName, defaultMessage: returnQuestionName }), [intl]);
     const inputValue = feedbackForReturnQuestion({ feedback, returnQuestion, translate }).join(" / ");
-    const deepestReturnQuestionWithFeedback = deepestReturnQuestionWithFeedbackForReturnQuestion({
+    const [deepestReturnQuestionWithFeedback, isLeaf] = deepestReturnQuestionWithFeedbackForReturnQuestion({
         feedback,
         returnQuestion,
     });
     const handleOnBackButtonPress = useCallback(() => deepestReturnQuestionWithFeedback &&
         onChange({ returnQuestionId: deepestReturnQuestionWithFeedback.id, returnQuestionFeedback: undefined }), [deepestReturnQuestionWithFeedback, onChange]);
+    useEffect(() => {
+        if (isLeaf) {
+            handleOnModalClose();
+        }
+        // deepestReturnQuestionWithFeedback needs to be as a dependency in order to be re-evaluated whenever it changes
+    }, [handleOnModalClose, deepestReturnQuestionWithFeedback, isLeaf]);
     return (React.createElement(React.Fragment, null,
         React.createElement(TouchableHighlight, { style: style.container, underlayColor: containerUnderlayColor, onPress: handleOnPress },
             React.createElement(View, { pointerEvents: "none" },

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

@@ -1,7 +1,7 @@
 import { FeedbackProjection } from "../../../../../../projection/feedback/feedback";
 import { ReturnQuestionProjection } from "../../../../../../projection/returnQuestion/returnQuestion";
 interface RecursiveFeedbackForReturnQuestionFunctionArgs {
-    readonly feedback: FeedbackProjection | undefined;
+    readonly feedback: FeedbackProjection;
     readonly returnQuestion: ReturnQuestionProjection;
     readonly translate: (i18nString: string) => string;
     readonly acc?: string[];
@@ -11,12 +11,15 @@ interface RecursiveFeedbackForReturnQuestionFunction {
 }
 declare const feedbackForReturnQuestion: RecursiveFeedbackForReturnQuestionFunction;
 interface RecursiveDeepestReturnQuestionWithFeedbackFunctionArgs {
-    readonly feedback: FeedbackProjection | undefined;
+    readonly feedback: FeedbackProjection;
     readonly returnQuestion: ReturnQuestionProjection;
     readonly deepestReturnQuestion?: ReturnQuestionProjection;
 }
 interface RecursiveDeepestReturnQuestionWithFeedbackFunction {
-    (args: RecursiveDeepestReturnQuestionWithFeedbackFunctionArgs): ReturnQuestionProjection | undefined;
+    (args: RecursiveDeepestReturnQuestionWithFeedbackFunctionArgs): [
+        question: ReturnQuestionProjection | undefined,
+        isLeaf: boolean
+    ];
 }
 declare const deepestReturnQuestionWithFeedbackForReturnQuestion: RecursiveDeepestReturnQuestionWithFeedbackFunction;
 export { feedbackForReturnQuestion, deepestReturnQuestionWithFeedbackForReturnQuestion };

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

@@ -1,9 +1,6 @@
 import { validate } from "uuid";
 const isUuid = (value) => validate(value);
 const feedbackForReturnQuestion = ({ feedback, returnQuestion, translate, acc = [], }) => {
-    if (!feedback) {
-        return [];
-    }
     const returnQuestionId = Object.keys(feedback).find((id) => id === returnQuestion.id);
     if (returnQuestionId) {
         const returnQuestionFeedback = feedback[returnQuestionId];
@@ -26,9 +23,6 @@ const feedbackForReturnQuestion = ({ feedback, returnQuestion, translate, acc =
     ], []) || []);
 };
 const deepestReturnQuestionWithFeedbackForReturnQuestion = ({ feedback, returnQuestion, deepestReturnQuestion, }) => {
-    if (!feedback) {
-        return;
-    }
     const returnQuestionId = Object.keys(feedback).find((id) => id === returnQuestion.id);
     if (returnQuestionId) {
         const returnQuestionFeedback = feedback[returnQuestionId];
@@ -41,9 +35,9 @@ const deepestReturnQuestionWithFeedbackForReturnQuestion = ({ feedback, returnQu
                     deepestReturnQuestion: returnQuestion,
                 });
             }
-            return returnQuestion;
+            return [returnQuestion, false];
         }
-        return returnQuestion;
+        return [returnQuestion, false];
     }
     const feebackReturnQuestionChild = returnQuestion.children?.find((childReturnQuestion) => Object.keys(feedback).find((id) => id === childReturnQuestion.id));
     if (feebackReturnQuestionChild) {
@@ -53,6 +47,6 @@ const deepestReturnQuestionWithFeedbackForReturnQuestion = ({ feedback, returnQu
             deepestReturnQuestion: feebackReturnQuestionChild,
         });
     }
-    return deepestReturnQuestion;
+    return [deepestReturnQuestion, !returnQuestion.children || returnQuestion.children.length === 0];
 };
 export { feedbackForReturnQuestion, deepestReturnQuestionWithFeedbackForReturnQuestion };

package/package.json

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