Skip to content

Commit e9ac46d

Browse files
jahirfiquitivalukewalczak
authored andcommitted
fix: change trailering to trailing (#3840)
1 parent a02544c commit e9ac46d

File tree

3 files changed

+61
-64
lines changed

3 files changed

+61
-64
lines changed

example/src/Examples/SearchbarExample.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const SearchExample = ({ navigation }: Props) => {
2222
const [isVisible, setIsVisible] = React.useState(false);
2323
const [searchQueries, setSearchQuery] = React.useState({
2424
searchBarMode: '',
25-
traileringIcon: '',
26-
traileringIconWithRightItem: '',
25+
trailingIcon: '',
26+
trailingIconWithRightItem: '',
2727
rightItem: '',
2828
loadingBarMode: '',
2929
searchViewMode: '',
@@ -52,15 +52,15 @@ const SearchExample = ({ navigation }: Props) => {
5252
<Searchbar
5353
placeholder="Trailering icon"
5454
onChangeText={(query) =>
55-
setSearchQuery({ ...searchQueries, traileringIcon: query })
55+
setSearchQuery({ ...searchQueries, trailingIcon: query })
5656
}
57-
value={searchQueries.traileringIcon}
58-
traileringIcon={'microphone'}
59-
traileringIconColor={
57+
value={searchQueries.trailingIcon}
58+
trailingIcon={'microphone'}
59+
trailingIconColor={
6060
isVisible ? Colors.error40 : colors.onSurfaceVariant
6161
}
62-
traileringIconAccessibilityLabel={'microphone button'}
63-
onTraileringIconPress={() => setIsVisible(true)}
62+
trailingIconAccessibilityLabel={'microphone button'}
63+
onTrailingIconPress={() => setIsVisible(true)}
6464
style={styles.searchbar}
6565
mode="bar"
6666
/>
@@ -70,16 +70,16 @@ const SearchExample = ({ navigation }: Props) => {
7070
onChangeText={(query) =>
7171
setSearchQuery({
7272
...searchQueries,
73-
traileringIconWithRightItem: query,
73+
trailingIconWithRightItem: query,
7474
})
7575
}
76-
value={searchQueries.traileringIconWithRightItem}
77-
traileringIcon={'microphone'}
78-
traileringIconColor={
76+
value={searchQueries.trailingIconWithRightItem}
77+
trailingIcon={'microphone'}
78+
trailingIconColor={
7979
isVisible ? Colors.error40 : colors.onSurfaceVariant
8080
}
81-
traileringIconAccessibilityLabel={'microphone button'}
82-
onTraileringIconPress={() => setIsVisible(true)}
81+
trailingIconAccessibilityLabel={'microphone button'}
82+
onTrailingIconPress={() => setIsVisible(true)}
8383
right={(props) => (
8484
<Avatar.Image
8585
{...props}
@@ -120,7 +120,7 @@ const SearchExample = ({ navigation }: Props) => {
120120
style={styles.searchbar}
121121
mode="bar"
122122
loading
123-
traileringIcon={'microphone'}
123+
trailingIcon={'microphone'}
124124
/>
125125
</List.Section>
126126
<List.Section title="View mode">

src/components/Searchbar.tsx

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,29 @@ export type Props = React.ComponentPropsWithRef<typeof TextInput> & {
8484
clearAccessibilityLabel?: string;
8585
/**
8686
* @supported Available in v5.x with theme version 3
87-
* Icon name for the right trailering icon button.
87+
* Icon name for the right trailing icon button.
8888
* Works only when `mode` is set to "bar". It won't be displayed if `loading` is set to `true`.
8989
*/
90-
traileringIcon?: IconSource;
90+
trailingIcon?: IconSource;
9191
/**
9292
* @supported Available in v5.x with theme version 3
93-
* Custom color for the right trailering icon, default will be derived from theme
93+
* Custom color for the right trailing icon, default will be derived from theme
9494
*/
95-
traileringIconColor?: string;
95+
trailingIconColor?: string;
9696
/**
9797
* @supported Available in v5.x with theme version 3
98-
* Color of the trailering icon ripple effect.
98+
* Color of the trailing icon ripple effect.
9999
*/
100-
traileringRippleColor?: ColorValue;
100+
trailingRippleColor?: ColorValue;
101101
/**
102102
* @supported Available in v5.x with theme version 3
103-
* Callback to execute on the right trailering icon button press.
103+
* Callback to execute on the right trailing icon button press.
104104
*/
105-
onTraileringIconPress?: (e: GestureResponderEvent) => void;
105+
onTrailingIconPress?: (e: GestureResponderEvent) => void;
106106
/**
107-
* Accessibility label for the right trailering icon button. This is read by the screen reader when the user taps the button.
107+
* Accessibility label for the right trailing icon button. This is read by the screen reader when the user taps the button.
108108
*/
109-
traileringIconAccessibilityLabel?: string;
109+
trailingIconAccessibilityLabel?: string;
110110
/**
111111
* @supported Available in v5.x with theme version 3
112112
* Callback which returns a React element to display on the right side.
@@ -187,11 +187,11 @@ const Searchbar = forwardRef<TextInputHandles, Props>(
187187
clearIcon,
188188
clearAccessibilityLabel = 'clear',
189189
onClearIconPress,
190-
traileringIcon,
191-
traileringIconColor,
192-
traileringIconAccessibilityLabel,
193-
traileringRippleColor: customTraileringRippleColor,
194-
onTraileringIconPress,
190+
trailingIcon,
191+
trailingIconColor,
192+
trailingIconAccessibilityLabel,
193+
trailingRippleColor: customTrailingRippleColor,
194+
onTrailingIconPress,
195195
right,
196196
mode = 'bar',
197197
showDivider = true,
@@ -243,8 +243,8 @@ const Searchbar = forwardRef<TextInputHandles, Props>(
243243
const iconColor = customIconColor || onSurfaceVariant;
244244
const rippleColor =
245245
customRippleColor || color(onSurfaceVariant).alpha(0.32).rgb().string();
246-
const traileringRippleColor =
247-
customTraileringRippleColor ||
246+
const trailingRippleColor =
247+
customTrailingRippleColor ||
248248
color(onSurfaceVariant).alpha(0.32).rgb().string();
249249

250250
const font = {
@@ -256,11 +256,8 @@ const Searchbar = forwardRef<TextInputHandles, Props>(
256256
};
257257

258258
const isBarMode = mode === 'bar';
259-
const shouldRenderTraileringIcon =
260-
isBarMode &&
261-
traileringIcon &&
262-
!loading &&
263-
(!value || right !== undefined);
259+
const shouldRenderTrailingIcon =
260+
isBarMode && trailingIcon && !loading && (!value || right !== undefined);
264261

265262
return (
266263
<Surface
@@ -362,16 +359,16 @@ const Searchbar = forwardRef<TextInputHandles, Props>(
362359
/>
363360
</View>
364361
)}
365-
{shouldRenderTraileringIcon ? (
362+
{shouldRenderTrailingIcon ? (
366363
<IconButton
367364
accessibilityRole="button"
368365
borderless
369-
onPress={onTraileringIconPress}
370-
iconColor={traileringIconColor || onSurfaceVariant}
371-
rippleColor={traileringRippleColor}
372-
icon={traileringIcon}
373-
accessibilityLabel={traileringIconAccessibilityLabel}
374-
testID={`${testID}-trailering-icon`}
366+
onPress={onTrailingIconPress}
367+
iconColor={trailingIconColor || onSurfaceVariant}
368+
rippleColor={trailingRippleColor}
369+
icon={trailingIcon}
370+
accessibilityLabel={trailingIconAccessibilityLabel}
371+
testID={`${testID}-trailing-icon`}
375372
/>
376373
) : null}
377374
{isBarMode &&

src/components/__tests__/Searchbar.test.tsx

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -151,75 +151,75 @@ it('render clear icon with custom ripple color', () => {
151151
expect(clearIconContainer.props.rippleColor).toBe('purple');
152152
});
153153

154-
it('renders trailering icon when mode is set to "bar"', () => {
154+
it('renders trailing icon when mode is set to "bar"', () => {
155155
const { getByTestId } = render(
156156
<Searchbar
157157
testID="search-bar"
158158
value={''}
159-
traileringIcon={'microphone'}
159+
trailingIcon={'microphone'}
160160
mode="bar"
161161
/>
162162
);
163163

164-
expect(getByTestId('search-bar-trailering-icon')).toBeTruthy();
164+
expect(getByTestId('search-bar-trailing-icon')).toBeTruthy();
165165
});
166166

167-
it('renders trailering icon with press functionality', () => {
168-
const onTraileringIconPressMock = jest.fn();
167+
it('renders trailing icon with press functionality', () => {
168+
const onTrailingIconPressMock = jest.fn();
169169

170170
const { getByTestId } = render(
171171
<Searchbar
172172
testID="search-bar"
173173
value={''}
174-
traileringIcon={'microphone'}
175-
onTraileringIconPress={onTraileringIconPressMock}
174+
trailingIcon={'microphone'}
175+
onTrailingIconPress={onTrailingIconPressMock}
176176
mode="bar"
177177
/>
178178
);
179179

180-
fireEvent(getByTestId('search-bar-trailering-icon'), 'onPress');
181-
expect(onTraileringIconPressMock).toHaveBeenCalledTimes(1);
180+
fireEvent(getByTestId('search-bar-trailing-icon'), 'onPress');
181+
expect(onTrailingIconPressMock).toHaveBeenCalledTimes(1);
182182
});
183183

184-
it('renders trailering icon with custom ripple colors', () => {
184+
it('renders trailing icon with custom ripple colors', () => {
185185
const { getByTestId } = render(
186186
<Searchbar
187187
testID="search-bar"
188188
value={''}
189-
traileringRippleColor={'purple'}
190-
traileringIcon={'microphone'}
189+
trailingRippleColor={'purple'}
190+
trailingIcon={'microphone'}
191191
mode="bar"
192192
/>
193193
);
194194

195-
const traileringIconContainer = getByTestId(
196-
'search-bar-trailering-icon-container'
195+
const trailingIconContainer = getByTestId(
196+
'search-bar-trailing-icon-container'
197197
).props.children;
198-
expect(traileringIconContainer.props.rippleColor).toBe('purple');
198+
expect(trailingIconContainer.props.rippleColor).toBe('purple');
199199
});
200200

201-
it('renders clear icon instead of trailering icon', () => {
201+
it('renders clear icon instead of trailing icon', () => {
202202
const { getByTestId, update, queryByTestId } = render(
203203
<Searchbar
204204
testID="search-bar"
205205
value={''}
206-
traileringIcon={'microphone'}
206+
trailingIcon={'microphone'}
207207
mode="bar"
208208
/>
209209
);
210210

211-
expect(getByTestId('search-bar-trailering-icon')).toBeTruthy();
211+
expect(getByTestId('search-bar-trailing-icon')).toBeTruthy();
212212

213213
update(
214214
<Searchbar
215215
testID="search-bar"
216216
value={'test'}
217-
traileringIcon={'microphone'}
217+
trailingIcon={'microphone'}
218218
mode="bar"
219219
/>
220220
);
221221

222-
expect(queryByTestId('search-bar-trailering-icon')).toBeNull();
222+
expect(queryByTestId('search-bar-trailing-icon')).toBeNull();
223223
expect(getByTestId('search-bar-icon-wrapper')).toBeTruthy();
224224
});
225225

0 commit comments

Comments
 (0)