Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 9a2f2df

Browse files
mydearxymmydearxym
committed
chore: merge branch 'fix/community-sub-unsub' into dev
2 parents 479bd88 + 2b39ed8 commit 9a2f2df

File tree

6 files changed

+101
-76
lines changed

6 files changed

+101
-76
lines changed

‎package.docker.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
"next-compose-plugins": "^2.2.0",
5555
"next-offline": "^4.0.2",
5656
"next-seo": "1.11.1",
57-
"overlayscrollbars": "^1.8.0",
57+
"overlayscrollbars": "1.9.1",
58+
"overlayscrollbars-react": "^0.1.0",
5859
"path-match": "^1.2.4",
5960
"polished": "2.3.1",
6061
"promise-timeout": "^1.3.0",

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
"next-offline": "^4.0.2",
8787
"next-progressbar": "^1.0.0",
8888
"next-seo": "1.11.1",
89-
"overlayscrollbars": "^1.8.0",
89+
"overlayscrollbars": "1.9.1",
90+
"overlayscrollbars-react": "^0.1.0",
9091
"path-match": "^1.2.4",
9192
"polished": "2.3.1",
9293
"promise-timeout": "^1.3.0",

‎src/containers/Sidebar/MenuList.js‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import React from 'react'
22
import R from 'ramda'
33
import { SortableContainer, SortableElement } from 'react-sortable-hoc'
44

5+
import { OverlayScrollbarsComponent } from 'overlayscrollbars-react'
6+
57
import MenuBar from './MenuBar'
68
import { Wrapper, ScrollWrapper } from './styles/menu_list'
79

@@ -23,26 +25,26 @@ const MenuList = SortableContainer(
2325

2426
return (
2527
<Wrapper>
26-
<ScrollWrapper id="sidebar-scroller">
27-
{homeCommunities.map(item => (
28-
<MenuBar
29-
key={item.raw}
30-
pin={pin}
31-
item={item}
32-
activeRaw={activeRaw}
33-
/>
34-
))}
35-
{sortableCommunities.map((item, index) => (
36-
<SortableMenuBar
37-
index={index}
38-
key={item.raw}
39-
pin={pin}
40-
item={item}
41-
activeRaw={activeRaw}
42-
forceRerender={forceRerender}
43-
/>
44-
))}
45-
</ScrollWrapper>
28+
{homeCommunities.map(item => (
29+
<MenuBar key={item.raw} pin={pin} item={item} activeRaw={activeRaw} />
30+
))}
31+
<OverlayScrollbarsComponent
32+
options={{ scrollbars: { autoHide: 'scroll', autoHideDelay: 200 } }}
33+
className="os-theme-light"
34+
>
35+
<ScrollWrapper>
36+
{sortableCommunities.map((item, index) => (
37+
<SortableMenuBar
38+
index={index}
39+
key={item.raw}
40+
pin={pin}
41+
item={item}
42+
activeRaw={activeRaw}
43+
forceRerender={forceRerender}
44+
/>
45+
))}
46+
</ScrollWrapper>
47+
</OverlayScrollbarsComponent>
4648
</Wrapper>
4749
)
4850
}

