From d8dc6e2ce837752eca22e7efa0c3644818bcb19b Mon Sep 17 00:00:00 2001 From: Krishna Gupta Date: Tue, 27 Feb 2024 09:48:43 +0530 Subject: [PATCH 1/2] fix: Task - Pointer shows up for an archived task when hovering over the edge of the checkbox. Signed-off-by: Krishna Gupta --- src/components/Checkbox.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx index 7e7720b57a6e..f2a2d299c4a1 100644 --- a/src/components/Checkbox.tsx +++ b/src/components/Checkbox.tsx @@ -97,6 +97,8 @@ function Checkbox( aria-checked={isChecked} accessibilityLabel={accessibilityLabel} pressDimmingValue={1} + // Explicitly need to add this because getCheckboxPressableStyle returns `cursorPointer` which will override disabled cursor style determined by `disabled` prop + disabledStyle={styles.cursorDisabled} > {children ?? ( Date: Thu, 29 Feb 2024 12:00:25 +0530 Subject: [PATCH 2/2] Update as suggested. Signed-off-by: Krishna Gupta --- src/components/Checkbox.tsx | 2 -- src/components/SelectionList/BaseListItem.tsx | 2 +- src/styles/utils/index.ts | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx index f2a2d299c4a1..7e7720b57a6e 100644 --- a/src/components/Checkbox.tsx +++ b/src/components/Checkbox.tsx @@ -97,8 +97,6 @@ function Checkbox( aria-checked={isChecked} accessibilityLabel={accessibilityLabel} pressDimmingValue={1} - // Explicitly need to add this because getCheckboxPressableStyle returns `cursorPointer` which will override disabled cursor style determined by `disabled` prop - disabledStyle={styles.cursorDisabled} > {children ?? ( ({ accessibilityLabel={item.text} role={CONST.ROLE.BUTTON} onPress={handleCheckboxPress} - style={StyleUtils.getCheckboxPressableStyle()} + style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle()]} > {item.isSelected && ( diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts index 72719e4795c4..21af5398232f 100644 --- a/src/styles/utils/index.ts +++ b/src/styles/utils/index.ts @@ -17,7 +17,6 @@ import type {ThemeStyles} from '..'; import shouldPreventScrollOnAutoCompleteSuggestion from './autoCompleteSuggestion'; import getCardStyles from './cardStyles'; import containerComposeStyles from './containerComposeStyles'; -import cursor from './cursor'; import FontUtils from './FontUtils'; import createModalStyleUtils from './generators/ModalStyleUtils'; import createReportActionContextMenuStyleUtils from './generators/ReportActionContextMenuStyleUtils'; @@ -929,7 +928,6 @@ function getCheckboxPressableStyle(borderRadius = 6): ViewStyle { alignItems: 'center', // eslint-disable-next-line object-shorthand borderRadius: borderRadius, - ...cursor.cursorPointer, }; }