From d6964460b6ffe53332a3703894ec030007cea690 Mon Sep 17 00:00:00 2001 From: Filip Solecki Date: Wed, 13 Mar 2024 08:01:23 +0100 Subject: [PATCH] Refactor isDisabledCheckbox --- src/components/SelectionList/BaseListItem.tsx | 6 ++---- src/components/SelectionList/BaseSelectionList.tsx | 2 +- src/pages/workspace/taxes/WorkspaceTaxesPage.tsx | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx index 1445a635a7a1..2af07701c5d3 100644 --- a/src/components/SelectionList/BaseListItem.tsx +++ b/src/components/SelectionList/BaseListItem.tsx @@ -34,8 +34,6 @@ function BaseListItem({ const StyleUtils = useStyleUtils(); const {hovered, bind} = useHover(); - const isDisabledCheckbox = item.isDisabledCheckbox === undefined || item.isDisabledCheckbox; - const rightHandSideComponentRender = () => { if (canSelectMultiple || !rightHandSideComponent) { return null; @@ -83,9 +81,9 @@ function BaseListItem({ accessibilityLabel={item.text ?? ''} role={CONST.ROLE.BUTTON} // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - disabled={isDisabled || !isDisabledCheckbox} + disabled={isDisabled || item.isDisabledCheckbox} onPress={handleCheckboxPress} - style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), !isDisabledCheckbox && styles.cursorDisabled]} + style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]} > {item.isSelected && ( diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index dda0ff7a21c0..5ab4eea6404a 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -120,7 +120,7 @@ function BaseSelectionList( // If disabled, add to the disabled indexes array // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (!!section.isDisabled || item.isDisabled || item.isDisabledCheckbox === false) { + if (!!section.isDisabled || item.isDisabled || item.isDisabledCheckbox) { disabledOptionsIndexes.push(disabledIndex); } disabledIndex += 1; diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx index 76ee8df0009b..18123d109645 100644 --- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx +++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx @@ -71,7 +71,7 @@ function WorkspaceTaxesPage({policy, route}: WorkspaceTaxesPageProps) { alternateText: textForDefault(key), keyForList: key, isSelected: !!selectedTaxesIDs.includes(key), - isDisabledCheckbox: key !== defaultExternalID, + isDisabledCheckbox: key === defaultExternalID, rightElement: (