@hero-design/rn 8.99.1 → 8.99.2

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-(node:3213) ExperimentalWarning: Importing JSON modules is an experimental feature and might change at any time
+(node:3078) ExperimentalWarning: Importing JSON modules is an experimental feature and might change at any time
 (Use `node --trace-warnings ...` to show where the warning was created)
 
 src/index.ts → lib/index.js, es/index.js...
@@ -10,9 +10,9 @@
                                      ~~~~~~~~~~~~~~~~~~~
 
 (!) [plugin node-resolve] preferring built-in module 'events' over local alternative at '/home/runner/work/hero-design/hero-design/node_modules/events/events.js', pass 'preferBuiltins: false' to disable this behavior or 'preferBuiltins: true' to disable this warning.or passing a function to 'preferBuiltins' to provide more fine-grained control over which built-in modules to prefer.
-created lib/index.js, es/index.js in 54s
+created lib/index.js, es/index.js in 55.4s
 
 /home/runner/work/hero-design/hero-design/packages/rn/src/locales/en_AU.ts, /home/runner/work/hero-design/hero-design/packages/rn/src/locales/en_CA.ts, /home/runner/work/hero-design/hero-design/packages/rn/src/locales/index.ts, /home/runner/work/hero-design/hero-design/packages/rn/src/locales/types.ts → ., ....
 (!) Generated empty chunks
 "locales/types" and "locales/types"
-created ., . in 20.5s
+created ., . in 20.7s

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @hero-design/rn
 
