@onewelcome/react-lib-components 6.0.0 → 6.2.0

package/src/components/Form/Select/SelectService.ts

@@ -21,6 +21,7 @@ import {
   UseSelectPositionListParams
 } from "./Select.interfaces";
 
+/** @scope .*/
 export const useArrowNavigation = ({
   expanded,
   setExpanded,
@@ -31,7 +32,8 @@ export const useArrowNavigation = ({
   childrenCount,
   setShouldClick,
   searchInputRef,
-  renderSearchCondition
+  addBtnRef,
+  renderThreshold
 }: UseArrowNavigationParams) => {
   const onArrowNavigation = (event: React.KeyboardEvent) => {
     const codesToPreventDefault = [
@@ -54,12 +56,16 @@ export const useArrowNavigation = ({
       "MetaRight"
     ];
 
-    /** If the select is expanded, we also want to control the Tab key */
+    const isAddBtnFocused = addBtnRef?.current === document.activeElement;
+
     if (expanded) {
       codesToPreventDefault.push("Tab");
     }
 
-    /** We will handle the way certain key strokes affect the Select, unless we're searching */
+    if (addBtnRef) {
+      codesToPreventDefaultWhenSearching.push("Tab");
+    }
+
     if (codesToPreventDefault.includes(event.code) && !event.metaKey && !isSearching) {
       event.preventDefault();
     }
@@ -80,7 +86,14 @@ export const useArrowNavigation = ({
           setFocusedSelectItem(childrenCount - 1);
           return;
         case "Escape":
+          setIsSearching(false);
+          setExpanded(false);
+          return;
         case "Tab":
+          if (addBtnRef?.current) {
+            addBtnRef.current.focus();
+            return;
+          }
           setIsSearching(false);
           setExpanded(false);
       }
@@ -125,10 +138,13 @@ export const useArrowNavigation = ({
 
           return;
         case "Tab":
-          if (childrenCount >= renderSearchCondition && expanded) {
+          if (childrenCount >= renderThreshold && expanded && !isAddBtnFocused) {
             setIsSearching(true);
             searchInputRef.current?.focus();
             return;
+          } else if (addBtnRef?.current && expanded && !isAddBtnFocused) {
+            addBtnRef.current.focus();
+            return;
           }
           setExpanded(false);
 
@@ -160,13 +176,21 @@ export const useArrowNavigation = ({
   return { onArrowNavigation };
 };
 
+/** @scope .*/
 export const useSelectPositionList = ({
   expanded,
   optionListReference,
+  addBtnRef,
   containerReference
 }: UseSelectPositionListParams) => {
-  const [optionsListMaxHeight, setOptionsListMaxHeight] = useState("none");
-  const [opacity, setOpacity] = useState(0); // We set opacity because other wise if we calculate the max height you see the list full height for a split second and then it shortens.
+  const [optionsListMaxHeight, setOptionsListMaxHeight] = useState<{
+    wrapper?: string;
+    list?: string;
+  }>({
+    wrapper: undefined,
+    list: undefined
+  });
+  const [opacity, setOpacity] = useState(0); // We set opacity because otherwise if we calculate the max height you see the list full height for a split second and then it shortens.
   const [listPosition, setListPosition] = useState<Partial<Position>>({});
 
   useEffect(() => {
@@ -203,6 +227,10 @@ export const useSelectPositionList = ({
   const calculateOptionListMaxHeight = (position: Position) => {
     // Calculate max height if there's more space below the select
     const listHeight = optionListReference.current?.getBoundingClientRect().height;
+    const addNewButtonHeightWithMargin = addBtnRef.current
+      ? addBtnRef.current.getBoundingClientRect().height +
+        parseInt(getComputedStyle(addBtnRef.current).marginBottom)
+      : 0;
     const transformOrigin = position.top !== "initial" ? "top" : "bottom";
 
     if (!containerReference.current) {
@@ -214,18 +242,23 @@ export const useSelectPositionList = ({
 
     const availableSpace =
       transformOrigin === "top"
-        ? window.innerHeight -
-          containerReference.current.getBoundingClientRect()[transformOrigin] -
-          16
-        : containerReference.current.getBoundingClientRect()[transformOrigin] - 16;
+        ? window.innerHeight - containerReference.current.getBoundingClientRect().bottom - 16
+        : containerReference.current.getBoundingClientRect().top - 16;
 
-    if (listHeight && availableSpace < listHeight) {
-      setOptionsListMaxHeight(`${availableSpace}px`);
+    if (listHeight && availableSpace < listHeight + addNewButtonHeightWithMargin) {
+      const maxHeightObject = {
+        wrapper: `${availableSpace}px`,
+        list:
+          addNewButtonHeightWithMargin > 0
+            ? `${availableSpace - addNewButtonHeightWithMargin}px`
+            : "none"
+      };
+      setOptionsListMaxHeight(maxHeightObject);
       setOpacity(100);
       return;
     }
 
-    setOptionsListMaxHeight("none");
+    setOptionsListMaxHeight({ wrapper: undefined, list: undefined });
     setOpacity(100);
   };
 

package/src/components/Form/Select/{Option.tsx → SingleSelect/Option.tsx}

@@ -37,6 +37,7 @@ export interface Props extends ComponentPropsWithRef<"li"> {
   childIndex?: number;
   onOptionSelect?: (ref: React.RefObject<HTMLLIElement>) => void;
   onFocusChange?: (childIndex: number) => void;
+  isAddBtnFocused?: boolean;
 }
 
 const OptionComponent: ForwardRefRenderFunction<HTMLLIElement, Props> = (
@@ -53,6 +54,7 @@ const OptionComponent: ForwardRefRenderFunction<HTMLLIElement, Props> = (
     onFocusChange,
     disabled,
     value,
+    isAddBtnFocused,
     ...rest
   }: Props,
   ref
@@ -66,7 +68,7 @@ const OptionComponent: ForwardRefRenderFunction<HTMLLIElement, Props> = (
   }, [isSelected, shouldClick]);
 
   useEffect(() => {
-    if (innerOptionRef.current && hasFocus && selectOpened && !isSearching) {
+    if (innerOptionRef.current && hasFocus && selectOpened && !isSearching && !isAddBtnFocused) {
       onFocusChange && childIndex && onFocusChange(childIndex);
       innerOptionRef.current.focus();
     }

package/src/components/Form/Select/SingleSelect/Select.module.scss

@@ -0,0 +1,232 @@
+/*!
+ * Copyright 2022 OneWelcome B.V.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+@use "src/mixins.module";
+@use "src/variables";
+
+$listItemHeight: 2.5rem;
+
+.select {
+  position: relative;
+  box-sizing: border-box;
+  @include mixins.transition(all, 0.2s, ease-in-out);
+  border: 0;
+  border-radius: var(--input-border-radius);
+  background-color: var(--input-background-color);
+  font-size: var(--form-control-font-size);
+
+  [data-display] {
+    color: var(--color-default);
+    font-family: var(--font-family);
+  }
+
+  &.expanded {
+    .list-wrapper {
+      background: var(--light);
+    }
+  }
+
+  &:not(.expanded) {
+    button:focus:not(.error) {
+      border: var(--input-border-width-focus) solid var(--color-focus);
+      padding: 0
+        calc(variables.$form-element-horizontal-padding-mobile - var(--input-border-width-focus));
+    }
+  }
+
+  &:hover:not(.disabled):not(.expanded):not(.error) {
+    button:not(:focus) {
+      border-color: var(--default);
+      border-width: var(--input-border-width);
+      background-color: var(--color-blue-grey25);
+    }
+  }
+
+  .custom-select {
+    position: relative;
+    width: 100%;
+    min-height: calc(2.625rem - (2 * var(--input-border-width)));
+    padding: 0 calc(variables.$form-element-horizontal-padding-mobile - var(--input-border-width));
+    background-color: transparent;
+    border-color: var(--color-blue-grey500);
+    border-style: var(--input-border-style);
+    border-width: var(--input-border-width);
+    border-radius: var(--input-border-radius);
+    font-size: var(--form-control-font-size);
+    cursor: pointer;
+    @include mixins.transition(all, 0.2s, ease-in-out);
+
+    &:focus {
+      outline: 0;
+    }
+
+    &.error {
+      border-color: var(--error);
+      color: var(--error);
+    }
+
+    &.error:focus {
+      border-width: var(--input-border-width-focus);
+    }
+
+    &.disabled {
+      border-color: var(--color-disabled);
+    }
+  }
+
+  .list-wrapper {
+    border-color: var(--light-grey-border);
+    border-style: var(--input-border-style);
+    border-width: var(--input-border-width);
+    border-radius: var(--input-border-radius);
+    box-shadow: 0 8px 10px 0 #01053224;
+    position: absolute;
+    z-index: variables.$select-z-index;
+    top: 44px;
+    left: 0;
+    width: 100%;
+    overflow: auto;
+  }
+
+  ul {
+    box-sizing: border-box;
+    padding: 0.25rem 0;
+    width: 100%;
+    margin: 0;
+    list-style: none;
+    background-color: var(--light);
+    border-radius: var(--input-border-radius);
+    color: var(--default);
+    text-align: left;
+    overflow: auto;
+    max-height: calc($listItemHeight * 10);
+
+    li {
+      padding: 0.62rem 0.75rem;
+      font-size: var(--form-control-font-size);
+      margin: 0;
+      position: relative;
+      line-height: 1.25rem;
+      box-sizing: border-box;
+      min-height: $listItemHeight;
+      cursor: pointer;
+
+      &:focus {
+        outline: var(--input-border-width-focus) solid var(--color-primary300);
+        outline-offset: var(--input-border-width-focus);
+      }
+
+      &:hover {
+        background-color: var(--color-blue-grey50);
+      }
+
+      &:active {
+        background-color: var(--color-blue-grey100);
+      }
+
+      &.disabled {
+        color: var(--greyed-out);
+        background-color: var(--disabled);
+        pointer-events: none;
+      }
+    }
+  }
+}
+
+.selected-option {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  border-top-right-radius: 0.125rem;
+  border-bottom-right-radius: 0.125rem;
+  border-left: 0.25rem solid var(--color-primary);
+  color: var(--color-primary);
+}
+
+.selected {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  pointer-events: none;
+}
+
+.status {
+  position: absolute;
+  top: 50%;
+  right: 0.8125rem;
+  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+
+  [data-icon-status="success"] {
+    color: var(--success);
+    font-size: 1.25rem;
+  }
+
+  [data-icon-status="error"] {
+    color: var(--error);
+    font-size: 1.25rem;
+  }
+
+  .chevron-icon {
+    color: var(--default);
+    font-size: 0.625rem;
+  }
+
+  * + * {
+    margin-left: 1.25rem;
+  }
+}
+
+.placeholder {
+  color: var(--greyed-out);
+}
+
+.select-search {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.disabled {
+  cursor: not-allowed;
+  color: var(--greyed-out);
+  background-color: var(--color-blue-grey25);
+
+  > * {
+    pointer-events: none;
+  }
+}
+
+@media only screen and (min-width: 30em) {
+  .select {
+    .custom-select {
+      padding: 0
+        calc(variables.$form-element-horizontal-padding-desktop - var(--input-border-width));
+    }
+
+    &:not(.expanded) {
+      button:focus:not(.error) {
+        padding: 0
+          calc(variables.$form-element-horizontal-padding-desktop - var(--input-border-width-focus));
+      }
+    }
+  }
+}

package/src/components/Form/Select/{Select.tsx → SingleSelect/Select.tsx}

@@ -17,7 +17,6 @@
 import classes from "./Select.module.scss";
 
 import React, {
-  ComponentPropsWithRef,
   createRef,
   ForwardRefRenderFunction,
   Fragment,
@@ -26,37 +25,17 @@ import React, {
   useRef,
   useState
 } from "react";
-import { Input, Props as InputProps } from "../Input/Input";
-import { Icon, Icons } from "../../Icon/Icon";
-import { FormElement } from "../form.interfaces";
-import { useBodyClick } from "../../../hooks/useBodyClick";
-import readyclasses from "../../../readyclasses.module.scss";
-import { filterProps } from "../../../util/helper";
-import { useArrowNavigation, useSelectPositionList } from "./SelectService";
-import { useDetermineStatusIcon } from "../../../hooks/useDetermineStatusIcon";
-
-type PartialInputProps = Partial<InputProps>;
-
-export interface Props extends ComponentPropsWithRef<"select">, FormElement {
-  children: ReactElement[];
-  name?: string;
-  labeledBy?: string;
-  describedBy?: string;
-  placeholder?: string;
-  searchPlaceholder?: string;
-  searchInputProps?: PartialInputProps & { reset?: boolean };
-  selectButtonProps?: ComponentPropsWithRef<"button">;
-  className?: string;
-  value: string;
-  clearLabel?: string;
-  noResultsLabel?: string;
-  onChange?: (event: React.ChangeEvent<HTMLSelectElement>, child?: ReactElement) => void;
-}
-
-/** Amount of items to be rendered before a search input is rendered */
-const renderSearchCondition = 10;
-
-const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
+import { useBodyClick } from "../../../../hooks/useBodyClick";
+import { useDetermineStatusIcon } from "../../../../hooks/useDetermineStatusIcon";
+import readyclasses from "../../../../readyclasses.module.scss";
+import { filterProps } from "../../../../util/helper";
+import { Icon, Icons } from "../../../Icon/Icon";
+import { SingleSelectProps } from "../Select.interfaces";
+import { useArrowNavigation, useSelectPositionList } from "../SelectService";
+import { useAddNewBtn } from "../useAddNewBtn";
+import { useSearch } from "../useSearch";
+
+const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, SingleSelectProps> = (
   {
     children,
     name,
@@ -74,25 +53,44 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     clearLabel = "Clear selection",
     noResultsLabel = "No results found",
     onChange,
+    addNew,
+    search,
     ...rest
-  }: Props,
+  }: SingleSelectProps,
   ref
 ) => {
   const [expanded, setExpanded] = useState(false);
-  const [filter, setFilter] = useState("");
   const [display, setDisplay] = useState("");
   const containerReference = useRef<HTMLDivElement>(null);
   const optionListReference = useRef<HTMLDivElement>(null);
-  const [isSearching, setIsSearching] = useState(false);
   const [focusedSelectItem, setFocusedSelectItem] = useState(-1);
-  const [shouldClick, setShouldClick] =
-    useState(
-      false
-    ); /** We need this, because whenever we use the arrow keys to select the select item, and we focus the currently selected item it fires the "click" listener in Option component. Instead, we only want this to fire if we press "enter" or "spacebar" so we set this to true whenever that is the case, and back to false when it has been executed. */
+  const [shouldClick, setShouldClick] = useState(false);
+  /** We need this, because whenever we use the arrow keys to select the select item, and we focus the currently selected item it fires the "click" listener in Option component. Instead, we only want this to fire if we press "enter" or "spacebar" so we set this to true whenever that is the case, and back to false when it has been executed. */
   const [shouldFocusButtonAfterClose, setShouldFocusButtonAfterClose] = useState(false);
+  const optionsCount = React.Children.count(children);
+  const {
+    filter,
+    isSearching,
+    renderSearch,
+    searchInputRef,
+    setIsSearching,
+    searchThreshold,
+    searchVisible
+  } = useSearch({
+    expanded,
+    search,
+    searchInputClassName: classes["select-search"],
+    optionsCount,
+    setFocusedSelectItem,
+    searchInputProps,
+    searchPlaceholder
+  });
+  const { addBtnRef, addNewBtnOptionsContainerClassName, renderAddNew } = useAddNewBtn({
+    addNew,
+    filter
+  });
 
   const nativeSelect = (ref as React.RefObject<HTMLSelectElement>) || createRef();
-  const searchInputRef = useRef<HTMLInputElement>(null);
 
   const onOptionChangeHandler = (optionElement: HTMLElement | null) => {
     if (nativeSelect.current && optionElement) {
@@ -111,14 +109,15 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     setIsSearching,
     setFocusedSelectItem,
     onOptionChangeHandler,
-    childrenCount: React.Children.count(children),
+    childrenCount: optionsCount,
     setShouldClick,
     searchInputRef,
-    renderSearchCondition
+    addBtnRef,
+    renderThreshold: searchThreshold
   });
 
   const { listPosition, opacity, optionsListMaxHeight, setListPosition, setOpacity } =
-    useSelectPositionList({ expanded, optionListReference, containerReference });
+    useSelectPositionList({ expanded, optionListReference, containerReference, addBtnRef });
 
   const syncDisplayValue = (val: string) => {
     React.Children.forEach(children, child => {
@@ -129,7 +128,7 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
   };
 
   /**
-   * @description We have to modify the children (Option component) to have a additional props that allows us to keep track of which one is selected and focused at all times and if a filter is active.
+   * @description We have to modify the children (Option component) to have an additional props that allows us to keep track of which one is selected and focused at all times and if a filter is active.
    * The `children` prop can be either a single object (1 child) or an array of multiple children.
    */
   const renderOptions = () => {
@@ -165,35 +164,13 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           selectOpened: expanded,
           childIndex: index,
           hasFocus: focusedSelectItem === index,
-          shouldClick: shouldClick
+          shouldClick: shouldClick,
+          isAddBtnFocused: addBtnRef.current === document.activeElement
         });
       });
     }
   };
 
-  const shouldRenderSearch =
-    expanded && Array.isArray(children) && children.length > renderSearchCondition;
-
-  const renderSearch = () => (
-    <Input
-      {...searchInputProps}
-      ref={searchInputRef}
-      onFocus={() => setIsSearching(true)}
-      onBlur={() => setIsSearching(false)}
-      onChange={filterResults}
-      className={classes["select-search"]}
-      wrapperProps={{
-        className: searchInputProps?.wrapperProps?.className
-      }}
-      style={{
-        display: expanded ? "block" : "none"
-      }}
-      type="text"
-      name="search-option"
-      placeholder={searchPlaceholder}
-    />
-  );
-
   const renderChevronIcon = () => {
     return expanded ? (
       <Icon className={classes["chevron-icon"]} icon={Icons.ChevronUp} />
@@ -202,10 +179,6 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     );
   };
 
-  const filterResults = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setFilter(event.currentTarget.value);
-  };
-
   const icon = useDetermineStatusIcon({ success, error });
 
   const nativeOnChangeHandler = (event: React.ChangeEvent<HTMLSelectElement>) => {
@@ -238,16 +211,6 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     expanded
   );
 
-  const resetSearchState = () => {
-    setFilter("");
-    setIsSearching(false);
-    setFocusedSelectItem(-1);
-  };
-
-  useEffect(() => {
-    searchInputProps?.reset && resetSearchState();
-  }, [searchInputProps?.reset]);
-
   const additionalClasses = [];
   expanded && additionalClasses.push(classes.expanded);
   error && additionalClasses.push(classes.error);
@@ -280,7 +243,7 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           className ?? ""
         }`}
       >
-        {Array.isArray(children) && children.length > renderSearchCondition && renderSearch()}
+        {searchVisible && renderSearch()}
         <button
           {...selectButtonProps}
           onClick={() => {
@@ -290,7 +253,7 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           type="button"
           name={name}
           className={`${classes["custom-select"]} ${additionalClasses.join(" ")} `}
-          style={{ display: shouldRenderSearch ? "none" : "initial" }}
+          style={{ display: expanded && searchVisible ? "none" : "initial" }}
           disabled={disabled}
           aria-disabled={disabled}
           aria-invalid={error}
@@ -312,16 +275,22 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           style={{
             display: expanded ? "block" : "none",
             opacity: opacity,
-            maxHeight: optionsListMaxHeight,
+            maxHeight: optionsListMaxHeight.wrapper,
             pointerEvents: expanded ? "auto" : "none",
             ...listPosition
           }}
         >
-          <ul role="listbox">{renderOptions()}</ul>
+          <ul
+            className={addNewBtnOptionsContainerClassName}
+            role="listbox"
+            style={{ maxHeight: optionsListMaxHeight.list }}
+          >
+            {renderOptions()}
+          </ul>
+          {renderAddNew()}
         </div>
       </div>
     </Fragment>
   );
 };
-
 export const Select = React.forwardRef(SelectComponent);

package/src/components/Form/Select/useAddNewBtn.module.scss

@@ -0,0 +1,51 @@
+/*!
+ * Copyright 2022 OneWelcome B.V.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+ul.has-sibling {
+  padding-bottom: 2px;
+}
+
+.action-button {
+  border: none;
+  border-top: 1px solid var(--color-blue-grey50);
+  width: 100%;
+  height: 2.5rem;
+  padding: 0.625rem 0.75rem;
+  margin: 0 0 0.25rem;
+  background-color: var(--light);
+  border-radius: var(--input-border-radius);
+  color: var(--default);
+  text-align: left;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  font-family: var(--font-family);
+  font-size: var(--form-control-font-size);
+
+  &:focus {
+    outline: 1px solid;
+    outline-offset: 0;
+    border-radius: 0;
+  }
+
+  &:hover {
+    background-color: var(--color-blue-grey50);
+  }
+
+  &:active {
+    background-color: var(--color-blue-grey100);
+  }
+}