From 2cb9ed230e4218ed3c8843728d417811cc44c1e6 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Wed, 12 May 2021 15:57:57 +0300
Subject: [PATCH] Fix namespace selector gradients

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../+namespaces/namespace-select-filter.scss  | 41 +++++++++++++++++++
 .../+namespaces/namespace-select-filter.tsx   |  3 +-
 .../+namespaces/namespace-select.scss         | 33 ---------------
 .../+namespaces/namespace-select.tsx          | 13 ------
 4 files changed, 43 insertions(+), 47 deletions(-)
 create mode 100644 src/renderer/components/+namespaces/namespace-select-filter.scss

diff --git a/src/renderer/components/+namespaces/namespace-select-filter.scss b/src/renderer/components/+namespaces/namespace-select-filter.scss
new file mode 100644
index 0000000000..76014ecbef
--- /dev/null
+++ b/src/renderer/components/+namespaces/namespace-select-filter.scss
@@ -0,0 +1,41 @@
+.NamespaceSelectFilter {
+  .Select {
+    &__placeholder {
+      width: 100%;
+      white-space: nowrap;
+      overflow: scroll!important;
+      text-overflow: unset!important;
+      margin-left: -8px;
+      padding-left: 8px;
+      margin-right: -8px;
+      padding-right: 8px;
+
+      &::-webkit-scrollbar {
+        display: none;
+      }
+    }
+
+    &__value-container {
+      position: relative;
+
+      &::before, &::after {
+        content: ' ';
+        position: absolute;
+        z-index: 20;
+        display: block;
+        width: 8px;
+        height: var(--font-size);
+      }
+
+      &::before {
+        left: 0px;
+        background: linear-gradient(to right, var(--contentColor) 0px, transparent);
+      }
+
+      &::after {
+        right: 0px;
+        background: linear-gradient(to left, var(--contentColor) 0px, transparent);
+      }
+    }
+  }
+}
diff --git a/src/renderer/components/+namespaces/namespace-select-filter.tsx b/src/renderer/components/+namespaces/namespace-select-filter.tsx
index 85a6299b17..63109a8630 100644
--- a/src/renderer/components/+namespaces/namespace-select-filter.tsx
+++ b/src/renderer/components/+namespaces/namespace-select-filter.tsx
@@ -1,4 +1,4 @@
-import "./namespace-select.scss";
+import "./namespace-select-filter.scss";
 
 import React from "react";
 import { observer } from "mobx-react";
@@ -71,6 +71,7 @@ export class NamespaceSelectFilter extends React.Component {
         placeholder={""}
         onChange={this.onChange}
         formatOptionLabel={this.formatOptionLabel}
+        className="NamespaceSelectFilter"
       />
     );
   }
diff --git a/src/renderer/components/+namespaces/namespace-select.scss b/src/renderer/components/+namespaces/namespace-select.scss
index 33293a6d7a..7e5081e3b8 100644
--- a/src/renderer/components/+namespaces/namespace-select.scss
+++ b/src/renderer/components/+namespaces/namespace-select.scss
@@ -4,41 +4,8 @@
   }
 }
 
-.GradientValueContainer {
-  width: 8px;
-  height: var(--font-size);
-  position: absolute;
-  z-index: 20;
-
-  &.front {
-    left: 0px;
-    background: linear-gradient(to right, var(--contentColor) 0px, transparent);
-  }
-
-  &.back {
-    right: 0px;
-    background: linear-gradient(to left, var(--contentColor) 0px, transparent);
-  }
-}
-
 .NamespaceSelect {
   @include namespaceSelectCommon;
-
-  .Select {
-    &__placeholder {
-      width: 100%;
-      white-space: nowrap;
-      overflow: scroll;
-      margin-left: -8px;
-      padding-left: 8px;
-      margin-right: -8px;
-      padding-right: 8px;
-
-      &::-webkit-scrollbar {
-        display: none;
-      }
-    }
-  }
 }
 
 .NamespaceSelectMenu {
diff --git a/src/renderer/components/+namespaces/namespace-select.tsx b/src/renderer/components/+namespaces/namespace-select.tsx
index d398f91f0a..17ba8e812f 100644
--- a/src/renderer/components/+namespaces/namespace-select.tsx
+++ b/src/renderer/components/+namespaces/namespace-select.tsx
@@ -8,7 +8,6 @@ import { cssNames } from "../../utils";
 import { Icon } from "../icon";
 import { namespaceStore } from "./namespace.store";
 import { kubeWatchApi } from "../../api/kube-watch-api";
-import { components, ValueContainerProps } from "react-select";
 
 interface Props extends SelectProps {
   showIcons?: boolean;
@@ -22,16 +21,6 @@ const defaultProps: Partial<Props> = {
   showClusterOption: false,
 };
 
-function GradientValueContainer<T>({children, ...rest}: ValueContainerProps<T>) {
-  return (
-    <components.ValueContainer {...rest}>
-      <div className="GradientValueContainer front" />
-      {children}
-      <div className="GradientValueContainer back" />
-    </components.ValueContainer>
-  );
-}
-
 @observer
 export class NamespaceSelect extends React.Component<Props> {
   static defaultProps = defaultProps as object;
@@ -77,8 +66,6 @@ export class NamespaceSelect extends React.Component<Props> {
   render() {
     const { className, showIcons, customizeOptions, components = {}, ...selectProps } = this.props;
 
-    components.ValueContainer ??= GradientValueContainer;
-
     return (
       <Select
         className={cssNames("NamespaceSelect", className)}