Skip to content

Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
carloscuesta wants to merge 3 commits into from
Closed

Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b51d8d1
fix(TouchableWithoutFeedback): Disable click fn a11y when disabled
carloscuesta Apr 4, 2021
ec0e05f
refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…
carloscuesta Apr 14, 2021
5cbbdb4
Merge branch 'master' into disable-click-functionality-a11y-Touchable…
carloscuesta Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Libraries/Components/Touchable/TouchableWithoutFeedback.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
'accessibilityLabel',
'accessibilityLiveRegion',
'accessibilityRole',
'accessibilityState',
'accessibilityValue',
'accessibilityViewIsModal',
'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
const elementProps: {[string]: mixed, ...} = {
...eventHandlersWithoutBlurAndFocus,
accessible: this.props.accessible !== false,
accessibilityState:
this.props.disabled != null
? {
...this.props.accessibilityState,
disabled: this.props.disabled,
}
: this.props.accessibilityState,
focusable:
this.props.focusable !== false && this.props.onPress !== undefined,
};
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
return {
cancelable: !props.rejectResponderTermination,
disabled: props.disabled,
disabled:
props.disabled !== null
? props.disabled
: props.accessibilityState?.disabled,
hitSlop: props.hitSlop,
delayLongPress: props.delayLongPress,
delayPressIn: props.delayPressIn,
Expand Down
68 changes: 62 additions & 6 deletions Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
it('renders correctly', () => {
const instance = render.create(
const instance = ReactTestRenderer.create(
<TouchableWithoutFeedback style={{}}>
<Text>Touchable</Text>
</TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
);
});
});

