@riosst100/pwa-marketplace 1.2.6 → 1.2.7

package/src/overwrites/venia-ui/lib/components/Header/storeSwitcher.js

@@ -1,105 +1,105 @@
-import React from 'react';
-import { shape, string } from 'prop-types';
-
-import { useStoreSwitcher } from '@magento/peregrine/lib/talons/Header/useStoreSwitcher';
-import { availableRoutes } from '@magento/venia-ui/lib/components/Routes/routes';
-
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import defaultClasses from '@magento/venia-ui/lib/components/Header/storeSwitcher.module.css';
-import SwitcherItem from '@magento/venia-ui/lib/components/Header/switcherItem';
-import Shimmer from '@magento/venia-ui/lib/components/Header/storeSwitcher.shimmer';
-
-const StoreSwitcher = props => {
-    const {
-        availableStores,
-        currentGroupName,
-        currentStoreName,
-        handleSwitchStore,
-        storeGroups,
-        storeMenuRef,
-        storeMenuTriggerRef,
-        storeMenuIsOpen,
-        handleTriggerClick
-    } = useStoreSwitcher({ availableRoutes });
-
-    const classes = useStyle(defaultClasses, props.classes);
-    const menuClassName = storeMenuIsOpen ? classes.menu_open : classes.menu;
-
-    if (!availableStores) return <Shimmer />;
-
-    const groups = [];
-
-    storeGroups.forEach((group, key) => {
-        const stores = [];
-        group.forEach(({ storeName, isCurrent, storeCode, websiteCode }) => {
-            let label = `${storeName}`;
-            
-            stores.push(
-                <li
-                    aria-selected={currentStoreName}
-                    role="option"
-                    key={storeCode}
-                    className={classes.menuItem}
-                    data-cy="StoreSwitcher-view"
-                >
-                    <SwitcherItem
-                        active={isCurrent}
-                        onClick={handleSwitchStore}
-                        option={storeCode}
-                        option2={websiteCode}
-                    >
-                        {label}
-                    </SwitcherItem>
-                </li>
-            );
-        });
-
-        groups.push(
-            <ul
-                role="listbox"
-                className={classes.groupList}
-                key={key}
-                data-cy="StoreSwitcher-group"
-            >
-                {stores}
-            </ul>
-        );
-    });
-
-    return (
-        <div className={classes.root} data-cy="StoreSwitcher-root">
-            <button
-                data-cy="StoreSwitcher-triggerButton"
-                className={classes.trigger}
-                aria-label={currentStoreName || ''}
-                onClick={handleTriggerClick}
-                ref={storeMenuTriggerRef}
-                data-cy="StoreSwitcher-trigger"
-                aria-expanded={storeMenuIsOpen}
-            >
-                {currentStoreName || ''}
-            </button>
-            <div
-                ref={storeMenuRef}
-                className={menuClassName}
-                data-cy="StoreSwitcher-menu"
-            >
-                <div className={classes.groups}>{groups}</div>
-            </div>
-        </div>
-    );
-};
-
-export default StoreSwitcher;
-
-StoreSwitcher.propTypes = {
-    classes: shape({
-        groupList: string,
-        groups: string,
-        menu: string,
-        menu_open: string,
-        menuItem: string,
-        root: string,
-        trigger: string
-    })
-};
+import React from 'react';
+import { shape, string } from 'prop-types';
+
+import { useStoreSwitcher } from '@magento/peregrine/lib/talons/Header/useStoreSwitcher';
+import { availableRoutes } from '@magento/venia-ui/lib/components/Routes/routes';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import defaultClasses from '@magento/venia-ui/lib/components/Header/storeSwitcher.module.css';
+import SwitcherItem from '@magento/venia-ui/lib/components/Header/switcherItem';
+import Shimmer from '@magento/venia-ui/lib/components/Header/storeSwitcher.shimmer';
+
+const StoreSwitcher = props => {
+    const {
+        availableStores,
+        currentGroupName,
+        currentStoreName,
+        handleSwitchStore,
+        storeGroups,
+        storeMenuRef,
+        storeMenuTriggerRef,
+        storeMenuIsOpen,
+        handleTriggerClick
+    } = useStoreSwitcher({ availableRoutes });
+
+    const classes = useStyle(defaultClasses, props.classes);
+    const menuClassName = storeMenuIsOpen ? classes.menu_open : classes.menu;
+
+    if (!availableStores) return <Shimmer />;
+
+    const groups = [];
+
+    storeGroups.forEach((group, key) => {
+        const stores = [];
+        group.forEach(({ storeName, isCurrent, storeCode, websiteCode }) => {
+            let label = `${storeName}`;
+            
+            stores.push(
+                <li
+                    aria-selected={currentStoreName}
+                    role="option"
+                    key={storeCode}
+                    className={classes.menuItem}
+                    data-cy="StoreSwitcher-view"
+                >
+                    <SwitcherItem
+                        active={isCurrent}
+                        onClick={handleSwitchStore}
+                        option={storeCode}
+                        option2={websiteCode}
+                    >
+                        {label}
+                    </SwitcherItem>
+                </li>
+            );
+        });
+
+        groups.push(
+            <ul
+                role="listbox"
+                className={classes.groupList}
+                key={key}
+                data-cy="StoreSwitcher-group"
+            >
+                {stores}
+            </ul>
+        );
+    });
+
+    return (
+        <div className={classes.root} data-cy="StoreSwitcher-root">
+            <button
+                data-cy="StoreSwitcher-triggerButton"
+                className={classes.trigger}
+                aria-label={currentStoreName || ''}
+                onClick={handleTriggerClick}
+                ref={storeMenuTriggerRef}
+                data-cy="StoreSwitcher-trigger"
+                aria-expanded={storeMenuIsOpen}
+            >
+                {currentStoreName || ''}
+            </button>
+            <div
+                ref={storeMenuRef}
+                className={menuClassName}
+                data-cy="StoreSwitcher-menu"
+            >
+                <div className={classes.groups}>{groups}</div>
+            </div>
+        </div>
+    );
+};
+
+export default StoreSwitcher;
+
+StoreSwitcher.propTypes = {
+    classes: shape({
+        groupList: string,
+        groups: string,
+        menu: string,
+        menu_open: string,
+        menuItem: string,
+        root: string,
+        trigger: string
+    })
+};

package/src/overwrites/venia-ui/lib/components/Header/switcherItem.js

@@ -1,47 +1,47 @@
-import React, { useCallback } from 'react';
-import { Check } from 'react-feather';
-import { bool, func, shape, string } from 'prop-types';
-
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import Icon from '@magento/venia-ui/lib/components/Icon/icon';
-import defaultClasses from '@magento/venia-ui/lib/components/Header/switcherItem.module.css';
-
-const SwitcherItem = props => {
-    const { active, onClick, option, option2, children } = props;
-    const classes = useStyle(defaultClasses, props.classes);
-
-    const handleClick = useCallback(() => {
-        onClick(option, option2);
-    }, [option, option2, onClick]);
-
-    const activeIcon = active ? (
-        <Icon data-cy="SwitcherItem-activeIcon" size={20} src={Check} />
-    ) : null;
-
-    return (
-        <button
-            data-cy="SwitcherItem-button"
-            className={classes.root}
-            disabled={active}
-            onClick={handleClick}
-        >
-            <span className={classes.content}>
-                <span className={classes.text}>{children}</span>
-                {activeIcon}
-            </span>
-        </button>
-    );
-};
-
-SwitcherItem.propTypes = {
-    active: bool,
-    classes: shape({
-        content: string,
-        root: string,
-        text: string
-    }),
-    onClick: func,
-    option: string
-};
-
-export default SwitcherItem;
+import React, { useCallback } from 'react';
+import { Check } from 'react-feather';
+import { bool, func, shape, string } from 'prop-types';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import Icon from '@magento/venia-ui/lib/components/Icon/icon';
+import defaultClasses from '@magento/venia-ui/lib/components/Header/switcherItem.module.css';
+
+const SwitcherItem = props => {
+    const { active, onClick, option, option2, children } = props;
+    const classes = useStyle(defaultClasses, props.classes);
+
+    const handleClick = useCallback(() => {
+        onClick(option, option2);
+    }, [option, option2, onClick]);
+
+    const activeIcon = active ? (
+        <Icon data-cy="SwitcherItem-activeIcon" size={20} src={Check} />
+    ) : null;
+
+    return (
+        <button
+            data-cy="SwitcherItem-button"
+            className={classes.root}
+            disabled={active}
+            onClick={handleClick}
+        >
+            <span className={classes.content}>
+                <span className={classes.text}>{children}</span>
+                {activeIcon}
+            </span>
+        </button>
+    );
+};
+
+SwitcherItem.propTypes = {
+    active: bool,
+    classes: shape({
+        content: string,
+        root: string,
+        text: string
+    }),
+    onClick: func,
+    option: string
+};
+
+export default SwitcherItem;

package/src/overwrites/venia-ui/lib/components/MegaMenu/__tests__/MegaMenu.spec.js

