@alfalab/core-components-select 17.21.2 → 17.21.4

package/src/components/base-option/index.module.css

@@ -30,6 +30,10 @@
     &.checkmarkAfter.checkmarkAfter {
         padding: var(--gap-0) var(--gap-12) var(--gap-0) var(--gap-0);
 
+        &.size-72 {
+            padding-right: var(--gap-16);
+        }
+
         &.mobile {
             padding-right: var(--gap-20);
         }
@@ -38,6 +42,11 @@
     &.textContent {
         padding: var(--gap-12);
 
+        &.size-72 {
+            padding-left: var(--gap-16);
+            padding-right: var(--gap-16);
+        }
+
         &.mobile {
             padding: var(--gap-16) var(--gap-20) var(--gap-16) var(--gap-16);
         }

package/src/components/base-select/Component.tsx

@@ -24,6 +24,7 @@ import {
 import { fnUtils, getDataTestId } from '@alfalab/core-components-shared';
 import { useLayoutEffect_SAFE_FOR_SSR } from '@alfalab/hooks';
 
+import { SIZE_TO_CLASSNAME_MAP } from '../../consts';
 import type { AnyObject, OptionShape, OptionsListProps, SearchProps } from '../../typings';
 import {
     defaultAccessor,
@@ -565,10 +566,14 @@ export const BaseSelect = forwardRef<unknown, ComponentProps>(
                     onChange={handleChange}
                     dataTestId={getDataTestId(dataTestId, 'search')}
                     onClear={handleClear}
-                    className={cn(searchProps?.componentProps?.className, {
-                        [styles.search]: view === 'desktop',
-                        [mobileStyles.search]: view === 'mobile',
-                    })}
+                    className={cn(
+                        searchProps?.componentProps?.className,
+                        {
+                            [styles.search]: view === 'desktop',
+                            [mobileStyles.search]: view === 'mobile',
+                        },
+                        size && styles[SIZE_TO_CLASSNAME_MAP[size]],
+                    )}
                     ref={mergeRefs([searchRef, searchProps?.componentProps?.ref || null])}
                 />
             );

package/src/components/base-select/index.module.css

@@ -69,6 +69,11 @@
 .search {
     margin: var(--gap-12) var(--gap-12) var(--gap-0);
 
+    &.size-72 {
+        margin-left: var(--gap-16);
+        margin-right: var(--gap-16);
+    }
+
     &:last-child {
         margin-bottom: var(--gap-12);
     }

package/src/components/optgroup/index.module.css

@@ -23,7 +23,6 @@
     color: var(--select-optgroup-color);
 }
 
-.size-64,
 .size-72 {
     padding-left: var(--select-optgroup-l-left-padding);
     padding-right: var(--select-optgroup-l-right-padding);

package/src/components/option/index.module.css

@@ -53,7 +53,6 @@
     min-height: var(--size-xl-height);
 }
 
-.size-64,
 .size-72 {
     padding-left: var(--select-option-l-left-padding);
     padding-right: var(--select-option-l-right-padding);

package/src/components/options-list/Component.tsx

@@ -120,8 +120,7 @@ export const OptionsList = forwardRef<HTMLDivElement, OptionsListProps>(
 
         const actualOptionsCount = limitDynamicOptionGroupSize && options.length > 0;
 
-        const measured = useVisibleOptions({
-            ...(!nativeScrollbar && { styleTargetRef: scrollbarRef }),
+        const [measured, height] = useVisibleOptions({
             visibleOptions,
             listRef,
             open,
@@ -168,6 +167,7 @@ export const OptionsList = forwardRef<HTMLDivElement, OptionsListProps>(
                 <Scrollbar
                     className={cn(styles.scrollable, scrollbarClassName)}
                     ref={scrollbarRef}
+                    style={{ height }}
                     horizontalAutoStretch={optionsListWidth === 'content'}
                     scrollableNodeProps={scrollableNodeProps}
                     contentNodeProps={{ ref: listRef }}
@@ -191,6 +191,7 @@ export const OptionsList = forwardRef<HTMLDivElement, OptionsListProps>(
                 className={cn(styles.scrollable, scrollbarClassName)}
                 ref={mergeRefs([listRef, ref])}
                 onScroll={handleScroll}
+                style={{ height }}
             >
                 {renderListItems()}
             </div>

package/src/components/options-list/index.module.css

@@ -44,7 +44,6 @@
     color: var(--select-options-list-empty-placeholder-color);
 }
 
-.size-64 .emptyPlaceholder,
 .size-72 .emptyPlaceholder {
     padding: var(--gap-24) var(--gap-16);
 }

package/src/components/virtual-options-list/index.module.css

@@ -72,7 +72,6 @@
     flex: 1;
 }
 
-.size-64 .emptyPlaceholder,
 .size-72 .emptyPlaceholder {
     padding: var(--gap-24) var(--gap-16);
 }

package/src/presets/useSelectWithApply/options-list-with-apply/Component.tsx

@@ -39,6 +39,7 @@ export const OptionsListWithApply = forwardRef<HTMLDivElement, OptionsListWithAp
             header,
             headerProps,
             setSelectedDraft,
+            size,
             ...restProps
         }: OptionsListWithApplyProps,
         ref,
@@ -98,7 +99,7 @@ export const OptionsListWithApply = forwardRef<HTMLDivElement, OptionsListWithAp
                 <React.Fragment>
                     {header}
                     {showHeaderWithSelectAll && flatOptions.length > 0 && (
-                        <Header {...headerProps} />
+                        <Header {...headerProps} size={size} />
                     )}
                 </React.Fragment>
             );
@@ -107,6 +108,7 @@ export const OptionsListWithApply = forwardRef<HTMLDivElement, OptionsListWithAp
         return (
             <OptionsList
                 {...restProps}
+                size={size}
                 ref={ref}
                 visibleOptions={visibleOptions}
                 toggleMenu={toggleMenu}
@@ -124,6 +126,7 @@ export const OptionsListWithApply = forwardRef<HTMLDivElement, OptionsListWithAp
                         showClear={showClear}
                         selectedDraft={selectedDraft}
                         dataTestId={restProps?.dataTestId}
+                        size={size}
                     />
                 }
             />

package/src/presets/useSelectWithApply/options-list-with-apply/footer/Component.tsx

@@ -1,9 +1,11 @@
 import React from 'react';
+import cn from 'classnames';
 
 import { ButtonDesktop } from '@alfalab/core-components-button/desktop';
 import { getDataTestId } from '@alfalab/core-components-shared';
 
-import { OptionShape } from '../../../../typings';
+import { SIZE_TO_CLASSNAME_MAP } from '../../../../consts';
+import { OptionShape, OptionsListProps } from '../../../../typings';
 
 import styles from './index.module.css';
 
@@ -13,6 +15,7 @@ export type FooterProps = {
     showClear?: boolean;
     selectedDraft?: OptionShape[];
     dataTestId?: string;
+    size?: OptionsListProps['size'];
 };
 
 export const Footer = ({
@@ -21,11 +24,12 @@ export const Footer = ({
     showClear,
     selectedDraft = [],
     dataTestId,
+    size,
 }: FooterProps) => (
     <div
         // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
         tabIndex={0}
-        className={styles.footer}
+        className={cn(styles.footer, size && styles[SIZE_TO_CLASSNAME_MAP[size]])}
     >
         <ButtonDesktop
             size={32}

package/src/presets/useSelectWithApply/options-list-with-apply/footer/index.module.css

@@ -6,6 +6,10 @@
     padding: var(--gap-12);
     outline: none;
 
+    &.size-72 {
+        padding: var(--gap-12) var(--gap-16);
+    }
+
     & > .button + .button {
         margin-left: var(--select-option-list-footer-button-gap);
     }

package/src/presets/useSelectWithApply/options-list-with-apply/header/Component.tsx

@@ -3,6 +3,9 @@ import cn from 'classnames';
 
 import { Checkbox, CheckboxProps } from '@alfalab/core-components-checkbox';
 
+import { SIZE_TO_CLASSNAME_MAP } from '../../../../consts';
+import { OptionsListProps } from '../../../../typings';
+
 import styles from './index.module.css';
 
 export type HeaderProps = {
@@ -11,6 +14,7 @@ export type HeaderProps = {
     onChange?: CheckboxProps['onChange'];
     mobile?: boolean;
     dataTestId?: string;
+    size?: OptionsListProps['size'];
 };
 
 export const Header: React.FC<HeaderProps> = ({
@@ -19,8 +23,14 @@ export const Header: React.FC<HeaderProps> = ({
     indeterminate,
     mobile,
     dataTestId,
+    size,
 }) => (
-    <div className={cn({ [styles.desktop]: !mobile, [styles.mobile]: mobile })}>
+    <div
+        className={cn(size && styles[SIZE_TO_CLASSNAME_MAP[size]], {
+            [styles.desktop]: !mobile,
+            [styles.mobile]: mobile,
+        })}
+    >
         <Checkbox
             block={true}
             indeterminate={indeterminate}

package/src/presets/useSelectWithApply/options-list-with-apply/header/index.module.css

@@ -2,6 +2,9 @@
 
 .desktop {
     padding: var(--gap-12);
+    &.size-72 {
+        padding-left: var(--gap-16);
+    }
 }
 
 .mobile {

package/src/utils.ts

@@ -231,24 +231,22 @@ export function useVirtualVisibleOptions({
 export function useVisibleOptions({
     visibleOptions,
     listRef,
-    styleTargetRef = listRef,
     open,
-    invalidate,
     options,
     size,
     actualOptionsCount,
 }: useVisibleOptionsArgs) {
     const [, runIfMounted] = useIsMounted();
     const [measured, setMeasured] = useState(false);
+    const [height, setHeight] = useState<number | undefined>();
 
     useEffect(() => {
         const measureOptionHeight = (element: HTMLElement) =>
             typeof size === 'number' ? Math.min(element.clientHeight, size) : element.clientHeight;
 
         const list = listRef.current;
-        const styleTarget = styleTargetRef.current;
 
-        if (open && list && styleTarget && visibleOptions > 0) {
+        if (open && list && visibleOptions > 0) {
             const childCount = list.children.length;
             const optionsNodes = ([] as HTMLElement[]).slice.call(
                 list.children,
@@ -256,7 +254,7 @@ export function useVisibleOptions({
                 visibleOptions + 1,
             );
 
-            let height = optionsNodes
+            let measuredHeight = optionsNodes
                 .slice(0, visibleOptions)
                 .reduce((acc, child) => acc + measureOptionHeight(child), 0);
 
@@ -266,7 +264,7 @@ export function useVisibleOptions({
                 );
 
                 // Если кол-во опций больше visibleOptions на 1, то показываем все опции, иначе добавляем половинку
-                height += Math.round(
+                measuredHeight += Math.round(
                     childCount - visibleOptions === 1
                         ? lastVisibleOptionHeight
                         : lastVisibleOptionHeight / 2,
@@ -281,43 +279,30 @@ export function useVisibleOptions({
                     0,
                 );
 
-                height =
+                measuredHeight =
                     Math.min(
                         actualCount === 0 ? /** empty placeholder */ 1 : actualCount,
                         visibleOptions,
                     ) * size;
 
                 if (visibleOptions < actualCount) {
-                    height += size / 2;
+                    measuredHeight += size / 2;
                 }
             }
 
-            const prevHeight = styleTarget.style.height;
-
-            styleTarget.style.height = `${height}px`;
+            setHeight(measuredHeight);
 
             setMeasured(true);
 
             return () => {
-                styleTarget.style.height = prevHeight;
                 runIfMounted(() => setMeasured(false));
             };
         }
 
         return fnUtils.noop;
-    }, [
-        actualOptionsCount,
-        listRef,
-        open,
-        options,
-        size,
-        styleTargetRef,
-        visibleOptions,
-        invalidate,
-        runIfMounted,
-    ]);
+    }, [actualOptionsCount, listRef, open, options, size, visibleOptions, runIfMounted]);
 
-    return measured;
+    return [measured, height] as const;
 }
 
 export function defaultFilterFn(optionText: string, search: string) {

package/utils.d.ts

@@ -46,7 +46,7 @@ type useVisibleOptionsArgs = {
     actualOptionsCount?: boolean;
 };
 declare function useVirtualVisibleOptions({ visibleOptions, listRef, styleTargetRef, open, invalidate, options, size, actualOptionsCount, }: useVisibleOptionsArgs): void;
-declare function useVisibleOptions({ visibleOptions, listRef, styleTargetRef, open, invalidate, options, size, actualOptionsCount, }: useVisibleOptionsArgs): boolean;
+declare function useVisibleOptions({ visibleOptions, listRef, open, options, size, actualOptionsCount, }: useVisibleOptionsArgs): readonly [boolean, number | undefined];
 declare function defaultFilterFn(optionText: string, search: string): boolean;
 declare function defaultGroupAccessor(option: GroupShape): string | undefined;
 declare function defaultAccessor(option: OptionShape): string;

package/utils.js

@@ -124,25 +124,25 @@ function useVirtualVisibleOptions(_a) {
     ]);
 }
 function useVisibleOptions(_a) {
-    var visibleOptions = _a.visibleOptions, listRef = _a.listRef, _b = _a.styleTargetRef, styleTargetRef = _b === void 0 ? listRef : _b, open = _a.open, invalidate = _a.invalidate, options = _a.options, size = _a.size, actualOptionsCount = _a.actualOptionsCount;
-    var _c = coreComponentsShared.useIsMounted(), runIfMounted = _c[1];
-    var _d = React.useState(false), measured = _d[0], setMeasured = _d[1];
+    var visibleOptions = _a.visibleOptions, listRef = _a.listRef, open = _a.open, options = _a.options, size = _a.size, actualOptionsCount = _a.actualOptionsCount;
+    var _b = coreComponentsShared.useIsMounted(), runIfMounted = _b[1];
+    var _c = React.useState(false), measured = _c[0], setMeasured = _c[1];
+    var _d = React.useState(), height = _d[0], setHeight = _d[1];
     React.useEffect(function () {
         var measureOptionHeight = function (element) {
             return typeof size === 'number' ? Math.min(element.clientHeight, size) : element.clientHeight;
         };
         var list = listRef.current;
-        var styleTarget = styleTargetRef.current;
-        if (open && list && styleTarget && visibleOptions > 0) {
+        if (open && list && visibleOptions > 0) {
             var childCount = list.children.length;
             var optionsNodes = [].slice.call(list.children, 0, visibleOptions + 1);
-            var height = optionsNodes
+            var measuredHeight = optionsNodes
                 .slice(0, visibleOptions)
                 .reduce(function (acc, child) { return acc + measureOptionHeight(child); }, 0);
             if (visibleOptions < childCount) {
                 var lastVisibleOptionHeight = measureOptionHeight(optionsNodes[optionsNodes.length - 1]);
                 // Если кол-во опций больше visibleOptions на 1, то показываем все опции, иначе добавляем половинку
-                height += Math.round(childCount - visibleOptions === 1
+                measuredHeight += Math.round(childCount - visibleOptions === 1
                     ? lastVisibleOptionHeight
                     : lastVisibleOptionHeight / 2);
             }
@@ -150,33 +150,21 @@ function useVisibleOptions(_a) {
                 actualOptionsCount &&
                 typeof size === 'number') {
                 var actualCount = (options !== null && options !== void 0 ? options : []).reduce(function (sum, option) { return sum + 1 + (isGroup(option) ? option.options.length : 0); }, 0);
-                height =
+                measuredHeight =
                     Math.min(actualCount === 0 ? /** empty placeholder */ 1 : actualCount, visibleOptions) * size;
                 if (visibleOptions < actualCount) {
-                    height += size / 2;
+                    measuredHeight += size / 2;
                 }
             }
-            var prevHeight_1 = styleTarget.style.height;
-            styleTarget.style.height = "".concat(height, "px");
+            setHeight(measuredHeight);
             setMeasured(true);
             return function () {
-                styleTarget.style.height = prevHeight_1;
                 runIfMounted(function () { return setMeasured(false); });
             };
         }
         return coreComponentsShared.fnUtils.noop;
-    }, [
-        actualOptionsCount,
-        listRef,
-        open,
-        options,
-        size,
-        styleTargetRef,
-        visibleOptions,
-        invalidate,
-        runIfMounted,
-    ]);
-    return measured;
+    }, [actualOptionsCount, listRef, open, options, size, visibleOptions, runIfMounted]);
+    return [measured, height];
 }
 function defaultFilterFn(optionText, search) {
     if (!search)

package/esm/mobile.module-17a9a022.js

@@ -1,4 +0,0 @@
-var mobileStyles = {"sheet":"select__sheet_12yag","sheetContent":"select__sheetContent_12yag","modalContent":"select__modalContent_12yag","sheetContainer":"select__sheetContainer_12yag","optionsListWrapper":"select__optionsListWrapper_12yag","optionsList":"select__optionsList_12yag","scrollbar":"select__scrollbar_12yag","search":"select__search_12yag","option":"select__option_12yag","optionGroup":"select__optionGroup_12yag"};
-require('./components/base-select/mobile.css')
-
-export { mobileStyles as m };

package/mobile.module-abcf78b8.js

@@ -1,6 +0,0 @@
-'use strict';
-
-var mobileStyles = {"sheet":"select__sheet_12yag","sheetContent":"select__sheetContent_12yag","modalContent":"select__modalContent_12yag","sheetContainer":"select__sheetContainer_12yag","optionsListWrapper":"select__optionsListWrapper_12yag","optionsList":"select__optionsList_12yag","scrollbar":"select__scrollbar_12yag","search":"select__search_12yag","option":"select__option_12yag","optionGroup":"select__optionGroup_12yag"};
-require('./components/base-select/mobile.css')
-
-exports.mobileStyles = mobileStyles;

package/modern/mobile.module-dae5cd65.js

@@ -1,4 +0,0 @@
-const mobileStyles = {"sheet":"select__sheet_12yag","sheetContent":"select__sheetContent_12yag","modalContent":"select__modalContent_12yag","sheetContainer":"select__sheetContainer_12yag","optionsListWrapper":"select__optionsListWrapper_12yag","optionsList":"select__optionsList_12yag","scrollbar":"select__scrollbar_12yag","search":"select__search_12yag","option":"select__option_12yag","optionGroup":"select__optionGroup_12yag"};
-require('./components/base-select/mobile.css')
-
-export { mobileStyles as m };