Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Mobile
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
203
Issues
203
List
Boards
Labels
Service Desk
Milestones
Merge Requests
19
Merge Requests
19
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Minds
Minds Mobile
Commits
6467e1f0
Commit
6467e1f0
authored
9 hours ago
by
Juan Manuel Solaro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(feat) scroll to index after remind from subscribed list
parent
57a9745d
feat/scroll-after-remind
1 merge request
!396
[Sprint/PinkPanther] (feat) scroll to index after remind from subscribed list
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
3 deletions
+30
-3
src/capture/CapturePoster.js
src/capture/CapturePoster.js
+2
-1
src/common/components/FeedList.js
src/common/components/FeedList.js
+9
-0
src/newsfeed/NewsfeedScreen.js
src/newsfeed/NewsfeedScreen.js
+1
-0
src/newsfeed/NewsfeedStore.js
src/newsfeed/NewsfeedStore.js
+15
-0
src/newsfeed/activity/Actions.js
src/newsfeed/activity/Actions.js
+1
-1
src/newsfeed/activity/Activity.js
src/newsfeed/activity/Activity.js
+1
-0
src/newsfeed/activity/actions/RemindAction.js
src/newsfeed/activity/actions/RemindAction.js
+1
-1
No files found.
src/capture/CapturePoster.js
View file @
6467e1f0
...
...
@@ -38,7 +38,7 @@ import CaptureTabs from './CaptureTabs';
// workaround for android copy/paste
import
TextInput
from
'
../common/components/TextInput
'
;
@
inject
(
'
user
'
,
'
capture
'
)
@
inject
(
'
user
'
,
'
capture
'
,
'
newsfeed
'
)
@
observer
export
default
class
CapturePoster
extends
Component
{
...
...
@@ -353,6 +353,7 @@ export default class CapturePoster extends Component {
try
{
const
response
=
await
this
.
props
.
capture
.
remind
(
params
.
entity
.
guid
,
post
);
this
.
props
.
newsfeed
.
userJustReminded
=
params
.
activityIndex
||
false
;
this
.
navToPrevious
(
response
.
entity
,
group
);
}
catch
(
err
)
{
logService
.
exception
(
'
[CapturePoster]
'
,
err
);
...
...
This diff is collapsed.
Click to expand it.
src/common/components/FeedList.js
View file @
6467e1f0
...
...
@@ -56,6 +56,14 @@ export default class FeedList extends Component {
this
.
listRef
.
scrollToOffset
({
animated
,
offset
:
0
});
}
componentDidUpdate
()
{
if
(
this
.
props
.
newsfeed
&&
this
.
props
.
newsfeed
.
userJustReminded
)
{
const
itemIndex
=
this
.
props
.
newsfeed
.
userJustReminded
;
this
.
props
.
newsfeed
.
userJustReminded
=
false
;
this
.
props
.
newsfeed
.
scrollToIndex
(
itemIndex
+
1
);
//+1 because of the just appended activity
}
}
/**
* Set list reference
*/
...
...
@@ -213,6 +221,7 @@ export default class FeedList extends Component {
navigation
=
{
this
.
props
.
navigation
}
autoHeight
=
{
false
}
isLast
=
{
isLast
}
activityIndex
=
{
row
.
index
}
/
>
<
/ErrorBoundary
>
)
...
...
This diff is collapsed.
Click to expand it.
src/newsfeed/NewsfeedScreen.js
View file @
6467e1f0
...
...
@@ -115,6 +115,7 @@ export default class NewsfeedScreen extends Component {
feedStore
=
{
newsfeed
.
feedStore
}
header
=
{
header
}
navigation
=
{
this
.
props
.
navigation
}
newsfeed
=
{
newsfeed
}
/
>
<
CaptureFab
navigation
=
{
this
.
props
.
navigation
}
/
>
<
/View
>
...
...
This diff is collapsed.
Click to expand it.
src/newsfeed/NewsfeedStore.js
View file @
6467e1f0
...
...
@@ -22,6 +22,11 @@ class NewsfeedStore {
*/
listRef
;
/**
* If the user reminded, contains remind height
*/
userJustReminded
=
false
;
service
=
new
NewsfeedService
;
@
observable
filter
=
'
subscribed
'
;
...
...
@@ -53,6 +58,16 @@ class NewsfeedStore {
this
.
listRef
.
scrollToTop
(
false
);
}
scrollToIndex
(
index
,
animated
=
true
)
{
if
(
this
.
filter
!==
'
subscribed
'
)
return
;
this
.
listRef
.
listRef
.
scrollToIndex
({
animated
:
animated
,
index
:
index
,
viewOffset
:
0
,
viewPosition
:
0
});
}
/**
* Set FeedList reference
*/
...
...
This diff is collapsed.
Click to expand it.
src/newsfeed/activity/Actions.js
View file @
6467e1f0
...
...
@@ -36,7 +36,7 @@ export default class Actions extends PureComponent {
<
ThumbDownAction
entity
=
{
entity
}
me
=
{
this
.
props
.
user
.
me
}
/
>
{
!
isOwner
&&
featuresService
.
has
(
'
crypto
'
)
&&
<
WireAction
owner
=
{
entity
.
ownerObj
}
navigation
=
{
this
.
props
.
navigation
}
/>
}
<
CommentsAction
entity
=
{
entity
}
navigation
=
{
this
.
props
.
navigation
}
/
>
<
RemindAction
entity
=
{
entity
}
navigation
=
{
this
.
props
.
navigation
}
/
>
<
RemindAction
entity
=
{
entity
}
navigation
=
{
this
.
props
.
navigation
}
activityIndex
=
{
this
.
props
.
activityIndex
}
/
>
{
isOwner
&&
featuresService
.
has
(
'
crypto
'
)
&&
<
BoostAction
entity
=
{
entity
}
navigation
=
{
this
.
props
.
navigation
}
/>
}
<
/View>
}
<
/View
>
...
...
This diff is collapsed.
Click to expand it.
src/newsfeed/activity/Activity.js
View file @
6467e1f0
...
...
@@ -257,6 +257,7 @@ export default class Activity extends Component {
return
<
Actions
entity
=
{
this
.
props
.
entity
}
navigation
=
{
this
.
props
.
navigation
}
activityIndex
=
{
this
.
props
.
activityIndex
}
/
>
}
}
...
...
This diff is collapsed.
Click to expand it.
src/newsfeed/activity/actions/RemindAction.js
View file @
6467e1f0
...
...
@@ -50,7 +50,7 @@ export default class RemindAction extends PureComponent {
*/
remind
=
()
=>
{
const
{
state
}
=
this
.
props
.
navigation
this
.
props
.
navigation
.
push
(
'
Capture
'
,
{
isRemind
:
true
,
entity
:
this
.
props
.
entity
,
parentKey
:
state
.
key
});
this
.
props
.
navigation
.
push
(
'
Capture
'
,
{
isRemind
:
true
,
entity
:
this
.
props
.
entity
,
parentKey
:
state
.
key
,
activityIndex
:
this
.
props
.
activityIndex
});
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment