Migrate Button to ButtonComposed (batch 8) #97089
+266
−193
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import AttachmentView from '@components/Attachments/AttachmentView'; | ||
| import type {Attachment} from '@components/Attachments/types'; | ||
| import Button from '@components/ButtonComposed'; | ||
| import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback'; | ||
| import SafeAreaConsumer from '@components/SafeAreaConsumer'; | ||
| import Text from '@components/Text'; | ||
|
|
@@ -48,8 +48,10 @@ function CarouselItem({item, onPress, isFocused, isModalHovered, reportID}: Caro | |
|
|
||
| const renderButton = (style: StyleProp<ViewStyle>) => ( | ||
| <Button | ||
|
Contributor
There was a problem hiding this comment. On
Member
Author
There was a problem hiding this comment. Thanks! I tested all three buttons in German and with an artificially long label and saw no overflow, so I decided I'll leave it as it is |
||
| size={CONST.BUTTON_SIZE.SMALL} | ||
| style={style} | ||
| // Restores the 12px horizontal padding from the legacy implementation. | ||
| innerStyles={styles.ph3} | ||
|
Contributor
There was a problem hiding this comment. Could you add a short comment, for example: // Raw children skip ButtonText and the ph1 it contributes, so the legacy 12px horizontal padding is restored here.
innerStyles={styles.ph3} |
||
| onPress={() => setIsHidden(!isHidden)} | ||
| testID="moderationButton" | ||
| sentryLabel={CONST.SENTRY_LABEL.ATTACHMENT_CAROUSEL.MODERATION_BUTTON} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import {useAttachmentCarouselPagerActions} from '@components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext'; | ||
| import MultiGestureIcon from '@components/Attachments/MultiGestureIcon'; | ||
| import type {Attachment, AttachmentSource} from '@components/Attachments/types'; | ||
| import Button from '@components/ButtonComposed'; | ||
| import DistanceEReceipt from '@components/DistanceEReceipt'; | ||
| import EReceipt from '@components/EReceipt'; | ||
| import Icon from '@components/Icon'; | ||
|
|
@@ -346,16 +346,17 @@ function AttachmentView({ | |
| <Text style={[styles.notFoundTextHeader]}>{translate('attachmentView.attachmentNotFound')}</Text> | ||
| </View> | ||
| <Button | ||
| onPress={() => { | ||
| if (isOffline) { | ||
| return; | ||
| } | ||
| setImageError(false); | ||
| }} | ||
| sentryLabel={CONST.SENTRY_LABEL.ATTACHMENT_CAROUSEL.RETRY_BUTTON} | ||
| > | ||
| <Button.Icon src={icons.ArrowCircleClockwise} /> | ||
| <Button.Text>{translate('attachmentView.retry')}</Button.Text> | ||
| </Button> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import ActivityIndicator from '@components/ActivityIndicator'; | ||
| import Button from '@components/ButtonComposed'; | ||
| import CopyTextToClipboard from '@components/CopyTextToClipboard'; | ||
| import Text from '@components/Text'; | ||
|
|
||
|
|
@@ -10,6 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles'; | |
|
|
||
| import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; | ||
|
|
||
| import CONST from '@src/CONST'; | ||
|
|
||
| import type {StyleProp, TextStyle, ViewStyle} from 'react-native'; | ||
|
|
||
| import React, {useState} from 'react'; | ||
|
|
@@ -71,12 +73,12 @@ function CopyableTextField({value, isLoading = false, style, textStyle, shouldDi | |
| </View> | ||
| {shouldDisplayShowMoreButton && ( | ||
| <Button | ||
| size={CONST.BUTTON_SIZE.SMALL} | ||
| onPress={() => setExpanded((current) => !current)} | ||
| > | ||
| <Button.Text>{translate(expanded ? 'common.showLess' : 'common.showMore')}</Button.Text> | ||
| <Button.Icon src={expanded ? icons.UpArrow : icons.DownArrow} /> | ||
| </Button> | ||
| )} | ||
| </> | ||
| )} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Button from '@components/ButtonComposed'; | ||
| import ImageSVG from '@components/ImageSVG'; | ||
|
|
||
| import useAppFocusEvent from '@hooks/useAppFocusEvent'; | ||
|
|
@@ -319,10 +319,14 @@ function GPSMapView({accessToken, style, mapPadding, styleURL, pitchEnabled, way | |
| <View style={[styles.pAbsolute, styles.p5, styles.t0, styles.r0, styles.zIndex1]}> | ||
| <Button | ||
| onPress={centerMap} | ||
| accessibilityLabel={translate('common.center')} | ||
| > | ||
| <Button.Icon | ||
| src={expensifyIcons.Crosshair} | ||
| fill={theme.icon} | ||
| hoverFill={theme.icon} | ||
| /> | ||
| </Button> | ||
| </View> | ||
| </View> | ||
| ) : ( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Button from '@components/ButtonComposed'; | ||
| import ImageSVG from '@components/ImageSVG'; | ||
| import Text from '@components/Text'; | ||
|
|
||
|
|
@@ -374,10 +374,14 @@ function MapView({ | |
| <View style={[styles.pAbsolute, styles.p5, styles.t0, styles.r0, styles.zIndex1]}> | ||
| <Button | ||
| onPress={centerMap} | ||
| accessibilityLabel={translate('common.center')} | ||
| > | ||
| <Button.Icon | ||
| src={expensifyIcons.Crosshair} | ||
| fill={theme.icon} | ||
| hoverFill={theme.icon} | ||
| /> | ||
| </Button> | ||
| </View> | ||
| )} | ||
| </View> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Button from '@components/ButtonComposed'; | ||
|
|
||
| import 'mapbox-gl/dist/mapbox-gl.css'; | ||
| import ImageSVG from '@components/ImageSVG'; | ||
|
|
@@ -335,10 +335,14 @@ function MapViewImpl({ | |
| <View style={[styles.pAbsolute, styles.p5, styles.t0, styles.r0, styles.zIndex1]}> | ||
| <Button | ||
| onPress={centerMap} | ||
| accessibilityLabel={translate('common.center')} | ||
| > | ||
| <Button.Icon | ||
| src={expensifyIcons.Crosshair} | ||
| fill={theme.icon} | ||
| hoverFill={theme.icon} | ||
| /> | ||
| </Button> | ||
| </View> | ||
| )} | ||
| </View> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,7 +257,7 @@ function SubmitPrimaryActionContent({reportID}: SubmitPrimaryActionProps) { | |
|
|
||
| return ( | ||
| <AnimatedSubmitButton | ||
| variant={CONST.BUTTON_VARIANT.SUCCESS} | ||
| text={shouldUseMarkAsDoneCopy ? translate('common.markAsDone') : translate('common.submit')} | ||
| isMarkAsDone={shouldUseMarkAsDoneCopy} | ||
| onPress={() => handleSubmit()} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Button from '@components/ButtonComposed'; | ||
| import OfflineWithFeedback from '@components/OfflineWithFeedback'; | ||
| import Text from '@components/Text'; | ||
|
|
||
|
|
@@ -10,7 +10,7 @@ import {getOriginalMessage} from '@libs/ReportActionsUtils'; | |
|
|
||
| import {removeEvent} from '@userActions/Chronos'; | ||
|
|
||
| import CONST from '@src/CONST'; | ||
| import type ReportAction from '@src/types/onyx/ReportAction'; | ||
|
|
||
| import React from 'react'; | ||
|
|
@@ -61,8 +61,10 @@ function ChronosOOOListActions({reportID, action}: ChronosOOOListActionsProps) { | |
| )} | ||
| </Text> | ||
| <Button | ||
| size={CONST.BUTTON_SIZE.SMALL} | ||
| style={styles.pl2} | ||
| // Restores the 12px horizontal padding from the legacy implementation. | ||
| innerStyles={styles.ph3} | ||
|
Contributor
There was a problem hiding this comment. Same as in |
||
| onPress={() => removeEvent(reportID, action.reportActionID, event.id, events)} | ||
| > | ||
| <Text style={styles.buttonSmallText}>{translate('common.remove')}</Text> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,7 +129,7 @@ function SubmitActionButtonContent() { | |
|
|
||
| return ( | ||
| <AnimatedSubmitButton | ||
| variant={CONST.BUTTON_VARIANT.SUCCESS} | ||
| text={shouldUseMarkAsDoneCopy ? translate('common.markAsDone') : translate('common.submit')} | ||
| isMarkAsDone={shouldUseMarkAsDoneCopy} | ||
| onPress={handleSubmit} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Button from '@components/ButtonComposed'; | ||
| import Icon from '@components/Icon'; | ||
| import {PressableWithFeedback} from '@components/Pressable'; | ||
|
|
||
|
|
@@ -51,12 +51,13 @@ function SearchSaveButton() { | |
|
|
||
| return ( | ||
| <Button | ||
| size={CONST.BUTTON_SIZE.SMALL} | ||
| onPress={openSaveSearchPage} | ||
| sentryLabel={CONST.SENTRY_LABEL.SEARCH.FILTER_SAVE_BUTTON} | ||
| > | ||
| <Button.Icon src={expensifyIcons.Bookmark} /> | ||
| <Button.Text>{translate('common.save')}</Button.Text> | ||
| </Button> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AI sent me a message like this. Check if it really looks wrong; if so, we should fix it now during the migration.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice find, we should look into it 👀