@onewelcome/react-lib-components 6.1.0 → 6.2.0

package/src/components/Form/Select/MultiSelect/SelectButton.tsx

@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+import React, { ComponentPropsWithRef, ForwardRefRenderFunction } from "react";
+import classes from "./SelectButton.module.scss";
+
+export interface Props extends ComponentPropsWithRef<"button"> {}
+
+const SelectButtonComponent: ForwardRefRenderFunction<HTMLButtonElement, Props> = (
+  { onClick, name, ...rest }: Props,
+  ref
+) => {
+  return (
+    <button
+      {...rest}
+      className={classes["add-btn"]}
+      onClick={onClick}
+      ref={ref}
+      type="button"
+      name={name}
+    ></button>
+  );
+};
+export const SelectButton = React.forwardRef(SelectButtonComponent);

package/src/components/Form/Select/MultiSelect/SelectedOptions.module.scss

@@ -0,0 +1,31 @@
+/*!
+ * 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.
+ */
+
+.options {
+  position: relative;
+  display: flex;
+  gap: 0.375rem;
+  flex-wrap: wrap;
+  cursor: pointer;
+}
+
+.tag {
+  cursor: text;
+
+  .remove-btn {
+    cursor: pointer;
+  }
+}

package/src/components/Form/Select/MultiSelect/SelectedOptions.tsx

@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+import React, { ForwardRefRenderFunction, ComponentPropsWithRef } from "react";
+import { Tag } from "../../../Tag/Tag";
+
+import classes from "./SelectedOptions.module.scss";
+
+export type Display = {
+  label: string;
+  fixed?: boolean;
+};
+
+export interface Props extends ComponentPropsWithRef<"div"> {
+  display: Record<string, Display>;
+  onRemove: (value: string) => void;
+  disabled: boolean;
+}
+
+const SelectedOptionsComponent: ForwardRefRenderFunction<HTMLDivElement, Props> = (
+  { display, onRemove, disabled, ...rest }: Props,
+  ref
+) => {
+  return (
+    <div {...rest} className={classes["options"]} ref={ref}>
+      {Object.entries(display).map(([value, item]) => (
+        <Tag
+          key={value}
+          onClick={(e: React.MouseEvent<HTMLDivElement>) => {
+            e.stopPropagation();
+          }}
+          className={classes["tag"]}
+          removeButton={
+            !disabled && !item.fixed
+              ? {
+                  onRemove: (e: React.MouseEvent<HTMLButtonElement>) => {
+                    e.stopPropagation();
+                    onRemove(value);
+                  },
+                  className: classes["remove-btn"]
+                }
+              : undefined
+          }
+          backgroundColor="var(--color-blue-grey100)"
+          shape="sharp"
+        >
+          {item.label}
+        </Tag>
+      ))}
+    </div>
+  );
+};
+
+export const SelectedOptions = React.forwardRef(SelectedOptionsComponent);

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

@@ -14,6 +14,54 @@
  *    limitations under the License.
  */
 
