@entur/dropdown 6.0.3-beta.0 → 6.0.3-beta.2

package/dist/styles.css

@@ -1,35 +1,3 @@
-.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 {
@@ -96,94 +64,28 @@
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
-.eds-multi-select {
-  position: relative;
-}
-.eds-multi-select__selected-items {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  position: relative;
-  flex: 1 1 0%;
-  padding: 0.25rem;
-}
-.eds-multi-select__selected-items-tag.eds-tag-chip {
-  margin-left: 0.25rem;
-  white-space: nowrap;
-}
-.eds-contrast .eds-multi-select__selected-items-tag.eds-tag-chip svg {
-  color: #181c56;
-}
-.eds-multi-select__selected-items-tag.eds-tag-chip:focus {
-  outline-offset: 0.125rem;
-}
-.eds-contrast .eds-multi-select__selected-items-tag.eds-tag-chip {
-  color: #181c56;
-  background: #ebebf1;
-  border: 0.0625rem solid #d1d4e3;
-}
-.eds-contrast .eds-multi-select__selected-items-tag.eds-tag-chip .eds-tag-chip__close-button:hover {
-  background: #babbcf;
-}
-.eds-multi-select__input {
-  flex: 1 1;
-  min-height: 44px;
-  display: flex;
-  align-items: center;
-}
-.eds-multi-select__placeholder {
-  padding-left: 1.5rem;
-  line-height: 1.375rem;
+.eds-dropdown__searchable-selected-item {
+  display: block;
   font-size: 1rem;
-}
-.eds-checkbox-icon {
-  height: 1rem;
-  width: 1rem;
-  visibility: hidden;
-}
-.eds-checkbox-icon__path {
-  transform-origin: 50% 50%;
-  stroke-dasharray: 48;
-  stroke-dashoffset: 48;
-  stroke-width: 0.375rem;
-}
-
-.eds-multiselect {
-  position: relative;
-}
-.eds-multiselect__button {
+  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-multiselect-checkbox {
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-  margin-right: 0.75rem;
-  height: 1.25rem;
-  width: 1.25rem;
-  border: 0.125rem solid #181c56;
-  border-radius: 0.0625rem;
-  background-color: transparent;
-  color: #ffffff;
+.eds-dropdown__searchable-selected-item__wrapper {
+  max-width: 65%;
 }
 
-.eds-multiselect-checkbox--checked {
-  background-color: #181c56;
-}
-.eds-multiselect-checkbox--checked .eds-checkbox-icon {
-  visibility: visible;
-}
-.eds-multiselect-checkbox--checked .eds-checkbox-icon__path {
-  stroke: #ffffff;
-  animation: stroke ease-in-out 0.2s 0.1s forwards;
+.eds-form-control.eds-dropdown__input::-moz-placeholder {
+  -moz-transition: none;
+  transition: none;
 }
 
-@keyframes stroke {
-  100% {
-    stroke-dashoffset: 0;
-  }
+.eds-form-control.eds-dropdown__input::placeholder {
+  transition: none;
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
@@ -243,6 +145,13 @@
 .eds-contrast .eds-form-control-wrapper--disabled .eds-dropdown__divider {
   background-color: #8285a8;
 }
+.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__toggle-button {
@@ -273,6 +182,97 @@
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
+.eds-multi-select {
+  position: relative;
+}
+.eds-multi-select__selected-items {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  position: relative;
+  flex: 1 1 0%;
+  padding: 0.25rem;
+}
+.eds-multi-select__selected-items-tag.eds-tag-chip {
+  margin-left: 0.25rem;
+  white-space: nowrap;
+}
+.eds-contrast .eds-multi-select__selected-items-tag.eds-tag-chip svg {
+  color: #181c56;
+}
+.eds-multi-select__selected-items-tag.eds-tag-chip:focus {
+  outline-offset: 0.125rem;
+}
+.eds-contrast .eds-multi-select__selected-items-tag.eds-tag-chip {
+  color: #181c56;
+  background: #ebebf1;
+  border: 0.0625rem solid #d1d4e3;
+}
+.eds-contrast .eds-multi-select__selected-items-tag.eds-tag-chip .eds-tag-chip__close-button:hover {
+  background: #babbcf;
+}
+.eds-multi-select__input {
+  flex: 1 1;
+  min-height: 44px;
+  display: flex;
+  align-items: center;
+}
+.eds-multi-select__placeholder {
+  padding-left: 1.5rem;
+  line-height: 1.375rem;
+  font-size: 1rem;
+}
+.eds-checkbox-icon {
+  height: 1rem;
+  width: 1rem;
+  visibility: hidden;
+}
+.eds-checkbox-icon__path {
+  transform-origin: 50% 50%;
+  stroke-dasharray: 48;
+  stroke-dashoffset: 48;
+  stroke-width: 0.375rem;
+}
+
+.eds-multiselect {
+  position: relative;
+}
+.eds-multiselect__button {
+  text-overflow: ellipsis;
+}
+
+.eds-multiselect-checkbox {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  margin-right: 0.75rem;
+  height: 1.25rem;
+  width: 1.25rem;
+  border: 0.125rem solid #181c56;
+  border-radius: 0.0625rem;
+  background-color: transparent;
+  color: #ffffff;
+}
+
+.eds-multiselect-checkbox--checked {
+  background-color: #181c56;
+}
+.eds-multiselect-checkbox--checked .eds-checkbox-icon {
+  visibility: visible;
+}
+.eds-multiselect-checkbox--checked .eds-checkbox-icon__path {
+  stroke: #ffffff;
+  animation: stroke ease-in-out 0.2s 0.1s forwards;
+}
+
+@keyframes stroke {
+  100% {
+    stroke-dashoffset: 0;
+  }
+}
+/* DO NOT CHANGE!*/
+/* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
 .eds-dropdown__list {
   box-sizing: content-box;
   z-index: 20;
@@ -462,6 +462,9 @@
 }
 /* DO NOT CHANGE!*/
 /* This file is automatically generated from @entur/tokens! Changes will be overwritten. */
+.eds-dropdown {
+  cursor: pointer;
+}
 .eds-dropdown__input {
   flex: 1;
   width: 0;
@@ -481,7 +484,6 @@
   overflow-x: hidden;
   text-overflow: ellipsis;
   line-height: 1rem;
-  cursor: pointer;
 }
 .eds-dropdown__selected-item.focus-visible {
   outline: none;
@@ -489,6 +491,9 @@
 .eds-dropdown__selected-item:focus-visible {
   outline: none;
 }
+.eds-dropdown--searchable {
+  cursor: text;
+}
 .eds-dropdown--searchable__selected-item {
   position: relative;
   flex: 1;
@@ -498,18 +503,19 @@
   white-space: nowrap;
   line-height: 1rem;
   font-family: inherit;
-  cursor: text;
 }
 .eds-dropdown--searchable__selected-item--hidden {
   flex: 0;
 }
+.eds-dropdown--multiselect {
+  cursor: text;
+}
 .eds-dropdown--multiselect__selected-items-and-input {
   display: flex;
   flex-wrap: wrap;
   flex: 1;
   gap: 0.5rem;
   min-width: 0;
-  cursor: text;
 }
 .eds-dropdown--multiselect__selected-items-and-input--filled {
   padding: 1.25rem 0rem 0.25rem;

package/dist/utils.d.ts

@@ -1,9 +1,10 @@
-import { A11yRemovalMessage, A11yStatusMessageOptions } from 'downshift';
+import { UseComboboxState } from 'downshift';
 import { NormalizedDropdownItemType } from './types';
 export declare const EMPTY_INPUT = "";
 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 itemToKey: (item: NormalizedDropdownItemType<any> | null) => any;
 export declare const isFunctionWithQueryArgument: (object: any) => boolean;
 type useMultiselectUtilsType<ValueType> = {
     selectedItems: NormalizedDropdownItemType<ValueType>[];
@@ -15,10 +16,10 @@ export declare const useMultiselectUtils: <ValueType>({ listItems, selectedItems
     allListItemsAreSelected: boolean;
     clickedItemIsInSelectedItems: (clickedItem: NormalizedDropdownItemType<ValueType>) => boolean;
     clickedItemIsSelectAll: (clickedItem: NormalizedDropdownItemType<string | ValueType>) => boolean;
-    handleListItemClicked: ({ clickedItem, onChange, setLastRemovedItem, }: {
+    handleListItemClicked: ({ clickedItem, onChange, setLastClickedItem: setLastRemovedItem, }: {
         clickedItem: NormalizedDropdownItemType<any>;
         onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void;
-        setLastRemovedItem: any;
+        setLastClickedItem: any;
     }) => void;
     hasSelectedItems: boolean;
     listItemsWithoutSelectAll: NormalizedDropdownItemType<ValueType>[];
@@ -28,18 +29,8 @@ export declare const useMultiselectUtils: <ValueType>({ listItems, selectedItems
     someListItemsAreSelected: boolean;
     unselectAllListItems: (onChange: (value: NormalizedDropdownItemType<ValueType>[]) => void) => void;
 };
-type getA11yStatusMessageType<Item> = A11yStatusMessageOptions<Item> & {
+export declare function getA11yStatusMessage<ValueType>(options: UseComboboxState<NormalizedDropdownItemType<ValueType>> & {
     selectAllItemIncluded?: boolean;
-    ariaLabelNoResults?: string;
-};
-export declare function getA11yStatusMessage<Item>(options: getA11yStatusMessageType<Item>): string;
-type getA11ySelectionMessageType<Item> = A11yStatusMessageOptions<Item> & {
-    selectAllItem?: NormalizedDropdownItemType<string>;
-};
-export declare function getA11ySelectionMessage(options: getA11ySelectionMessageType<NormalizedDropdownItemType<any>>): string;
-type getA11yRemovalMessageType<Item> = A11yRemovalMessage<Item> & {
-    selectAllItem?: NormalizedDropdownItemType<string>;
-    removedItem?: NormalizedDropdownItemType<any>;
-};
-export declare function getA11yRemovalMessage(options: getA11yRemovalMessageType<NormalizedDropdownItemType<any>>): string;
+    resultCount: number;
+}): string;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/dropdown",
-  "version": "6.0.3-beta.0",
+  "version": "6.0.3-beta.2",
   "license": "EUPL-1.2",
   "main": "dist/index.js",
   "module": "dist/dropdown.esm.js",
@@ -27,18 +27,18 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@entur/a11y": "^0.2.89",
-    "@entur/button": "^3.2.30",
-    "@entur/chip": "^0.7.18-beta.0",
-    "@entur/form": "^8.1.0-beta.0",
+    "@entur/a11y": "^0.2.90-beta.0",
+    "@entur/button": "^3.2.31-beta.0",
+    "@entur/chip": "^0.7.18-beta.1",
+    "@entur/form": "^8.1.0-beta.1",
     "@entur/icons": "^7.2.0",
-    "@entur/loader": "^0.5.8",
+    "@entur/loader": "^0.5.9-beta.0",
     "@entur/tokens": "^3.17.0",
-    "@entur/tooltip": "^4.0.0-beta.0",
-    "@entur/utils": "^0.11.1",
+    "@entur/tooltip": "^4.0.0-beta.1",
+    "@entur/utils": "^0.11.2-beta.0",
     "@floating-ui/react-dom": "^2.1.0",
     "classnames": "^2.3.1",
-    "downshift": "^8.3.3"
+    "downshift": "^9.0.8"
   },
-  "gitHead": "cf307ea5b19e314649370964a7368666df04305b"
+  "gitHead": "bf6f8921dac8b869172f77ab6da76401e40bbc9b"
 }