From 3a1b66026946ebd7a767f34d9bd0dfd9f2ec3497 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 20 Sep 2021 17:53:08 -0500 Subject: [PATCH] Make column panels sticky --- app/soapbox/pages/default_page.js | 51 ++++++++++++---------- app/soapbox/pages/home_page.js | 71 +++++++++++++++++-------------- app/soapbox/pages/profile_page.js | 35 ++++++++------- app/soapbox/pages/status_page.js | 51 ++++++++++++---------- package.json | 1 + yarn.lock | 39 ++++++++++++++++- 6 files changed, 152 insertions(+), 96 deletions(-) diff --git a/app/soapbox/pages/default_page.js b/app/soapbox/pages/default_page.js index 5b18623e7..04cf5e439 100644 --- a/app/soapbox/pages/default_page.js +++ b/app/soapbox/pages/default_page.js @@ -1,6 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import Sticky from 'react-stickynode'; import PrimaryNavigation from 'soapbox/components/primary_navigation'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import { @@ -37,7 +38,9 @@ class DefaultPage extends ImmutablePureComponent {
- + + +
@@ -49,29 +52,31 @@ class DefaultPage extends ImmutablePureComponent {
- {me ? ( - - {Component => } + + {me ? ( + + {Component => } + + ) : ( + + {Component => } + + )} + {showTrendsPanel && ( + + {Component => } + + )} + {showWhoToFollowPanel && ( + + {Component => } + + )} + + {Component => } - ) : ( - - {Component => } - - )} - {showTrendsPanel && ( - - {Component => } - - )} - {showWhoToFollowPanel && ( - - {Component => } - - )} - - {Component => } - - + +
diff --git a/app/soapbox/pages/home_page.js b/app/soapbox/pages/home_page.js index 5cc907660..da07687e4 100644 --- a/app/soapbox/pages/home_page.js +++ b/app/soapbox/pages/home_page.js @@ -2,6 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router-dom'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import Sticky from 'react-stickynode'; import BundleContainer from '../features/ui/containers/bundle_container'; import ComposeFormContainer from '../features/compose/containers/compose_form_container'; import Avatar from '../components/avatar'; @@ -60,7 +61,9 @@ class HomePage extends ImmutablePureComponent {
- + + +
@@ -83,39 +86,41 @@ class HomePage extends ImmutablePureComponent {
- {me ? ( - - {Component => } + + {me ? ( + + {Component => } + + ) : ( + + {Component => } + + )} + {showTrendsPanel && ( + + {Component => } + + )} + {showWhoToFollowPanel && ( + + {Component => } + + )} + + {Component => } - ) : ( - - {Component => } - - )} - {showTrendsPanel && ( - - {Component => } - - )} - {showWhoToFollowPanel && ( - - {Component => } - - )} - - {Component => } - - {showFundingPanel && ( - - {Component => } - - )} - {showCryptoDonatePanel && ( - - {Component => } - - )} - + {showFundingPanel && ( + + {Component => } + + )} + {showCryptoDonatePanel && ( + + {Component => } + + )} + +
diff --git a/app/soapbox/pages/profile_page.js b/app/soapbox/pages/profile_page.js index a7ac608ec..251bf7190 100644 --- a/app/soapbox/pages/profile_page.js +++ b/app/soapbox/pages/profile_page.js @@ -3,6 +3,7 @@ import { connect } from 'react-redux'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import Sticky from 'react-stickynode'; import Helmet from 'soapbox/components/helmet'; import HeaderContainer from '../features/account_timeline/containers/header_container'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; @@ -89,9 +90,11 @@ class ProfilePage extends ImmutablePureComponent {
- - {Component => } - + + + {Component => } + +
@@ -103,20 +106,22 @@ class ProfilePage extends ImmutablePureComponent {
- - {Component => } - - {account && ( - - {Component => } - - )} - {features.suggestions && ( - + + {Component => } - )} - + {account && ( + + {Component => } + + )} + {features.suggestions && ( + + {Component => } + + )} + +
diff --git a/app/soapbox/pages/status_page.js b/app/soapbox/pages/status_page.js index 492afb0bd..f3eb5b3ab 100644 --- a/app/soapbox/pages/status_page.js +++ b/app/soapbox/pages/status_page.js @@ -1,6 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import Sticky from 'react-stickynode'; import BundleContainer from '../features/ui/containers/bundle_container'; import PrimaryNavigation from 'soapbox/components/primary_navigation'; import { @@ -38,7 +39,9 @@ class StatusPage extends ImmutablePureComponent {
- + + +
@@ -50,29 +53,31 @@ class StatusPage extends ImmutablePureComponent {
- {me ? ( - - {Component => } + + {me ? ( + + {Component => } + + ) : ( + + {Component => } + + )} + {showTrendsPanel && ( + + {Component => } + + )} + {showWhoToFollowPanel && ( + + {Component => } + + )} + + {Component => } - ) : ( - - {Component => } - - )} - {showTrendsPanel && ( - - {Component => } - - )} - {showWhoToFollowPanel && ( - - {Component => } - - )} - - {Component => } - - + +
diff --git a/package.json b/package.json index 5de8a4d31..de8aaf608 100644 --- a/package.json +++ b/package.json @@ -131,6 +131,7 @@ "react-router-dom": "^4.3.1", "react-router-scroll-4": "^1.0.0-beta.1", "react-sparklines": "^1.7.0", + "react-stickynode": "^4.0.0", "react-swipeable-views": "^0.14.0", "react-textarea-autosize": "^8.3.3", "react-toggle": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index add93b603..e5dc94e30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,7 +2731,7 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -classnames@^2.2.5, classnames@^2.2.6: +classnames@^2.0.0, classnames@^2.2.5, classnames@^2.2.6: version "2.3.1" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== @@ -2974,6 +2974,11 @@ core-js@^3.15.2: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e" integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw== +core-js@^3.6.5: + version "3.18.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.0.tgz#9af3f4a6df9ba3428a3fb1b171f1503b3f40cc49" + integrity sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w== + core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -4045,6 +4050,11 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= +eventemitter3@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" + integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== + eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -7688,7 +7698,7 @@ quote@^0.4.0: resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01" integrity sha1-EIOSF/bBNiuJGUBE0psjP9fzLwE= -raf@^3.1.0, raf@^3.4.1: +raf@^3.0.0, raf@^3.1.0, raf@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== @@ -7964,6 +7974,17 @@ react-sparklines@^1.7.0: dependencies: prop-types "^15.5.10" +react-stickynode@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/react-stickynode/-/react-stickynode-4.0.0.tgz#ca1deeda866aeace3d522d01eb868f286cdb49d1" + integrity sha512-H6Ae6l8soAc188eFAmE4CGJz3oidQa88jNO/fnJWjpFw4DwGRS6boL9gHNE4DCvbMPgek1AAP85pUPIEKUMgtw== + dependencies: + classnames "^2.0.0" + core-js "^3.6.5" + prop-types "^15.6.0" + shallowequal "^1.0.0" + subscribe-ui-event "^2.0.6" + react-swipeable-views-core@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz#6ac443a7cc7bc5ea022fbd549292bb5fff361cce" @@ -8597,6 +8618,11 @@ shallow-equal@^1.2.1: resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== +shallowequal@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -9026,6 +9052,15 @@ stylelint@^13.7.2: v8-compile-cache "^2.3.0" write-file-atomic "^3.0.3" +subscribe-ui-event@^2.0.6: + version "2.0.7" + resolved "https://registry.yarnpkg.com/subscribe-ui-event/-/subscribe-ui-event-2.0.7.tgz#8d18b6339c35b25246a5335775573f0e5dc461f8" + integrity sha512-Acrtf9XXl6lpyHAWYeRD1xTPUQHDERfL4GHeNuYAtZMc4Z8Us2iDBP0Fn3xiRvkQ1FO+hx+qRLmPEwiZxp7FDQ== + dependencies: + eventemitter3 "^3.0.0" + lodash "^4.17.15" + raf "^3.0.0" + substring-trie@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz#7b42592391628b4f2cb17365c6cce4257c7b7af5"