Skip to content

Commit

Permalink
Merge pull request #1079 from shopgate/PWA-2784
Browse files Browse the repository at this point in the history
Added portal for headline on browse page
  • Loading branch information
alexbridge committed Mar 19, 2021
2 parents 7fff96e + ffc36aa commit 8e79f5a
Show file tree
Hide file tree
Showing 12 changed files with 598 additions and 550 deletions.
2 changes: 1 addition & 1 deletion extensions/@shopgate-product-reviews/extension-config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.13.13-rc.2",
"version": "6.13.14",
"id": "@shopgate/product-reviews",
"components": [
{
Expand Down
12 changes: 6 additions & 6 deletions extensions/@shopgate-product-reviews/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@shopgate/product-reviews",
"version": "6.13.13-rc.2",
"version": "6.13.14",
"description": "Shopgate Connect Product Reviews extension.",
"license": "Apache-2.0",
"devDependencies": {
"@shopgate/engage": "6.13.13-rc.2",
"@shopgate/eslint-config": "6.13.13-rc.2",
"@shopgate/pwa-common": "6.13.13-rc.2",
"@shopgate/pwa-common-commerce": "6.13.13-rc.2",
"@shopgate/pwa-core": "6.13.13-rc.2",
"@shopgate/engage": "6.13.14",
"@shopgate/eslint-config": "6.13.14",
"@shopgate/pwa-common": "6.13.14",
"@shopgate/pwa-common-commerce": "6.13.14",
"@shopgate/pwa-core": "6.13.14",
"lint-staged": "^7.2.2",
"prop-types": "~15.7.2",
"react": "~16.12.0",
Expand Down
2 changes: 1 addition & 1 deletion extensions/@shopgate-theme-config/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopgate/theme-config",
"version": "6.13.13-rc.2",
"version": "6.13.14",
"description": "Provides the theme configurations for Catalog 2.0",
"license": "Apache-2.0",
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.13.13-rc.2",
"version": "6.13.14",
"id": "@shopgate/tracking-ga-native",
"components": [
{
Expand Down
8 changes: 4 additions & 4 deletions extensions/@shopgate-tracking-ga-native/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@shopgate/tracking-ga-native",
"version": "6.13.13-rc.2",
"version": "6.13.14",
"description": "Shopgate Connect Google Analytics native tracker extension.",
"main": "frontend/index.js",
"repository": "shopgate/tracking-ga-native",
"bugs": "https://github.com/shopgate/tracking-ga-native/issues",
"homepage": "https://github.com/shopgate/tracking-ga-native",
"license": "Apache-2.0",
"dependencies": {
"@shopgate/tracking-core": "6.13.13-rc.2"
"@shopgate/tracking-core": "6.13.14"
},
"devDependencies": {
"@shopgate/pwa-common": "6.13.13-rc.2",
"@shopgate/pwa-core": "6.13.13-rc.2"
"@shopgate/pwa-common": "6.13.14",
"@shopgate/pwa-core": "6.13.14"
}
}
2 changes: 1 addition & 1 deletion extensions/@shopgate-user-privacy/extension-config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.13.13-rc.2",
"version": "6.13.14",
"id": "@shopgate/user-privacy",
"configuration": {
"isActive": {
Expand Down
10 changes: 5 additions & 5 deletions extensions/@shopgate-user-privacy/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@shopgate/user-privacy",
"version": "6.13.13-rc.2",
"version": "6.13.14",
"description": "Shopgate Connect User Privacy Extension",
"license": "Apache 2.0",
"repository": {
"type": "git",
"url": "https://github.com/shopgate/ext-user-privacy"
},
"devDependencies": {
"@shopgate/pwa-common": "6.13.13-rc.2",
"@shopgate/pwa-common-commerce": "6.13.13-rc.2",
"@shopgate/pwa-core": "6.13.13-rc.2",
"@shopgate/pwa-ui-shared": "6.13.13-rc.2",
"@shopgate/pwa-common": "6.13.14",
"@shopgate/pwa-common-commerce": "6.13.14",
"@shopgate/pwa-core": "6.13.14",
"@shopgate/pwa-ui-shared": "6.13.14",
"prop-types": "~15.7.2",
"react": "~16.12.0",
"react-redux": "^5.1.2",
Expand Down
8 changes: 8 additions & 0 deletions libraries/ui-material/NavDrawer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ class NavDrawer extends Component {
return this.state.open !== nextState.open;
}

/**
* The unmount lifecycle hook
*/
componentWillUnmount() {
UIEvents.removeListener(OPEN, this.open);
UIEvents.removeListener(CLOSE, this.close);
}

onEntering = () => {
this.props.onOpen();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class AppBarDefault extends PureComponent {
* Removes the event listeners when the component unmounts.
*/
componentWillUnmount() {
UIEvents.addListener(NavDrawer.EVENT_CLOSE, this.setFocus);
UIEvents.removeListener(NavDrawer.EVENT_CLOSE, this.setFocus);
}

/**
Expand Down

0 comments on commit 8e79f5a

Please sign in to comment.