Skip to content

Commit 876079a

Browse files
committed
[fix] Patch internal sources of deprecation warnings
1 parent 75920f3 commit 876079a

File tree

17 files changed

+67
-69
lines changed

17 files changed

+67
-69
lines changed

packages/react-native-web-docs/src/pages/docs/concepts/localization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The `useLocaleContext` API can be used for fine-grained control of layout, e.g.,
5050
const { direction, locale } = useLocaleContext();
5151

5252
const isRTL = direction === 'rtl';
53-
const style = { transform: [{ scaleX: isRTL ? -1 : 1 }] };
53+
const style = { scaleX: isRTL ? -1 : 1 };
5454

5555
<Image source={'forward.svg'} style={style} />
5656
<Image source={isRTL ? 'back.svg' : 'forward.svg'} />

packages/react-native-web-examples/pages/localization/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ class LayoutRTLExample extends React.Component {
452452
source={iconSource}
453453
style={[
454454
styles.image,
455-
{ transform: [{ scaleX: this.state.isRTL ? -1 : 1 }] }
455+
{ transform: `scaleX(${this.state.isRTL ? -1 : 1})` }
456456
]}
457457
/>
458458
<Text style={styles.fontSizeSmall}>RTL flip</Text>

packages/react-native-web-examples/pages/pan-responder/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class LocationXY extends React.Component {
121121
};
122122

123123
render() {
124-
const transform = { transform: [{ translateX: this.state.translateX }] };
124+
const transform = { transform: `translateX${this.state.translateX}` };
125125
return (
126126
<View style={styles.box}>
127127
<View style={styles.outer} {...this.panResponder.panHandlers}>

packages/react-native-web/src/exports/ActivityIndicator/__tests__/__snapshots__/index-test.js.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ exports[`components/ActivityIndicator prop "accessibilityLabel" value is set 1`]
99
role="progressbar"
1010
>
1111
<div
12-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
12+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
1313
>
1414
<svg
1515
height="100%"
@@ -46,7 +46,7 @@ exports[`components/ActivityIndicator prop "accessibilityLiveRegion" value is se
4646
role="progressbar"
4747
>
4848
<div
49-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
49+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
5050
>
5151
<svg
5252
height="100%"
@@ -82,7 +82,7 @@ exports[`components/ActivityIndicator prop "animating" is "false" 1`] = `
8282
role="progressbar"
8383
>
8484
<div
85-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0 r-animationPlayState-1abnn5w r-visibility-11j9u27"
85+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0 r-animationPlayState-1abnn5w r-visibility-11j9u27"
8686
>
8787
<svg
8888
height="100%"
@@ -118,7 +118,7 @@ exports[`components/ActivityIndicator prop "animating" is "true" 1`] = `
118118
role="progressbar"
119119
>
120120
<div
121-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
121+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
122122
>
123123
<svg
124124
height="100%"
@@ -181,7 +181,7 @@ exports[`components/ActivityIndicator prop "dataSet" value is set 1`] = `
181181
role="progressbar"
182182
>
183183
<div
184-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
184+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
185185
>
186186
<svg
187187
height="100%"
@@ -217,7 +217,7 @@ exports[`components/ActivityIndicator prop "hidesWhenStopped" is "false" 1`] = `
217217
role="progressbar"
218218
>
219219
<div
220-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0 r-animationPlayState-1abnn5w"
220+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0 r-animationPlayState-1abnn5w"
221221
>
222222
<svg
223223
height="100%"
@@ -253,7 +253,7 @@ exports[`components/ActivityIndicator prop "hidesWhenStopped" is "true" 1`] = `
253253
role="progressbar"
254254
>
255255
<div
256-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0 r-animationPlayState-1abnn5w r-visibility-11j9u27"
256+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0 r-animationPlayState-1abnn5w r-visibility-11j9u27"
257257
>
258258
<svg
259259
height="100%"
@@ -290,7 +290,7 @@ exports[`components/ActivityIndicator prop "nativeID" value is set 1`] = `
290290
role="progressbar"
291291
>
292292
<div
293-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
293+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
294294
>
295295
<svg
296296
height="100%"
@@ -326,7 +326,7 @@ exports[`components/ActivityIndicator prop "size" is "large" 1`] = `
326326
role="progressbar"
327327
>
328328
<div
329-
class="css-view-175oi2r r-height-1r8g8re r-width-1acpoxo r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
329+
class="css-view-175oi2r r-height-1r8g8re r-width-1acpoxo r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
330330
>
331331
<svg
332332
height="100%"
@@ -362,7 +362,7 @@ exports[`components/ActivityIndicator prop "size" is a number 1`] = `
362362
role="progressbar"
363363
>
364364
<div
365-
class="css-view-175oi2r r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
365+
class="css-view-175oi2r r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
366366
style="height: 30px; width: 30px;"
367367
>
368368
<svg
@@ -400,7 +400,7 @@ exports[`components/ActivityIndicator prop "style" value is set 1`] = `
400400
style="border-top-width: 5px; border-right-width: 5px; border-bottom-width: 5px; border-left-width: 5px;"
401401
>
402402
<div
403-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
403+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
404404
>
405405
<svg
406406
height="100%"
@@ -437,7 +437,7 @@ exports[`components/ActivityIndicator prop "testID" value is set 1`] = `
437437
role="progressbar"
438438
>
439439
<div
440-
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-127358a r-animationTimingFunction-1ldzwu0"
440+
class="css-view-175oi2r r-height-z80fyv r-width-19wmn03 r-animationDuration-17bb2tj r-animationIterationCount-1muvv40 r-animationKeyframes-1yef0xd r-animationTimingFunction-1ldzwu0"
441441
>
442442
<svg
443443
height="100%"

packages/react-native-web/src/exports/ActivityIndicator/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ const styles = StyleSheet.create({
9191
animationDuration: '0.75s',
9292
animationKeyframes: [
9393
{
94-
'0%': { transform: [{ rotate: '0deg' }] },
95-
'100%': { transform: [{ rotate: '360deg' }] }
94+
'0%': { transform: 'rotate(0deg)' },
95+
'100%': { transform: 'rotate(360deg)' }
9696
}
9797
],
9898
animationTimingFunction: 'linear',

packages/react-native-web/src/exports/AppRegistry/AppContainer.js

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ const AppContainer: React.AbstractComponent<Props> = React.forwardRef(
2626
const { children, WrapperComponent } = props;
2727

2828
let innerView = (
29-
<View
30-
children={children}
31-
key={1}
32-
pointerEvents="box-none"
33-
style={styles.appContainer}
34-
/>
29+
<View children={children} key={1} style={styles.appContainer} />
3530
);
3631

3732
if (WrapperComponent) {
@@ -40,11 +35,7 @@ const AppContainer: React.AbstractComponent<Props> = React.forwardRef(
4035

4136
return (
4237
<RootTagContext.Provider value={props.rootTag}>
43-
<View
44-
pointerEvents="box-none"
45-
ref={forwardedRef}
46-
style={styles.appContainer}
47-
>
38+
<View ref={forwardedRef} style={styles.appContainer}>
4839
{innerView}
4940
</View>
5041
</RootTagContext.Provider>
@@ -58,6 +49,7 @@ export default AppContainer;
5849

5950
const styles = StyleSheet.create({
6051
appContainer: {
61-
flex: 1
52+
flex: 1,
53+
pointerEvents: 'box-none'
6254
}
6355
});

packages/react-native-web/src/exports/CheckBox/__tests__/index-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ describe('CheckBox', () => {
1818
describe('prop "accessibilityLabel"', () => {
1919
test('value is set', () => {
2020
const { container } = render(
21-
<CheckBox accessibilityLabel="accessibility label" />
21+
<CheckBox aria-label="accessibility label" />
2222
);
2323
expect(container.firstChild).toMatchSnapshot();
2424
});
2525
});
2626

2727
describe('prop "accessibilityReadOnly"', () => {
2828
test('value is set', () => {
29-
const { container } = render(<CheckBox accessibilityReadOnly={true} />);
29+
const { container } = render(<CheckBox aria-readonly={true} />);
3030
expect(container.firstChild).toMatchSnapshot();
3131
});
3232
});
@@ -61,7 +61,7 @@ describe('CheckBox', () => {
6161

6262
describe('prop "nativeID"', () => {
6363
test('value is set', () => {
64-
const { container } = render(<CheckBox nativeID="123" />);
64+
const { container } = render(<CheckBox id="123" />);
6565
expect(container.firstChild).toMatchSnapshot();
6666
});
6767
});

packages/react-native-web/src/exports/CheckBox/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const CheckBox: React.AbstractComponent<
3030
React.ElementRef<typeof View>
3131
> = React.forwardRef((props, forwardedRef) => {
3232
const {
33-
accessibilityReadOnly,
33+
'aria-readonly': ariaReadOnly,
3434
color,
3535
disabled,
3636
onChange,
@@ -64,7 +64,7 @@ const CheckBox: React.AbstractComponent<
6464
checked: value,
6565
disabled: disabled,
6666
onChange: handleChange,
67-
readOnly: accessibilityReadOnly,
67+
readOnly: ariaReadOnly || other.accessibilityReadOnly,
6868
ref: forwardedRef,
6969
style: [styles.nativeControl, styles.cursorInherit],
7070
type: 'checkbox'
@@ -73,8 +73,8 @@ const CheckBox: React.AbstractComponent<
7373
return (
7474
<View
7575
{...other}
76-
accessibilityDisabled={disabled}
77-
accessibilityReadOnly={accessibilityReadOnly}
76+
aria-disabled={disabled}
77+
aria-readonly={ariaReadOnly}
7878
style={[styles.root, style, disabled && styles.cursorDefault]}
7979
>
8080
{fakeControl}

packages/react-native-web/src/exports/Image/__tests__/__snapshots__/index-test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`components/Image prop "accessibilityLabel" 1`] = `
3+
exports[`components/Image prop "aria-label" 1`] = `
44
<div
55
aria-label="accessibilityLabel"
66
class="css-view-175oi2r r-flexBasis-1mlwlqe r-overflow-1udh08x r-zIndex-417010"

packages/react-native-web/src/exports/Image/__tests__/index-test.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,10 @@ describe('components/Image', () => {
2626
window.Image = originalImage;
2727
});
2828

29-
test('prop "accessibilityLabel"', () => {
29+
test('prop "aria-label"', () => {
3030
const defaultSource = { uri: 'https://google.com/favicon.ico' };
3131
const { container } = render(
32-
<Image
33-
accessibilityLabel="accessibilityLabel"
34-
defaultSource={defaultSource}
35-
/>
32+
<Image aria-label="accessibilityLabel" defaultSource={defaultSource} />
3633
);
3734
expect(container.firstChild).toMatchSnapshot();
3835
});

0 commit comments

Comments
 (0)