@snack-uikit/fields 0.18.2-preview-86dac340.0 → 0.18.2-preview-cb79db34.0

package/dist/components/FieldSelect/utils/updateItems.js

@@ -1,4 +1,4 @@
-import { flattenItems } from '@snack-uikit/list';
+import { flattenItems } from '../legacy';
 import { transformOptionsToItems } from './options';
 export function createPlaceholderItem(value) {
     return { id: value, content: { option: String(value) }, placeholder: true };
@@ -39,11 +39,20 @@ export function updateMultipleItems({ options, value, selectedItems, }) {
             items: originalItems,
         };
     }
+    const foundedValue = [];
     let newItems = originalItems;
     let newSelectedItems = selectedItems;
     const flattenOriginalItems = flattenItems(originalItems);
-    const foundItems = flattenOriginalItems.filter(item => value.includes(item.id));
-    const nonFoundValues = value.filter(value => !flattenOriginalItems.find(item => item.id === value));
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const foundItems = flattenOriginalItems.filter((item) => {
+        if (value.includes(item.id) && !foundedValue.includes(item.id)) {
+            foundedValue.push(item.id);
+            return true;
+        }
+    });
+    const nonFoundValues = value.filter(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    value => !flattenOriginalItems.find((item) => item.id === value));
     if (nonFoundValues.length) {
         const nonFoundItems = nonFoundValues.map(value => (selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.find(selectedItem => selectedItem.id === value)) || createPlaceholderItem(value));
         newSelectedItems = [...foundItems, ...nonFoundItems];

package/dist/helperComponents/FieldContainerPrivate/styles.module.css

@@ -7,7 +7,7 @@
   border-style:solid;
 }
 .container[data-validation=default]{
-  background-color:var(--sys-neutral-background1-level, #fafafc);
+  background-color:var(--sys-neutral-background1-level, #fdfdff);
   border-color:var(--sys-neutral-decor-default, #dfe2ec);
 }
 .container[data-validation=default]:hover{

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Fields",
-  "version": "0.18.2-preview-86dac340.0",
+  "version": "0.18.2-preview-cb79db34.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -32,29 +32,31 @@
   "license": "Apache-2.0",
   "scripts": {},
   "dependencies": {
-    "@snack-uikit/button": "0.17.0",
-    "@snack-uikit/calendar": "0.7.6",
-    "@snack-uikit/droplist": "0.13.15-preview-86dac340.0",
+    "@snack-uikit/button": "0.17.1-preview-cb79db34.0",
+    "@snack-uikit/calendar": "0.7.7-preview-cb79db34.0",
+    "@snack-uikit/dropdown": "0.2.2-preview-cb79db34.0",
     "@snack-uikit/icons": "0.20.1",
-    "@snack-uikit/input-private": "3.1.1",
-    "@snack-uikit/list": "0.10.0",
-    "@snack-uikit/scroll": "0.5.2",
-    "@snack-uikit/slider": "0.1.7",
-    "@snack-uikit/tag": "0.8.3-preview-86dac340.0",
-    "@snack-uikit/tooltip": "0.13.1",
-    "@snack-uikit/truncate-string": "0.4.12",
-    "@snack-uikit/utils": "3.2.0",
+    "@snack-uikit/input-private": "3.1.2-preview-cb79db34.0",
+    "@snack-uikit/list": "0.10.1-preview-cb79db34.0",
+    "@snack-uikit/scroll": "0.5.3-preview-cb79db34.0",
+    "@snack-uikit/slider": "0.1.8-preview-cb79db34.0",
+    "@snack-uikit/tag": "0.8.3-preview-cb79db34.0",
+    "@snack-uikit/tooltip": "0.13.2-preview-cb79db34.0",
+    "@snack-uikit/truncate-string": "0.4.13-preview-cb79db34.0",
+    "@snack-uikit/utils": "3.2.1-preview-cb79db34.0",
     "classnames": "2.3.2",
     "copy-to-clipboard": "3.3.3",
+    "fuzzy-search": "3.2.1",
     "merge-refs": "1.2.2",
     "react-textarea-autosize": "8.5.3",
     "uncontrollable": "8.0.4"
   },
   "devDependencies": {
+    "@types/fuzzy-search": "2.1.5",
     "@types/merge-refs": "1.0.0"
   },
   "peerDependencies": {
     "@snack-uikit/locale": "*"
   },
-  "gitHead": "80e44337bb89c080ebfdefb1bd31e74469d1da2e"
+  "gitHead": "ec06c40c0ed64aa42d8842734a8c532f5c4603e6"
 }

package/src/components/FieldDate/FieldDate.tsx

@@ -13,7 +13,7 @@ import {
 import { useUncontrolledProp } from 'uncontrollable';
 
 import { Calendar, CalendarProps } from '@snack-uikit/calendar';
-import { Dropdown } from '@snack-uikit/droplist';
+import { Dropdown } from '@snack-uikit/dropdown';
 import { CalendarSVG } from '@snack-uikit/icons';
 import {
   ICON_SIZE,

package/src/components/FieldSelect/FieldSelectMultiple.tsx

@@ -3,7 +3,7 @@ import mergeRefs from 'merge-refs';
 import { FocusEvent, forwardRef, KeyboardEvent, KeyboardEventHandler, useLayoutEffect, useRef, useState } from 'react';
 
 import { InputPrivate } from '@snack-uikit/input-private';
-import { BaseItemProps, Droplist, ItemProps, SelectionSingleValueType, useFuzzySearch } from '@snack-uikit/list';
+import { BaseItemProps, Droplist, ItemProps, SelectionSingleValueType } from '@snack-uikit/list';
 import { Tag } from '@snack-uikit/tag';
 import { extractSupportProps } from '@snack-uikit/utils';
 
@@ -12,13 +12,17 @@ import { useValueControl } from '../../hooks';
 import { FieldDecorator } from '../FieldDecorator';
 import { extractFieldDecoratorProps } from '../FieldDecorator/utils';
 import { useButtons, useHandleDeleteItem, useHandleOnKeyDown, useSearchInput } from './hooks';
+import { useFuzzySearch } from './legacy';
 import styles from './styles.module.scss';
 import { FieldSelectMultipleProps, ItemWithId, SelectedOptionFormatter } from './types';
 import { extractListProps, getArrowIcon, updateMultipleItems } from './utils';
 
 const BASE_MIN_WIDTH = 4;
 
-const defaultSelectedOptionFormatter: SelectedOptionFormatter = item => item?.content.option || '';
+const defaultSelectedOptionFormatter: SelectedOptionFormatter = item =>
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  item?.content.option || '';
 
 export const FieldSelectMultiple = forwardRef<HTMLInputElement, FieldSelectMultipleProps>(
   (

package/src/components/FieldSelect/FieldSelectSingle.tsx

@@ -13,7 +13,7 @@ import {
 } from 'react';
 
 import { InputPrivate } from '@snack-uikit/input-private';
-import { Droplist, ItemProps, SelectionSingleValueType, useFuzzySearch } from '@snack-uikit/list';
+import { Droplist, ItemProps, SelectionSingleValueType } from '@snack-uikit/list';
 import { extractSupportProps } from '@snack-uikit/utils';
 
 import { FieldContainerPrivate } from '../../helperComponents';
@@ -21,11 +21,15 @@ import { useValueControl } from '../../hooks';
 import { FieldDecorator } from '../FieldDecorator';
 import { extractFieldDecoratorProps } from '../FieldDecorator/utils';
 import { useButtons, useHandleOnKeyDown, useSearchInput } from './hooks';
+import { useFuzzySearch } from './legacy';
 import styles from './styles.module.scss';
 import { FieldSelectSingleProps, ItemWithId, SelectedOptionFormatter } from './types';
 import { extractListProps, getArrowIcon, updateItems } from './utils';
 
-const defaultSelectedOptionFormatter: SelectedOptionFormatter = item => item?.content.option || '';
+const defaultSelectedOptionFormatter: SelectedOptionFormatter = item =>
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  item?.content.option || '';
 
 export const FieldSelectSingle = forwardRef<HTMLInputElement, FieldSelectSingleProps>(
   (
@@ -72,6 +76,8 @@ export const FieldSelectSingle = forwardRef<HTMLInputElement, FieldSelectSingleP
 
     const { inputValue, setInputValue, prevInputValue, updateInputValue } = useSearchInput({
       ...search,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       defaultValue: selectedItem?.content.option ?? '',
       selectedOptionFormatter,
     });
@@ -86,6 +92,8 @@ export const FieldSelectSingle = forwardRef<HTMLInputElement, FieldSelectSingleP
       if (
         prevSelectedItem.current &&
         prevSelectedItem.current.id === selectedItem?.id &&
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
         prevSelectedItem.current.content.option === selectedItem?.content.option
       ) {
         return;

package/src/components/FieldSelect/hooks.ts

@@ -3,13 +3,14 @@ import { Handler } from 'uncontrollable';
 
 import { useButtonNavigation, useClearButton } from '@snack-uikit/input-private';
 import {
-  extractChildIds,
+  // extractChildIds,
   isAccordionItemProps,
   isNextListItemProps,
   SelectionSingleValueType,
 } from '@snack-uikit/list';
 
 import { useCopyButton, useValueControl } from '../../hooks';
+import { extractChildIds } from './legacy';
 import { ItemWithId, SearchState, SelectedOptionFormatter } from './types';
 import { isBaseOptionProps } from './utils';
 
@@ -141,7 +142,15 @@ export function useHandleDeleteItem(setValue: Handler) {
       }
 
       if (isBaseOptionProps(item)) {
-        setValue((value: SelectionSingleValueType[]) => value?.filter(v => v !== item.id));
+        setValue(
+          (value: SelectionSingleValueType[]) =>
+            value?.filter(
+              v =>
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-expect-error
+                v !== item.id,
+            ),
+        );
       }
     },
     [setValue],

package/src/components/FieldSelect/legacy/components/Items/hooks.tsx

@@ -0,0 +1,53 @@
+import { useEffect, useMemo } from 'react';
+
+import { ItemProps, useSelectionContext } from '@snack-uikit/list';
+
+import { extractAllChildIds, extractChildIds } from '../../utils';
+
+type UseGroupItemSelectionProps = {
+  items: ItemProps[];
+  id?: string | number;
+  disabled?: boolean;
+};
+
+export function useLegacyGroupItemSelection({ id = '', items, disabled }: UseGroupItemSelectionProps) {
+  const { value, setValue, isSelectionMultiple } = useSelectionContext();
+  const { childIds, allChildIds } = useMemo(
+    () => ({ childIds: extractChildIds({ items }), allChildIds: extractAllChildIds({ items }) }),
+    [items],
+  );
+
+  const isIndeterminate = isSelectionMultiple
+    ? allChildIds.some(childId => value?.includes(childId))
+    : allChildIds.includes(value ?? '');
+  const checked = isSelectionMultiple ? allChildIds.every(childId => value?.includes(childId)) : undefined;
+
+  useEffect(() => {
+    if (isSelectionMultiple) {
+      if (checked && !value?.includes(id)) {
+        setValue?.((value: Array<number | string>) => (value ?? []).concat([id ?? '']));
+      }
+      if (!checked && value?.includes(id)) {
+        setValue?.((value: Array<number | string>) => (value ?? []).filter(itemId => itemId !== id));
+      }
+    }
+  }, [checked, disabled, id, isSelectionMultiple, setValue, value]);
+
+  const handleOnSelect = () => {
+    if (checked) {
+      setValue?.((value: Array<string | number>) =>
+        (value ?? []).filter(itemId => itemId !== id && !childIds.includes(itemId)),
+      );
+      return;
+    }
+
+    if (isIndeterminate) {
+      setValue?.((value: Array<string | number>) => Array.from(new Set([...(value ?? []), ...childIds, id])));
+      return;
+    }
+
+    setValue?.((value: Array<string | number>) => (value ?? []).concat([...childIds, id ?? '']));
+  };
+
+  return { checked, isIndeterminate, handleOnSelect };
+}

package/src/components/FieldSelect/legacy/components/index.ts

@@ -0,0 +1 @@
+export { useLegacyGroupItemSelection } from './Items/hooks';

package/src/components/FieldSelect/legacy/hooks.ts

@@ -0,0 +1,32 @@
+import FuzzySearch from 'fuzzy-search';
+import { useCallback, useMemo } from 'react';
+
+import { ItemProps, kindFlattenItems } from '@snack-uikit/list';
+
+const DEFAULT_MIN_SEARCH_INPUT_LENGTH = 2;
+
+/**
+ * Нечеткий поиск среди айтемов по полям 'content.option', 'content.caption', 'content.description', 'label'
+ */
+export function useFuzzySearch(items: ItemProps[], minSearchInputLength?: number) {
+  const flattenItems = useMemo(() => {
+    const { flattenItems } = kindFlattenItems({ items });
+
+    return Object.values(flattenItems);
+  }, [items]);
+
+  return useCallback(
+    (search: string) => {
+      const searcher = new FuzzySearch(
+        flattenItems,
+        ['content.option', 'content.caption', 'content.description', 'label'],
+        {},
+      );
+
+      return search.length > (minSearchInputLength ?? DEFAULT_MIN_SEARCH_INPUT_LENGTH)
+        ? searcher.search(search)
+        : items;
+    },
+    [flattenItems, items, minSearchInputLength],
+  );
+}

package/src/components/FieldSelect/legacy/index.ts

@@ -0,0 +1,3 @@
+export * from './components';
+export { useFuzzySearch } from './hooks';
+export { extractChildIds, flattenItems } from './utils';

package/src/components/FieldSelect/legacy/utils.ts

@@ -0,0 +1,166 @@
+import { RefObject } from 'react';
+
+import {
+  AccordionItemProps,
+  BaseItemProps,
+  isAccordionItemProps,
+  isBaseItemProps,
+  isGroupItemProps,
+  isNextListItemProps,
+  ItemProps,
+  NextListItemProps,
+} from '@snack-uikit/list';
+
+type WithCollapsedItemsProps = {
+  items: ItemProps[];
+  openCollapsedItems: Array<number | string>;
+};
+
+export function withCollapsedItems({ items, openCollapsedItems }: WithCollapsedItemsProps) {
+  let itemRefs: RefObject<HTMLElement>[] = [];
+  let newItems: ItemProps[] = [];
+  let ids: Array<string | number> = [];
+  let expandedIds: Array<string | number> = [];
+
+  items.forEach(item => {
+    if (
+      ((isBaseItemProps(item) && !item.inactive) || isNextListItemProps(item) || isAccordionItemProps(item)) &&
+      !item.disabled
+    ) {
+      newItems = newItems.concat([item]);
+      ids = ids.concat([item.id ?? '']);
+
+      if (item.itemRef) {
+        itemRefs = itemRefs.concat([item.itemRef]);
+      }
+    }
+
+    if (isNextListItemProps(item) && item.id && !item.disabled) {
+      expandedIds = expandedIds.concat(item.id);
+    }
+
+    if (isGroupItemProps(item)) {
+      const { itemRefs: nestedItemsRefs, ids: nestedIds } = withCollapsedItems({
+        items: item.items,
+        openCollapsedItems,
+      });
+
+      ids = ids.concat(nestedIds);
+
+      itemRefs = itemRefs.concat(nestedItemsRefs);
+    }
+
+    if (isAccordionItemProps(item) && item.id && openCollapsedItems.includes(item.id)) {
+      const {
+        itemRefs: nestedItemsRefs,
+        ids: nestedIds,
+        items: nestedItems,
+        expandedIds: nestedExpandedIds,
+      } = withCollapsedItems({
+        items: item.items,
+        openCollapsedItems,
+      });
+
+      ids = ids.concat(nestedIds);
+      newItems = newItems.concat(nestedItems);
+      itemRefs = itemRefs.concat(nestedItemsRefs);
+      expandedIds = expandedIds.concat(nestedExpandedIds);
+    }
+  });
+
+  return { items, itemRefs, ids, expandedIds };
+}
+
+/**
+ * Функция возвращает массив id дочерних items
+ * @function  extractItemIds
+ */
+
+export function extractItemIds(items: ItemProps[]): Array<string | number> {
+  return items.reduce(
+    (prev: Array<string | number>, item: ItemProps) => {
+      if (isGroupItemProps(item)) {
+        return prev.concat(extractItemIds(item.items));
+      }
+      return item.id ? prev.concat([item.id]) : prev;
+    },
+    [] as Array<string | number>,
+  );
+}
+
+export function extractChildIds({ items }: { items: ItemProps[] }): Array<string | number> {
+  return items
+    .filter(
+      item =>
+        isAccordionItemProps(item) ||
+        isNextListItemProps(item) ||
+        isGroupItemProps(item) ||
+        (isBaseItemProps(item) && !item.disabled && !item.inactive),
+    )
+    .reduce(
+      (prev: Array<string | number>, item: ItemProps) => {
+        if (isAccordionItemProps(item) || isNextListItemProps(item)) {
+          return prev.concat([item.id ?? '']).concat(extractChildIds({ items: item.items }));
+        }
+
+        if (isGroupItemProps(item)) {
+          return prev.concat(extractChildIds({ items: item.items }));
+        }
+
+        return item.id && !isGroupItemProps(item) ? prev.concat([item.id]) : prev;
+      },
+      [] as Array<string | number>,
+    );
+}
+
+export function extractAllChildIds({ items }: { items: ItemProps[] }): Array<string | number> {
+  return items
+    .filter(
+      item =>
+        isAccordionItemProps(item) ||
+        isNextListItemProps(item) ||
+        isGroupItemProps(item) ||
+        (isBaseItemProps(item) && !item.inactive),
+    )
+    .reduce(
+      (prev: Array<string | number>, item: ItemProps) => {
+        if (isAccordionItemProps(item) || isNextListItemProps(item)) {
+          return prev.concat([item.id ?? '']).concat(extractAllChildIds({ items: item.items }));
+        }
+
+        if (isGroupItemProps(item)) {
+          return prev.concat(extractAllChildIds({ items: item.items }));
+        }
+
+        return item.id && !isGroupItemProps(item) ? prev.concat([item.id]) : prev;
+      },
+      [] as Array<string | number>,
+    );
+}
+
+/**
+ *  Функция разворачивает массив айтемов в плоский список
+ *  @function  flattenItems
+ */
+
+export function flattenItems(items: ItemProps[]): (BaseItemProps | AccordionItemProps | NextListItemProps)[] {
+  const flattenItems: (BaseItemProps | AccordionItemProps | NextListItemProps)[] = [];
+
+  function flatten(item: ItemProps) {
+    if (!isGroupItemProps(item)) {
+      flattenItems.push(item);
+    }
+
+    if ('items' in item) {
+      for (const nestedItem of item.items) {
+        flatten(nestedItem);
+      }
+    }
+  }
+
+  for (const item of items) {
+    flatten(item);
+  }
+
+  return flattenItems;
+}

package/src/components/FieldSelect/styles.module.scss

@@ -18,12 +18,8 @@ $base-min-width: 4px;
 }
 
 .contentWrapper {
-  position: relative;
-
-  overflow: hidden;
   display: flex;
   flex-wrap: wrap;
-
   width: 100%;
 }
 
@@ -63,7 +59,9 @@ $base-min-width: 4px;
           $button-width: simple-var($icons-sizes, $size);
           $postfix-width: calc(var(#{$space-fields-postfix-gap}) + $button-width * 2);
           $margin-right: calc(
-            #{simple-var($fields, $containerVariant, $size, 'padding-right')} + #{simple-var($fields, $containerVariant, $size, 'gap')} + #{$postfix-width}
+            #{simple-var($fields, $containerVariant, $size, 'padding-right')} +
+              #{simple-var($fields, $containerVariant, $size, 'gap')} +
+              #{$postfix-width}
           );
 
           width: calc(100% - $margin-right);

package/src/components/FieldSelect/types.ts

@@ -4,8 +4,9 @@ import { InputPrivateProps } from '@snack-uikit/input-private';
 import {
   AccordionItemProps,
   BaseItemProps,
-  DroplistProps,
   GroupItemProps,
+  ItemContentProps,
+  ListProps,
   NextListItemProps,
   SelectionMultipleState,
   SelectionSingleState,
@@ -15,17 +16,33 @@ import { WithSupportProps } from '@snack-uikit/utils';
 
 import { FieldDecoratorProps } from '../FieldDecorator';
 
-// eslint-disable-next-line no-use-before-define
-export type OptionProps = BaseOptionProps | AccordionOptionProps | GroupOptionProps | NestListOptionProps;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type AnyType = any;
+
+export type OptionProps =
+  // eslint-disable-next-line no-use-before-define
+  | BaseOptionProps
+  // eslint-disable-next-line no-use-before-define
+  | AccordionOptionProps
+  // eslint-disable-next-line no-use-before-define
+  | GroupOptionProps
+  // eslint-disable-next-line no-use-before-define
+  | NestListOptionProps;
 
 // eslint-disable-next-line no-use-before-define
 export type OptionWithoutGroup = BaseOptionProps | AccordionOptionProps | NestListOptionProps;
 
 export type BaseOptionProps = Pick<BaseItemProps, 'beforeContent' | 'afterContent' | 'disabled'> &
-  BaseItemProps['content'] & { value: string | number } & Pick<TagProps, 'appearance'>;
+  Pick<ItemContentProps, 'option' | 'caption' | 'description'> & { value: string | number } & Pick<
+    TagProps,
+    'appearance'
+  >;
 
 export type AccordionOptionProps = Pick<AccordionItemProps, 'type'> & BaseOptionProps & { options: OptionProps[] };
-export type GroupOptionProps = Omit<GroupItemProps, 'items' | 'id'> & { options: OptionProps[] };
+
+export type GroupOptionProps = Omit<GroupItemProps, 'items' | 'id'> & {
+  options: OptionProps[];
+};
 export type NestListOptionProps = Pick<NextListItemProps, 'type' | 'onSublistOpenChanged' | 'id'> &
   BaseOptionProps & { options: OptionProps[] };
 
@@ -65,6 +82,10 @@ export type FieldSelectPrivateProps = InputProps & WrapperProps & { options: Opt
 
 type FiledSelectCommonProps = WithSupportProps<{
   options: OptionProps[];
+
+  pinTop: OptionProps[];
+  pinBottom: OptionProps[];
+
   searchable?: boolean;
   /** Отображение кнопки Копировать для поля (актуально только для `readonly = true`) */
   showCopyButton?: boolean;
@@ -81,14 +102,8 @@ type FiledSelectCommonProps = WithSupportProps<{
 
   /** Иконка-префикс для поля */
   prefixIcon?: ReactElement;
-  /**
-   * Footer списка айтемов
-   */
-  footer?: DroplistProps['footer'];
-  /**
-   * Управление шириной выпадающего списка
-   */
-  widthStrategy?: DroplistProps['widthStrategy'];
+
+  footer?: ListProps['footer'];
 
   search?: SearchState;
 
@@ -102,20 +117,16 @@ type FiledSelectCommonProps = WithSupportProps<{
 
   selectedOptionFormatter?: SelectedOptionFormatter;
 }> &
-  Pick<
-    DroplistProps,
-    'dataError' | 'noDataState' | 'noResultsState' | 'errorDataState' | 'pinTop' | 'pinBottom' | 'dataFiltered'
-  >;
+  Pick<ListProps, 'dataError' | 'noDataState' | 'noResultsState' | 'errorDataState' | 'dataFiltered'>;
 
 export type FieldSelectSingleProps = FieldSelectPrivateProps &
   Omit<SelectionSingleState, 'mode'> &
   WrapperProps &
   FiledSelectCommonProps;
 
-export type FieldSelectMultipleProps = FieldSelectPrivateProps & { removeByBackspace?: boolean } & Omit<
-    SelectionMultipleState,
-    'mode'
-  > &
+export type FieldSelectMultipleProps = FieldSelectPrivateProps & {
+  removeByBackspace?: boolean;
+} & Omit<SelectionMultipleState, 'mode'> &
   Omit<FiledSelectCommonProps, 'showCopyButton'>;
 
 export type FieldSelectProps =

package/src/components/FieldSelect/utils/extractListProps.ts

@@ -7,24 +7,16 @@ export function extractListProps({
   noDataState,
   noResultsState,
   errorDataState,
-  pinTop,
-  pinBottom,
   dataFiltered,
   loading,
-  footer,
-  widthStrategy,
 }: Partial<FieldSelectProps>): Partial<DroplistProps> {
   return {
     dataError,
     noDataState,
     noResultsState,
     errorDataState,
-    pinTop,
-    pinBottom,
     dataFiltered,
     loading,
-    footer,
-    widthStrategy,
     trigger: 'clickAndFocusVisible',
     placement: 'bottom',
     'data-test-id': 'field-select__list',

package/src/components/FieldSelect/utils/options.ts

@@ -1,6 +1,7 @@
-import { flattenItems, ItemProps, SelectionSingleValueType } from '@snack-uikit/list';
+import { ItemProps, SelectionSingleValueType } from '@snack-uikit/list';
 import { TagProps } from '@snack-uikit/tag';
 
+import { flattenItems } from '../legacy';
 import { BaseOptionProps, ItemWithId, OptionProps } from '../types';
 import { isAccordionOptionProps, isGroupOptionProps, isNextListOptionProps } from './typeGuards';
 

package/src/components/FieldSelect/utils/typeGuards.ts

@@ -24,7 +24,7 @@ export function isNextListOptionProps(option: any): option is NestListOptionProp
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isGroupOptionProps(option: any): option is GroupOptionProps {
-  return 'options' in option && option['type'] === undefined;
+  return 'options' in option && option['type'] === 'group';
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any