@entur/dropdown 5.1.3 → 5.2.0-beta.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import './index.scss';
-export type { NormalizedDropdownItemType, DropdownItemType, } from './useNormalizedItems';
+export type { NormalizedDropdownItemType, DropdownItemType } from './types';
 export * from './deprecated';
 export * from './SearchableDropdown';
 export * from './MultiSelect';

package/dist/styles.css

@@ -1,5 +1,95 @@
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
+.eds-dropdown__searchable-selected-item {
+  display: block;
+  font-size: 1rem;
+  line-height: 1rem;
+  margin-right: -1rem;
+  padding: calc(1rem + 0.25rem) 0 0.25rem 1rem;
+  font-family: inherit;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.eds-dropdown__searchable-selected-item__wrapper {
+  max-width: 65%;
+}
+
+.eds-form-control.eds-dropdown__input::-moz-placeholder {
+  -moz-transition: none;
+  transition: none;
+}
+
+.eds-form-control.eds-dropdown__input::placeholder {
+  transition: none;
+}
+.eds-inline-spinner {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+}
+/* DO NOT CHANGE!*/
+/* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
+.eds-dropdown-wrapper {
+  position: relative;
+}
+.eds-dropdown-wrapper .eds-form-control {
+  padding-right: 0;
+}
+.eds-dropdown-wrapper .eds-form-control__append {
+  display: flex;
+  align-items: center;
+}
+
+.eds-dropdown__input::-moz-placeholder {
+  color: #656782;
+}
+
+.eds-dropdown__input::placeholder {
+  color: #656782;
+}
+
+.eds-dropdown__selected-item {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.eds-dropdown__clear-button {
+  background: none;
+  border: none;
+  border-radius: 50%;
+  color: inherit;
+  cursor: pointer;
+  display: flex;
+  font: inherit;
+  font-size: 1rem;
+  line-height: 1rem;
+  padding: 0.5rem;
+}
+.eds-dropdown__clear-button:hover {
+  background: #f3f3f3;
+}
+.eds-dropdown__clear-button:focus {
+  outline-offset: 0.125rem;
+  outline: none;
+  box-shadow: 0 0 0 0.125rem #ffffff, 0 0 0 0.25rem #181c56;
+}
+
+.eds-dropdown__divider {
+  content: "";
+  display: block;
+  background-color: #e9e9e9;
+  height: 1.5rem;
+  width: 1px;
+}
+.eds-contrast .eds-form-control-wrapper--disabled .eds-dropdown__divider {
+  background-color: #8285a8;
+}
+/* DO NOT CHANGE!*/
+/* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
 .eds-dropdown-list {
   border-radius: 0.25rem;
   box-shadow: 0 0.0625rem 0.1875rem rgba(0, 0, 0, 0.25);
@@ -64,61 +154,31 @@
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
-.eds-dropdown-wrapper {
-  position: relative;
-}
-.eds-dropdown-wrapper .eds-form-control {
-  padding-right: 0;
-}
-.eds-dropdown-wrapper .eds-form-control__append {
-  display: flex;
-  align-items: center;
-}
-
-.eds-dropdown__input::-moz-placeholder {
-  color: #656782;
-}
-
-.eds-dropdown__input::placeholder {
-  color: #656782;
-}
-
-.eds-dropdown__selected-item {
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.eds-dropdown__clear-button {
+.eds-dropdown__toggle-button {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
   background: none;
   border: none;
-  border-radius: 50%;
+  border-radius: 0;
   color: inherit;
-  cursor: pointer;
-  display: flex;
-  font: inherit;
-  font-size: 1rem;
-  line-height: 1rem;
+  font-size: inherit;
+  font-family: inherit;
+  margin-right: -0.75rem;
   padding: 0.5rem;
+  display: flex;
+  justify-content: center;
 }
-.eds-dropdown__clear-button:hover {
-  background: #f3f3f3;
+.eds-dropdown__toggle-button--open svg {
+  transform: rotate(180deg);
 }
-.eds-dropdown__clear-button:focus {
+.eds-dropdown__toggle-button:focus {
   outline-offset: 0.125rem;
   outline: none;
   box-shadow: 0 0 0 0.125rem #ffffff, 0 0 0 0.25rem #181c56;
 }
-
-.eds-dropdown__divider {
-  content: "";
-  display: block;
-  background-color: #e9e9e9;
-  height: 1.5rem;
-  width: 1px;
-}
-.eds-contrast .eds-form-control-wrapper--disabled .eds-dropdown__divider {
-  background-color: #8285a8;
+.eds-contrast .eds-dropdown__toggle-button:focus {
+  box-shadow: 0 0 0 0.125rem #181c56, 0 0 0 0.25rem #ffffff;
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
@@ -213,66 +273,6 @@
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
-.eds-dropdown__toggle-button {
-  -webkit-appearance: none;
-     -moz-appearance: none;
-          appearance: none;
-  background: none;
-  border: none;
-  border-radius: 0;
-  color: inherit;
-  font-size: inherit;
-  font-family: inherit;
-  margin-right: -0.75rem;
-  padding: 0.5rem;
-  display: flex;
-  justify-content: center;
-}
-.eds-dropdown__toggle-button--open svg {
-  transform: rotate(180deg);
-}
-.eds-dropdown__toggle-button:focus {
-  outline-offset: 0.125rem;
-  outline: none;
-  box-shadow: 0 0 0 0.125rem #ffffff, 0 0 0 0.25rem #181c56;
-}
-.eds-contrast .eds-dropdown__toggle-button:focus {
-  box-shadow: 0 0 0 0.125rem #181c56, 0 0 0 0.25rem #ffffff;
-}
-.eds-inline-spinner {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  height: 100%;
-  width: 100%;
-}
-/* DO NOT CHANGE!*/
-/* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
-.eds-dropdown__searchable-selected-item {
-  display: block;
-  font-size: 1rem;
-  line-height: 1rem;
-  margin-right: -1rem;
-  padding: calc(1rem + 0.25rem) 0 0.25rem 1rem;
-  font-family: inherit;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.eds-dropdown__searchable-selected-item__wrapper {
-  max-width: 65%;
-}
-
-.eds-form-control.eds-dropdown__input::-moz-placeholder {
-  -moz-transition: none;
-  transition: none;
-}
-
-.eds-form-control.eds-dropdown__input::placeholder {
-  transition: none;
-}
-/* DO NOT CHANGE!*/
-/* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
 .eds-dropdown__list {
   position: absolute;
   list-style: none;

package/dist/types.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+export type DropdownItemType<ValueType = string> = {
+    value?: ValueType;
+    label: string;
+    icons?: React.ComponentType<any>[];
+} | string;
+export type NormalizedDropdownItemType<ValueType = string> = {
+    value: ValueType;
+    label: string;
+    icons?: React.ComponentType<any>[];
+};
+export type AsyncDropdownItemType<ValueType = string> = (inputType: string, abortControllerRef: React.MutableRefObject<AbortController>) => Promise<DropdownItemType<ValueType>[]>;
+export type SyncDropdownItemType<ValueType = string> = (inputType: string, abortControllerRef: React.MutableRefObject<AbortController>) => DropdownItemType<ValueType>[];
+export type PotentiallyAsyncDropdownItemType<ValueType = string> = DropdownItemType<ValueType>[] | SyncDropdownItemType<ValueType> | AsyncDropdownItemType<ValueType>;

package/dist/useNormalizedItems.d.ts

@@ -1,12 +1,2 @@
-import React from 'react';
-export type DropdownItemType = {
-    value?: string;
-    label: string;
-    icons?: React.ComponentType<any>[];
-} | string;
-export type NormalizedDropdownItemType = {
-    value: string;
-    label: string;
-    icons?: React.ComponentType<any>[];
-};
-export declare const useNormalizedItems: (items: DropdownItemType[]) => NormalizedDropdownItemType[];
+import { DropdownItemType, NormalizedDropdownItemType } from './types';
+export declare const useNormalizedItems: <ValueType = string>(items: DropdownItemType<ValueType>[]) => NormalizedDropdownItemType<ValueType>[];

package/dist/useResolvedItems.d.ts

@@ -1,11 +1,6 @@
-import React from 'react';
-import { DropdownItemType, NormalizedDropdownItemType } from './useNormalizedItems';
-type AsyncDropdownItemType = (inputType: string, abortControllerRef: React.MutableRefObject<AbortController>) => Promise<DropdownItemType[]>;
-type SyncDropdownItemType = (inputType: string, abortControllerRef: React.MutableRefObject<AbortController>) => DropdownItemType[];
-export type PotentiallyAsyncDropdownItemType = DropdownItemType[] | SyncDropdownItemType | AsyncDropdownItemType;
-export declare const useResolvedItems: (itemsOrItemsResolver: PotentiallyAsyncDropdownItemType, debounceTimeout?: number) => {
+import { PotentiallyAsyncDropdownItemType, NormalizedDropdownItemType } from './types';
+export declare const useResolvedItems: <ValueType extends unknown>(itemsOrItemsResolver: PotentiallyAsyncDropdownItemType<ValueType>, debounceTimeout?: number) => {
     fetchItems: (query?: string) => void;
     loading: boolean;
-    items: NormalizedDropdownItemType[];
+    items: NormalizedDropdownItemType<ValueType>[];
 };
-export {};

package/dist/utils.d.ts

@@ -1,33 +1,33 @@
 import { A11yRemovalMessage, A11yStatusMessageOptions } from 'downshift';
-import { NormalizedDropdownItemType } from './useNormalizedItems';
+import { NormalizedDropdownItemType } from './types';
 import React from 'react';
 export declare const EMPTY_INPUT = "";
-export declare function lowerCaseFilterTest(item: NormalizedDropdownItemType, input: string | undefined): boolean;
-export declare function noFilter(item: NormalizedDropdownItemType, input: string | undefined): boolean;
-export declare const itemToString: (item: NormalizedDropdownItemType | null) => string;
+export declare function lowerCaseFilterTest(item: NormalizedDropdownItemType<any>, input: string | undefined): boolean;
+export declare function noFilter<ValueType>(item: NormalizedDropdownItemType<ValueType>, input: string | undefined): boolean;
+export declare const itemToString: (item: NormalizedDropdownItemType<any> | null) => string;
 export declare const isFunctionWithQueryArgument: (object: any) => boolean;
-type useMultiselectUtilsType = {
-    selectedItems: NormalizedDropdownItemType[];
-    listItems: NormalizedDropdownItemType[];
-    selectAll: NormalizedDropdownItemType;
+type useMultiselectUtilsType<ValueType> = {
+    selectedItems: NormalizedDropdownItemType<ValueType>[];
+    listItems: NormalizedDropdownItemType<ValueType | string>[];
+    selectAll: NormalizedDropdownItemType<string>;
 };
-export declare const useMultiselectUtils: ({ listItems, selectedItems, selectAll, }: useMultiselectUtilsType) => {
-    addClickedItemToSelectedItems: (clickedItem: NormalizedDropdownItemType, onChange: (value: NormalizedDropdownItemType[]) => void) => void;
+export declare const useMultiselectUtils: <ValueType>({ listItems, selectedItems, selectAll, }: useMultiselectUtilsType<ValueType>) => {
+    addClickedItemToSelectedItems: (clickedItem: NormalizedDropdownItemType<ValueType>, onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void) => void;
     allListItemsAreSelected: boolean;
-    clickedItemIsInSelectedItems: (clickedItem: NormalizedDropdownItemType) => boolean;
-    clickedItemIsSelectAll: (clickedItem: NormalizedDropdownItemType) => boolean;
+    clickedItemIsInSelectedItems: (clickedItem: NormalizedDropdownItemType<ValueType>) => boolean;
+    clickedItemIsSelectAll: (clickedItem: NormalizedDropdownItemType<string | ValueType>) => boolean;
     handleListItemClicked: ({ clickedItem, onChange, setLastRemovedItem, }: {
-        clickedItem: NormalizedDropdownItemType;
-        onChange: (value: NormalizedDropdownItemType[]) => void;
+        clickedItem: NormalizedDropdownItemType<any>;
+        onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void;
         setLastRemovedItem: any;
     }) => void;
     hasSelectedItems: boolean;
-    listItemsWithoutSelectAll: NormalizedDropdownItemType[];
-    removeClickedItemFromSelectedItems: (clickedItem: NormalizedDropdownItemType, onChange: (value: NormalizedDropdownItemType[]) => void) => void;
+    listItemsWithoutSelectAll: NormalizedDropdownItemType<ValueType>[];
+    removeClickedItemFromSelectedItems: (clickedItem: NormalizedDropdownItemType<ValueType>, onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void) => void;
     selectAllCheckboxState: () => boolean | "indeterminate";
-    selectAllUnselectedItemsInListItems: (onChange: (value: NormalizedDropdownItemType[]) => void) => void;
+    selectAllUnselectedItemsInListItems: (onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void) => void;
     someListItemsAreSelected: boolean;
-    unselectAllListItems: (onChange: (value: NormalizedDropdownItemType[]) => void) => void;
+    unselectAllListItems: (onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void) => void;
 };
 type getA11yStatusMessageType<Item> = A11yStatusMessageOptions<Item> & {
     selectAllItemIncluded?: boolean;
@@ -35,14 +35,14 @@ type getA11yStatusMessageType<Item> = A11yStatusMessageOptions<Item> & {
 };
 export declare function getA11yStatusMessage<Item>(options: getA11yStatusMessageType<Item>): string;
 type getA11ySelectionMessageType<Item> = A11yStatusMessageOptions<Item> & {
-    selectAllItem?: NormalizedDropdownItemType;
+    selectAllItem?: NormalizedDropdownItemType<string>;
 };
-export declare function getA11ySelectionMessage(options: getA11ySelectionMessageType<NormalizedDropdownItemType>): string;
+export declare function getA11ySelectionMessage(options: getA11ySelectionMessageType<NormalizedDropdownItemType<any>>): string;
 type getA11yRemovalMessageType<Item> = A11yRemovalMessage<Item> & {
-    selectAllItem?: NormalizedDropdownItemType;
-    removedItem?: NormalizedDropdownItemType;
+    selectAllItem?: NormalizedDropdownItemType<string>;
+    removedItem?: NormalizedDropdownItemType<any>;
 };
-export declare function getA11yRemovalMessage(options: getA11yRemovalMessageType<NormalizedDropdownItemType>): string;
+export declare function getA11yRemovalMessage(options: getA11yRemovalMessageType<NormalizedDropdownItemType<any>>): string;
 /**A VoiceOver click is always preformed in the center of the clicked element.
    This functions expolits that to check if the performed click likely is
    made by VoiceOver. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/dropdown",
-  "version": "5.1.3",
+  "version": "5.2.0-beta.1",
   "license": "EUPL-1.2",
   "main": "dist/index.js",
   "module": "dist/dropdown.esm.js",
@@ -39,5 +39,5 @@
     "classnames": "^2.3.1",
     "downshift": "^7.6.1"
   },
-  "gitHead": "3842f90322ff4340572e6597baf4ce753a6bf355"
+  "gitHead": "fa014a9549cb01649cf36a415fc2f1cbb7a52bad"
 }