From 124656172aeb553942c1477415bc077b55a60a76 Mon Sep 17 00:00:00 2001
From: Elizaveta Ragozina <svillyfly@mail.ru>
Date: Mon, 16 May 2022 21:31:42 +0200
Subject: [PATCH] Multiple fixes (#6954)

* fix: text editor textarea height

* show default action first in context menu

* fix: applications menu items hover text color

* fix: horizontal overflow by sidebar

* add changelogs

* text editor textarea height
---
 .../bugfix-text-color-application-menu-item          |  6 ++++++
 ...nhancement-sort-default-action-first-context-menu |  6 ++++++
 .../src/components/FilesList/ContextActions.vue      |  4 +++-
 packages/web-app-text-editor/src/App.vue             | 12 ++++++++----
 packages/web-pkg/src/components/sidebar/SideBar.vue  |  1 +
 .../src/components/Topbar/ApplicationsMenu.vue       |  8 ++++++++
 6 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 changelog/unreleased/bugfix-text-color-application-menu-item
 create mode 100644 changelog/unreleased/enhancement-sort-default-action-first-context-menu

diff --git a/changelog/unreleased/bugfix-text-color-application-menu-item b/changelog/unreleased/bugfix-text-color-application-menu-item
new file mode 100644
index 00000000000..99b388fe7d2
--- /dev/null
+++ b/changelog/unreleased/bugfix-text-color-application-menu-item
@@ -0,0 +1,6 @@
+Bugfix: The selected app item has a bad text color contrast in light mode
+
+We've fixed the contrast of the text color for hovered and active application menus items.
+
+https://github.com/owncloud/web/pull/6954
+https://github.com/owncloud/web/issues/6958
diff --git a/changelog/unreleased/enhancement-sort-default-action-first-context-menu b/changelog/unreleased/enhancement-sort-default-action-first-context-menu
new file mode 100644
index 00000000000..4fd545806bc
--- /dev/null
+++ b/changelog/unreleased/enhancement-sort-default-action-first-context-menu
@@ -0,0 +1,6 @@
+Enhancement: Show default action at the first place in context menu
+
+We've added the sorting of actions in the way that default file handler shows first in the context menu
+
+https://github.com/owncloud/web/issues/6971
+https://github.com/owncloud/web/pull/6954
\ No newline at end of file
diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
index 9ec6eb533e2..a072c70847d 100644
--- a/packages/web-app-files/src/components/FilesList/ContextActions.vue
+++ b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -130,7 +130,9 @@ export default {
         ...this.$_fileActions_loadExternalAppActions(this.filterParams.resources)
       ]
 
-      return [...fileHandlers].filter((item) => item.isEnabled(this.filterParams))
+      return [...fileHandlers]
+        .filter((item) => item.isEnabled(this.filterParams))
+        .sort((x, y) => Number(y.canBeDefault) - Number(x.canBeDefault))
     },
 
     menuItemsShare() {
diff --git a/packages/web-app-text-editor/src/App.vue b/packages/web-app-text-editor/src/App.vue
index f9e7f01cd49..41482523618 100644
--- a/packages/web-app-text-editor/src/App.vue
+++ b/packages/web-app-text-editor/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <main id="text-editor" class="oc-mx-l oc-my-m">
+  <main id="text-editor" class="oc-px-l oc-py-m oc-height-1-1">
     <app-bar
       :current-file-context="currentFileContext"
       :is-loading="isLoading"
@@ -16,8 +16,8 @@
         @close="clearLastError"
       />
     </oc-notifications>
-    <div class="oc-flex">
-      <div :class="showPreview ? 'oc-width-1-2' : 'oc-width-1-1'">
+    <div class="oc-flex editor-wrapper-height">
+      <div :class="showPreview ? 'oc-width-1-2' : 'oc-width-1-1'" class="oc-height-1-1">
         <oc-textarea
           id="text-editor-input"
           v-model="currentContent"
@@ -230,12 +230,16 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 #text-editor-preview {
   max-height: 80vh;
   overflow-y: scroll;
 }
 #text-editor-input {
   resize: vertical;
+  height: 100%;
+}
+.editor-wrapper-height {
+  height: calc(100% - 42px);
 }
 </style>
diff --git a/packages/web-pkg/src/components/sidebar/SideBar.vue b/packages/web-pkg/src/components/sidebar/SideBar.vue
index 7147548a544..8516baa0a93 100644
--- a/packages/web-pkg/src/components/sidebar/SideBar.vue
+++ b/packages/web-pkg/src/components/sidebar/SideBar.vue
@@ -338,6 +338,7 @@ export default defineComponent({
 
   &__body {
     overflow-y: auto;
+    overflow-x: hidden;
     padding: 10px;
   }
 
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index ed381a4608c..b2649acb5e3 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -103,5 +103,13 @@ export default {
       right: 1rem;
     }
   }
+
+  a.router-link-active,
+  button.router-link-active {
+    &:focus,
+    &:hover {
+      color: var(--oc-color-swatch-inverse-default);
+    }
+  }
 }
 </style>