From 94cbd80336c87ff6c22d3e35d76261fac0668c0e Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Thu, 15 Dec 2022 08:44:11 +0300
Subject: [PATCH] Fix AccordionEditor, ExpandCollapse (#2438)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/theme/styles/_layouts.scss                    |  6 ++++--
 packages/ui/src/components/ExpandCollapse.svelte       | 10 ++++++++--
 .../src/components/AccordionEditor.svelte              |  1 +
 plugins/view-resources/src/components/ObjectBox.svelte |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index 1e2e13927c..53dde57365 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -30,12 +30,14 @@ a {
   }
   &:visited { color: var(--theme-caption-color); }
 
+  &.stealth,
+  &.no-underline {
+    &:hover, &:active { text-decoration: none; }
+  }
   &.stealth {
     display: inline-flex;
     align-items: center;
     width: 100%;
-
-    &:hover, &:active { text-decoration: none; }
   }
 }
 button {
diff --git a/packages/ui/src/components/ExpandCollapse.svelte b/packages/ui/src/components/ExpandCollapse.svelte
index b4bf282986..edb6375679 100644
--- a/packages/ui/src/components/ExpandCollapse.svelte
+++ b/packages/ui/src/components/ExpandCollapse.svelte
@@ -31,7 +31,7 @@
   $: tweenedHeight.set(isExpanded ? height : 0, { duration, easing })
 </script>
 
-<div class="root" style="height: {$tweenedHeight}px">
+<div class="root" style="height: {$tweenedHeight}px" style:overflow={isExpanded ? 'visible' : 'hidden'}>
   <div bind:offsetHeight={height} class="flex-no-shrink clear-mins">
     <slot />
   </div>
@@ -39,8 +39,14 @@
 
 <style lang="scss">
   .root {
-    overflow: hidden;
     min-height: 0;
     flex-shrink: 0;
+
+    &::-webkit-scrollbar:vertical {
+      width: 0;
+    }
+    &::-webkit-scrollbar:horizontal {
+      height: 0;
+    }
   }
 </style>
diff --git a/plugins/attachment-resources/src/components/AccordionEditor.svelte b/plugins/attachment-resources/src/components/AccordionEditor.svelte
index 308d023015..d91ffdce61 100644
--- a/plugins/attachment-resources/src/components/AccordionEditor.svelte
+++ b/plugins/attachment-resources/src/components/AccordionEditor.svelte
@@ -49,6 +49,7 @@
         items[index].state = 'opened'
         attachments[index].setEditable(true)
         attachments[index].setContent(cont)
+        items[index].content = cont
         attachments[index].focus()
         break
     }
diff --git a/plugins/view-resources/src/components/ObjectBox.svelte b/plugins/view-resources/src/components/ObjectBox.svelte
index b6dac4b9c9..1793ecf65d 100644
--- a/plugins/view-resources/src/components/ObjectBox.svelte
+++ b/plugins/view-resources/src/components/ObjectBox.svelte
@@ -122,7 +122,7 @@
     <Button {focusIndex} width={width ?? 'min-content'} {size} {kind} {justify} {showTooltip} on:click={_click}>
       <span slot="content" class="overflow-label flex-grow" class:flex-between={showNavigate && selected}>
         <div
-          class="disabled"
+          class="disabled flex-row-center"
           style:width={showNavigate && selected
             ? `calc(${width ?? 'min-content'} - 1.5rem)`
             : `${width ?? 'min-content'}`}