Browse Source

style(client): collapse search into header action

_Kerman 2 months ago
parent
commit
d86ecf7b29

+ 27 - 8
packages/client/ui-workspace/src/client/WorkspaceBrowser.module.css

@@ -70,11 +70,21 @@
 
 
 .searchSlot {
 .searchSlot {
   flex: 1;
   flex: 1;
+  max-width: 28px;
   min-width: 0;
   min-width: 0;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  padding-left: 4px;
+  margin-left: auto;
+  padding-left: 0;
   box-sizing: border-box;
   box-sizing: border-box;
+  transition:
+    max-width 180ms var(--ds-ease-in-out),
+    padding-left 180ms var(--ds-ease-in-out);
+}
+
+.searchSlotExpanded {
+  max-width: 100%;
+  padding-left: 4px;
 }
 }
 
 
 .headerActions {
 .headerActions {
@@ -110,15 +120,15 @@
   align-items: center;
   align-items: center;
   gap: 0;
   gap: 0;
   width: 100%;
   width: 100%;
-  height: 26px;
+  height: 28px;
   margin: 0;
   margin: 0;
   padding: 0;
   padding: 0;
   box-sizing: border-box;
   box-sizing: border-box;
-  border: 1px solid var(--dsw-alias-border-l1);
-  border-radius: 10px;
+  border: none;
+  border-radius: 50%;
   background: transparent;
   background: transparent;
   cursor: text;
   cursor: text;
-  color: var(--dsw-alias-label-caption);
+  color: var(--dsw-alias-label-secondary);
   overflow: hidden;
   overflow: hidden;
   transition:
   transition:
     width 180ms var(--ds-ease-in-out),
     width 180ms var(--ds-ease-in-out),
@@ -128,9 +138,12 @@
 }
 }
 
 
 .searchExpanded {
 .searchExpanded {
+  height: 26px;
   padding: 0 4px 0 0;
   padding: 0 4px 0 0;
-  border-color: var(--dsw-alias-border-l2);
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 10px;
   background: transparent;
   background: transparent;
+  color: var(--dsw-alias-label-caption);
 }
 }
 
 
 .searchButton {
 .searchButton {
@@ -138,8 +151,8 @@
   display: inline-flex;
   display: inline-flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  width: 26px;
-  height: 26px;
+  width: 28px;
+  height: 28px;
   border: none;
   border: none;
   border-radius: 50%;
   border-radius: 50%;
   padding: 0;
   padding: 0;
@@ -148,6 +161,11 @@
   color: inherit;
   color: inherit;
 }
 }
 
 
+.searchExpanded .searchButton {
+  width: 26px;
+  height: 26px;
+}
+
 .searchButton:hover {
 .searchButton:hover {
   background: var(--dsw-alias-interactive-bg-hover);
   background: var(--dsw-alias-interactive-bg-hover);
 }
 }
@@ -420,6 +438,7 @@
   }
   }
 
 
   .search,
   .search,
+  .searchSlot,
   .searchInput,
   .searchInput,
   .headerActions {
   .headerActions {
     transition: none;
     transition: none;

+ 2 - 2
packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx

@@ -691,7 +691,7 @@ export function WorkspaceBrowser({
           </span>
           </span>
         )}
         )}
         {wide && (
         {wide && (
-          <div className={css.searchSlot}>
+          <div className={clsx(css.searchSlot, searchExpanded && css.searchSlotExpanded)}>
             <div
             <div
               ref={searchRoot}
               ref={searchRoot}
               className={clsx(css.search, searchExpanded && css.searchExpanded)}
               className={clsx(css.search, searchExpanded && css.searchExpanded)}
@@ -712,7 +712,7 @@ export function WorkspaceBrowser({
                     setSearchExpanded(true)
                     setSearchExpanded(true)
                   }}
                   }}
                 >
                 >
-                  <IconSearchOutline16 size={11} />
+                  <IconSearchOutline16 size={searchExpanded ? 11 : 14} />
                 </button>
                 </button>
               </Tooltip>
               </Tooltip>
               <input
               <input