Merge pull request #268 from NicolasConstant/develop

0.27.1 PR
NicolasConstant · Apr 29, 2020 · ed81e4b · ed81e4b
2 parents 9eb6fc6 + a6a8f4b
commit ed81e4b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sengi",
-    "version": "0.27.0",
+    "version": "0.27.1",
     "license": "AGPL-3.0-or-later",
     "main": "main-electron.js",
     "description": "A multi-account desktop client for Mastodon and Pleroma",

diff --git a/src/app/components/stream/stream-notifications/stream-notifications.component.ts b/src/app/components/stream/stream-notifications/stream-notifications.component.ts
@@ -261,7 +261,7 @@ export class StreamNotificationsComponent implements OnInit, OnDestroy {
             } else {
                 element = this.notificationstream.nativeElement as HTMLElement;
             }
-            element.focus();
+            element.focus({preventScroll:true});
         }, 0);
         return false;
     }

diff --git a/src/app/components/stream/stream-statuses/stream-statuses.component.ts b/src/app/components/stream/stream-statuses/stream-statuses.component.ts
@@ -306,7 +306,7 @@ export class StreamStatusesComponent implements OnInit, OnDestroy {
     focus(): boolean {
         setTimeout(() => {
             var element = this.statustream.nativeElement as HTMLElement;
-            element.focus();
+            element.focus({preventScroll:true});
         }, 0);
         return false;
     }

diff --git a/src/app/components/stream/stream.component.scss b/src/app/components/stream/stream.component.scss
@@ -76,6 +76,7 @@
             // position: absolute;
             position: relative;
             top: 9px;
+            margin: 0;
             // left: 35px;
 
             &--only {
@@ -90,7 +91,7 @@
             font-style: italic;
             // position: absolute;
             position: relative;
-            top: -2px;
+            top: 6px;
             // top: 21px;
             // top: 10px;
             // left: 35px;;

diff --git a/src/app/pages/streams-main-display/streams-main-display.component.ts b/src/app/pages/streams-main-display/streams-main-display.component.ts
@@ -37,9 +37,9 @@ export class StreamsMainDisplayComponent implements OnInit, OnDestroy {
         if (columnIndex > -1) {
             setTimeout(() => {
                 let element = this.streamsElementRef.toArray()[columnIndex].nativeElement;
-                element.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
+                //element.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
 
-                const scrolling = <Promise<any>><any>scrollIntoView(element, { behavior: 'smooth', block: 'nearest'});
+                const scrolling = <Promise<any>><any>scrollIntoView(element, { behavior: 'smooth', block: 'nearest', inline: 'start'});
                 scrolling
                     .then(() => {
                         this.streamComponents.toArray()[columnIndex].focus();