@@ -1,91 +1,91 @@
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
-
-import { createTestInstance } from '@magento/peregrine';
-import { useIsInViewport } from '@magento/peregrine/lib/hooks/useIsInViewport';
-
-import MegaMenu from '../megaMenu';
-
-jest.mock('@magento/venia-ui/lib/classify');
-jest.mock('@magento/peregrine/lib/hooks/useIsInViewport');
-jest.mock('@magento/peregrine/lib/talons/MegaMenu/useMegaMenu', () => ({
-    useMegaMenu: jest.fn().mockReturnValue({
-        megaMenuData: {
-            id: 1,
-            name: 'Clothing',
-            children: [
-                {
-                    id: 2,
-                    name: 'Women',
-                    url_path: 'women',
-                    children: [
-                        {
-                            id: 5,
-                            name: 'Bottoms',
-                            url_path: 'bottoms',
-                            isActive: true,
-                            children: []
-                        }
-                    ]
-                },
-                {
-                    id: 3,
-                    name: 'Men',
-                    url_path: 'men',
-                    children: []
-                },
-                {
-                    id: 4,
-                    name: 'Gear',
-                    url_path: 'gear',
-                    children: []
-                }
-            ]
-        },
-        activeCategoryId: 5,
-        categoryUrlSuffix: '.html',
-        useOutsideAlerter: () => {}
-    })
-}));
-
-describe('#MegaMenu', () => {
-    test('useEffect', () => {
-        const useEffect = jest.spyOn(React, 'useEffect');
-
-        const mockUseEffect = () => {
-            useEffect.mockImplementationOnce(mockFunction => mockFunction());
-        };
-
-        mockUseEffect();
-    });
-
-    test('not resetting the menu', () => {
-        const handleClickOutside = jest.fn();
-
-        expect(handleClickOutside).toHaveBeenCalledTimes(0);
-    });
-
-    it('renders empty div if not in viewport', () => {
-        useIsInViewport.mockReturnValue(false);
-
-        const instance = createTestInstance(
-            <MemoryRouter>
-                <MegaMenu />
-            </MemoryRouter>
-        );
-
-        expect(instance.toJSON()).toMatchSnapshot();
-    });
-
-    it('renders menu if in viewport', () => {
-        useIsInViewport.mockReturnValue(true);
-
-        const instance = createTestInstance(
-            <MemoryRouter>
-                <MegaMenu />
-            </MemoryRouter>
-        );
-
-        expect(instance.toJSON()).toMatchSnapshot();
-    });
-});
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+
+import { createTestInstance } from '@magento/peregrine';
+import { useIsInViewport } from '@magento/peregrine/lib/hooks/useIsInViewport';
+
+import MegaMenu from '../megaMenu';
+
+jest.mock('@magento/venia-ui/lib/classify');
+jest.mock('@magento/peregrine/lib/hooks/useIsInViewport');
+jest.mock('@magento/peregrine/lib/talons/MegaMenu/useMegaMenu', () => ({
+    useMegaMenu: jest.fn().mockReturnValue({
+        megaMenuData: {
+            id: 1,
+            name: 'Clothing',
+            children: [
+                {
+                    id: 2,
+                    name: 'Women',
+                    url_path: 'women',
+                    children: [
+                        {
+                            id: 5,
+                            name: 'Bottoms',
+                            url_path: 'bottoms',
+                            isActive: true,
+                            children: []
+                        }
+                    ]
+                },
+                {
+                    id: 3,
+                    name: 'Men',
+                    url_path: 'men',
+                    children: []
+                },
+                {
+                    id: 4,
+                    name: 'Gear',
+                    url_path: 'gear',
+                    children: []
+                }
+            ]
+        },
+        activeCategoryId: 5,
+        categoryUrlSuffix: '.html',
+        useOutsideAlerter: () => {}
+    })
+}));
+
+describe('#MegaMenu', () => {
+    test('useEffect', () => {
+        const useEffect = jest.spyOn(React, 'useEffect');
+
+        const mockUseEffect = () => {
+            useEffect.mockImplementationOnce(mockFunction => mockFunction());
+        };
+
+        mockUseEffect();
+    });
+
+    test('not resetting the menu', () => {
+        const handleClickOutside = jest.fn();
+
+        expect(handleClickOutside).toHaveBeenCalledTimes(0);
+    });
+
+    it('renders empty div if not in viewport', () => {
+        useIsInViewport.mockReturnValue(false);
+
+        const instance = createTestInstance(
+            <MemoryRouter>
+                <MegaMenu />
+            </MemoryRouter>
+        );
+
+        expect(instance.toJSON()).toMatchSnapshot();
+    });
+
+    it('renders menu if in viewport', () => {
+        useIsInViewport.mockReturnValue(true);
+
+        const instance = createTestInstance(
+            <MemoryRouter>
+                <MegaMenu />
+            </MemoryRouter>
+        );
+
+        expect(instance.toJSON()).toMatchSnapshot();
+    });
+});