+## 8.99.2
+
+### Patch Changes
+
+- [#3811](https://github.com/Thinkei/hero-design/pull/3811) [`4a35bdd6c7cf89d87faeef60e385818df2963a62`](https://github.com/Thinkei/hero-design/commit/4a35bdd6c7cf89d87faeef60e385818df2963a62) Thanks [@vinhphan-eh](https://github.com/vinhphan-eh)! - [Select.Multi] Support display object value
+
 ## 8.99.1
 
 ### Patch Changes

package/es/index.js

@@ -19957,6 +19957,15 @@ var Option$2 = function Option(_ref) {
   return highlighted === true ? /*#__PURE__*/React__default.createElement(List.Item, props) : /*#__PURE__*/React__default.createElement(List.BasicItem, props);
 };
 
+var isOptionSelected = function isOptionSelected(value, option) {
+  if (typeof option.value === 'string') {
+    return value.includes(option.value);
+  }
+  return value.some(function (v) {
+    return _deepCompareValue(v, option.value);
+  });
+};
+
 var _excluded$d = ["keyExtractor", "loading", "onEndReached", "onPress", "onQueryChange", "sections", "renderOption", "value", "sectionListRef"];
 var OptionList$1 = function OptionList(_ref) {
   var keyExtractor = _ref.keyExtractor,
@@ -19971,14 +19980,14 @@ var OptionList$1 = function OptionList(_ref) {
     rest = _objectWithoutProperties(_ref, _excluded$d);
   var renderItem = function renderItem(info) {
     var item = info.item;
-    var selected = value.includes(info.item.value);
+    var selected = isOptionSelected(value, item);
     var onItemPress = function onItemPress() {
-      if (value.includes(info.item.value)) {
+      if (isOptionSelected(value, item)) {
         onPress(value.filter(function (val) {
-          return val !== info.item.value;
+          return !_deepCompareValue(val, item.value);
         }));
       } else {
-        onPress([].concat(_toConsumableArray(value), [info.item.value]));
+        onPress([].concat(_toConsumableArray(value), [item.value]));
       }
     };
     return renderOption ? renderOption(_objectSpread2(_objectSpread2({}, info), {}, {
@@ -20045,7 +20054,7 @@ function MultiSelect(_ref) {
   var sections = toSections(options);
   var flatOptions = toFlatOptions(options);
   var displayedValue = flatOptions.filter(function (opt) {
-    return value.includes(opt.value);
+    return isOptionSelected(value, opt);
   }).map(function (opt) {
     return opt.text;
   }).join(', ');

package/lib/index.js

@@ -19986,6 +19986,15 @@ var Option$2 = function Option(_ref) {
   return highlighted === true ? /*#__PURE__*/React__namespace.default.createElement(List.Item, props) : /*#__PURE__*/React__namespace.default.createElement(List.BasicItem, props);
 };
 
+var isOptionSelected = function isOptionSelected(value, option) {
+  if (typeof option.value === 'string') {
+    return value.includes(option.value);
+  }
+  return value.some(function (v) {
+    return _deepCompareValue(v, option.value);
+  });
+};
+
 var _excluded$d = ["keyExtractor", "loading", "onEndReached", "onPress", "onQueryChange", "sections", "renderOption", "value", "sectionListRef"];
 var OptionList$1 = function OptionList(_ref) {
   var keyExtractor = _ref.keyExtractor,
@@ -20000,14 +20009,14 @@ var OptionList$1 = function OptionList(_ref) {
     rest = _objectWithoutProperties(_ref, _excluded$d);
   var renderItem = function renderItem(info) {
     var item = info.item;
-    var selected = value.includes(info.item.value);
+    var selected = isOptionSelected(value, item);
     var onItemPress = function onItemPress() {
-      if (value.includes(info.item.value)) {
+      if (isOptionSelected(value, item)) {
         onPress(value.filter(function (val) {
-          return val !== info.item.value;
+          return !_deepCompareValue(val, item.value);
         }));
       } else {
-        onPress([].concat(_toConsumableArray(value), [info.item.value]));
+        onPress([].concat(_toConsumableArray(value), [item.value]));
       }
     };
     return renderOption ? renderOption(_objectSpread2(_objectSpread2({}, info), {}, {
@@ -20074,7 +20083,7 @@ function MultiSelect(_ref) {
   var sections = toSections(options);
   var flatOptions = toFlatOptions(options);
   var displayedValue = flatOptions.filter(function (opt) {
-    return value.includes(opt.value);
+    return isOptionSelected(value, opt);
   }).map(function (opt) {
     return opt.text;
   }).join(', ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hero-design/rn",
-  "version": "8.99.1",
+  "version": "8.99.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/components/Select/MultiSelect/OptionList.tsx

@@ -4,6 +4,8 @@ import BaseOptionList, { BaseOptionListProps } from '../BaseOptionList';
 import Option from './Option';
 import type { MultiSelectProps } from '.';
 import type { OptionType, SectionType } from '../types';
+import { deepCompareValue } from '../helpers';
+import { isOptionSelected } from './utils';
 
 type OptionListProps<V, T extends OptionType<V>> = Pick<
   MultiSelectProps<V, T>,
@@ -31,12 +33,12 @@ const OptionList = <V, T extends OptionType<V>>({
 }: OptionListProps<V, T>) => {
   const renderItem = (info: SectionListRenderItemInfo<T, SectionType>) => {
     const { item } = info;
-    const selected = value.includes(info.item.value);
+    const selected = isOptionSelected(value, item);
     const onItemPress = () => {
-      if (value.includes(info.item.value)) {
-        onPress(value.filter((val) => val !== info.item.value));
+      if (isOptionSelected(value, item)) {
+        onPress(value.filter((val) => !deepCompareValue(val, item.value)));
       } else {
-        onPress([...value, info.item.value]);
+        onPress([...value, item.value]);
       }
     };
 

package/src/components/Select/MultiSelect/__tests__/OptionList.spec.tsx

@@ -14,6 +14,16 @@ const sections = [
   },
 ];
 
+const sectionsWithObjectValue = [
+  { category: 'A', data: [{ text: 'A1', value: { id: 'a1' } }] },
+  {
+    category: 'B',
+    data: [
+      { text: 'B1', value: { id: 'b1' } },
+      { text: 'B2', value: { id: 'b2' } },
+    ],
+  },
+];
 describe('OptionList', () => {
   it('renders correctly', () => {
     const pressFn = jest.fn();
@@ -64,3 +74,38 @@ describe('OptionList', () => {
     expect(toJSON()).toMatchSnapshot();
   });
 });
+
+describe('OptionList with object value', () => {
+  it('renders correctly', () => {
+    const pressFn = jest.fn();
+    const { getByText } = renderWithTheme(
+      <OptionList
+        value={[{ id: 'a1' }]}
+        sections={sectionsWithObjectValue}
+        onPress={pressFn}
+        keyExtractor={(opt) => opt.value.id}
+      />
+    );
+
+    expect(getByText('A1')).toBeVisible();
+    expect(getByText('B1')).toBeVisible();
+    expect(getByText('B2')).toBeVisible();
+  });
+
+  it('trigger onPress correctly on select value', () => {
+    const pressFn = jest.fn();
+    const { getByText } = renderWithTheme(
+      <OptionList
+        value={[{ id: 'a1' }]}
+        sections={sectionsWithObjectValue}
+        onPress={pressFn}
+      />
+    );
+
+    fireEvent.press(getByText('B1'));
+    expect(pressFn).toHaveBeenCalledWith([{ id: 'a1' }, { id: 'b1' }]);
+
+    fireEvent.press(getByText('A1'));
+    expect(pressFn).toHaveBeenCalledWith([]);
+  });
+});

package/src/components/Select/MultiSelect/__tests__/index.spec.tsx

@@ -32,6 +32,11 @@ const sections = [
   },
 ];
 
+const objectOptions = [
+  { text: 'Monday', value: { id: 'mon' } },
+  { text: 'Tuesday', value: { id: 'tue' } },
+];
+
 type CustomOptionType = {
   text: string;
   value: string;
@@ -341,6 +346,22 @@ describe('rendering', () => {
     expect(getByText('Monday')).toBeTruthy();
     expect(toJSON()).toMatchSnapshot();
   });
+
+  it('renders correctly when receives object value', () => {
+    const { getByText, getByTestId } = renderWithTheme(
+      <MultiSelect
+        value={[{ id: 'mon' }]}
+        options={objectOptions}
+        onConfirm={jest.fn()}
+        footerLabel="Confirm"
+        label="Allow notifications"
+      />
+    );
+
+    fireEvent.press(getByTestId('text-input'));
+    expect(getByText('Monday')).toBeVisible();
+    expect(getByText('Tuesday')).toBeVisible();
+  });
 });
 
 describe('behavior', () => {
@@ -379,4 +400,23 @@ describe('behavior', () => {
 
     expect(onPress).toBeCalledTimes(0);
   });
+
+  it('calls confirm with correct value when receives object value', () => {
+    const onPress = jest.fn();
+    const { getByText, getByTestId } = renderWithTheme(
+      <MultiSelect
+        value={[{ id: 'mon' }]}
+        options={objectOptions}
+        onConfirm={onPress}
+        footerLabel="Confirm"
+        label="Allow notifications"
+      />
+    );
+
+    fireEvent.press(getByTestId('text-input'));
+    fireEvent.press(getByText('Tuesday'));
+    fireEvent.press(getByText('Confirm'));
+
+    expect(onPress).toBeCalledWith([{ id: 'mon' }, { id: 'tue' }]);
+  });
 });

package/src/components/Select/MultiSelect/__tests__/utils.spec.ts

@@ -0,0 +1,31 @@
+import { isOptionSelected } from '../utils';
+
+describe('isOptionSelected', () => {
+  it('should return true when string value is selected', () => {
+    const selectedValues = ['option1', 'option2'];
+    const option = { value: 'option1', text: 'Option 1' };
+
+    expect(isOptionSelected(selectedValues, option)).toBe(true);
+  });
+
+  it('should return false when string value is not selected', () => {
+    const selectedValues = ['option1', 'option2'];
+    const option = { value: 'option3', text: 'Option 3' };
+
+    expect(isOptionSelected(selectedValues, option)).toBe(false);
+  });
+
+  it('should return true when object value is selected', () => {
+    const selectedValues = [{ id: 1 }, { id: 2 }];
+    const option = { value: { id: 1 }, text: 'Option 1' };
+
+    expect(isOptionSelected(selectedValues, option)).toBe(true);
+  });
+
+  it('should return false when object value is not selected', () => {
+    const selectedValues = [{ id: 1 }, { id: 2 }];
+    const option = { value: { id: 3 }, text: 'Option 3' };
+
+    expect(isOptionSelected(selectedValues, option)).toBe(false);
+  });
+});

package/src/components/Select/MultiSelect/index.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import type {
-  SectionList,
   TextInputProps as NativeTextInputProps,
+  SectionList,
 } from 'react-native';
 import { TouchableOpacity, View } from 'react-native';
 import BottomSheet from '../../BottomSheet';
@@ -17,6 +17,7 @@ import {
 import { StyledSearchBar } from '../StyledSelect';
 import type { OptionType, SectionType, SelectProps } from '../types';
 import OptionList from './OptionList';
+import { isOptionSelected } from './utils';
 
 export interface MultiSelectProps<V, T extends OptionType<V> = OptionType<V>>
   extends SelectProps<V, T> {
@@ -83,7 +84,7 @@ function MultiSelect<V, T extends OptionType<V>>({
   const sections = toSections(options);
   const flatOptions = toFlatOptions(options);
   const displayedValue = flatOptions
-    .filter((opt) => value.includes(opt.value))
+    .filter((opt) => isOptionSelected(value, opt))
     .map((opt) => opt.text)
     .join(', ');
   const rawValue = value.length > 0 ? value.join(', ') : '';

package/src/components/Select/MultiSelect/utils.ts

@@ -0,0 +1,12 @@
+import { deepCompareValue } from '../helpers';
+import { OptionType } from '../types';
+
+export const isOptionSelected = <V, T extends OptionType<V>>(
+  value: V[],
+  option: T
+): boolean => {
+  if (typeof option.value === 'string') {
+    return value.includes(option.value);
+  }
+  return value.some((v) => deepCompareValue(v, option.value));
+};