@shopgate/pwa-ui-ios 7.32.0-beta.2 → 7.32.0-beta.20

package/AppBar/index.js

@@ -20,6 +20,7 @@ const useStyles = makeStyles()(theme => ({
   },
   inner: {
     display: 'flex',
+    alignItems: 'center',
     justifyContent: 'space-between',
     position: 'relative',
     zIndex: 1
@@ -99,7 +100,7 @@ const AppBar = ({
 };
 AppBar.defaultProps = {
   'aria-hidden': null,
-  backgroundColor: 'var(--sg-palette-background-default)',
+  backgroundColor: 'var(--sg-components-appBar-background)',
   below: null,
   center: null,
   classes: {
@@ -108,7 +109,7 @@ AppBar.defaultProps = {
   },
   left: null,
   right: null,
-  textColor: 'var(--sg-palette-text-primary)'
+  textColor: 'var(--sg-components-appBar-color)'
 };
 AppBar.Field = Field;
 AppBar.Icon = Icon;

package/BaseDialog/components/Buttons/index.js

@@ -1,33 +1,44 @@
 import React, { memo } from 'react';
 import PropTypes from 'prop-types';
-import { I18n, Button } from '@shopgate/engage/components';
+import { I18n } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx } from "react/jsx-runtime";
 const borderColor = 'rgba(0,0,0,0.2)';
+const pressedColor = 'rgba(0,0,0,0.08)';
+const hoverColor = 'rgba(0,0,0,0.04)';
 const useStyles = makeStyles()(theme => ({
   button: {
-    '&& > *': {
+    '& > *': {
       color: 'var(--color-button-dialog-ios, #1a73e8)'
     },
-    '&&': {
-      fontWeight: theme.typography.fontWeightRegular,
-      minWidth: '50%',
-      flexGrow: 1,
-      paddingTop: 10,
-      paddingBottom: 10
-    },
+    fontWeight: theme.typography.fontWeightRegular,
+    minWidth: '50%',
+    flexGrow: 1,
+    lineHeight: 1.2,
+    paddingTop: 11,
+    paddingBottom: 11,
     marginBottom: -1,
     marginRight: theme.spacing(-0.5),
+    '&:active': {
+      background: pressedColor
+    },
+    '&:focus-visible': {
+      background: pressedColor
+    },
+    '@media (hover: hover)': {
+      '&:hover': {
+        background: hoverColor
+      }
+    },
     '&:not(:last-child)': {
-      borderRadius: '0 !important',
+      borderRadius: 0,
       borderRight: `0.5px solid ${borderColor}`,
       borderBottom: `0.5px solid ${borderColor}`
     }
   },
   buttonPrimary: {
-    '&&': {
-      fontWeight: theme.typography.fontWeightRegular
-    }
+    fontWeight: theme.typography.fontWeightRegular
   },
   buttonText: {
     overflow: 'hidden',
@@ -54,10 +65,11 @@ const Buttons = ({
     disabled = false
   }) => /*#__PURE__*/_jsx(Button, {
     className: cx(classes.button, type === 'primary' && classes.buttonPrimary),
-    type: "primary",
+    variant: "link",
+    color: "secondary",
     onClick: action,
     disabled: disabled,
-    flat: true,
+    disableRipple: true,
     children: /*#__PURE__*/_jsx(I18n.Text, {
       className: classes.buttonText,
       string: label

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@shopgate/pwa-ui-ios",
-  "version": "7.32.0-beta.2",
+  "version": "7.32.0-beta.20",
   "description": "Shopgate's iOS UI components.",
   "main": "index.js",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@shopgate/pwa-common": "7.32.0-beta.2",
+    "@shopgate/pwa-common": "7.32.0-beta.20",
     "react": "^17.0.2"
   },
   "peerDependencies": {

package/BaseDialog/components/Buttons/spec.js

@@ -1,29 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import Button from '@shopgate/pwa-ui-shared/Button';
-import Buttons from "./index";
-import { jsx as _jsx } from "react/jsx-runtime";
-const actions = [{
-  label: 'action0',
-  action: jest.fn()
-}, {
-  label: 'action1',
-  action: jest.fn()
-}, {
-  label: 'action2',
-  action: jest.fn()
-}];
-describe('<Buttons />', () => {
-  it('should not render if no actions are passed', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(Buttons, {}));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.instance()).toEqual(null);
-  });
-  it('should render buttons', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(Buttons, {
-      actions: actions
-    }));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.find(Button).length).toBe(actions.length);
-  });
-});

package/BaseDialog/components/Content/spec.js

@@ -1,18 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import Content from "./index";
-import { jsx as _jsx } from "react/jsx-runtime";
-describe('<Content />', () => {
-  it('should not render if no content is passed', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(Content, {}));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.instance()).toEqual(null);
-  });
-  it('should render content components', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(Content, {
-      content: "Hello World"
-    }));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.find('[id="basicDialogDesc"]').length).toBe(1);
-  });
-});

package/BaseDialog/components/Title/spec.js

@@ -1,18 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import Title from "./index";
-import { jsx as _jsx } from "react/jsx-runtime";
-describe('<Title />', () => {
-  it('should not render without a title', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(Title, {}));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.instance()).toEqual(null);
-  });
-  it('should render with a title', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(Title, {
-      title: "Some test title"
-    }));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.find('[id="basicDialogTitle"]').length).toBe(1);
-  });
-});

package/BaseDialog/spec.js

@@ -1,44 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import Title from "./components/Title";
-import Content from "./components/Content";
-import Buttons from "./components/Buttons";
-import BasicDialog from "./index";
-import { jsx as _jsx } from "react/jsx-runtime";
-const props = {
-  title: 'Hello World',
-  children: /*#__PURE__*/_jsx("div", {
-    children: "Hello World"
-  }),
-  actions: [{
-    label: 'action0',
-    action: jest.fn()
-  }, {
-    label: 'action1',
-    action: jest.fn()
-  }, {
-    label: 'action2',
-    action: jest.fn()
-  }]
-};
-jest.mock('@shopgate/engage/a11y/components');
-describe('<BasicDialog />', () => {
-  it('should render with minimal props', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(BasicDialog, {
-      actions: []
-    }));
-    expect(wrapper).toMatchSnapshot();
-  });
-  it('should render as expected', () => {
-    const wrapper = shallow(/*#__PURE__*/_jsx(BasicDialog, {
-      ...props
-    }));
-    expect(wrapper).toMatchSnapshot();
-    expect(wrapper.find(Title).length).toBe(1);
-    expect(wrapper.find(Title).props().title).toEqual(props.title);
-    expect(wrapper.find(Content).length).toBe(1);
-    expect(wrapper.find(Content).props().content).toEqual(props.children);
-    expect(wrapper.find(Buttons).length).toBe(1);
-    expect(wrapper.find(Buttons).props().actions).toEqual(props.actions);
-  });
-});

package/tsconfig.build.json

@@ -1,16 +0,0 @@
-{
-  "extends": "@shopgate/engage/tsconfig.build.json",
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "."
-  },
-  "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": [
-    "dist",
-    "node_modules",
-    "**/*.spec.*",
-    "**/__tests__/**",
-    "**/__snapshots__/**",
-    "coverage"
-  ]
-}

package/tsconfig.json

@@ -1,3 +0,0 @@
-{
-  "extends": "@shopgate/engage/tsconfig.json",
-}