‎src/containers/Sidebar/logic.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,6 @@ export const useInit = _store => {
154154
// log('effect init')
155155
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
156156

157-
/* eslint-disable no-undef */
158-
OverlayScrollbars(document.getElementById('sidebar-scroller'), {
159-
scrollbars: { autoHide: 'scroll', autoHideDelay: 200 },
160-
className: 'os-theme-light',
161-
})
162-
163157
setTimeout(() => {
164158
/* eslint-disable-next-line */
165159
toggleForeceRerender(true)

‎src/containers/Sidebar/styles/menu_list.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ export const Wrapper = styled.div`
66
height: 100%;
77
transition: left 0.2s;
88
`
9-
export const ScrollWrapper = styled.div.attrs(({ id }) => ({
10-
id,
11-
}))`
12-
height: calc(100% - 20px);
9+
export const ScrollWrapper = styled.div`
10+
height: 85vh;
1311
`

‎yarn.lock‎

Lines changed: 73 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,11 @@ acorn@^6.2.0:
15521552
version "6.2.0"
15531553
resolved "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
15541554

1555+
acorn@^7.0.0:
1556+
version "7.0.0"
1557+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a"
1558+
integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==
1559+
15551560
add-dom-event-listener@^1.1.0:
15561561
version "1.1.0"
15571562
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:
17391744
micromatch "^3.1.4"
17401745
normalize-path "^2.1.1"
17411746

1742-
apollo-cache-inmemory@1.6.2:
1743-
version "1.6.2"
1744-
resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
1747+
apollo-cache-inmemory@1.6.3:
1748+
version "1.6.3"
1749+
resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz#826861d20baca4abc45f7ca7a874105905b8525d"
1750+
integrity sha512-S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg==
17451751
dependencies:
17461752
apollo-cache "^1.3.2"
17471753
apollo-utilities "^1.3.2"
1748-
optimism "^0.9.0"
1754+
optimism "^0.10.0"
17491755
ts-invariant "^0.4.0"
17501756
tslib "^1.9.3"
17511757

@@ -1756,9 +1762,10 @@ apollo-cache@1.3.2, apollo-cache@^1.3.2:
17561762
apollo-utilities "^1.3.2"
17571763
tslib "^1.9.3"
17581764

1759-
apollo-client@2.6.3:
1760-
version "2.6.3"
1761-
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.3.tgz#9bb2d42fb59f1572e51417f341c5f743798d22db"
1765+
apollo-client@2.6.4:
1766+
version "2.6.4"
1767+
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz#872c32927263a0d34655c5ef8a8949fbb20b6140"
1768+
integrity sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ==
17621769
dependencies:
17631770
"@types/zen-observable" "^0.8.0"
17641771
apollo-cache "1.3.2"
@@ -2236,15 +2243,16 @@ babel-plugin-ramda@2.0.0:
22362243
"@babel/helper-module-imports" "^7.0.0"
22372244
ramda "^0.25.0"
22382245

2239-
babel-plugin-react-intl@4.1.2:
2240-
version "4.1.2"
2241-
resolved "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-4.1.2.tgz#9092f4a61f8dccaac46bc1026f8de8c6d8dc9a87"
2246+
babel-plugin-react-intl@4.1.9:
2247+
version "4.1.9"
2248+
resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-4.1.9.tgz#d29fcc0cf313c91e59f260300087f601a46e9fae"
2249+
integrity sha512-ERMkETKOeE70aX8T3i70A2wXLr1Xd+sudETVU09G+2dta4HV7OxfbOlOBbPkkhiMNfZh8r4bIXghGYUizfU1hQ==
22422250
dependencies:
22432251
"@babel/core" "^7.4.5"
22442252
"@babel/helper-plugin-utils" "^7.0.0"
22452253
"@types/babel__core" "^7.1.2"
22462254
fs-extra "^8.0.1"
2247-
intl-messageformat-parser "^2.1.2"
2255+
intl-messageformat-parser "^3.0.5"
22482256

22492257
babel-plugin-react-require@3.0.0:
22502258
version "3.0.0"
@@ -3399,9 +3407,10 @@ core-js-pure@3.1.4:
33993407
version "3.1.4"
34003408
resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
34013409

3402-
core-js@3.2.0:
3403-
version "3.2.0"
3404-
resolved "https://registry.npmjs.org/core-js/-/core-js-3.2.0.tgz#0a835fdf6aa677fff83a823a7b5276c9e7cebb76"
3410+
core-js@3.2.1:
3411+
version "3.2.1"
3412+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09"
3413+
integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==
34053414

34063415
core-js@^1.0.0:
34073416
version "1.2.7"
@@ -4066,9 +4075,10 @@ dotenv-webpack@1.6.0:
40664075
dotenv "^5.0.1"
40674076
dotenv-expand "^4.0.1"
40684077

4069-
dotenv@6.2.0:
4070-
version "6.2.0"
4071-
resolved "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
4078+
dotenv@8.1.0:
4079+
version "8.1.0"
4080+
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2"
4081+
integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==
40724082

40734083
dotenv@^5.0.1:
40744084
version "5.0.1"
@@ -4465,17 +4475,26 @@ eslint-scope@^5.0.0:
44654475
esrecurse "^4.1.0"
44664476
estraverse "^4.1.1"
44674477

4468-
eslint-utils@^1.3.1:
4469-
version "1.3.1"
4470-
resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
4478+
eslint-utils@^1.4.0:
4479+
version "1.4.2"
4480+
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
4481+
integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
4482+
dependencies:
4483+
eslint-visitor-keys "^1.0.0"
44714484

44724485
eslint-visitor-keys@^1.0.0:
44734486
version "1.0.0"
44744487
resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
44754488

4476-
eslint@6.1.0:
4477-
version "6.1.0"
4478-
resolved "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646"
4489+
eslint-visitor-keys@^1.1.0:
4490+
version "1.1.0"
4491+
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
4492+
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
4493+
4494+
eslint@6.2.0:
4495+
version "6.2.0"
4496+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.2.0.tgz#4c42c20e3fc03f28db25f34ccba621a9a47e8b56"
4497+
integrity sha512-sS0SZwm5UAoI83F+cgdomz0cBNPs+AnRvEboNYeWvrZ8UcDHCu/5muocwoDL2TkHq9skkP0GvZjmwI8HG7S3sw==
44794498
dependencies:
44804499
"@babel/code-frame" "^7.0.0"
44814500
ajv "^6.10.0"
@@ -4484,9 +4503,9 @@ eslint@6.1.0:
44844503
debug "^4.0.1"
44854504
doctrine "^3.0.0"
44864505
eslint-scope "^5.0.0"
4487-
eslint-utils "^1.3.1"
4488-
eslint-visitor-keys "^1.0.0"
4489-
espree "^6.0.0"
4506+
eslint-utils "^1.4.0"
4507+
eslint-visitor-keys "^1.1.0"
4508+
espree "^6.1.0"
44904509
esquery "^1.0.1"
44914510
esutils "^2.0.2"
44924511
file-entry-cache "^5.0.1"
@@ -4515,13 +4534,14 @@ eslint@6.1.0:
45154534
text-table "^0.2.0"
45164535
v8-compile-cache "^2.0.3"
45174536

4518-
espree@^6.0.0:
4519-
version "6.0.0"
4520-
resolved "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
4537+
espree@^6.1.0:
4538+
version "6.1.0"
4539+
resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.0.tgz#a1e8aa65bf29a331d70351ed814a80e7534e0884"
4540+
integrity sha512-boA7CHRLlVWUSg3iL5Kmlt/xT3Q+sXnKoRYYzj1YeM10A76TEJBbotV5pKbnK42hEUIr121zTv+QLRM5LsCPXQ==
45214541
dependencies:
4522-
acorn "^6.0.7"
4542+
acorn "^7.0.0"
45234543
acorn-jsx "^5.0.0"
4524-
eslint-visitor-keys "^1.0.0"
4544+
eslint-visitor-keys "^1.1.0"
45254545

45264546
esprima@^3.1.3:
45274547
version "3.1.3"
@@ -6060,14 +6080,15 @@ intl-locales-supported@^1.4.2:
60606080
version "1.4.3"
60616081
resolved "https://registry.npmjs.org/intl-locales-supported/-/intl-locales-supported-1.4.3.tgz#2cbfebe94e3954350622b518b7e1d42324ff69c9"
60626082

6063-
intl-messageformat-parser@^2.1.2:
6064-
version "2.1.3"
6065-
resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-2.1.3.tgz#c918e36a08bd7ff01349d8ea3736262c986aaeb1"
6066-
60676083
intl-messageformat-parser@^3.0.1, intl-messageformat-parser@^3.0.2:
60686084
version "3.0.2"
60696085
resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-3.0.2.tgz#87d26e25c5435355174ae2b7de63eaba77a0af38"
60706086

6087+
intl-messageformat-parser@^3.0.5:
6088+
version "3.0.7"
6089+
resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-3.0.7.tgz#d28493501a1bc40a094239b7ef26fe9412558e72"
6090+
integrity sha512-L16VbbV3NFaiZV65XwOIH9fBe52TS2EkOR0k8Y4ratsgTE7KPEbcUCUrz/iEQwJo7BcWY4ohkZbeYZRgAiPR1Q==
6091+
60716092
intl-messageformat@^6.0.1:
60726093
version "6.0.3"
60736094
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:
77557776
version "1.4.0"
77567777
resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-1.4.0.tgz#193beb5fdddf17ae61542f65ff951d84db402351"
77577778

7758-
mobx-react@6.1.2:
7759-
version "6.1.2"
7760-
resolved "https://registry.npmjs.org/mobx-react/-/mobx-react-6.1.2.tgz#ed705566edca4baf1c6d87c3eff3dcd17ba09573"
7779+
mobx-react@6.1.3:
7780+
version "6.1.3"
7781+
resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.1.3.tgz#ad07880ea60cdcdb2a7e2a0d54e01379710cf00a"
7782+
integrity sha512-eT/jO9dYIoB1AlZwI2VC3iX0gPOeOIqZsiwg7tDJV1B7Z69h+TZZL3dgOE0UeS2zoHhGeKbP+K+OLeLMnnkGnA==
77617783
dependencies:
77627784
mobx-react-lite "1.4.0"
77637785

@@ -8329,9 +8351,10 @@ opener@^1.5.1:
83298351
version "1.5.1"
83308352
resolved "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
83318353

8332-
optimism@^0.9.0:
8333-
version "0.9.5"
8334-
resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527"
8354+
optimism@^0.10.0:
8355+
version "0.10.2"
8356+
resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9"
8357+
integrity sha512-zPfBIxFFWMmQboM9+Z4MSJqc1PXp82v1PFq/GfQaufI69mHKlup7ykGNnfuGIGssXJQkmhSodQ/k9EWwjd8O8A==
83358358
dependencies:
83368359
"@wry/context" "^0.4.0"
83378360

@@ -8408,9 +8431,15 @@ outlayer@^2.1.0:
84088431
fizzy-ui-utils "^2.0.0"
84098432
get-size "^2.0.2"
84108433

8411-
overlayscrollbars@^1.8.0:
8412-
version "1.8.0"
8413-
resolved "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.8.0.tgz#d2139207d2064efe58f1f528791429895cae0801"
8434+
overlayscrollbars-react@^0.1.0:
8435+
version "0.1.0"
8436+
resolved "https://registry.yarnpkg.com/overlayscrollbars-react/-/overlayscrollbars-react-0.1.0.tgz#54ae394b07fc9ef9c3ce084b7f0dcbad7569605f"
8437+
integrity sha512-5ZmZtWoj++DBMhrRxE7k5hDWXPcvdowapgZHjetl41mZ94F0bD4EfzgPjMv4e/gqYRpsgdLEcozOlatay5WYyw==
8438+
8439+
overlayscrollbars@1.9.1:
8440+
version "1.9.1"
8441+
resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.9.1.tgz#46f5f275e3966b11dbf147f6c441e777c313af76"
8442+
integrity sha512-MKOIiIaxfvemDQu1o03M/4lSs8EsSEqtaKMfspTtgF6bzxh8+ymzDtMCDGRIy4BQBQlu1ThP1QuSCdM9VAO1Qw==
84148443

84158444
p-finally@^1.0.0:
84168445
version "1.0.0"

0 commit comments

Comments
 (0)