@true-engineering/true-react-common-ui-kit 3.8.0 → 3.9.0

package/src/components/Select/components/SelectList/SelectList.tsx

@@ -1,157 +1,156 @@
-import { ReactNode, useMemo, MouseEvent } from 'react';
-import clsx from 'clsx';
-import {
-  addDataTestId,
-  isNotEmpty,
-  isReactNodeNotEmpty,
-  isStringNotEmpty,
-} from '@true-engineering/true-react-platform-helpers';
-import { ICommonProps } from '../../../../types';
-import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
-import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../../constants';
-import { IMultipleSelectValue } from '../../types';
-import { SelectListItem } from '../SelectListItem';
-import { useStyles, ISelectListStyles } from './SelectList.styles';
-
-export interface ISelectListProps<Value> extends ICommonProps<ISelectListStyles> {
-  options: Value[];
-  focusedIndex?: number;
-  activeValue?: Value | Value[];
-  noMatchesLabel?: string;
-  isLoading?: boolean;
-  loadingLabel?: ReactNode;
-  defaultOptionLabel?: ReactNode;
-  allOptionsLabel?: string;
-  areAllOptionsSelected?: boolean;
-  shouldScrollToList?: boolean;
-  customListHeader?: ReactNode;
-  onOptionSelect: (index: number, event: MouseEvent<HTMLElement>) => void;
-  onToggleCheckbox?: (index: number, isSelected: boolean) => void;
-  isOptionDisabled: (value: Value) => boolean;
-  convertValueToString: (value: Value) => string | undefined;
-  convertValueToReactNode?: (value: Value, isDisabled: boolean) => ReactNode;
-  convertValueToId: (value: Value) => string | undefined;
-}
-
-export function SelectList<Value>({
-  options,
-  focusedIndex,
-  activeValue,
-  defaultOptionLabel,
-  noMatchesLabel = 'Совпадений не найдено',
-  isLoading,
-  loadingLabel = 'Загрузка...',
-  tweakStyles,
-  testId,
-  shouldScrollToList = true,
-  areAllOptionsSelected,
-  customListHeader,
-  isOptionDisabled,
-  allOptionsLabel,
-  onOptionSelect,
-  onToggleCheckbox,
-  convertValueToString,
-  convertValueToReactNode = convertValueToString,
-  convertValueToId,
-}: ISelectListProps<Value>): JSX.Element {
-  const classes = useStyles({ theme: tweakStyles });
-
-  const isMultiSelect = isNotEmpty(onToggleCheckbox);
-  const multiSelectValue = activeValue as IMultipleSelectValue<Value> | undefined;
-  const selectedOptionsCount = multiSelectValue?.length ?? 0;
-
-  // MultiSelect
-  const activeOptionsIdMap = useMemo(
-    () => (isMultiSelect ? multiSelectValue?.map(convertValueToId) ?? [] : []),
-    [isMultiSelect, multiSelectValue, convertValueToId],
-  );
-
-  const optionsDisableMap = useMemo(
-    () => options.map((o) => isOptionDisabled(o)),
-    [options, isOptionDisabled],
-  );
-
-  const listOptions = useMemo(
-    () => options.map((opt, i) => convertValueToReactNode(opt, optionsDisableMap[i])),
-    [options, convertValueToReactNode, optionsDisableMap],
-  );
-
-  const isActiveOption = (item: Value): boolean =>
-    isMultiSelect
-      ? activeOptionsIdMap.includes(convertValueToId(item))
-      : isNotEmpty(activeValue) &&
-        convertValueToId(activeValue as Value) === convertValueToId(item);
-
-  return (
-    <ScrollIntoViewIfNeeded
-      active={shouldScrollToList && !isMultiSelect}
-      className={clsx(classes.root, {
-        [classes.withListHeader]: isReactNodeNotEmpty(customListHeader),
-      })}
-    >
-      {isReactNodeNotEmpty(customListHeader) && (
-        <div className={classes.listHeader}>{customListHeader}</div>
-      )}
-      <div className={classes.list} {...addDataTestId(testId)}>
-        {isLoading ? (
-          <div className={clsx(classes.cell, classes.loading)}>{loadingLabel}</div>
-        ) : (
-          <>
-            {isReactNodeNotEmpty(defaultOptionLabel) && (
-              <ScrollIntoViewIfNeeded
-                active={focusedIndex === DEFAULT_OPTION_INDEX}
-                options={{ block: 'nearest' }}
-                className={clsx(
-                  classes.cell,
-                  classes.defaultCell,
-                  focusedIndex === DEFAULT_OPTION_INDEX && classes.focused,
-                )}
-                onClick={(event) => onOptionSelect(DEFAULT_OPTION_INDEX, event)}
-              >
-                {defaultOptionLabel}
-              </ScrollIntoViewIfNeeded>
-            )}
-            {isStringNotEmpty(allOptionsLabel) && (
-              <SelectListItem
-                classes={classes}
-                index={ALL_OPTION_INDEX}
-                isSemiChecked={selectedOptionsCount > 0 && !areAllOptionsSelected}
-                isActive={areAllOptionsSelected}
-                isFocused={focusedIndex === ALL_OPTION_INDEX}
-                onOptionSelect={onOptionSelect}
-                onToggleCheckbox={onToggleCheckbox}
-              >
-                {allOptionsLabel}
-              </SelectListItem>
-            )}
-            {listOptions.map((opt, i) => {
-              const optionValue = options[i];
-              const isFocused = focusedIndex === i;
-              const isActive = isActiveOption(optionValue);
-              // проверяем, что опция задизейблена
-              const isDisabled = optionsDisableMap[i];
-
-              return (
-                <SelectListItem
-                  key={i}
-                  classes={classes}
-                  index={i}
-                  isDisabled={isDisabled}
-                  isActive={isActive}
-                  isFocused={isFocused}
-                  onOptionSelect={onOptionSelect}
-                  onToggleCheckbox={onToggleCheckbox}
-                >
-                  {opt}
-                </SelectListItem>
-              );
-            })}
-            {listOptions.length === 0 && (
-              <div className={clsx(classes.cell, classes.noMatchesLabel)}>{noMatchesLabel}</div>
-            )}
-          </>
-        )}
-      </div>
-    </ScrollIntoViewIfNeeded>
-  );
-}
+import { ReactNode, useMemo } from 'react';
+import clsx from 'clsx';
+import {
+  addDataTestId,
+  isNotEmpty,
+  isReactNodeNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
+import { ICommonProps } from '../../../../types';
+import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
+import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../../constants';
+import { IMultipleSelectValue } from '../../types';
+import { ISelectListItemProps, SelectListItem } from '../SelectListItem';
+import { useStyles, ISelectListStyles } from './SelectList.styles';
+
+export interface ISelectListProps<Value>
+  extends ICommonProps<ISelectListStyles>,
+    Pick<ISelectListItemProps, 'onToggleCheckbox' | 'onOptionSelect'> {
+  options: Value[] | Readonly<Value[]>;
+  focusedIndex?: number;
+  activeValue?: Value | Value[];
+  noMatchesLabel?: string;
+  isLoading?: boolean;
+  loadingLabel?: ReactNode;
+  defaultOptionLabel?: ReactNode;
+  allOptionsLabel?: ReactNode;
+  areAllOptionsSelected?: boolean;
+  shouldScrollToList?: boolean;
+  customListHeader?: ReactNode;
+  isOptionDisabled: (value: Value) => boolean;
+  convertValueToString: (value: Value) => string | undefined;
+  convertValueToReactNode?: (value: Value, isDisabled: boolean) => ReactNode;
+  convertValueToId: (value: Value) => string | undefined;
+}
+
+export function SelectList<Value>({
+  options,
+  focusedIndex,
+  activeValue,
+  defaultOptionLabel,
+  noMatchesLabel = 'Совпадений не найдено',
+  isLoading,
+  loadingLabel = 'Загрузка...',
+  tweakStyles,
+  testId,
+  shouldScrollToList = true,
+  areAllOptionsSelected,
+  customListHeader,
+  isOptionDisabled,
+  allOptionsLabel,
+  onOptionSelect,
+  onToggleCheckbox,
+  convertValueToString,
+  convertValueToReactNode = convertValueToString,
+  convertValueToId,
+}: ISelectListProps<Value>): JSX.Element {
+  const classes = useStyles({ theme: tweakStyles });
+
+  const isMultiSelect = isNotEmpty(onToggleCheckbox);
+  const multiSelectValue = activeValue as IMultipleSelectValue<Value> | undefined;
+  const selectedOptionsCount = multiSelectValue?.length ?? 0;
+
+  // MultiSelect
+  const activeOptionsIdMap = useMemo(
+    () => (isMultiSelect ? multiSelectValue?.map(convertValueToId) ?? [] : []),
+    [isMultiSelect, multiSelectValue, convertValueToId],
+  );
+
+  const optionsDisableMap = useMemo(
+    () => options.map((o) => isOptionDisabled(o)),
+    [options, isOptionDisabled],
+  );
+
+  const listOptions = useMemo(
+    () => options.map((opt, i) => convertValueToReactNode(opt, optionsDisableMap[i])),
+    [options, convertValueToReactNode, optionsDisableMap],
+  );
+
+  const isActiveOption = (item: Value): boolean =>
+    isMultiSelect
+      ? activeOptionsIdMap.includes(convertValueToId(item))
+      : isNotEmpty(activeValue) &&
+        convertValueToId(activeValue as Value) === convertValueToId(item);
+
+  return (
+    <ScrollIntoViewIfNeeded
+      active={shouldScrollToList && !isMultiSelect}
+      className={clsx(classes.root, {
+        [classes.withListHeader]: isReactNodeNotEmpty(customListHeader),
+      })}
+    >
+      {isReactNodeNotEmpty(customListHeader) && (
+        <div className={classes.listHeader}>{customListHeader}</div>
+      )}
+      <div className={classes.list} {...addDataTestId(testId)}>
+        {isLoading ? (
+          <div className={clsx(classes.cell, classes.loading)}>{loadingLabel}</div>
+        ) : (
+          <>
+            {isReactNodeNotEmpty(defaultOptionLabel) && (
+              <ScrollIntoViewIfNeeded
+                active={focusedIndex === DEFAULT_OPTION_INDEX}
+                options={{ block: 'nearest' }}
+                className={clsx(
+                  classes.cell,
+                  classes.defaultCell,
+                  focusedIndex === DEFAULT_OPTION_INDEX && classes.focused,
+                )}
+                onClick={(event) => onOptionSelect(DEFAULT_OPTION_INDEX, event)}
+              >
+                {defaultOptionLabel}
+              </ScrollIntoViewIfNeeded>
+            )}
+            {isReactNodeNotEmpty(allOptionsLabel) && (
+              <SelectListItem
+                classes={classes}
+                index={ALL_OPTION_INDEX}
+                isSemiChecked={selectedOptionsCount > 0 && !areAllOptionsSelected}
+                isActive={areAllOptionsSelected}
+                isFocused={focusedIndex === ALL_OPTION_INDEX}
+                onOptionSelect={onOptionSelect}
+                onToggleCheckbox={onToggleCheckbox}
+              >
+                {allOptionsLabel}
+              </SelectListItem>
+            )}
+            {listOptions.map((opt, i) => {
+              const optionValue = options[i];
+              const isFocused = focusedIndex === i;
+              const isActive = isActiveOption(optionValue);
+              // проверяем, что опция задизейблена
+              const isDisabled = optionsDisableMap[i];
+
+              return (
+                <SelectListItem
+                  key={i}
+                  classes={classes}
+                  index={i}
+                  isDisabled={isDisabled}
+                  isActive={isActive}
+                  isFocused={isFocused}
+                  onOptionSelect={onOptionSelect}
+                  onToggleCheckbox={onToggleCheckbox}
+                >
+                  {opt}
+                </SelectListItem>
+              );
+            })}
+            {listOptions.length === 0 && (
+              <div className={clsx(classes.cell, classes.noMatchesLabel)}>{noMatchesLabel}</div>
+            )}
+          </>
+        )}
+      </div>
+    </ScrollIntoViewIfNeeded>
+  );
+}

package/src/components/Select/components/SelectListItem/SelectListItem.tsx

@@ -1,68 +1,72 @@
-import { ReactNode, MouseEvent, FC } from 'react';
-import clsx from 'clsx';
-import { Classes } from 'jss';
-import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../../../helpers';
-import { Checkbox } from '../../../Checkbox';
-import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
-import { checkboxStyles } from './SelectListItem.styles';
-
-export interface ISelectListItemProps {
-  index: number;
-  isSemiChecked?: boolean;
-  isDisabled?: boolean;
-  isActive?: boolean;
-  isFocused?: boolean;
-  children: ReactNode;
-  classes: Classes<'cellWithCheckbox' | 'cell' | 'focused' | 'active' | 'disabled'>; // TODO: !!!
-  onOptionSelect: (index: number, event: MouseEvent<HTMLElement>) => void;
-  onToggleCheckbox?: (index: number, isSelected: boolean) => void;
-}
-
-export const SelectListItem: FC<ISelectListItemProps> = ({
-  classes,
-  index,
-  isSemiChecked,
-  isDisabled,
-  isActive,
-  children,
-  isFocused,
-  onOptionSelect,
-  onToggleCheckbox,
-}) => {
-  const isMultiSelect = isNotEmpty(onToggleCheckbox);
-
-  return (
-    <ScrollIntoViewIfNeeded
-      active={isFocused}
-      options={{ block: 'nearest' }}
-      className={clsx(classes.cell, {
-        [classes.cellWithCheckbox]: isMultiSelect,
-        [classes.focused]: isFocused,
-        [classes.active]: isActive && !isMultiSelect,
-        [classes.disabled]: isDisabled,
-      })}
-      {...addDataAttributes({
-        disabled: isDisabled,
-        active: isActive,
-        focused: isFocused,
-      })}
-      onClick={!isDisabled && !isMultiSelect ? (event) => onOptionSelect(index, event) : undefined}
-    >
-      {isMultiSelect ? (
-        <Checkbox
-          value={index}
-          isChecked={isActive || isSemiChecked}
-          isSemiChecked={isSemiChecked}
-          isDisabled={isDisabled}
-          tweakStyles={checkboxStyles}
-          onSelect={(v) => onToggleCheckbox(index, v.isSelected)}
-        >
-          {children}
-        </Checkbox>
-      ) : (
-        children
-      )}
-    </ScrollIntoViewIfNeeded>
-  );
-};
+import { ReactNode, MouseEvent, FC, KeyboardEvent, ChangeEvent } from 'react';
+import clsx from 'clsx';
+import { Classes } from 'jss';
+import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../../../helpers';
+import { Checkbox } from '../../../Checkbox';
+import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
+import { checkboxStyles } from './SelectListItem.styles';
+
+export interface ISelectListItemProps {
+  index: number;
+  isSemiChecked?: boolean;
+  isDisabled?: boolean;
+  isActive?: boolean;
+  isFocused?: boolean;
+  children: ReactNode;
+  classes: Classes<'cellWithCheckbox' | 'cell' | 'focused' | 'active' | 'disabled'>; // TODO: !!!
+  onOptionSelect: (index: number, event: MouseEvent<HTMLElement>) => void;
+  onToggleCheckbox?: (
+    index: number,
+    isSelected: boolean,
+    event: ChangeEvent<HTMLElement> | KeyboardEvent,
+  ) => void;
+}
+
+export const SelectListItem: FC<ISelectListItemProps> = ({
+  classes,
+  index,
+  isSemiChecked,
+  isDisabled,
+  isActive,
+  children,
+  isFocused,
+  onOptionSelect,
+  onToggleCheckbox,
+}) => {
+  const isMultiSelect = isNotEmpty(onToggleCheckbox);
+
+  return (
+    <ScrollIntoViewIfNeeded
+      active={isFocused}
+      options={{ block: 'nearest' }}
+      className={clsx(classes.cell, {
+        [classes.cellWithCheckbox]: isMultiSelect,
+        [classes.focused]: isFocused,
+        [classes.active]: isActive && !isMultiSelect,
+        [classes.disabled]: isDisabled,
+      })}
+      {...addDataAttributes({
+        disabled: isDisabled,
+        active: isActive,
+        focused: isFocused,
+      })}
+      onClick={!isDisabled && !isMultiSelect ? (event) => onOptionSelect(index, event) : undefined}
+    >
+      {isMultiSelect ? (
+        <Checkbox
+          value={index}
+          isChecked={isActive || isSemiChecked}
+          isSemiChecked={isSemiChecked}
+          isDisabled={isDisabled}
+          tweakStyles={checkboxStyles}
+          onSelect={(v, event) => onToggleCheckbox(index, v.isSelected, event)}
+        >
+          {children}
+        </Checkbox>
+      ) : (
+        children
+      )}
+    </ScrollIntoViewIfNeeded>
+  );
+};

package/src/components/WithPopup/WithPopup.stories.tsx

@@ -67,6 +67,7 @@ export const Default = Template.bind({});
 Default.args = {
   isDisabled: false,
   shouldRenderInBody: true,
+  shouldHideOnScroll: false,
 };
 
 Default.parameters = {

package/src/components/WithPopup/WithPopup.styles.ts

@@ -12,6 +12,10 @@ export const useStyles = createThemedStyles('WithPopup', {
   trigger: {
     cursor: 'pointer',
   },
+
+  popup: {
+    zIndex: 5,
+  },
 });
 
 export type IWithPopupStyles = ITweakStyles<typeof useStyles>;

package/src/components/WithPopup/WithPopup.tsx

@@ -25,6 +25,8 @@ export interface IWithPopupProps extends ICommonProps<IWithPopupStyles> {
   middlewares?: Middleware[];
   /** @default eventType === 'click' ? 'bottom-end' : 'top' */
   placement?: Placement;
+  /** @default false */
+  shouldHideOnScroll?: boolean;
   /** @default true */
   shouldRenderInBody?: boolean;
   /** @default 'click' */
@@ -44,6 +46,7 @@ export const WithPopup: FC<IWithPopupProps> = ({
   middlewares,
   eventType = 'click',
   placement = eventType === 'click' ? 'bottom-end' : 'top',
+  shouldHideOnScroll = false,
   shouldRenderInBody = false,
   hoverDelay = 0,
   popupOffset = DEFAULT_OFFSET,
@@ -85,7 +88,10 @@ export const WithPopup: FC<IWithPopupProps> = ({
     delay: { open: hoverDelay },
   });
   const click = useClick(context, { enabled: eventType === 'click', toggle: false });
-  const dismiss = useDismiss(context, { enabled: eventType === 'click' });
+  const dismiss = useDismiss(context, {
+    enabled: eventType === 'click',
+    ancestorScroll: shouldHideOnScroll,
+  });
 
   const { getReferenceProps, getFloatingProps } = useInteractions([hover, click, dismiss]);
 
@@ -108,7 +114,12 @@ export const WithPopup: FC<IWithPopupProps> = ({
         <FloatingPortal
           root={!shouldRenderInBody ? (refs.reference.current as HTMLDivElement) : undefined}
         >
-          <div style={floatingStyles} ref={refs.setFloating} {...getFloatingProps()}>
+          <div
+            style={floatingStyles}
+            className={classes.popup}
+            ref={refs.setFloating}
+            {...getFloatingProps()}
+          >
             {isFunction(Popup) ? <Popup onClose={handleClose} /> : Popup}
           </div>
         </FloatingPortal>