describe('TouchableWithoutFeedback with disabled state', () => {
it('should be disabled when disabled is true', () => {
expect(
ReactTestRenderer.create(
<TouchableWithoutFeedback disabled={true}>
<View />
</TouchableWithoutFeedback>,
),
).toMatchSnapshot();
});

it('should be disabled when disabled is true and accessibilityState is empty', () => {
expect(
ReactTestRenderer.create(
<TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
<View />
</TouchableWithoutFeedback>,
),
).toMatchSnapshot();
});

it('should keep accessibilityState when disabled is true', () => {
expect(
ReactTestRenderer.create(
<TouchableWithoutFeedback
disabled={true}
accessibilityState={{checked: true}}>
<View />
</TouchableWithoutFeedback>,
),
).toMatchSnapshot();
});

it('should overwrite accessibilityState with value of disabled prop', () => {
expect(
ReactTestRenderer.create(
<TouchableWithoutFeedback
disabled={true}
accessibilityState={{disabled: false}}>
<View />
</TouchableWithoutFeedback>,
),
).toMatchSnapshot();
});

it('should disable button when accessibilityState is disabled', () => {
expect(
ReactTestRenderer.create(
<TouchableWithoutFeedback accessibilityState={{disabled: true}}>
<View />
</TouchableWithoutFeedback>,
),
).toMatchSnapshot();
});
});
96 changes: 96 additions & 0 deletions Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
focusable={false}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
focusable={false}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
focusable={false}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
accessibilityState={
Object {
Comment thread
carloscuesta marked this conversation as resolved.
"checked": true,
"disabled": true,
}
}
accessible={true}
focusable={false}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
accessibilityState={
Object {
"disabled": true,
}
}
accessible={true}
focusable={false}
onClick={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
/>
`;
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Disable `accessibilityState` when `TouchableWithoutFeedback` is `disabled` by carloscuesta · Pull Request #31297 · react/react-native · GitHub
Skip to content
Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

carloscuesta
wants to merge
3
commits into

from

 Closed


Disable accessibilityState when TouchableWithoutFeedback is disabled#31297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b51d8d1

fix(TouchableWithoutFeedback): Disable click fn a11y when disabled


carloscuesta Apr 4, 2021
ec0e05f

refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…


carloscuesta Apr 14, 2021
5cbbdb4

Merge branch 'master' into disable-click-functionality-a11y-Touchable…


carloscuesta Apr 14, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 11 additions & 2 deletions
Libraries/Components/Touchable/TouchableWithoutFeedback.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
 'accessibilityLabel',
 'accessibilityLiveRegion',
 'accessibilityRole',
 'accessibilityState',
 'accessibilityValue',
 'accessibilityViewIsModal',
 'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 const elementProps: {[string]: mixed, ...} = {
 ...eventHandlersWithoutBlurAndFocus,
 accessible: this.props.accessible !== false,
 accessibilityState:
 this.props.disabled != null
 ? {
 ...this.props.accessibilityState,
 disabled: this.props.disabled,
 }
 : this.props.accessibilityState,
 focusable:
 this.props.focusable !== false && this.props.onPress !== undefined,
 };
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
 return {
 cancelable: !props.rejectResponderTermination,
 disabled: props.disabled,
 disabled:
 props.disabled !== null
 ? props.disabled
 : props.accessibilityState?.disabled,
 hitSlop: props.hitSlop,
 delayLongPress: props.delayLongPress,
 delayPressIn: props.delayPressIn,
Expand Down

68 changes: 62 additions & 6 deletions
Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
 it('renders correctly', () => {
 const instance = render.create(
 const instance = ReactTestRenderer.create(
 <TouchableWithoutFeedback style={{}}>
 <Text>Touchable</Text>
 </TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
 );
 });
});

describe('TouchableWithoutFeedback with disabled state', () => {
 it('should be disabled when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should be disabled when disabled is true and accessibilityState is empty', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should keep accessibilityState when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{checked: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should overwrite accessibilityState with value of disabled prop', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{disabled: false}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should disable button when accessibilityState is disabled', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });
});

96 changes: 96 additions & 0 deletions
Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
 Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
Comment thread
carloscuesta marked this conversation as resolved.

 "checked": true,
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Disable `accessibilityState` when `TouchableWithoutFeedback` is `disabled` by carloscuesta · Pull Request #31297 · react/react-native · GitHub
Skip to content
Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

carloscuesta
wants to merge
3
commits into

from

 Closed


Disable accessibilityState when TouchableWithoutFeedback is disabled#31297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b51d8d1

fix(TouchableWithoutFeedback): Disable click fn a11y when disabled


carloscuesta Apr 4, 2021
ec0e05f

refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…


carloscuesta Apr 14, 2021
5cbbdb4

Merge branch 'master' into disable-click-functionality-a11y-Touchable…


carloscuesta Apr 14, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 11 additions & 2 deletions
Libraries/Components/Touchable/TouchableWithoutFeedback.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
 'accessibilityLabel',
 'accessibilityLiveRegion',
 'accessibilityRole',
 'accessibilityState',
 'accessibilityValue',
 'accessibilityViewIsModal',
 'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 const elementProps: {[string]: mixed, ...} = {
 ...eventHandlersWithoutBlurAndFocus,
 accessible: this.props.accessible !== false,
 accessibilityState:
 this.props.disabled != null
 ? {
 ...this.props.accessibilityState,
 disabled: this.props.disabled,
 }
 : this.props.accessibilityState,
 focusable:
 this.props.focusable !== false && this.props.onPress !== undefined,
 };
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
 return {
 cancelable: !props.rejectResponderTermination,
 disabled: props.disabled,
 disabled:
 props.disabled !== null
 ? props.disabled
 : props.accessibilityState?.disabled,
 hitSlop: props.hitSlop,
 delayLongPress: props.delayLongPress,
 delayPressIn: props.delayPressIn,
Expand Down

68 changes: 62 additions & 6 deletions
Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
 it('renders correctly', () => {
 const instance = render.create(
 const instance = ReactTestRenderer.create(
 <TouchableWithoutFeedback style={{}}>
 <Text>Touchable</Text>
 </TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
 );
 });
});

describe('TouchableWithoutFeedback with disabled state', () => {
 it('should be disabled when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should be disabled when disabled is true and accessibilityState is empty', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should keep accessibilityState when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{checked: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should overwrite accessibilityState with value of disabled prop', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{disabled: false}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should disable button when accessibilityState is disabled', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });
});

96 changes: 96 additions & 0 deletions
Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
 Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
Comment thread
carloscuesta marked this conversation as resolved.

 "checked": true,
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Disable `accessibilityState` when `TouchableWithoutFeedback` is `disabled` by carloscuesta · Pull Request #31297 · react/react-native · GitHub
Skip to content
Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

carloscuesta
wants to merge
3
commits into

from

 Closed


Disable accessibilityState when TouchableWithoutFeedback is disabled#31297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b51d8d1

fix(TouchableWithoutFeedback): Disable click fn a11y when disabled


carloscuesta Apr 4, 2021
ec0e05f

refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…


carloscuesta Apr 14, 2021
5cbbdb4

Merge branch 'master' into disable-click-functionality-a11y-Touchable…


carloscuesta Apr 14, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 11 additions & 2 deletions
Libraries/Components/Touchable/TouchableWithoutFeedback.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
 'accessibilityLabel',
 'accessibilityLiveRegion',
 'accessibilityRole',
 'accessibilityState',
 'accessibilityValue',
 'accessibilityViewIsModal',
 'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 const elementProps: {[string]: mixed, ...} = {
 ...eventHandlersWithoutBlurAndFocus,
 accessible: this.props.accessible !== false,
 accessibilityState:
 this.props.disabled != null
 ? {
 ...this.props.accessibilityState,
 disabled: this.props.disabled,
 }
 : this.props.accessibilityState,
 focusable:
 this.props.focusable !== false && this.props.onPress !== undefined,
 };
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
 return {
 cancelable: !props.rejectResponderTermination,
 disabled: props.disabled,
 disabled:
 props.disabled !== null
 ? props.disabled
 : props.accessibilityState?.disabled,
 hitSlop: props.hitSlop,
 delayLongPress: props.delayLongPress,
 delayPressIn: props.delayPressIn,
Expand Down

68 changes: 62 additions & 6 deletions
Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
 it('renders correctly', () => {
 const instance = render.create(
 const instance = ReactTestRenderer.create(
 <TouchableWithoutFeedback style={{}}>
 <Text>Touchable</Text>
 </TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
 );
 });
});

describe('TouchableWithoutFeedback with disabled state', () => {
 it('should be disabled when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should be disabled when disabled is true and accessibilityState is empty', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should keep accessibilityState when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{checked: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should overwrite accessibilityState with value of disabled prop', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{disabled: false}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should disable button when accessibilityState is disabled', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });
});

96 changes: 96 additions & 0 deletions
Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
 Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
Comment thread
carloscuesta marked this conversation as resolved.

 "checked": true,
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Disable `accessibilityState` when `TouchableWithoutFeedback` is `disabled` by carloscuesta · Pull Request #31297 · react/react-native · GitHub
Skip to content
Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

carloscuesta
wants to merge
3
commits into

from

 Closed


Disable accessibilityState when TouchableWithoutFeedback is disabled#31297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b51d8d1

fix(TouchableWithoutFeedback): Disable click fn a11y when disabled


carloscuesta Apr 4, 2021
ec0e05f

refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…


carloscuesta Apr 14, 2021
5cbbdb4

Merge branch 'master' into disable-click-functionality-a11y-Touchable…


carloscuesta Apr 14, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 11 additions & 2 deletions
Libraries/Components/Touchable/TouchableWithoutFeedback.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
 'accessibilityLabel',
 'accessibilityLiveRegion',
 'accessibilityRole',
 'accessibilityState',
 'accessibilityValue',
 'accessibilityViewIsModal',
 'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 const elementProps: {[string]: mixed, ...} = {
 ...eventHandlersWithoutBlurAndFocus,
 accessible: this.props.accessible !== false,
 accessibilityState:
 this.props.disabled != null
 ? {
 ...this.props.accessibilityState,
 disabled: this.props.disabled,
 }
 : this.props.accessibilityState,
 focusable:
 this.props.focusable !== false && this.props.onPress !== undefined,
 };
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
 return {
 cancelable: !props.rejectResponderTermination,
 disabled: props.disabled,
 disabled:
 props.disabled !== null
 ? props.disabled
 : props.accessibilityState?.disabled,
 hitSlop: props.hitSlop,
 delayLongPress: props.delayLongPress,
 delayPressIn: props.delayPressIn,
Expand Down

68 changes: 62 additions & 6 deletions
Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
 it('renders correctly', () => {
 const instance = render.create(
 const instance = ReactTestRenderer.create(
 <TouchableWithoutFeedback style={{}}>
 <Text>Touchable</Text>
 </TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
 );
 });
});

describe('TouchableWithoutFeedback with disabled state', () => {
 it('should be disabled when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should be disabled when disabled is true and accessibilityState is empty', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should keep accessibilityState when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{checked: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should overwrite accessibilityState with value of disabled prop', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{disabled: false}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should disable button when accessibilityState is disabled', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });
});

96 changes: 96 additions & 0 deletions
Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
 Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
Comment thread
carloscuesta marked this conversation as resolved.

 "checked": true,
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Disable `accessibilityState` when `TouchableWithoutFeedback` is `disabled` by carloscuesta · Pull Request #31297 · react/react-native · GitHub
Skip to content
Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

carloscuesta
wants to merge
3
commits into

from

 Closed


Disable accessibilityState when TouchableWithoutFeedback is disabled#31297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b51d8d1

fix(TouchableWithoutFeedback): Disable click fn a11y when disabled


carloscuesta Apr 4, 2021
ec0e05f

refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…


carloscuesta Apr 14, 2021
5cbbdb4

Merge branch 'master' into disable-click-functionality-a11y-Touchable…


carloscuesta Apr 14, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 11 additions & 2 deletions
Libraries/Components/Touchable/TouchableWithoutFeedback.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
 'accessibilityLabel',
 'accessibilityLiveRegion',
 'accessibilityRole',
 'accessibilityState',
 'accessibilityValue',
 'accessibilityViewIsModal',
 'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 const elementProps: {[string]: mixed, ...} = {
 ...eventHandlersWithoutBlurAndFocus,
 accessible: this.props.accessible !== false,
 accessibilityState:
 this.props.disabled != null
 ? {
 ...this.props.accessibilityState,
 disabled: this.props.disabled,
 }
 : this.props.accessibilityState,
 focusable:
 this.props.focusable !== false && this.props.onPress !== undefined,
 };
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
 return {
 cancelable: !props.rejectResponderTermination,
 disabled: props.disabled,
 disabled:
 props.disabled !== null
 ? props.disabled
 : props.accessibilityState?.disabled,
 hitSlop: props.hitSlop,
 delayLongPress: props.delayLongPress,
 delayPressIn: props.delayPressIn,
Expand Down

68 changes: 62 additions & 6 deletions
Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
 it('renders correctly', () => {
 const instance = render.create(
 const instance = ReactTestRenderer.create(
 <TouchableWithoutFeedback style={{}}>
 <Text>Touchable</Text>
 </TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
 );
 });
});

describe('TouchableWithoutFeedback with disabled state', () => {
 it('should be disabled when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should be disabled when disabled is true and accessibilityState is empty', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should keep accessibilityState when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{checked: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should overwrite accessibilityState with value of disabled prop', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{disabled: false}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should disable button when accessibilityState is disabled', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });
});

96 changes: 96 additions & 0 deletions
Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
 Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
Comment thread
carloscuesta marked this conversation as resolved.

 "checked": true,
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Disable `accessibilityState` when `TouchableWithoutFeedback` is `disabled` by carloscuesta · Pull Request #31297 · react/react-native · GitHub
Skip to content
Disable accessibilityState when TouchableWithoutFeedback is disabled#31297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

carloscuesta
wants to merge
3
commits into

from

 Closed


Disable accessibilityState when TouchableWithoutFeedback is disabled#31297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b51d8d1

fix(TouchableWithoutFeedback): Disable click fn a11y when disabled


carloscuesta Apr 4, 2021
ec0e05f

refactor(TouchableWithoutFeedback): Remove accessibilityState from PA…


carloscuesta Apr 14, 2021
5cbbdb4

Merge branch 'master' into disable-click-functionality-a11y-Touchable…


carloscuesta Apr 14, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 11 additions & 2 deletions
Libraries/Components/Touchable/TouchableWithoutFeedback.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ const PASSTHROUGH_PROPS = [
 'accessibilityLabel',
 'accessibilityLiveRegion',
 'accessibilityRole',
 'accessibilityState',
 'accessibilityValue',
 'accessibilityViewIsModal',
 'hitSlop',
Expand DownExpand Up@@ -116,6 +115,13 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 const elementProps: {[string]: mixed, ...} = {
 ...eventHandlersWithoutBlurAndFocus,
 accessible: this.props.accessible !== false,
 accessibilityState:
 this.props.disabled != null
 ? {
 ...this.props.accessibilityState,
 disabled: this.props.disabled,
 }
 : this.props.accessibilityState,
 focusable:
 this.props.focusable !== false && this.props.onPress !== undefined,
 };
Expand All@@ -140,7 +146,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
function createPressabilityConfig(props: Props): PressabilityConfig {
 return {
 cancelable: !props.rejectResponderTermination,
 disabled: props.disabled,
 disabled:
 props.disabled !== null
 ? props.disabled
 : props.accessibilityState?.disabled,
 hitSlop: props.hitSlop,
 delayLongPress: props.delayLongPress,
 delayPressIn: props.delayPressIn,
Expand Down

68 changes: 62 additions & 6 deletions
Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,15 +10,15 @@

'use strict';

const React = require('react');
const Text = require('../../../Text/Text');
const TouchableWithoutFeedback = require('../TouchableWithoutFeedback');

const render = require('../../../../jest/renderer');
import * as React from 'react';
import ReactTestRenderer from 'react-test-renderer';
import Text from '../../../Text/Text';
import View from '../../View/View';
import TouchableWithoutFeedback from '../TouchableWithoutFeedback';

describe('TouchableWithoutFeedback', () => {
 it('renders correctly', () => {
 const instance = render.create(
 const instance = ReactTestRenderer.create(
 <TouchableWithoutFeedback style={{}}>
 <Text>Touchable</Text>
 </TouchableWithoutFeedback>,
Expand All@@ -33,3 +33,59 @@ describe('TouchableWithoutFeedback', () => {
 );
 });
});

describe('TouchableWithoutFeedback with disabled state', () => {
 it('should be disabled when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should be disabled when disabled is true and accessibilityState is empty', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should keep accessibilityState when disabled is true', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{checked: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should overwrite accessibilityState with value of disabled prop', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback
 disabled={true}
 accessibilityState={{disabled: false}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });

 it('should disable button when accessibilityState is disabled', () => {
 expect(
 ReactTestRenderer.create(
 <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
 <View />
 </TouchableWithoutFeedback>,
 ),
 ).toMatchSnapshot();
 });
});

96 changes: 96 additions & 0 deletions
Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,99 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
 Touchable
</Text>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
<View
 accessibilityState={
 Object {
Comment thread
carloscuesta marked this conversation as resolved.

 "checked": true,
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;

exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
<View
 accessibilityState={
 Object {
 "disabled": true,
 }
 }
 accessible={true}
 focusable={false}
 onClick={[Function]}
 onResponderGrant={[Function]}
 onResponderMove={[Function]}
 onResponderRelease={[Function]}
 onResponderTerminate={[Function]}
 onResponderTerminationRequest={[Function]}
 onStartShouldSetResponder={[Function]}
/>
`;