@graphcommerce/next-ui 3.14.3 → 3.14.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AppShell/Footer/index.tsx +4 -22
- package/CHANGELOG.md +11 -0
- package/Page/Document.tsx +1 -0
- package/Row/ColumnTwoWithTop/index.tsx +15 -13
- package/UspList/index.tsx +1 -1
- package/package.json +11 -11
- package/types.d.ts +9 -0
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
import { ContainerProps, Theme, makeStyles, Container } from '@material-ui/core'
|
|
2
|
-
import clsx from 'clsx'
|
|
3
2
|
import React from 'react'
|
|
4
3
|
import { UseStyles } from '../../Styles'
|
|
5
4
|
|
|
6
5
|
const useStyles = makeStyles(
|
|
7
6
|
(theme: Theme) => ({
|
|
8
7
|
footer: {
|
|
9
|
-
gridTemplateColumns: '
|
|
8
|
+
gridTemplateColumns: '5fr 3fr',
|
|
10
9
|
gridTemplateAreas: `
|
|
11
10
|
'social switcher'
|
|
12
11
|
'links support'
|
|
13
12
|
`,
|
|
14
13
|
borderTop: `1px solid ${theme.palette.divider}`,
|
|
15
|
-
padding: `${theme.page.vertical} ${theme.page.horizontal}
|
|
14
|
+
padding: `${theme.page.vertical} ${theme.page.horizontal}`,
|
|
16
15
|
display: 'grid',
|
|
17
16
|
gap: theme.spacings.xs,
|
|
18
17
|
alignItems: 'center',
|
|
@@ -36,11 +35,6 @@ const useStyles = makeStyles(
|
|
|
36
35
|
justifyContent: 'space-between',
|
|
37
36
|
},
|
|
38
37
|
},
|
|
39
|
-
disableMargin: {
|
|
40
|
-
[theme.breakpoints.down('xs')]: {
|
|
41
|
-
marginBottom: 0,
|
|
42
|
-
},
|
|
43
|
-
},
|
|
44
38
|
copyright: {
|
|
45
39
|
display: 'grid',
|
|
46
40
|
gridAutoFlow: 'column',
|
|
@@ -86,7 +80,6 @@ const useStyles = makeStyles(
|
|
|
86
80
|
)
|
|
87
81
|
|
|
88
82
|
type FooterProps = UseStyles<typeof useStyles> & {
|
|
89
|
-
disableMargin?: boolean
|
|
90
83
|
storeSwitcher?: React.ReactNode
|
|
91
84
|
socialLinks?: React.ReactElement
|
|
92
85
|
customerService?: React.ReactNode
|
|
@@ -94,22 +87,11 @@ type FooterProps = UseStyles<typeof useStyles> & {
|
|
|
94
87
|
} & Omit<ContainerProps, 'children'>
|
|
95
88
|
|
|
96
89
|
export default function Footer(props: FooterProps) {
|
|
97
|
-
const {
|
|
98
|
-
disableMargin,
|
|
99
|
-
socialLinks,
|
|
100
|
-
storeSwitcher,
|
|
101
|
-
customerService,
|
|
102
|
-
copyright,
|
|
103
|
-
...containerProps
|
|
104
|
-
} = props
|
|
90
|
+
const { socialLinks, storeSwitcher, customerService, copyright, ...containerProps } = props
|
|
105
91
|
const classes = useStyles(props)
|
|
106
92
|
|
|
107
93
|
return (
|
|
108
|
-
<Container
|
|
109
|
-
maxWidth={false}
|
|
110
|
-
className={clsx(classes.footer, disableMargin && classes.disableMargin)}
|
|
111
|
-
{...containerProps}
|
|
112
|
-
>
|
|
94
|
+
<Container maxWidth={false} className={classes.footer} {...containerProps}>
|
|
113
95
|
<div className={classes.social}>{socialLinks}</div>
|
|
114
96
|
<div className={classes.storeSwitcher}>{storeSwitcher}</div>
|
|
115
97
|
<div className={classes.support}>{customerService}</div>
|
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [3.14.7](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.14.6...@graphcommerce/next-ui@3.14.7) (2021-11-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* make sure the translations are ran ([9d77807](https://github.com/ho-nl/m2-pwa/commit/9d7780711fc1d66884a7465e18d175a6a1d40abb))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [3.14.3](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.14.2...@graphcommerce/next-ui@3.14.3) (2021-11-06)
|
|
7
18
|
|
|
8
19
|
|
package/Page/Document.tsx
CHANGED
|
@@ -8,12 +8,16 @@ const useStyles = makeStyles(
|
|
|
8
8
|
root: {
|
|
9
9
|
display: 'grid',
|
|
10
10
|
gap: `${theme.spacings.lg} 0`,
|
|
11
|
-
gridTemplateAreas: `
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
gridTemplateAreas: `
|
|
12
|
+
"top"
|
|
13
|
+
"left"
|
|
14
|
+
"right"
|
|
15
|
+
`,
|
|
14
16
|
[theme.breakpoints.up('md')]: {
|
|
15
|
-
gridTemplateAreas: `
|
|
16
|
-
|
|
17
|
+
gridTemplateAreas: `
|
|
18
|
+
"top ."
|
|
19
|
+
"left right"
|
|
20
|
+
`,
|
|
17
21
|
gridTemplateColumns: '1fr auto',
|
|
18
22
|
gap: `${theme.spacings.sm} ${theme.spacings.xl}`,
|
|
19
23
|
},
|
|
@@ -31,15 +35,13 @@ const useStyles = makeStyles(
|
|
|
31
35
|
{ name: 'ColumnTwoWithTop' },
|
|
32
36
|
)
|
|
33
37
|
|
|
34
|
-
export type
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
>
|
|
38
|
+
export type ColumnTwoWithTopProps = UseStyles<typeof useStyles> & {
|
|
39
|
+
top: React.ReactNode
|
|
40
|
+
left: React.ReactNode
|
|
41
|
+
right: React.ReactNode
|
|
42
|
+
}
|
|
41
43
|
|
|
42
|
-
export default function ColumnTwoWithTop(props:
|
|
44
|
+
export default function ColumnTwoWithTop(props: ColumnTwoWithTopProps) {
|
|
43
45
|
const { top, left, right } = props
|
|
44
46
|
const classes = useStyles(props)
|
|
45
47
|
|
package/UspList/index.tsx
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@graphcommerce/next-ui",
|
|
3
|
-
"version": "3.14.
|
|
3
|
+
"version": "3.14.7",
|
|
4
4
|
"author": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"scripts": {
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@apollo/client": "^3.4.16",
|
|
13
|
-
"@graphcommerce/framer-next-pages": "^2.107.
|
|
14
|
-
"@graphcommerce/framer-scroller": "^1.0.
|
|
15
|
-
"@graphcommerce/framer-sheet": "^2.106.
|
|
16
|
-
"@graphcommerce/framer-utils": "^2.103.
|
|
17
|
-
"@graphcommerce/graphql": "^2.105.
|
|
18
|
-
"@graphcommerce/image": "^2.105.
|
|
13
|
+
"@graphcommerce/framer-next-pages": "^2.107.4",
|
|
14
|
+
"@graphcommerce/framer-scroller": "^1.0.3",
|
|
15
|
+
"@graphcommerce/framer-sheet": "^2.106.1",
|
|
16
|
+
"@graphcommerce/framer-utils": "^2.103.14",
|
|
17
|
+
"@graphcommerce/graphql": "^2.105.4",
|
|
18
|
+
"@graphcommerce/image": "^2.105.3",
|
|
19
19
|
"@graphql-typed-document-node/core": "^3.1.0",
|
|
20
20
|
"@material-ui/core": "^4.12.3",
|
|
21
21
|
"@material-ui/lab": "^4.0.0-alpha.60",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"clsx": "^1.1.1",
|
|
24
24
|
"framer-motion": "^4.1.17",
|
|
25
25
|
"graphql": "^15.6.1",
|
|
26
|
-
"next": "^12.0.
|
|
26
|
+
"next": "^12.0.3",
|
|
27
27
|
"react": "^17.0.2",
|
|
28
28
|
"react-dom": "^17.0.2",
|
|
29
29
|
"react-focus-lock": "^2.5.2",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@graphcommerce/browserslist-config-pwa": "^3.0.2",
|
|
37
|
-
"@graphcommerce/eslint-config-pwa": "^3.1.
|
|
38
|
-
"@graphcommerce/prettier-config-pwa": "^3.0.
|
|
37
|
+
"@graphcommerce/eslint-config-pwa": "^3.1.4",
|
|
38
|
+
"@graphcommerce/prettier-config-pwa": "^3.0.4",
|
|
39
39
|
"@graphcommerce/typescript-config-pwa": "^3.1.1",
|
|
40
40
|
"@playwright/test": "^1.16.2",
|
|
41
41
|
"@types/react-is": "^17.0.3",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"project": "./tsconfig.json"
|
|
54
54
|
}
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "c9d9c589d7e118318f3b44d8322e9bc71feca484"
|
|
57
57
|
}
|
package/types.d.ts
CHANGED
|
@@ -11,3 +11,12 @@ declare module 'react' {
|
|
|
11
11
|
loading?: 'lazy' | 'eager' | 'auto'
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
+
|
|
15
|
+
declare module '*.po' {
|
|
16
|
+
const messages: Record<
|
|
17
|
+
string,
|
|
18
|
+
string | Array<string | Array<string | (string | undefined) | Record<string, unknown>>>
|
|
19
|
+
>
|
|
20
|
+
|
|
21
|
+
export const messages
|
|
22
|
+
}
|