icon in chip with passed size

renrizzolo · Jun 30, 2022 · 33ed6a7 · 33ed6a7
1 parent 8c00318
commit 33ed6a7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 33 deletions.
diff --git a/lib/components/ItemIcon.js b/lib/components/ItemIcon.js
@@ -9,8 +9,8 @@ const ItemIcon = ({ iconRenderer: Icon, icon, iconKey, itemIconStyle }) => {
       source={icon}
       style={[
         {
-          width: 32,
-          height: 32,
+          // width: 32,
+          // height: 32,
           marginHorizontal: 10
         },
         itemIconStyle

diff --git a/lib/sectioned-multi-select.js b/lib/sectioned-multi-select.js
@@ -16,7 +16,8 @@ import {
 } from 'react-native'
 import isEqual from 'lodash.isequal'
 import memoize from 'memoize-one'
-import { RowItem } from './components'
+import { isEqual } from 'lodash'
+import { RowItem, ItemIcon } from './components'
 import { callIfFunction } from './helpers'
 
 const Touchable =
@@ -392,7 +393,7 @@ class SectionedMultiSelect extends PureComponent {
         else
           return null
       }
-      
+
       return (
         <ItemIcon
           iconRenderer={Icon}
@@ -935,7 +936,7 @@ class SectionedMultiSelect extends PureComponent {
     } = this.props
     const styles = this.getStyles(this.props.styles)
     const colors = this.getColors(this.props.colors)
-
+    const { Icon, iconKey } = this.props
     return selectedItems.map((singleSelectedItem) => {
       const item = this._findItem(singleSelectedItem)
 
@@ -966,8 +967,13 @@ class SectionedMultiSelect extends PureComponent {
             styles.chipContainer,
             isParent && styles.parentChipContainer
           ]}
-          key={item[uniqueKey]}
-        >
+          key={item[uniqueKey]}>
+          <ItemIcon
+            iconRenderer={Icon}
+            iconKey={iconKey}
+            icon={item.icon}
+            style={styles.itemIconStyle}
+          />
           <Text
             numberOfLines={1}
             style={[
@@ -1084,8 +1090,8 @@ class SectionedMultiSelect extends PureComponent {
         <View {...props} />
       </Wrapper>
     ) : (
-      <View {...props} />
-    )
+        <View {...props} />
+      )
   }
 
   // _renderSubItemFlatList = ({ item }) => (
@@ -1222,30 +1228,30 @@ class SectionedMultiSelect extends PureComponent {
                   {loading ? (
                     callIfFunction(loadingComponent)
                   ) : (
-                    <View>
-                      {!renderItems || (!renderItems.length && !searchTerm)
-                        ? callIfFunction(noItemsComponent)
-                        : null}
-                      {items && renderItems && renderItems.length ? (
-                        <View>
-                          <FlatList
-                            keyboardShouldPersistTaps="always"
-                            removeClippedSubviews
-                            initialNumToRender={15}
-                            data={renderItems}
-                            extraData={selectedItems}
-                            keyExtractor={(item) => `${item[uniqueKey]}`}
-                            ItemSeparatorComponent={this._renderSeparator}
-                            ListFooterComponent={this._renderFooter}
-                            renderItem={this._renderItemFlatList}
-                            {...itemsFlatListProps}
-                          />
-                        </View>
-                      ) : searchTerm ? (
-                        callIfFunction(noResultsComponent)
-                      ) : null}
-                    </View>
-                  )}
+                      <View>
+                        {!renderItems || (!renderItems.length && !searchTerm)
+                          ? callIfFunction(noItemsComponent)
+                          : null}
+                        {items && renderItems && renderItems.length ? (
+                          <View>
+                            <FlatList
+                              keyboardShouldPersistTaps="always"
+                              removeClippedSubviews
+                              initialNumToRender={15}
+                              data={renderItems}
+                              extraData={selectedItems}
+                              keyExtractor={(item) => `${item[uniqueKey]}`}
+                              ItemSeparatorComponent={this._renderSeparator}
+                              ListFooterComponent={this._renderFooter}
+                              renderItem={this._renderItemFlatList}
+                              {...itemsFlatListProps}
+                            />
+                          </View>
+                        ) : searchTerm ? (
+                          callIfFunction(noResultsComponent)
+                        ) : null}
+                      </View>
+                    )}
                 </View>
               </View>
               <View style={{ flexDirection: 'row' }}>