diff --git a/package.docker.json b/package.docker.json index 569336d9b..1fd484396 100644 --- a/package.docker.json +++ b/package.docker.json @@ -54,7 +54,8 @@ "next-compose-plugins": "^2.2.0", "next-offline": "^4.0.2", "next-seo": "1.11.1", - "overlayscrollbars": "^1.8.0", + "overlayscrollbars": "1.9.1", + "overlayscrollbars-react": "^0.1.0", "path-match": "^1.2.4", "polished": "2.3.1", "promise-timeout": "^1.3.0", diff --git a/package.json b/package.json index fc8186971..cc3e04b2b 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,8 @@ "next-offline": "^4.0.2", "next-progressbar": "^1.0.0", "next-seo": "1.11.1", - "overlayscrollbars": "^1.8.0", + "overlayscrollbars": "1.9.1", + "overlayscrollbars-react": "^0.1.0", "path-match": "^1.2.4", "polished": "2.3.1", "promise-timeout": "^1.3.0", diff --git a/src/containers/Sidebar/MenuList.js b/src/containers/Sidebar/MenuList.js index cc9c340bd..e8267f08e 100644 --- a/src/containers/Sidebar/MenuList.js +++ b/src/containers/Sidebar/MenuList.js @@ -2,6 +2,8 @@ import React from 'react' import R from 'ramda' import { SortableContainer, SortableElement } from 'react-sortable-hoc' +import { OverlayScrollbarsComponent } from 'overlayscrollbars-react' + import MenuBar from './MenuBar' import { Wrapper, ScrollWrapper } from './styles/menu_list' @@ -23,26 +25,26 @@ const MenuList = SortableContainer( return ( - - {homeCommunities.map(item => ( - - ))} - {sortableCommunities.map((item, index) => ( - - ))} - + {homeCommunities.map(item => ( + + ))} + + + {sortableCommunities.map((item, index) => ( + + ))} + + ) } diff --git a/src/containers/Sidebar/logic.js b/src/containers/Sidebar/logic.js index 6a2e2fdaa..3f04797d8 100644 --- a/src/containers/Sidebar/logic.js +++ b/src/containers/Sidebar/logic.js @@ -154,12 +154,6 @@ export const useInit = _store => { // log('effect init') sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver)) - /* eslint-disable no-undef */ - OverlayScrollbars(document.getElementById('sidebar-scroller'), { - scrollbars: { autoHide: 'scroll', autoHideDelay: 200 }, - className: 'os-theme-light', - }) - setTimeout(() => { /* eslint-disable-next-line */ toggleForeceRerender(true) diff --git a/src/containers/Sidebar/styles/menu_list.js b/src/containers/Sidebar/styles/menu_list.js index 8edd767c4..437fd7378 100644 --- a/src/containers/Sidebar/styles/menu_list.js +++ b/src/containers/Sidebar/styles/menu_list.js @@ -6,8 +6,6 @@ export const Wrapper = styled.div` height: 100%; transition: left 0.2s; ` -export const ScrollWrapper = styled.div.attrs(({ id }) => ({ - id, -}))` - height: calc(100% - 20px); +export const ScrollWrapper = styled.div` + height: 85vh; ` diff --git a/yarn.lock b/yarn.lock index 2d29d923d..5b0e66b41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1552,6 +1552,11 @@ acorn@^6.2.0: version "6.2.0" resolved "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3" +acorn@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" + integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== + add-dom-event-listener@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310" @@ -1739,13 +1744,14 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -apollo-cache-inmemory@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e" +apollo-cache-inmemory@1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz#826861d20baca4abc45f7ca7a874105905b8525d" + integrity sha512-S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg== dependencies: apollo-cache "^1.3.2" apollo-utilities "^1.3.2" - optimism "^0.9.0" + optimism "^0.10.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -1756,9 +1762,10 @@ apollo-cache@1.3.2, apollo-cache@^1.3.2: apollo-utilities "^1.3.2" tslib "^1.9.3" -apollo-client@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.3.tgz#9bb2d42fb59f1572e51417f341c5f743798d22db" +apollo-client@2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz#872c32927263a0d34655c5ef8a8949fbb20b6140" + integrity sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ== dependencies: "@types/zen-observable" "^0.8.0" apollo-cache "1.3.2" @@ -2236,15 +2243,16 @@ babel-plugin-ramda@2.0.0: "@babel/helper-module-imports" "^7.0.0" ramda "^0.25.0" -babel-plugin-react-intl@4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-4.1.2.tgz#9092f4a61f8dccaac46bc1026f8de8c6d8dc9a87" +babel-plugin-react-intl@4.1.9: + version "4.1.9" + resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-4.1.9.tgz#d29fcc0cf313c91e59f260300087f601a46e9fae" + integrity sha512-ERMkETKOeE70aX8T3i70A2wXLr1Xd+sudETVU09G+2dta4HV7OxfbOlOBbPkkhiMNfZh8r4bIXghGYUizfU1hQ== dependencies: "@babel/core" "^7.4.5" "@babel/helper-plugin-utils" "^7.0.0" "@types/babel__core" "^7.1.2" fs-extra "^8.0.1" - intl-messageformat-parser "^2.1.2" + intl-messageformat-parser "^3.0.5" babel-plugin-react-require@3.0.0: version "3.0.0" @@ -3399,9 +3407,10 @@ core-js-pure@3.1.4: version "3.1.4" resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769" -core-js@3.2.0: - version "3.2.0" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.2.0.tgz#0a835fdf6aa677fff83a823a7b5276c9e7cebb76" +core-js@3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" + integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw== core-js@^1.0.0: version "1.2.7" @@ -4066,9 +4075,10 @@ dotenv-webpack@1.6.0: dotenv "^5.0.1" dotenv-expand "^4.0.1" -dotenv@6.2.0: - version "6.2.0" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" +dotenv@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2" + integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA== dotenv@^5.0.1: version "5.0.1" @@ -4465,17 +4475,26 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" +eslint-utils@^1.4.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" + integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== + dependencies: + eslint-visitor-keys "^1.0.0" eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646" +eslint-visitor-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== + +eslint@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.2.0.tgz#4c42c20e3fc03f28db25f34ccba621a9a47e8b56" + integrity sha512-sS0SZwm5UAoI83F+cgdomz0cBNPs+AnRvEboNYeWvrZ8UcDHCu/5muocwoDL2TkHq9skkP0GvZjmwI8HG7S3sw== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -4484,9 +4503,9 @@ eslint@6.1.0: debug "^4.0.1" doctrine "^3.0.0" eslint-scope "^5.0.0" - eslint-utils "^1.3.1" - eslint-visitor-keys "^1.0.0" - espree "^6.0.0" + eslint-utils "^1.4.0" + eslint-visitor-keys "^1.1.0" + espree "^6.1.0" esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^5.0.1" @@ -4515,13 +4534,14 @@ eslint@6.1.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6" +espree@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.0.tgz#a1e8aa65bf29a331d70351ed814a80e7534e0884" + integrity sha512-boA7CHRLlVWUSg3iL5Kmlt/xT3Q+sXnKoRYYzj1YeM10A76TEJBbotV5pKbnK42hEUIr121zTv+QLRM5LsCPXQ== dependencies: - acorn "^6.0.7" + acorn "^7.0.0" acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" + eslint-visitor-keys "^1.1.0" esprima@^3.1.3: version "3.1.3" @@ -6060,14 +6080,15 @@ intl-locales-supported@^1.4.2: version "1.4.3" resolved "https://registry.npmjs.org/intl-locales-supported/-/intl-locales-supported-1.4.3.tgz#2cbfebe94e3954350622b518b7e1d42324ff69c9" -intl-messageformat-parser@^2.1.2: - version "2.1.3" - resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-2.1.3.tgz#c918e36a08bd7ff01349d8ea3736262c986aaeb1" - intl-messageformat-parser@^3.0.1, intl-messageformat-parser@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-3.0.2.tgz#87d26e25c5435355174ae2b7de63eaba77a0af38" +intl-messageformat-parser@^3.0.5: + version "3.0.7" + resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-3.0.7.tgz#d28493501a1bc40a094239b7ef26fe9412558e72" + integrity sha512-L16VbbV3NFaiZV65XwOIH9fBe52TS2EkOR0k8Y4ratsgTE7KPEbcUCUrz/iEQwJo7BcWY4ohkZbeYZRgAiPR1Q== + intl-messageformat@^6.0.1: version "6.0.3" resolved "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-6.0.3.tgz#161646e0007526c86d6700d087561b2c4249d2e3" @@ -7755,9 +7776,10 @@ mobx-react-lite@1.4.0, mobx-react-lite@^1.2.0: version "1.4.0" resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-1.4.0.tgz#193beb5fdddf17ae61542f65ff951d84db402351" -mobx-react@6.1.2: - version "6.1.2" - resolved "https://registry.npmjs.org/mobx-react/-/mobx-react-6.1.2.tgz#ed705566edca4baf1c6d87c3eff3dcd17ba09573" +mobx-react@6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.1.3.tgz#ad07880ea60cdcdb2a7e2a0d54e01379710cf00a" + integrity sha512-eT/jO9dYIoB1AlZwI2VC3iX0gPOeOIqZsiwg7tDJV1B7Z69h+TZZL3dgOE0UeS2zoHhGeKbP+K+OLeLMnnkGnA== dependencies: mobx-react-lite "1.4.0" @@ -8329,9 +8351,10 @@ opener@^1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" -optimism@^0.9.0: - version "0.9.5" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527" +optimism@^0.10.0: + version "0.10.2" + resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9" + integrity sha512-zPfBIxFFWMmQboM9+Z4MSJqc1PXp82v1PFq/GfQaufI69mHKlup7ykGNnfuGIGssXJQkmhSodQ/k9EWwjd8O8A== dependencies: "@wry/context" "^0.4.0" @@ -8408,9 +8431,15 @@ outlayer@^2.1.0: fizzy-ui-utils "^2.0.0" get-size "^2.0.2" -overlayscrollbars@^1.8.0: - version "1.8.0" - resolved "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.8.0.tgz#d2139207d2064efe58f1f528791429895cae0801" +overlayscrollbars-react@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/overlayscrollbars-react/-/overlayscrollbars-react-0.1.0.tgz#54ae394b07fc9ef9c3ce084b7f0dcbad7569605f" + integrity sha512-5ZmZtWoj++DBMhrRxE7k5hDWXPcvdowapgZHjetl41mZ94F0bD4EfzgPjMv4e/gqYRpsgdLEcozOlatay5WYyw== + +overlayscrollbars@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.9.1.tgz#46f5f275e3966b11dbf147f6c441e777c313af76" + integrity sha512-MKOIiIaxfvemDQu1o03M/4lSs8EsSEqtaKMfspTtgF6bzxh8+ymzDtMCDGRIy4BQBQlu1ThP1QuSCdM9VAO1Qw== p-finally@^1.0.0: version "1.0.0"