From 207a8e160e46a2d1fa2376f831a7cb045c170046 Mon Sep 17 00:00:00 2001 From: Hezekiel Tamire Date: Tue, 13 Jun 2023 21:47:21 +0300 Subject: [PATCH 1/9] add cancelButtonID native id --- src/pages/home/report/ReportActionItemMessageEdit.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js index 0e4c602e674f..d6242d3f2886 100644 --- a/src/pages/home/report/ReportActionItemMessageEdit.js +++ b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -283,6 +283,7 @@ class ReportActionItemMessageEdit extends React.Component { {(hovered) => ( Date: Tue, 13 Jun 2023 23:14:56 +0300 Subject: [PATCH 2/9] added props to PressableWithFeedback --- src/components/Pressable/PressableWithFeedback.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 281492568867..062a3bf429dc 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -10,7 +10,7 @@ import * as StyleUtils from '../../styles/StyleUtils'; const omittedProps = ['style', 'pressStyle', 'hoverStyle', 'focusStyle', 'wrapperStyle']; -const PressableWithFeedbackPropTypes = { +constDPressableWithFeedbackPropTypes = { ..._.omit(GenericPressablePropTypes.pressablePropTypes, omittedProps), /** * Determines what opacity value should be applied to the underlaying view when Pressable is pressed. @@ -44,6 +44,7 @@ const PressableWithFeedback = forwardRef((props, ref) => { return ( Date: Tue, 13 Jun 2023 23:18:03 +0300 Subject: [PATCH 3/9] correction --- src/components/Pressable/PressableWithFeedback.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 062a3bf429dc..4cc85deffaaa 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -10,7 +10,7 @@ import * as StyleUtils from '../../styles/StyleUtils'; const omittedProps = ['style', 'pressStyle', 'hoverStyle', 'focusStyle', 'wrapperStyle']; -constDPressableWithFeedbackPropTypes = { +const PressableWithFeedbackPropTypes = { ..._.omit(GenericPressablePropTypes.pressablePropTypes, omittedProps), /** * Determines what opacity value should be applied to the underlaying view when Pressable is pressed. From 9898b43a4f6187a8e963b0dd05a29114aaaf03cd Mon Sep 17 00:00:00 2001 From: Hezekiel Tamire Date: Tue, 13 Jun 2023 23:20:00 +0300 Subject: [PATCH 4/9] added to propType --- src/components/Pressable/PressableWithFeedback.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 4cc85deffaaa..e016c84cf9ae 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -24,6 +24,7 @@ const PressableWithFeedbackPropTypes = { * @default variables.hoverDimValue */ hoverDimmingValue: propTypes.number, + nativeID: propTypes.string, }; const PressableWithFeedbackDefaultProps = { @@ -44,7 +45,6 @@ const PressableWithFeedback = forwardRef((props, ref) => { return ( Date: Tue, 13 Jun 2023 23:38:02 +0300 Subject: [PATCH 5/9] added propTypes --- src/components/Pressable/PressableWithFeedback.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index e016c84cf9ae..4b3430d0bce9 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -8,7 +8,7 @@ import OpacityView from '../OpacityView'; import variables from '../../styles/variables'; import * as StyleUtils from '../../styles/StyleUtils'; -const omittedProps = ['style', 'pressStyle', 'hoverStyle', 'focusStyle', 'wrapperStyle']; +const omittedProps = ['style', 'pressStyle', 'hoverStyle', 'focusStyle', 'wrapperStyle', ]; const PressableWithFeedbackPropTypes = { ..._.omit(GenericPressablePropTypes.pressablePropTypes, omittedProps), @@ -24,6 +24,10 @@ const PressableWithFeedbackPropTypes = { * @default variables.hoverDimValue */ hoverDimmingValue: propTypes.number, + /** + * a native ID for the pressable with feedback component + * @default '' + */ nativeID: propTypes.string, }; @@ -31,6 +35,7 @@ const PressableWithFeedbackDefaultProps = { ..._.omit(GenericPressablePropTypes.defaultProps, omittedProps), pressDimmingValue: variables.pressDimValue, hoverDimmingValue: variables.hoverDimValue, + nativeID: '', wrapperStyle: [], }; From dd9cacbf53ce9a8e58b04239213ea5b5f2fd8acb Mon Sep 17 00:00:00 2001 From: Hezekiel Tamire Date: Tue, 13 Jun 2023 23:39:24 +0300 Subject: [PATCH 6/9] unnecessary space --- src/components/Pressable/PressableWithFeedback.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 4b3430d0bce9..6a83b575211a 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -8,7 +8,7 @@ import OpacityView from '../OpacityView'; import variables from '../../styles/variables'; import * as StyleUtils from '../../styles/StyleUtils'; -const omittedProps = ['style', 'pressStyle', 'hoverStyle', 'focusStyle', 'wrapperStyle', ]; +const omittedProps = ['style', 'pressStyle', 'hoverStyle', 'focusStyle', 'wrapperStyle']; const PressableWithFeedbackPropTypes = { ..._.omit(GenericPressablePropTypes.pressablePropTypes, omittedProps), From b950ab9a19964460aa50d52502b4f102e0bf0fcd Mon Sep 17 00:00:00 2001 From: Hezekiel Tamire Date: Tue, 13 Jun 2023 23:53:37 +0300 Subject: [PATCH 7/9] removed @default --- src/components/Pressable/PressableWithFeedback.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 6a83b575211a..af7377a8b39d 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -25,8 +25,7 @@ const PressableWithFeedbackPropTypes = { */ hoverDimmingValue: propTypes.number, /** - * a native ID for the pressable with feedback component - * @default '' + * a native ID for the pressable with feedback component. */ nativeID: propTypes.string, }; From 8192231a49d5ee10bab5441291bf1215450498bb Mon Sep 17 00:00:00 2001 From: Hezekiel Tamire Date: Tue, 13 Jun 2023 23:58:03 +0300 Subject: [PATCH 8/9] added a comment --- src/components/Pressable/PressableWithFeedback.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index af7377a8b39d..324450db1e74 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -25,7 +25,8 @@ const PressableWithFeedbackPropTypes = { */ hoverDimmingValue: propTypes.number, /** - * a native ID for the pressable with feedback component. + * a native ID for the pressable with feedback component + * Used to locate this view from native classes. */ nativeID: propTypes.string, }; From 96af661627423dc7afc7983a1da23656115be17d Mon Sep 17 00:00:00 2001 From: Hezekiel Tamire Date: Wed, 14 Jun 2023 00:07:41 +0300 Subject: [PATCH 9/9] remove comment --- src/components/Pressable/PressableWithFeedback.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js index 324450db1e74..4516a57a85d3 100644 --- a/src/components/Pressable/PressableWithFeedback.js +++ b/src/components/Pressable/PressableWithFeedback.js @@ -25,7 +25,6 @@ const PressableWithFeedbackPropTypes = { */ hoverDimmingValue: propTypes.number, /** - * a native ID for the pressable with feedback component * Used to locate this view from native classes. */ nativeID: propTypes.string,