@lookiero/checkout 1.3.0-beta.3 → 2.0.0-beta.0

package/README.md

@@ -38,7 +38,7 @@ Once we can replace the build of Jenkins for NPM one, we are going to be able to
   "dependencies": {
     (...)
     "@expo/dev-server": "0.1.120",
-    "expo-modules-core": "^1.2.6",
+    "expo-modules-core": "^1.0.3",
     "inline-style-prefixer": "6.0.1",
     (...)
   },

package/dist/infrastructure/domain/checkout/react/useStartCheckout.js

@@ -8,7 +8,7 @@ const useStartCheckout = ({ checkoutId, logger }) => {
     const start = useCallback(async () => {
         invariant(checkoutId, "CheckoutId must be defined in order to start checkout");
         try {
-            await commandBus(startCheckout({ aggregateId: checkoutId }));
+            return await commandBus(startCheckout({ aggregateId: checkoutId }));
         }
         catch (error) {
             if (!error?.message?.includes("Checkout is already started")) {

package/dist/infrastructure/ui/Root.d.ts

@@ -4,7 +4,6 @@ import { ComponentType } from "react";
 import { useRoutes as reactRouterUseRoutes } from "react-router-native";
 import { Customer } from "../../projection/shared/customer";
 import { SentryEnvironment } from "../../shared/logging/SentryLogger";
-import { Menu, TabBar } from "./views/navigation/Navigation";
 interface RootFunctionArgs {
     readonly Messaging: MessagingRoot;
     readonly I18n: I18n;
@@ -19,9 +18,8 @@ interface RootProps {
     readonly basePath: string;
     readonly locale?: string;
     readonly customer: Customer | undefined;
-    readonly menu: Menu;
-    readonly tabBar: TabBar;
     readonly onNotAccessible: () => void;
+    readonly onOpenMenu: () => void;
     readonly useRedirect: () => Record<string, string>;
     readonly useRoutes?: typeof reactRouterUseRoutes;
 }

package/dist/infrastructure/ui/Root.js

@@ -6,10 +6,10 @@ import { sentryLoggerHOC } from "../../shared/logging/SentryLoggerHOC";
 import { Routing } from "./routing/Routing";
 const root = ({ Messaging, I18n, getAuthToken, development, sentry }) => {
     // eslint-disable-next-line react/display-name, react/prop-types
-    const Root = ({ basePath, locale = "en", customer, menu, tabBar, onNotAccessible, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
+    const Root = ({ basePath, locale = "en", customer, onNotAccessible, onOpenMenu, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
         const handleOnI18nError = useCallback(() => void 0, []);
         return (React.createElement(Messaging, { includeReactQueryDevTools: Platform.OS === "web" },
-            React.createElement(Routing, { I18n: I18n, basePath: basePath, customer: customer, getAuthToken: getAuthToken, locale: locale, menu: menu, tabBar: tabBar, useRedirect: useRedirect, useRoutes: useRoutes, onI18nError: development ? undefined : handleOnI18nError, onNotAccessible: onNotAccessible })));
+            React.createElement(Routing, { I18n: I18n, basePath: basePath, customer: customer, getAuthToken: getAuthToken, locale: locale, useRedirect: useRedirect, useRoutes: useRoutes, onI18nError: development ? undefined : handleOnI18nError, onNotAccessible: onNotAccessible, onOpenMenu: onOpenMenu })));
     };
     return sentryLoggerHOC({ logger: sentryLogger(sentry) })(Root);
 };

package/dist/infrastructure/ui/routing/Routing.d.ts

@@ -2,16 +2,14 @@ import { I18n } from "@lookiero/i18n-react";
 import React from "react";
 import { useRoutes as reactRouterUseRoutes } from "react-router-native";
 import { Customer } from "../../../projection/shared/customer";
-import { Menu, TabBar } from "../views/navigation/Navigation";
 interface RoutingProps {
     readonly basePath?: string;
     readonly customer: Customer | undefined;
     readonly locale: string;
     readonly I18n: I18n;
-    readonly menu: Menu;
-    readonly tabBar: TabBar;
     readonly getAuthToken: () => Promise<string>;
     readonly onNotAccessible: () => void;
+    readonly onOpenMenu: () => void;
     readonly onI18nError?: (err: Error) => void;
     readonly useRedirect: () => Record<string, string>;
     readonly useRoutes: typeof reactRouterUseRoutes;

package/dist/infrastructure/ui/routing/Routing.js

@@ -11,7 +11,7 @@ const Item = lazy(() => import("../views/item/Item").then((module) => ({ default
 const Summary = lazy(() => import("../views/summary/Summary").then((module) => ({ default: module.Summary })));
 const Checkout = lazy(() => import("../views/checkout/Checkout").then((module) => ({ default: module.Checkout })));
 const Feedback = lazy(() => import("../views/feedback/Feedback").then((module) => ({ default: module.Feedback })));
-const Routing = ({ basePath = "", customer, locale, I18n, menu, tabBar, getAuthToken, onI18nError, onNotAccessible, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
+const Routing = ({ basePath = "", customer, locale, I18n, getAuthToken, onI18nError, onNotAccessible, onOpenMenu, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
     return useRoutes([
         {
             path: "",
@@ -19,7 +19,7 @@ const Routing = ({ basePath = "", customer, locale, I18n, menu, tabBar, getAuthT
                 React.createElement(CheckoutAccessibilityMiddleware, { customerId: customer?.customerId, onNotAccessible: onNotAccessible },
                     React.createElement(I18n, { loader: React.createElement(Spinner, null), locale: locale, onError: onI18nError },
                         React.createElement(CheckoutMiddleware, { customerId: customer?.customerId },
-                            React.createElement(App, { country: customer?.country, customerId: customer?.customerId, menu: menu, tabBar: tabBar },
+                            React.createElement(App, { country: customer?.country, customerId: customer?.customerId, onOpenMenu: onOpenMenu },
                                 React.createElement(Outlet, null))))))),
             children: [
                 {

package/dist/infrastructure/ui/views/App.d.ts

@@ -1,12 +1,10 @@
 import { FC } from "react";
 import { Country } from "../../../projection/shared/country";
-import { Menu, TabBar } from "./navigation/Navigation";
 interface AppProps {
+    readonly children: JSX.Element;
     readonly customerId: string;
     readonly country: Country;
-    readonly menu: Menu;
-    readonly tabBar: TabBar;
-    readonly children: JSX.Element;
+    readonly onOpenMenu: () => void;
 }
 declare const App: FC<AppProps>;
 export { App };

package/dist/infrastructure/ui/views/App.js

@@ -7,9 +7,9 @@ import { MESSAGING_CONTEXT_ID } from "../../delivery/baseBootstrap";
 import { theme } from "../theme/theme";
 import { Navigation } from "./navigation/Navigation";
 const { colorBase } = theme();
-const App = ({ customerId, country, menu, tabBar, children }) => (React.createElement(SafeAreaProvider, null,
+const App = ({ children, customerId, country, onOpenMenu }) => (React.createElement(SafeAreaProvider, null,
     React.createElement(PortalProvider, null,
         React.createElement(StatusBar, { backgroundColor: colorBase, barStyle: "dark-content", translucent: true }),
         React.createElement(Notifications, { contextId: MESSAGING_CONTEXT_ID }),
-        React.createElement(Navigation, { country: country, customerId: customerId, menu: menu, tabBar: tabBar }, children))));
+        React.createElement(Navigation, { country: country, customerId: customerId, onOpenMenu: onOpenMenu }, children))));
 export { App };

package/dist/infrastructure/ui/views/navigation/Navigation.d.ts

@@ -11,11 +11,10 @@ interface TabBarProps {
 }
 type TabBar = FC<TabBarProps>;
 interface NavigationProps {
+    readonly children: ReactNode;
     readonly customerId: string;
     readonly country: Country;
-    readonly menu: Menu;
-    readonly tabBar: TabBar;
-    readonly children: ReactNode;
+    readonly onOpenMenu: () => void;
 }
 declare const Navigation: FC<NavigationProps>;
 export type { Menu, TabBar };

package/dist/infrastructure/ui/views/navigation/Navigation.js

@@ -1,33 +1,21 @@
-import { usePortal } from "@lookiero/aurora";
-import React, { useCallback, useState } from "react";
-import { Platform } from "react-native";
+import React, { useCallback } from "react";
 import { useTrackPressBack } from "../../../../shared/tracking/infrastructure/useTrackPressBack";
 import { useTrackPressMenu } from "../../../../shared/tracking/infrastructure/useTrackPressMenu";
 import { useTrackPressNext } from "../../../../shared/tracking/infrastructure/useTrackPressNext";
 import { useTrackPressPrevious } from "../../../../shared/tracking/infrastructure/useTrackPressPrevious";
 import { style } from "./Navigation.style";
 import { Header } from "./components/header/Header";
-const Navigation = ({ customerId, country, menu, tabBar: TabBar, children }) => {
-    const [menuVisible, setMenuVisible] = useState(false);
+const Navigation = ({ children, customerId, country, onOpenMenu }) => {
     const trackPressMenu = useTrackPressMenu();
     const handleOnOpenMenu = useCallback(({ page, checkoutId, collapse }) => {
-        setMenuVisible(true);
+        onOpenMenu();
         trackPressMenu({
             page,
             country,
             checkoutId,
             collapse,
         });
-    }, [country, trackPressMenu]);
-    const handleOnCloseMenu = useCallback(({ page, checkoutId, collapse }) => {
-        setMenuVisible(false);
-        trackPressMenu({
-            page,
-            country,
-            checkoutId,
-            collapse,
-        });
-    }, [country, trackPressMenu]);
+    }, [country, onOpenMenu, trackPressMenu]);
     const trackPressBack = useTrackPressBack();
     const handleOnBack = useCallback(({ page, checkoutId }) => trackPressBack({
         page,
@@ -50,10 +38,8 @@ const Navigation = ({ customerId, country, menu, tabBar: TabBar, children }) =>
         from,
         to,
     }), [country, trackPressPrevious]);
-    const { busy } = usePortal();
     return (React.createElement(React.Fragment, null,
-        React.createElement(Header, { customerId: customerId, menu: menu, menuVisible: menuVisible, style: style.header, onBack: handleOnBack, onCloseMenu: handleOnCloseMenu, onNext: handleOnNext, onOpenMenu: handleOnOpenMenu, onPrevious: handleOnPrevious }),
-        children,
-        Platform.OS !== "web" && React.createElement(TabBar, { isPortalBusy: busy, panel: menuVisible })));
+        React.createElement(Header, { customerId: customerId, style: style.header, onBack: handleOnBack, onNext: handleOnNext, onOpenMenu: handleOnOpenMenu, onPrevious: handleOnPrevious }),
+        children));
 };
 export { Navigation };

package/dist/infrastructure/ui/views/navigation/components/header/Header.d.ts

@@ -1,7 +1,6 @@
 import { FC } from "react";
 import { StyleProp, ViewStyle } from "react-native";
 import { TrackingPage } from "../../../../../tracking/tracking";
-import { Menu } from "../../Navigation";
 interface OnOpenMenuFunctionArgs {
     readonly page: TrackingPage;
     readonly checkoutId: string | undefined;
@@ -10,14 +9,6 @@ interface OnOpenMenuFunctionArgs {
 interface OnOpenMenuFunction {
     (args: OnOpenMenuFunctionArgs): void;
 }
-interface OnCloseMenuFunctionArgs {
-    readonly page: TrackingPage;
-    readonly checkoutId: string | undefined;
-    readonly collapse: boolean;
-}
-interface OnCloseMenuFunction {
-    (args: OnCloseMenuFunctionArgs): void;
-}
 interface OnBackFunctionArgs {
     readonly page: TrackingPage;
     readonly checkoutId: string | undefined;
@@ -45,10 +36,7 @@ interface OnPreviousFunction {
 }
 interface HeaderProps {
     readonly customerId: string;
-    readonly menu: Menu;
-    readonly menuVisible: boolean;
     readonly onOpenMenu: OnOpenMenuFunction;
-    readonly onCloseMenu: OnCloseMenuFunction;
     readonly onBack?: OnBackFunction;
     readonly onNext?: OnNextFunction;
     readonly onPrevious?: OnPreviousFunction;

package/dist/infrastructure/ui/views/navigation/components/header/Header.js

@@ -66,7 +66,7 @@ const CheckoutHeader = ({ onBack }) => {
         React.createElement(Text, { level: 3, detail: true, upperCase: true }, title),
         React.createElement(ButtonIconPlaceholder, null)));
 };
-const Header = ({ customerId, menu: Menu, menuVisible, onOpenMenu, onCloseMenu, onBack, onNext, onPrevious, style: customStyle, }) => {
+const Header = ({ customerId, onOpenMenu, onBack, onNext, onPrevious, style: customStyle }) => {
     const { id: itemId } = useParams();
     const [checkout] = useViewFirstAvailableCheckoutByCustomerId({ customerId });
     const currentItem = checkout?.items.find((item) => item.id === itemId);
@@ -97,7 +97,6 @@ const Header = ({ customerId, menu: Menu, menuVisible, onOpenMenu, onCloseMenu,
     ]);
     const { top: safeAreaInsetTop } = useSafeAreaInsets();
     const handleOnOpenMenu = useCallback(() => onOpenMenu({ page: trackingPage(), checkoutId: checkout?.id, collapse: false }), [checkout?.id, onOpenMenu, trackingPage]);
-    const handleOnCloseMenu = useCallback(() => onCloseMenu({ page: trackingPage(), checkoutId: checkout?.id, collapse: true }), [checkout?.id, onCloseMenu, trackingPage]);
     const handleOnBack = useCallback(() => onBack?.({ page: trackingPage(), checkoutId: checkout?.id }), [checkout?.id, onBack, trackingPage]);
     const handleOnNext = useCallback(({ from, to }) => onNext?.({ page: trackingPage(), checkoutId: checkout?.id, from, to }), [checkout?.id, onNext, trackingPage]);
     const handleOnPrevious = useCallback(({ from, to }) => onPrevious?.({ page: trackingPage(), checkoutId: checkout?.id, from, to }), [checkout?.id, onPrevious, trackingPage]);
@@ -116,8 +115,6 @@ const Header = ({ customerId, menu: Menu, menuVisible, onOpenMenu, onCloseMenu,
     else {
         header = React.createElement(DefaultHeader, { onOpenMenu: handleOnOpenMenu });
     }
-    return (React.createElement(React.Fragment, null,
-        React.createElement(SafeAreaView, { edges: ["top"], style: [style.container, { height: HEADER_HEIGHT + safeAreaInsetTop }, customStyle] }, header),
-        React.createElement(Menu, { isVisible: menuVisible, onClose: handleOnCloseMenu })));
+    return (React.createElement(SafeAreaView, { edges: ["top"], style: [style.container, { height: HEADER_HEIGHT + safeAreaInsetTop }, customStyle] }, header));
 };
 export { Header };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "1.3.0-beta.3",
+  "version": "2.0.0-beta.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -19,7 +19,7 @@
     "build:app": "tsc -p ./tsconfig.build-app.json --noemit && ENTRY_POINT='./src/Expo.tsx' NODE_ENV=production expo export:web --clear",
     "lint": "eslint --fix --cache --cache-location ./node_modules/.cache/.eslintcache --ext ts,tsx .",
     "format": "prettier --write \"**/*.+(json|css|ts|tsx|md)\"",
-    "test": "tsc -p ./tsconfig.test.json --noemit && jest --passWithNoTests --colors --verbose --runInBand --detectOpenHandles --forceExit",
+    "test": "tsc -p ./tsconfig.test.json --noemit && jest",
     "test:coverage": "jest --coverage --coverageReporters=text --detectOpenHandles --forceExit --silent",
     "test:contract": "TEST_ENV=CONTRACT jest --coverage false --detectOpenHandles --testMatch \"**/?(*.)+(pact).ts\" --testTimeout=3000  --watchAll=false --forceExit",
     "publish:contract": "BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) node pact.publish.js",
@@ -37,15 +37,15 @@
     "inline-style-prefixer": "6.0.1",
     "lodash": "^4.17.21",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
-    "react-native-safe-area-context": "^4.5.0",
-    "react-native-svg": "^13.4.0",
+    "react-native-safe-area-context": "^4.4.1",
+    "react-native-svg": "^12.1.1",
     "tiny-invariant": "^1.3.1",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@lookiero/aurora": "^3.1.0",
     "@lookiero/aurora-fonts": "^1.0.6",
     "@lookiero/aurora-iconfont": "^2.0.41",
+    "@lookiero/aurora": "^3.1.0",
     "@lookiero/data-sources": "^0.3",
     "@lookiero/event": "^0.3",
     "@lookiero/locale": "^0.3",
@@ -54,20 +54,20 @@
     "apollo-boost": "0.4.4",
     "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-native": "^0.71.4",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "react-native": "^0.70.6",
     "react-native-get-random-values": "^1.8.0",
-    "react-native-web": "^0.18.11",
+    "react-native-web": "^0.18.9",
     "react-router-dom": "^6.8.1",
     "react-router-native": "^6.8.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@expo/webpack-config": "^0.17.4",
-    "@lookiero/aurora": "^3.1.0",
+    "@babel/core": "^7.19.1",
+    "@expo/webpack-config": "^0.17.2",
     "@lookiero/aurora-fonts": "^1.0.6",
     "@lookiero/aurora-iconfont": "^2.0.41",
+    "@lookiero/aurora": "^3.1.0",
     "@lookiero/data-sources": "^0.3",
     "@lookiero/event": "^0.3",
     "@lookiero/locale": "^0.3",
@@ -77,12 +77,14 @@
     "@pact-foundation/pact-node": "^10.17.6",
     "@react-native-firebase/analytics": "10.5.1",
     "@react-native-firebase/app": "10.5.0",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/react-native": "^11.5.0",
     "@trivago/prettier-plugin-sort-imports": "^3.3.0",
     "@types/jest": "^29.2.4",
-    "@types/react": "~18.0.27",
-    "@types/react-dom": "~18.0.10",
-    "@types/react-native": "^0.70.13",
+    "@types/react": "~18.0.26",
+    "@types/react-dom": "~18.0.0",
+    "@types/react-native": "~0.69.1",
     "@types/uuid": "^9.0.0",
     "abort-controller": "^3.0.0",
     "apollo-boost": "0.4.4",
@@ -96,30 +98,31 @@
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-native": "^4.0.0",
-    "expo": "^48.0.0",
-    "expo-modules-core": "^1.2.6",
-    "expo-status-bar": "~1.4.4",
+    "expo": "~46.0.8",
+    "expo-modules-core": "^1.0.3",
+    "expo-status-bar": "~1.4.0",
     "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
     "husky": "^8.0.2",
     "jest": "^29.3.1",
-    "jest-expo": "^48.0.0",
+    "jest-expo": "^46.0.1",
     "jest-fetch-mock": "^3.0.3",
     "jest-mock-extended": "^3.0.1",
     "lint-staged": "^13.0.3",
     "pino-std-serializers": "^6.0.0",
     "prettier": "^2.7.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "react-error-overlay": "^6.0.9",
-    "react-native": "^0.71.3",
+    "react-native": "^0.70.6",
     "react-native-adjust": "^4.33.0",
     "react-native-get-random-values": "^1.8.0",
-    "react-native-web": "^0.18.11",
+    "react-native-unimodules": "^0.14.10",
+    "react-native-web": "^0.18.9",
     "react-router-dom": "^6.8.1",
     "react-router-native": "^6.8.1",
     "react-test-renderer": "^18.0.0",
-    "typescript": "^4.9.4",
+    "typescript": "^4.9.3",
     "webpack-bundle-analyzer": "^4.7.0"
   }
 }