From b076d3548415feb75d027d257af24d8fc6bd10d4 Mon Sep 17 00:00:00 2001 From: keisyrzk Date: Mon, 11 Dec 2023 12:14:59 +0100 Subject: [PATCH 1/6] member on delete offline --- src/components/SelectionList/BaseListItem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/SelectionList/BaseListItem.js b/src/components/SelectionList/BaseListItem.js index c2e468359f3f..818f9a2770a3 100644 --- a/src/components/SelectionList/BaseListItem.js +++ b/src/components/SelectionList/BaseListItem.js @@ -91,6 +91,7 @@ function BaseListItem({ isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, isUserItem || item.isSelected ? styles.sidebarLinkTextBold : null, styles.pre, + item.pendingAction === 'delete' ? styles.offlineFeedback.deleted : null, ]} alternateTextStyles={[styles.optionAlternateText, styles.textLabelSupporting, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.pre]} isDisabled={isDisabled} From 681bb5ea7fbccc9f751085e7376f62a6a47129f9 Mon Sep 17 00:00:00 2001 From: keisyrzk Date: Mon, 11 Dec 2023 12:24:34 +0100 Subject: [PATCH 2/6] update alternateTextStyles --- src/components/SelectionList/BaseListItem.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/SelectionList/BaseListItem.js b/src/components/SelectionList/BaseListItem.js index 818f9a2770a3..06c8f9f638a1 100644 --- a/src/components/SelectionList/BaseListItem.js +++ b/src/components/SelectionList/BaseListItem.js @@ -93,7 +93,13 @@ function BaseListItem({ styles.pre, item.pendingAction === 'delete' ? styles.offlineFeedback.deleted : null, ]} - alternateTextStyles={[styles.optionAlternateText, styles.textLabelSupporting, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.pre]} + alternateTextStyles={[ + styles.optionAlternateText, + styles.textLabelSupporting, + isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, + styles.pre, + item.pendingAction === 'delete' ? styles.offlineFeedback.deleted : null, + ]} isDisabled={isDisabled} onSelectRow={onSelectRow} showTooltip={showTooltip} From d30c159559c5e628ae39e37821a8d0c4b1f95d42 Mon Sep 17 00:00:00 2001 From: keisyrzk Date: Mon, 18 Dec 2023 08:22:58 +0100 Subject: [PATCH 3/6] change fix place from BaseListItem --- src/components/SelectionList/BaseListItem.js | 2 -- src/components/SelectionList/UserListItem.js | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/SelectionList/BaseListItem.js b/src/components/SelectionList/BaseListItem.js index 06c8f9f638a1..450a14b63dc5 100644 --- a/src/components/SelectionList/BaseListItem.js +++ b/src/components/SelectionList/BaseListItem.js @@ -91,14 +91,12 @@ function BaseListItem({ isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, isUserItem || item.isSelected ? styles.sidebarLinkTextBold : null, styles.pre, - item.pendingAction === 'delete' ? styles.offlineFeedback.deleted : null, ]} alternateTextStyles={[ styles.optionAlternateText, styles.textLabelSupporting, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.pre, - item.pendingAction === 'delete' ? styles.offlineFeedback.deleted : null, ]} isDisabled={isDisabled} onSelectRow={onSelectRow} diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js index 0b4b6b52e0ac..80d8b5b98657 100644 --- a/src/components/SelectionList/UserListItem.js +++ b/src/components/SelectionList/UserListItem.js @@ -6,9 +6,11 @@ import Text from '@components/Text'; import Tooltip from '@components/Tooltip'; import useThemeStyles from '@styles/useThemeStyles'; import {userListItemPropTypes} from './selectionListPropTypes'; +import useStyleUtils from '@styles/useStyleUtils'; -function UserListItem({item, textStyles, alternateTextStyles, showTooltip}) { +function UserListItem({item, textStyles, alternateTextStyles, showTooltip, style}) { const styles = useThemeStyles(); + const StyleUtils = useStyleUtils(); return ( <> {Boolean(item.icons) && ( @@ -24,7 +26,7 @@ function UserListItem({item, textStyles, alternateTextStyles, showTooltip}) { text={item.text} > {item.text} @@ -36,7 +38,7 @@ function UserListItem({item, textStyles, alternateTextStyles, showTooltip}) { text={item.alternateText} > {item.alternateText} From 04a75d7167942430c222d878b0dd6d1626bc6a2c Mon Sep 17 00:00:00 2001 From: keisyrzk Date: Tue, 19 Dec 2023 14:36:32 +0100 Subject: [PATCH 4/6] lint and prettier --- src/components/SelectionList/BaseListItem.js | 7 +------ src/components/SelectionList/UserListItem.js | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/components/SelectionList/BaseListItem.js b/src/components/SelectionList/BaseListItem.js index aab18468687d..ac679f32d103 100644 --- a/src/components/SelectionList/BaseListItem.js +++ b/src/components/SelectionList/BaseListItem.js @@ -92,12 +92,7 @@ function BaseListItem({ isUserItem || item.isSelected ? styles.sidebarLinkTextBold : null, styles.pre, ]} - alternateTextStyles={[ - styles.optionAlternateText, - styles.textLabelSupporting, - isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, - styles.pre, - ]} + alternateTextStyles={[styles.optionAlternateText, styles.textLabelSupporting, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.pre]} isDisabled={isDisabled} onSelectRow={onSelectRow} showTooltip={showTooltip} diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js index 1d6e14ced6ac..151ffaa90e94 100644 --- a/src/components/SelectionList/UserListItem.js +++ b/src/components/SelectionList/UserListItem.js @@ -5,8 +5,8 @@ import SubscriptAvatar from '@components/SubscriptAvatar'; import Text from '@components/Text'; import Tooltip from '@components/Tooltip'; import useThemeStyles from '@hooks/useThemeStyles'; -import {userListItemPropTypes} from './selectionListPropTypes'; import useStyleUtils from '@styles/useStyleUtils'; +import {userListItemPropTypes} from './selectionListPropTypes'; function UserListItem({item, textStyles, alternateTextStyles, showTooltip, style}) { const styles = useThemeStyles(); From 9d9df1aafabff7c2fc1fa109ca25edf289968351 Mon Sep 17 00:00:00 2001 From: keisyrzk Date: Tue, 19 Dec 2023 14:41:27 +0100 Subject: [PATCH 5/6] useStyleUtils hook --- src/components/SelectionList/UserListItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js index 151ffaa90e94..b88e010561ae 100644 --- a/src/components/SelectionList/UserListItem.js +++ b/src/components/SelectionList/UserListItem.js @@ -5,7 +5,7 @@ import SubscriptAvatar from '@components/SubscriptAvatar'; import Text from '@components/Text'; import Tooltip from '@components/Tooltip'; import useThemeStyles from '@hooks/useThemeStyles'; -import useStyleUtils from '@styles/useStyleUtils'; +import useStyleUtils from '@hooks/useStyleUtils'; import {userListItemPropTypes} from './selectionListPropTypes'; function UserListItem({item, textStyles, alternateTextStyles, showTooltip, style}) { From b23ed61c68c9de48b6a5327acceb601390bbef06 Mon Sep 17 00:00:00 2001 From: keisyrzk Date: Mon, 8 Jan 2024 11:19:40 +0100 Subject: [PATCH 6/6] lint and prettier --- src/components/SelectionList/UserListItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js index b88e010561ae..a842f19858f2 100644 --- a/src/components/SelectionList/UserListItem.js +++ b/src/components/SelectionList/UserListItem.js @@ -4,8 +4,8 @@ import {View} from 'react-native'; import SubscriptAvatar from '@components/SubscriptAvatar'; import Text from '@components/Text'; import Tooltip from '@components/Tooltip'; -import useThemeStyles from '@hooks/useThemeStyles'; import useStyleUtils from '@hooks/useStyleUtils'; +import useThemeStyles from '@hooks/useThemeStyles'; import {userListItemPropTypes} from './selectionListPropTypes'; function UserListItem({item, textStyles, alternateTextStyles, showTooltip, style}) {