From 5b6f50637f0114c7ea9b32f1fcb3b8ece7ea43af Mon Sep 17 00:00:00 2001 From: martin bedouret Date: Sat, 25 Jul 2020 13:33:39 -0300 Subject: [PATCH 1/4] debug --- src/components/Board/Board.container.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js index 9968631ab..cb2cc0d22 100644 --- a/src/components/Board/Board.container.js +++ b/src/components/Board/Board.container.js @@ -326,6 +326,8 @@ export class BoardContainer extends Component { } toggleTileSelect(tileId) { + console.log(tileId); + console.log(this.state.selectedTileIds); if (this.state.selectedTileIds.includes(tileId)) { this.deselectTile(tileId); } else { @@ -517,6 +519,8 @@ export class BoardContainer extends Component { }; handleTileClick = tile => { + console.log(tile); + console.log(this.state.isSelecting); if (this.state.isSelecting) { this.toggleTileSelect(tile.id); return; From 73d86b876eb26f0cfc8e24de18532b5b977356fc Mon Sep 17 00:00:00 2001 From: martin bedouret Date: Sat, 25 Jul 2020 13:35:37 -0300 Subject: [PATCH 2/4] debug --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a536b2c8e..995586450 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -99,6 +99,4 @@ workflows: - image: requires: - build - filters: - branches: - only: master + From b5e9b40f26cb2b581363db165edb992f70e53b8e Mon Sep 17 00:00:00 2001 From: martin bedouret Date: Sat, 25 Jul 2020 14:46:58 -0300 Subject: [PATCH 3/4] fix for react grid --- package.json | 2 +- yarn.lock | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 8f630137c..4f3957a39 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "react": "^16.13.1", "react-autosuggest": "^9.4.2", "react-dom": "^16.8.6", - "react-grid-layout": "^0.18.3", + "react-grid-layout": "^0.16.6", "react-helmet": "^5.2.0", "react-intl": "^2.7.2", "react-loadable": "^5.5.0", diff --git a/yarn.lock b/yarn.lock index f31f1ebf1..c399f659f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10835,7 +10835,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@15.x, prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -11156,7 +11156,15 @@ react-dom@^16.8.6: prop-types "^15.6.2" scheduler "^0.19.1" -react-draggable@^4.0.0, react-draggable@^4.0.3: +react-draggable@3.x: + version "3.3.2" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.3.2.tgz#966ef1d90f2387af3c2d8bd3516f601ea42ca359" + integrity sha512-oaz8a6enjbPtx5qb0oDWxtDNuybOylvto1QLydsXgKmwT7e3GXC2eMVDwEMIUYJIFqVG72XpOv673UuuAq6LhA== + dependencies: + classnames "^2.2.5" + prop-types "^15.6.0" + +react-draggable@^4.0.3: version "4.4.3" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3" integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w== @@ -11174,16 +11182,16 @@ react-fast-compare@^2.0.1, react-fast-compare@^2.0.2: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9" integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw== -react-grid-layout@^0.18.3: - version "0.18.3" - resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.18.3.tgz#4f9540199f35211077eae0aa5bc83096a672c39c" - integrity sha512-lHkrk941Tk5nTwZPa9uj6ttHBT0VehSHwEhWbINBJKvM1GRaFNOefvjcuxSyuCI5JWjVUP+Qm3ARt2470AlxMA== +react-grid-layout@^0.16.6: + version "0.16.6" + resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.16.6.tgz#9b2407a2b946c2260ebaf66f13b556e1da4efeb2" + integrity sha512-h2EsYgsqcESLJeevQSJsEKp8hhh+phOlXDJoMhlV2e7T3VWQL+S6iCF3iD/LK19r4oyRyOMDEir0KV+eLXrAyw== dependencies: classnames "2.x" lodash.isequal "^4.0.0" - prop-types "^15.0.0" - react-draggable "^4.0.0" - react-resizable "^1.9.0" + prop-types "15.x" + react-draggable "3.x" + react-resizable "1.x" react-helmet@^5.2.0: version "5.2.1" @@ -11255,7 +11263,7 @@ react-redux@^5.1.1: react-is "^16.6.0" react-lifecycles-compat "^3.0.0" -react-resizable@^1.9.0: +react-resizable@1.x: version "1.10.1" resolved "https://registry.yarnpkg.com/react-resizable/-/react-resizable-1.10.1.tgz#f0c2cf1d83b3470b87676ce6d6b02bbe3f4d8cd4" integrity sha512-Jd/bKOKx6+19NwC4/aMLRu/J9/krfxlDnElP41Oc+oLiUWs/zwV1S9yBfBZRnqAwQb6vQ/HRSk3bsSWGSgVbpw== From a24e6aff67ce30e1193bc5a565b31d57dffce83f Mon Sep 17 00:00:00 2001 From: martin bedouret Date: Sat, 25 Jul 2020 15:07:50 -0300 Subject: [PATCH 4/4] remove debug --- .circleci/config.yml | 4 +++- src/components/Board/Board.container.js | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 995586450..a536b2c8e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -99,4 +99,6 @@ workflows: - image: requires: - build - + filters: + branches: + only: master diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js index cb2cc0d22..9968631ab 100644 --- a/src/components/Board/Board.container.js +++ b/src/components/Board/Board.container.js @@ -326,8 +326,6 @@ export class BoardContainer extends Component { } toggleTileSelect(tileId) { - console.log(tileId); - console.log(this.state.selectedTileIds); if (this.state.selectedTileIds.includes(tileId)) { this.deselectTile(tileId); } else { @@ -519,8 +517,6 @@ export class BoardContainer extends Component { }; handleTileClick = tile => { - console.log(tile); - console.log(this.state.isSelecting); if (this.state.isSelecting) { this.toggleTileSelect(tile.id); return;