+import { ComponentPropsWithRef, ReactElement } from "react";
+import { Props as InputProps } from "../Input/Input";
+import { FormElement } from "../form.interfaces";
+
+export type PartialInputProps = Partial<InputProps>;
+
+export interface SearchProps {
+  enabled?: boolean;
+  renderThreshold?: number;
+  searchPlaceholder?: string;
+  searchInputProps?: PartialInputProps & { reset?: boolean };
+}
+
+export interface AddNewProps {
+  label: string;
+  onAddNew: (value: string) => void;
+  btnProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
+}
+
+export interface SelectProps<V extends string | readonly string[] | undefined>
+  extends ComponentPropsWithRef<"select">,
+    FormElement {
+  children: ReactElement[];
+  name?: string;
+  labeledBy?: string;
+  describedBy?: string;
+  placeholder?: string;
+  /**
+   * @deprecated
+   */
+  searchPlaceholder?: string;
+  /**
+   * @deprecated
+   */
+  searchInputProps?: PartialInputProps & { reset?: boolean };
+  selectButtonProps?: ComponentPropsWithRef<"button">;
+  search?: SearchProps;
+  className?: string;
+  value: V;
+  clearLabel?: string;
+  noResultsLabel?: string;
+  onChange?: (event: React.ChangeEvent<HTMLSelectElement>, child?: ReactElement) => void;
+  addNew?: AddNewProps;
+}
+
+export type SingleSelectProps = SelectProps<string>;
+export type MultiSelectProps = SelectProps<string[]>;
+
 export type Position = {
   top: number | `${number}rem` | "initial";
   bottom: number | `${number}rem` | "initial";

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

@@ -21,7 +21,7 @@ import {
   UseSelectPositionListParams
 } from "./Select.interfaces";
 
-/** @scope . */
+/** @scope .*/
 export const useArrowNavigation = ({
   expanded,
   setExpanded,
@@ -176,13 +176,20 @@ export const useArrowNavigation = ({
   return { onArrowNavigation };
 };
 
+/** @scope .*/
 export const useSelectPositionList = ({
   expanded,
   optionListReference,
   addBtnRef,
   containerReference
 }: UseSelectPositionListParams) => {
-  const [optionsListMaxHeight, setOptionsListMaxHeight] = useState("none");
+  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>>({});
 
@@ -220,7 +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 addNewButtonHeight = addBtnRef.current?.getBoundingClientRect().height ?? 0;
+    const addNewButtonHeightWithMargin = addBtnRef.current
+      ? addBtnRef.current.getBoundingClientRect().height +
+        parseInt(getComputedStyle(addBtnRef.current).marginBottom)
+      : 0;
     const transformOrigin = position.top !== "initial" ? "top" : "bottom";
 
     if (!containerReference.current) {
@@ -235,13 +245,20 @@ export const useSelectPositionList = ({
         ? window.innerHeight - containerReference.current.getBoundingClientRect().bottom - 16
         : containerReference.current.getBoundingClientRect().top - 16;
 
-    if (listHeight && availableSpace < listHeight + addNewButtonHeight) {
-      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/{Select.module.scss → SingleSelect/Select.module.scss}

@@ -111,6 +111,8 @@ $listItemHeight: 2.5rem;
     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;
@@ -144,10 +146,6 @@ $listItemHeight: 2.5rem;
   }
 }
 
-ul.has-sibling {
-  padding-bottom: 2px;
-}
-
 .selected-option {
   content: "";
   position: absolute;
@@ -167,38 +165,6 @@ ul.has-sibling {
   pointer-events: none;
 }
 
-.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);
-  }
-}
-
 .status {
   position: absolute;
   top: 50%;

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,53 +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>;
-
-interface SearchProps {
-  enabled?: boolean;
-  renderThreshold?: number;
-  searchPlaceholder?: string;
-  searchInputProps?: PartialInputProps & { reset?: boolean };
-}
-
-export interface Props extends ComponentPropsWithRef<"select">, FormElement {
-  children: ReactElement[];
-  name?: string;
-  labeledBy?: string;
-  describedBy?: string;
-  placeholder?: string;
-  /**
-   * @deprecated
-   */
-  searchPlaceholder?: string;
-  /**
-   * @deprecated
-   */
-  searchInputProps?: PartialInputProps & { reset?: boolean };
-  selectButtonProps?: ComponentPropsWithRef<"button">;
-  search?: SearchProps;
-  className?: string;
-  value: string;
-  clearLabel?: string;
-  noResultsLabel?: string;
-  onChange?: (event: React.ChangeEvent<HTMLSelectElement>, child?: ReactElement) => void;
-  addNew?: {
-    label: string;
-    onAddNew: (value: string) => void;
-    btnProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
-  };
-}
-
-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,
@@ -93,42 +56,41 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     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 [shouldFocusButtonAfterClose, setShouldFocusButtonAfterClose] = useState(false);
-
-  const DEFAULT_RENDER_THRESHOLD = 10;
+  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 addBtnRef = useRef<HTMLButtonElement>(null);
-
-  const addNewLabel = addNew?.label ?? "Create new";
-
-  const getRenderThreshold = search?.renderThreshold ?? DEFAULT_RENDER_THRESHOLD;
-  const hasEnoughChildren = Array.isArray(children) && children.length > getRenderThreshold;
-
-  const shouldRenderSearch = () => {
-    if (search?.enabled) {
-      return hasEnoughChildren;
-    }
-
-    if (search) {
-      return search.enabled as boolean;
-    }
-
-    return children.length > DEFAULT_RENDER_THRESHOLD;
-  };
 
   const onOptionChangeHandler = (optionElement: HTMLElement | null) => {
     if (nativeSelect.current && optionElement) {
@@ -147,11 +109,11 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     setIsSearching,
     setFocusedSelectItem,
     onOptionChangeHandler,
-    childrenCount: React.Children.count(children),
+    childrenCount: optionsCount,
     setShouldClick,
     searchInputRef,
     addBtnRef,
-    renderThreshold: getRenderThreshold
+    renderThreshold: searchThreshold
   });
 
   const { listPosition, opacity, optionsListMaxHeight, setListPosition, setOpacity } =
@@ -209,28 +171,6 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     }
   };
 
-  const renderSearch = () => (
-    <Input
-      {...(search?.searchInputProps ?? searchInputProps)}
-      ref={searchInputRef}
-      onFocus={() => setIsSearching(true)}
-      onBlur={() => setIsSearching(false)}
-      onChange={filterResults}
-      className={classes["select-search"]}
-      wrapperProps={{
-        className:
-          search?.searchInputProps?.wrapperProps?.className ??
-          searchInputProps?.wrapperProps?.className
-      }}
-      style={{
-        display: expanded ? "block" : "none"
-      }}
-      type="text"
-      name="search-option"
-      placeholder={search?.searchPlaceholder ?? searchPlaceholder}
-    />
-  );
-
   const renderChevronIcon = () => {
     return expanded ? (
       <Icon className={classes["chevron-icon"]} icon={Icons.ChevronUp} />
@@ -239,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>) => {
@@ -275,16 +211,6 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
     expanded
   );
 
-  const resetSearchState = () => {
-    setFilter("");
-    setIsSearching(false);
-    setFocusedSelectItem(-1);
-  };
-
-  useEffect(() => {
-    (search?.searchInputProps?.reset || searchInputProps?.reset) && resetSearchState();
-  }, [searchInputProps?.reset, search?.searchInputProps?.reset]);
-
   const additionalClasses = [];
   expanded && additionalClasses.push(classes.expanded);
   error && additionalClasses.push(classes.error);
@@ -317,7 +243,7 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           className ?? ""
         }`}
       >
-        {shouldRenderSearch() && renderSearch()}
+        {searchVisible && renderSearch()}
         <button
           {...selectButtonProps}
           onClick={() => {
@@ -327,7 +253,7 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           type="button"
           name={name}
           className={`${classes["custom-select"]} ${additionalClasses.join(" ")} `}
-          style={{ display: expanded && shouldRenderSearch() ? "none" : "initial" }}
+          style={{ display: expanded && searchVisible ? "none" : "initial" }}
           disabled={disabled}
           aria-disabled={disabled}
           aria-invalid={error}
@@ -349,27 +275,19 @@ const SelectComponent: ForwardRefRenderFunction<HTMLSelectElement, Props> = (
           style={{
             display: expanded ? "block" : "none",
             opacity: opacity,
-            maxHeight: optionsListMaxHeight,
+            maxHeight: optionsListMaxHeight.wrapper,
             pointerEvents: expanded ? "auto" : "none",
             ...listPosition
           }}
         >
-          <ul className={addNew && classes["has-sibling"]} role="listbox">
+          <ul
+            className={addNewBtnOptionsContainerClassName}
+            role="listbox"
+            style={{ maxHeight: optionsListMaxHeight.list }}
+          >
             {renderOptions()}
           </ul>
-          {addNew && (
-            <button
-              data-testid={"select-action-button"}
-              className={classes["action-button"]}
-              onClick={() => addNew.onAddNew(filter)}
-              ref={addBtnRef}
-              {...addNew.btnProps}
-            >
-              {!filter && addNewLabel}
-              {filter && <span style={{ fontWeight: "700" }}>{`"${filter}"`}</span>}
-              {filter && ` (${addNewLabel.toLowerCase()})`}
-            </button>
-          )}
+          {renderAddNew()}
         </div>
       </div>
     </Fragment>

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);
+  }
+}

package/src/components/Form/Select/useAddNewBtn.tsx

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+import classes from "./useAddNewBtn.module.scss";
+
+import React, { useRef } from "react";
+import { AddNewProps } from "./Select.interfaces";
+
+interface Props {
+  addNew?: AddNewProps;
+  filter: string;
+}
+
+export const useAddNewBtn = ({ addNew, filter }: Props) => {
+  const addBtnRef = useRef<HTMLButtonElement>(null);
+
+  const addNewLabel = addNew?.label ?? "Create new";
+
+  const renderAddNew = () =>
+    addNew && (
+      <button
+        data-testid={"select-action-button"}
+        className={classes["action-button"]}
+        onClick={() => addNew.onAddNew(filter)}
+        ref={addBtnRef}
+        {...addNew.btnProps}
+      >
+        {!filter && addNewLabel}
+        {filter && <span style={{ fontWeight: "700" }}>{`"${filter}"`}</span>}
+        {filter && ` (${addNewLabel.toLowerCase()})`}
+      </button>
+    );
+
+  const addNewBtnOptionsContainerClassName = addNew ? classes["has-sibling"] : "";
+
+  return {
+    addNewBtnOptionsContainerClassName,
+    renderAddNew,
+    addBtnRef
+  };
+};